From b1621aa2e898a3eeff69e1eb32809e0c4cc05156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mert=20Bora=20=C4=B0nevi?= <bora.inevi@nmi-agro.nl>
Date: Tue, 16 Sep 2025 13:31:12 +0200
Subject: [PATCH 1/3] Add year dropdown to the farm creation fields page

---
 ...arm.create.$b_id_farm.$calendar.fields.tsx | 48 ++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/fdm-app/app/routes/farm.create.$b_id_farm.$calendar.fields.tsx b/fdm-app/app/routes/farm.create.$b_id_farm.$calendar.fields.tsx
index 1cbce7a1a..00860878b 100644
--- a/fdm-app/app/routes/farm.create.$b_id_farm.$calendar.fields.tsx
+++ b/fdm-app/app/routes/farm.create.$b_id_farm.$calendar.fields.tsx
@@ -7,6 +7,7 @@ import {
     NavLink,
     Outlet,
     useLoaderData,
+    useNavigate,
 } from "react-router"
 import { Header } from "~/components/blocks/header/base"
 import { HeaderFarmCreate } from "~/components/blocks/header/create-farm"
@@ -15,11 +16,19 @@ import { Button } from "~/components/ui/button"
 import { Separator } from "~/components/ui/separator"
 import { SidebarInset } from "~/components/ui/sidebar"
 import { getSession } from "~/lib/auth.server"
-import { getCalendar, getTimeframe } from "~/lib/calendar"
+import { getCalendar, getCalendarSelection, getTimeframe } from "~/lib/calendar"
 import { clientConfig } from "~/lib/config"
 import { handleLoaderError } from "~/lib/error"
 import { fdm } from "~/lib/fdm.server"
 import { cn } from "~/lib/utils"
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from "../components/ui/select"
+import { useCalendarStore } from "../store/calendar"
 
 // Meta
 export const meta: MetaFunction = () => {
@@ -105,7 +114,12 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
 // Main
 export default function Index() {
     const loaderData = useLoaderData<typeof loader>()
+    const calendarStore = useCalendarStore()
+    const navigate = useNavigate()
 
+    const handleCalendarSelect = (year: string) => {
+        navigate(`/farm/create/${loaderData.b_id_farm}/${year}/fields`)
+    }
     return (
         <SidebarInset>
             <Header action={undefined}>
@@ -147,6 +161,38 @@ export default function Index() {
                     <div className="space-y-6 pb-0">
                         <div className="flex flex-col space-y-0 lg:flex-row lg:space-x-4 lg:space-y-0">
                             <aside className="lg:w-1/5">
+                                <p className="flex flex-row items-baseline mb-4">
+                                    <label
+                                        htmlFor="calendar-select"
+                                        className="mr-2"
+                                    >
+                                        Kies een jaar:
+                                    </label>
+                                    <Select
+                                        defaultValue={loaderData.calendar}
+                                        name="role"
+                                        onValueChange={handleCalendarSelect}
+                                    >
+                                        <SelectTrigger
+                                            id="calendar-select"
+                                            className="flex-1"
+                                        >
+                                            <SelectValue />
+                                        </SelectTrigger>
+                                        <SelectContent>
+                                            {getCalendarSelection().map(
+                                                (year) => (
+                                                    <SelectItem
+                                                        key={year}
+                                                        value={year}
+                                                    >
+                                                        {year}
+                                                    </SelectItem>
+                                                ),
+                                            )}
+                                        </SelectContent>
+                                    </Select>
+                                </p>
                                 <SidebarPage
                                     items={loaderData.sidebarPageItems}
                                 >

From 06e4626e1310990da40b104291ce6f85f4111990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mert=20Bora=20=C4=B0nevi?= <bora.inevi@nmi-agro.nl>
Date: Tue, 16 Sep 2025 15:34:54 +0200
Subject: [PATCH 2/3] Redirect differently based on shapefile calendar years

---
 ...arm.create.$b_id_farm.$calendar.fields.tsx | 79 ++++++++++---------
 ...arm.create.$b_id_farm.$calendar.upload.tsx | 39 ++++++++-
 fdm-core/src/farm.ts                          | 43 ++++++++++
 fdm-core/src/index.ts                         |  1 +
 4 files changed, 125 insertions(+), 37 deletions(-)

diff --git a/fdm-app/app/routes/farm.create.$b_id_farm.$calendar.fields.tsx b/fdm-app/app/routes/farm.create.$b_id_farm.$calendar.fields.tsx
index 00860878b..82c91dcaf 100644
--- a/fdm-app/app/routes/farm.create.$b_id_farm.$calendar.fields.tsx
+++ b/fdm-app/app/routes/farm.create.$b_id_farm.$calendar.fields.tsx
@@ -1,4 +1,4 @@
-import { getFarm, getFields } from "@svenvw/fdm-core"
+import { getCalendarYears, getFarm, getFields } from "@svenvw/fdm-core"
 import { ArrowLeft } from "lucide-react"
 import {
     data,
@@ -16,7 +16,7 @@ import { Button } from "~/components/ui/button"
 import { Separator } from "~/components/ui/separator"
 import { SidebarInset } from "~/components/ui/sidebar"
 import { getSession } from "~/lib/auth.server"
-import { getCalendar, getCalendarSelection, getTimeframe } from "~/lib/calendar"
+import { getCalendar, getTimeframe } from "~/lib/calendar"
 import { clientConfig } from "~/lib/config"
 import { handleLoaderError } from "~/lib/error"
 import { fdm } from "~/lib/fdm.server"
@@ -27,8 +27,7 @@ import {
     SelectItem,
     SelectTrigger,
     SelectValue,
-} from "../components/ui/select"
-import { useCalendarStore } from "../store/calendar"
+} from "~/components/ui/select"
 
 // Meta
 export const meta: MetaFunction = () => {
@@ -100,11 +99,18 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
             }
         })
 
+        const calendarYears = await getCalendarYears(
+            fdm,
+            session.principal_id,
+            b_id_farm,
+        )
+
         return {
             sidebarPageItems: sidebarPageItems,
             b_id_farm: b_id_farm,
             b_name_farm: farm.b_name_farm,
             calendar: calendar,
+            calendarYears: calendarYears,
         }
     } catch (error) {
         throw handleLoaderError(error)
@@ -114,7 +120,6 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
 // Main
 export default function Index() {
     const loaderData = useLoaderData<typeof loader>()
-    const calendarStore = useCalendarStore()
     const navigate = useNavigate()
 
     const handleCalendarSelect = (year: string) => {
@@ -161,38 +166,40 @@ export default function Index() {
                     <div className="space-y-6 pb-0">
                         <div className="flex flex-col space-y-0 lg:flex-row lg:space-x-4 lg:space-y-0">
                             <aside className="lg:w-1/5">
-                                <p className="flex flex-row items-baseline mb-4">
-                                    <label
-                                        htmlFor="calendar-select"
-                                        className="mr-2"
-                                    >
-                                        Kies een jaar:
-                                    </label>
-                                    <Select
-                                        defaultValue={loaderData.calendar}
-                                        name="role"
-                                        onValueChange={handleCalendarSelect}
-                                    >
-                                        <SelectTrigger
-                                            id="calendar-select"
-                                            className="flex-1"
+                                {loaderData.calendarYears.length > 1 && (
+                                    <p className="flex flex-row items-baseline mb-4">
+                                        <label
+                                            htmlFor="calendar-select"
+                                            className="mr-2"
+                                        >
+                                            Kies een jaar:
+                                        </label>
+                                        <Select
+                                            defaultValue={loaderData.calendar}
+                                            name="role"
+                                            onValueChange={handleCalendarSelect}
                                         >
-                                            <SelectValue />
-                                        </SelectTrigger>
-                                        <SelectContent>
-                                            {getCalendarSelection().map(
-                                                (year) => (
-                                                    <SelectItem
-                                                        key={year}
-                                                        value={year}
-                                                    >
-                                                        {year}
-                                                    </SelectItem>
-                                                ),
-                                            )}
-                                        </SelectContent>
-                                    </Select>
-                                </p>
+                                            <SelectTrigger
+                                                id="calendar-select"
+                                                className="flex-1"
+                                            >
+                                                <SelectValue />
+                                            </SelectTrigger>
+                                            <SelectContent>
+                                                {loaderData.calendarYears.map(
+                                                    (year) => (
+                                                        <SelectItem
+                                                            key={year}
+                                                            value={year}
+                                                        >
+                                                            {year}
+                                                        </SelectItem>
+                                                    ),
+                                                )}
+                                            </SelectContent>
+                                        </Select>
+                                    </p>
+                                )}
                                 <SidebarPage
                                     items={loaderData.sidebarPageItems}
                                 >
diff --git a/fdm-app/app/routes/farm.create.$b_id_farm.$calendar.upload.tsx b/fdm-app/app/routes/farm.create.$b_id_farm.$calendar.upload.tsx
index c2d06fe41..026d040dd 100644
--- a/fdm-app/app/routes/farm.create.$b_id_farm.$calendar.upload.tsx
+++ b/fdm-app/app/routes/farm.create.$b_id_farm.$calendar.upload.tsx
@@ -15,7 +15,11 @@ import type {
     MetaFunction,
 } from "react-router"
 import { data, useLoaderData } from "react-router"
-import { dataWithWarning, redirectWithSuccess } from "remix-toast"
+import {
+    dataWithWarning,
+    redirectWithError,
+    redirectWithSuccess,
+} from "remix-toast"
 import { combine, parseDbf, parseShp } from "shpjs"
 import { MijnPercelenUploadForm } from "@/app/components/blocks/mijnpercelen/form-upload"
 import { Header } from "~/components/blocks/header/base"
@@ -176,6 +180,10 @@ export async function action({ request, params }: ActionFunctionArgs) {
             },
         )
 
+        const calendarYears = new Set()
+        let minCalendarYear = Number.POSITIVE_INFINITY
+        let maxCalendarYear = 0
+
         for (const feature of features) {
             const { properties, geometry } = feature
             const {
@@ -256,6 +264,35 @@ export async function action({ request, params }: ActionFunctionArgs) {
                     estimates,
                 )
             }
+
+            calendarYears.add(b_start.getFullYear().toString())
+            minCalendarYear = Math.min(minCalendarYear, b_start.getFullYear())
+            maxCalendarYear = Math.max(maxCalendarYear, b_start.getFullYear())
+        }
+
+        if (calendarYears.size === 0) {
+            return redirectWithError(
+                `/farm/create/${b_id_farm}/${calendar}/fields`,
+                {
+                    message: "Geen percelen zijn geïmporteerd.",
+                },
+            )
+        }
+
+        if (!calendarYears.has(calendar)) {
+            try {
+                const redirectCalendar = Math.max(
+                    minCalendarYear,
+                    Math.min(maxCalendarYear, Number.parseInt(calendar)),
+                )
+
+                return redirectWithSuccess(
+                    `/farm/create/${b_id_farm}/${redirectCalendar}/fields`,
+                    {
+                        message: `Geen percelen in ${calendar} zijn geïmporteerd. Je bekijkt nu de percelen in ${redirectCalendar}.`,
+                    },
+                )
+            } catch (_) {}
         }
 
         return redirectWithSuccess(
diff --git a/fdm-core/src/farm.ts b/fdm-core/src/farm.ts
index b4026a9c8..7d07a6031 100644
--- a/fdm-core/src/farm.ts
+++ b/fdm-core/src/farm.ts
@@ -72,6 +72,49 @@ export async function addFarm(
     }
 }
 
+/**
+ * Retrieves the calendar years during which the farm has fields, after verifying that the requesting principal has read access.
+ *
+ * This function checks the principal's permissions before querying the database for the farm identified by the provided ID.
+ *
+ * @param fdm The FDM instance providing the connection to the database. The instance can be created with {@link createFdmServer}.
+ * @param principal_id - The identifier of the principal making the request.
+ * @param b_id_farm - The unique identifier of the farm to retrieve.
+ * @returns A Promise that resolves with a string array of calendar years.
+ * @throws {Error} If permission checks fail or if an error occurs while retrieving the calendar years.
+ * @alpha
+ */
+export async function getCalendarYears(
+    fdm: FdmType,
+    principal_id: string,
+    b_id_farm: string,
+): Promise<string[]> {
+    try {
+        return await fdm.transaction(async (tx: FdmType) => {
+            await checkPermission(
+                tx,
+                "farm",
+                "read",
+                b_id_farm,
+                principal_id,
+                "getCalendarYears",
+            )
+
+            const results = await tx
+                .selectDistinct({ b_start: schema.fieldAcquiring.b_start })
+                .from(schema.fieldAcquiring)
+                .where(eq(schema.fieldAcquiring.b_id_farm, b_id_farm))
+                .orderBy(asc(schema.fieldAcquiring.b_start))
+
+            return results.map(({ b_start }) =>
+                b_start.getFullYear().toString(),
+            )
+        })
+    } catch (err) {
+        throw handleError(err, "Exception for getCalendarYears")
+    }
+}
+
 /**
  * Retrieves a farm's details after verifying that the requesting principal has read access.
  *
diff --git a/fdm-core/src/index.ts b/fdm-core/src/index.ts
index d3b3724b4..fe4c09f31 100644
--- a/fdm-core/src/index.ts
+++ b/fdm-core/src/index.ts
@@ -57,6 +57,7 @@ export {
 } from "./derogation"
 export {
     addFarm,
+    getCalendarYears,
     getFarm,
     getFarms,
     grantRoleToFarm,

From 021c257959ba3cf68aa3aba213d4835840672522 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mert=20Bora=20=C4=B0nevi?= <bora.inevi@nmi-agro.nl>
Date: Tue, 16 Sep 2025 15:42:39 +0200
Subject: [PATCH 3/3] Add changeset

---
 .changeset/polite-falcons-sniff.md | 6 ++++++
 .changeset/ten-days-joke.md        | 6 ++++++
 2 files changed, 12 insertions(+)
 create mode 100644 .changeset/polite-falcons-sniff.md
 create mode 100644 .changeset/ten-days-joke.md

diff --git a/.changeset/polite-falcons-sniff.md b/.changeset/polite-falcons-sniff.md
new file mode 100644
index 000000000..2ba612053
--- /dev/null
+++ b/.changeset/polite-falcons-sniff.md
@@ -0,0 +1,6 @@
+---
+"@svenvw/fdm-core": minor
+"@svenvw/fdm-app": minor
+---
+
+There is a new year selection drop-down in the farm creation fields page in case the farm has fields from multiple years.
diff --git a/.changeset/ten-days-joke.md b/.changeset/ten-days-joke.md
new file mode 100644
index 000000000..958ab333f
--- /dev/null
+++ b/.changeset/ten-days-joke.md
@@ -0,0 +1,6 @@
+---
+"@svenvw/fdm-core": minor
+"@svenvw/fdm-app": minor
+---
+
+When an user uploads their shapefile obtained from mijnpercelen, they are now redirected to a different year in case the farm doesn't have any fields from the current year still.