Merge pull request #360 from openscript-ch/359-gap-detection-in-period-picker-cannot-be-satisfied

359 gap detection in period picker cannot be satisfied

Author: openscript

.changeset/three-ladybugs-dress.md

@@ -0,0 +1,6 @@
+---
+"@quassel/frontend": patch
+"@quassel/utils": patch
+---
+
+Fix always setting start date to start of month

apps/frontend/src/routes/_auth/questionnaire/_questionnaire/new.tsx

@@ -6,7 +6,7 @@ import { $api } from "../../../../stores/api";
 import { $questionnaire } from "../../../../stores/questionnaire";
 import { useEffect } from "react";
 import { Title } from "@quassel/ui";
-import { getNext } from "@quassel/utils";
+import { getNext, getStartOf } from "@quassel/utils";
 
 const messages = i18n("questionnaireNew", {
   title: "Create new period of life",
@@ -35,7 +35,10 @@ function QuestionnaireNew() {
 
   const prevEndDate = questionnaire?.participant.latestQuestionnaire?.endedAt;
 
-  const startDate = prevEndDate ? getNext("month", new Date(prevEndDate)) : participant?.birthday ? new Date(participant.birthday) : undefined;
+  const startFromBirthday = participant?.birthday ? getStartOf("month", new Date(participant.birthday)) : undefined;
+  const startFromPrevious = prevEndDate ? getNext("month", new Date(prevEndDate)) : undefined;
+
+  const startDate = startFromPrevious ?? startFromBirthday;
 
   const onSave = (form: PeriodFormValues) => {
     const {

libs/utils/src/date.ts

@@ -11,17 +11,12 @@ export function formatDate(date: Date, dayjsFormatTemplate: string) {
 
 export const getTime = (date: Date) => formatDate(date, "HH:mm");
 
-export const getNext = (unit: dayjs.ManipulateType, date: Date) => {
-  return dayjs(date).utc().add(1, unit).startOf(unit).toDate();
-};
+export const getNext = (unit: dayjs.ManipulateType, date: Date) => dayjs(date).utc().add(1, unit).startOf(unit).toDate();
 
-export const isSame = (unit: dayjs.ManipulateType, left: Date, right = new Date()) => {
-  return dayjs(left).isSame(right, unit);
-};
+export const getStartOf = (unit: dayjs.ManipulateType, date: Date) => dayjs(date).utc().startOf(unit).toDate();
 
-export const isSameOrAfter = (left: Date, right: Date, unit: dayjs.ManipulateType) => {
-  return dayjs(left).isAfter(dayjs(right).startOf(unit));
-};
+export const isSame = (unit: dayjs.ManipulateType, left: Date, right = new Date()) => dayjs(left).isSame(right, unit);
+export const isSameOrAfter = (left: Date, right: Date, unit: dayjs.ManipulateType) => dayjs(left).isAfter(dayjs(right).startOf(unit));
 
 export function getDateFromTimeAndWeekday(time: string, weekday: number) {
   return dayjs(time, "HH:mm:ss")

libs/utils/src/index.ts

@@ -1,3 +1,3 @@
-export { formatDate, getTime, getDateFromTimeAndWeekday, getNext, isSameOrAfter, isSame } from "./date";
+export { formatDate, getTime, getDateFromTimeAndWeekday, getNext, isSameOrAfter, isSame, getStartOf } from "./date";
 
 export { type Gap, type GapsPerDay, groupByWeekday, resolveGaps, entriesByInterval } from "./entry";