Implement calendar-aware date handling for forms and date pickers

fdm-app/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog fdm-app
 
+## 0.28.1
+
+### Patch Changes
+
+- [#495](https://github.com/nmi-agro/fdm/pull/495) [`9d5050a`](https://github.com/nmi-agro/fdm/commit/9d5050aef5f70636be638d2f1a4027ccd22f4189) Thanks [@SvenVw](https://github.com/SvenVw)! - Do not show the NavigationProgress for pages with their own loaders, like uploading files
+
+- [#495](https://github.com/nmi-agro/fdm/pull/495) [`9d5050a`](https://github.com/nmi-agro/fdm/commit/9d5050aef5f70636be638d2f1a4027ccd22f4189) Thanks [@SvenVw](https://github.com/SvenVw)! - Increase navigation progress time from 300 to 500ms
+
+- [#495](https://github.com/nmi-agro/fdm/pull/495) [`9d5050a`](https://github.com/nmi-agro/fdm/commit/9d5050aef5f70636be638d2f1a4027ccd22f4189) Thanks [@SvenVw](https://github.com/SvenVw)! - Improve DatePickers and Forms to use contextual default dates based on the selected calendar year. Forms now default to domain-specific dates (e.g., March 1st for fertilizer and cultivation-specific harvest defaults in non-current years), and DatePickers now resolve partial text entries (like "15 april") to the active calendar year instead of the current real-world year.
+
+- [#495](https://github.com/nmi-agro/fdm/pull/495) [`9d5050a`](https://github.com/nmi-agro/fdm/commit/9d5050aef5f70636be638d2f1a4027ccd22f4189) Thanks [@SvenVw](https://github.com/SvenVw)! - Fix that link for going back for fertilizer application modification goes back to rotation
+
+- [#495](https://github.com/nmi-agro/fdm/pull/495) [`9d5050a`](https://github.com/nmi-agro/fdm/commit/9d5050aef5f70636be638d2f1a4027ccd22f4189) Thanks [@SvenVw](https://github.com/SvenVw)! - Fix that going to Fertilizers page does not reset the selected calendar year to current year
+
+- [#495](https://github.com/nmi-agro/fdm/pull/495) [`9d5050a`](https://github.com/nmi-agro/fdm/commit/9d5050aef5f70636be638d2f1a4027ccd22f4189) Thanks [@SvenVw](https://github.com/SvenVw)! - At the Sentry metric for NavigationProgress include a tag for the page
+
+- Updated dependencies [[`9d5050a`](https://github.com/nmi-agro/fdm/commit/9d5050aef5f70636be638d2f1a4027ccd22f4189)]:
+  - @nmi-agro/fdm-calculator@0.12.1
+
 ## 0.28.0
 
 ### Minor Changes

fdm-app/app/components/blocks/fertilizer-applications/card.tsx

@@ -5,6 +5,7 @@ import { Plus } from "lucide-react"
 import { useEffect, useRef, useState } from "react"
 import { useFetcher, useLocation, useNavigation, useParams } from "react-router"
 import { useFieldFertilizerFormStore } from "@/app/store/field-fertilizer-form"
+import { useCalendarStore } from "~/store/calendar"
 import { Button } from "~/components/ui/button"
 import { Card, CardContent, CardHeader, CardTitle } from "~/components/ui/card"
 import {
@@ -75,11 +76,13 @@ export function FertilizerApplicationCard({
     }, [navigation.state])
 
     const fieldFertilizerFormStore = useFieldFertilizerFormStore()
+    const { calendar } = useCalendarStore()
     const savedFormValues =
         params.b_id_farm && b_id_or_b_lu_catalogue
             ? fieldFertilizerFormStore.load(
                   params.b_id_farm,
                   b_id_or_b_lu_catalogue,
+                  calendar,
               )
             : null
 
@@ -98,6 +101,7 @@ export function FertilizerApplicationCard({
             fieldFertilizerFormStore.delete(
                 params.b_id_farm || "",
                 b_id_or_b_lu_catalogue || "",
+                calendar,
             )
         }
     }, [
@@ -139,6 +143,7 @@ export function FertilizerApplicationCard({
             fieldFertilizerFormStore.delete(
                 params.b_id_farm,
                 b_id_or_b_lu_catalogue,
+                calendar,
             )
         }
 

fdm-app/app/components/blocks/fertilizer-applications/form.tsx

@@ -9,6 +9,8 @@ import type { Navigation } from "react-router"
 import { Form, useNavigate, useSearchParams } from "react-router"
 import { RemixFormProvider, useRemixForm } from "remix-hook-form"
 import { useFieldFertilizerFormStore } from "@/app/store/field-fertilizer-form"
+import { useCalendarStore } from "~/store/calendar"
+import { getContextualDate } from "~/lib/calendar"
 import { Combobox } from "~/components/custom/combobox"
 import { DatePicker } from "~/components/custom/date-picker-v2"
 import { Button } from "~/components/ui/button"
@@ -78,6 +80,7 @@ export function FertilizerApplicationForm<T extends typeof FormSchemaPartial>({
     const navigate = useNavigate()
     const [searchParams] = useSearchParams()
     const formId = useId()
+    const { calendar } = useCalendarStore()
     const form = useRemixForm<FieldFertilizerFormValues>({
         mode: "onTouched",
         resolver: zodResolver(
@@ -94,7 +97,7 @@ export function FertilizerApplicationForm<T extends typeof FormSchemaPartial>({
                 ? fertilizerApplication.p_app_date
                 : exampleFertilizerApplication
                   ? undefined
-                  : new Date(),
+                  : getContextualDate(calendar, 3, 1),
         },
         submitConfig: {
             method: fertilizerApplication ? "PUT" : "POST",
@@ -113,13 +116,32 @@ export function FertilizerApplicationForm<T extends typeof FormSchemaPartial>({
         }
     }, [p_id, fertilizerApplication, form.setValue])
 
+    useEffect(() => {
+        const currentValue = form.getValues("p_app_date")
+        const { isDirty } = form.getFieldState("p_app_date")
+        if (
+            !fertilizerApplication?.p_app_date &&
+            !exampleFertilizerApplication &&
+            !currentValue &&
+            !isDirty
+        ) {
+            form.setValue("p_app_date", getContextualDate(calendar, 3, 1))
+        }
+    }, [
+        calendar,
+        exampleFertilizerApplication,
+        fertilizerApplication?.p_app_date,
+        form.setValue,
+    ])
+
     const fieldFertilizerFormStore = useFieldFertilizerFormStore()
 
     useEffect(() => {
         if (b_id_farm && b_id_or_b_lu_catalogue) {
             const savedFormValues = fieldFertilizerFormStore.load(
                 b_id_farm,
                 b_id_or_b_lu_catalogue,
+                calendar,
             )
             if (savedFormValues) {
                 for (const [k, v] of Object.entries(savedFormValues)) {
@@ -137,6 +159,7 @@ export function FertilizerApplicationForm<T extends typeof FormSchemaPartial>({
         b_id_or_b_lu_catalogue,
         form.setValue,
         fieldFertilizerFormStore.load,
+        calendar,
     ])
 
     useEffect(() => {
@@ -156,13 +179,18 @@ export function FertilizerApplicationForm<T extends typeof FormSchemaPartial>({
 
     useEffect(() => {
         if (form.formState.isSubmitSuccessful) {
-            fieldFertilizerFormStore.delete(b_id_farm, b_id_or_b_lu_catalogue)
+            fieldFertilizerFormStore.delete(
+                b_id_farm,
+                b_id_or_b_lu_catalogue,
+                calendar,
+            )
         }
     }, [
         form.formState.isSubmitSuccessful,
         b_id_farm,
         b_id_or_b_lu_catalogue,
         fieldFertilizerFormStore.delete,
+        calendar,
     ])
 
     function handleManageFertilizers(_e: MouseEvent<HTMLButtonElement>) {
@@ -171,6 +199,7 @@ export function FertilizerApplicationForm<T extends typeof FormSchemaPartial>({
                 b_id_farm,
                 b_id_or_b_lu_catalogue,
                 form.getValues(),
+                calendar,
             )
         }
         navigate(

fdm-app/app/components/blocks/harvest/form.tsx

@@ -7,6 +7,7 @@ import { useEffect, useState } from "react"
 import { Controller } from "react-hook-form"
 import { Form, useFetcher, useNavigate } from "react-router"
 import { RemixFormProvider, useRemixForm } from "remix-hook-form"
+import type { UseRemixFormReturn } from "remix-hook-form"
 import type { z } from "zod"
 import { cn } from "@/app/lib/utils"
 import { DatePicker } from "~/components/custom/date-picker-v2"
@@ -34,6 +35,7 @@ import {
 } from "~/components/ui/field"
 import { Input } from "~/components/ui/input"
 import { Spinner } from "~/components/ui/spinner"
+import { useCalendarStore } from "~/store/calendar"
 import { getHarvestParameterLabel } from "./parameters"
 import { FormSchema } from "./schema"
 
@@ -42,6 +44,7 @@ type HarvestFormDialogProps = {
     exampleHarvestableAnalysis?: Partial<HarvestableAnalysis>
     example_b_lu_harvest_date?: Date | null
     b_lu_harvest_date: Date | string | null | undefined // Changed to allow Date or string
+    b_date_harvest_default?: string | null // MM-dd format from cultivation catalogue
     b_lu_yield: number | undefined
     b_lu_yield_fresh: number | undefined
     b_lu_yield_bruto: number | undefined
@@ -62,6 +65,7 @@ type HarvestFormDialogProps = {
 function useHarvestRemixForm({
     harvestParameters,
     b_lu_harvest_date,
+    b_date_harvest_default,
     b_lu_yield,
     b_lu_yield_fresh,
     b_lu_yield_bruto,
@@ -77,6 +81,37 @@ function useHarvestRemixForm({
     example_b_lu_harvest_date,
     handleConfirmation,
 }: HarvestFormDialogProps) {
+    const { calendar } = useCalendarStore()
+    const currentYear = new Date().getFullYear()
+    const parsedCalendar = calendar ? Number(calendar) : Number.NaN
+    const calendarYear = Number.isNaN(parsedCalendar)
+        ? currentYear
+        : parsedCalendar
+
+    // Compute default harvest date from catalogue's MM-dd + calendar year
+    // Only apply when creating a new harvest (no existing date) and not in current year
+    function getDefaultHarvestDate(): Date | undefined {
+        if (b_lu_harvest_date) {
+            return new Date(b_lu_harvest_date)
+        }
+        if (example_b_lu_harvest_date) {
+            // Bulk edit: leave empty
+            return undefined
+        }
+        if (calendarYear === currentYear) {
+            // Current year: leave empty (calendar opens at today)
+            return undefined
+        }
+        if (b_date_harvest_default) {
+            // Parse MM-dd and combine with calendar year
+            const [month, day] = b_date_harvest_default.split("-").map(Number)
+            if (month && day) {
+                return new Date(calendarYear, month - 1, day)
+            }
+        }
+        return undefined
+    }
+
     const form = useRemixForm<z.infer<typeof FormSchema>>({
         mode: "onSubmit",
         resolver: async (values, bypass, options) => {
@@ -115,9 +150,7 @@ function useHarvestRemixForm({
             return validation
         },
         defaultValues: {
-            b_lu_harvest_date: b_lu_harvest_date
-                ? new Date(b_lu_harvest_date)
-                : undefined,
+            b_lu_harvest_date: getDefaultHarvestDate(),
             b_lu_yield: harvestParameters.includes("b_lu_yield")
                 ? b_lu_yield
                 : undefined,
@@ -151,6 +184,22 @@ function useHarvestRemixForm({
         },
     })
 
+    // When the calendar store is populated after initial render, re-evaluate the
+    // default harvest date, but only if the user has not already entered a value.
+    useEffect(() => {
+        const currentValue = form.getValues("b_lu_harvest_date")
+        const { isDirty } = form.getFieldState("b_lu_harvest_date")
+        if (
+            !b_lu_harvest_date &&
+            !example_b_lu_harvest_date &&
+            !currentValue &&
+            !isDirty
+        ) {
+            form.setValue("b_lu_harvest_date", getDefaultHarvestDate())
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [calendar])
+
     return form
 }
 
@@ -162,7 +211,7 @@ function HarvestFields({
     example_b_lu_harvest_date,
     b_lu_harvest_date,
 }: HarvestFormDialogProps & {
-    form: ReturnType<typeof useHarvestRemixForm>
+    form: UseRemixFormReturn<z.infer<typeof FormSchema>>
     className: React.ComponentProps<typeof FieldGroup>["className"]
 }) {
     const formatted_b_lu_harvest_date = example_b_lu_harvest_date

fdm-app/app/components/blocks/soil/form.tsx

@@ -26,6 +26,8 @@ import {
 } from "~/components/ui/select"
 import { Spinner } from "~/components/ui/spinner"
 import { cn } from "~/lib/utils"
+import { getContextualDate } from "~/lib/calendar"
+import { useCalendarStore } from "~/store/calendar"
 
 export function SoilAnalysisForm(props: {
     soilAnalysis: SoilAnalysis | undefined
@@ -35,6 +37,7 @@ export function SoilAnalysisForm(props: {
 }) {
     const { soilAnalysis, soilParameterDescription, editable = true } = props
 
+    const { calendar } = useCalendarStore()
     const defaultValues: {
         [key: string]: string | number | Date | undefined | null
     } = {}
@@ -50,6 +53,10 @@ export function SoilAnalysisForm(props: {
             defaultValue = ""
         }
 
+        if (defaultValue === undefined && x.type === "date" && !soilAnalysis) {
+            defaultValue = getContextualDate(calendar, 2, 1)
+        }
+
         defaultValues[x.parameter] = defaultValue
     }
     defaultValues.a_id = undefined