From 9d8f46e30a4bbfc077e3272f3bc7ff13d477c041 Mon Sep 17 00:00:00 2001
From: Felix Cornelissen <felix.cornelissen@icatt.nl>
Date: Mon, 16 Dec 2024 12:22:31 +0100
Subject: [PATCH] fix: zoek op datum tot en met

---
 .../src/components/DateRangePicker.vue        |  2 +-
 .../publicatie/PublicatiesOverview.vue        | 27 +++++++++++++++----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/odpc.client/src/components/DateRangePicker.vue b/odpc.client/src/components/DateRangePicker.vue
index 1222ed2..f245c94 100644
--- a/odpc.client/src/components/DateRangePicker.vue
+++ b/odpc.client/src/components/DateRangePicker.vue
@@ -6,7 +6,7 @@
   </div>
 
   <div class="form-group">
-    <label for="untilDate">Datum tot</label>
+    <label for="untilDate">Datum tot en met</label>
 
     <input type="date" id="untilDate" ref="untilDateRef" v-model="untilDate" :max="today" />
   </div>
diff --git a/odpc.client/src/features/publicatie/PublicatiesOverview.vue b/odpc.client/src/features/publicatie/PublicatiesOverview.vue
index 9eb6c54..55d48ad 100644
--- a/odpc.client/src/features/publicatie/PublicatiesOverview.vue
+++ b/odpc.client/src/features/publicatie/PublicatiesOverview.vue
@@ -17,7 +17,7 @@
         <input type="text" id="zoeken" v-model="searchString" @keydown.enter.prevent="onSearch" />
       </div>
 
-      <date-range-picker v-model:from-date="fromDate" v-model:until-date="untilDate" />
+      <date-range-picker v-model:from-date="fromDate" v-model:until-date="untilDateInclusive" />
 
       <div class="form-group-button">
         <button
@@ -128,7 +128,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, watch } from "vue";
+import { computed, ref, watch } from "vue";
 import SimpleSpinner from "@/components/SimpleSpinner.vue";
 import AlertInline from "@/components/AlertInline.vue";
 import DateRangePicker from "@/components/DateRangePicker.vue";
@@ -137,7 +137,12 @@ import { PublicatieStatus, type Publicatie } from "./types";
 
 const searchString = ref("");
 const fromDate = ref("");
-const untilDate = ref("");
+const untilDateInclusive = ref("");
+// we zoeken met een datum in een datum-tijd veld, daarom corrigeren we de datum hier
+const untilDateExclusive = computed({
+  get: () => addDay(untilDateInclusive.value),
+  set: (v) => untilDateInclusive.value = subtractDay(v)
+})
 
 const sortingOptions = {
   officiele_titel: "Title (a-z)",
@@ -156,6 +161,18 @@ const searchParamsConfig = {
   registratiedatumTot: ""
 };
 
+const addDay = (v: string) => {
+  if(!v) return v
+  const date = new Date(v)
+  return new Date(date.getFullYear(), date.getMonth(), date.getDate() + 2).toISOString().substring(0, 10)
+}
+
+const subtractDay = (v: string) => {
+  if(!v) return v
+  const date = new Date(v)
+  return new Date(date.getFullYear(), date.getMonth(), date.getDate()).toISOString().substring(0, 10)
+}
+
 const { pagedResult, queryParams, pageCount, onNext, onPrev, isFetching, error } = usePagedSearch<
   Publicatie,
   typeof searchParamsConfig
@@ -171,7 +188,7 @@ watch(
   ({ search, registratiedatumVanaf, registratiedatumTot }) => {
     searchString.value = search;
     fromDate.value = registratiedatumVanaf;
-    untilDate.value = registratiedatumTot;
+    untilDateExclusive.value = registratiedatumTot;
   },
   { once: true }
 );
@@ -182,7 +199,7 @@ const onSearch = () =>
     ...queryParams.value,
     search: searchString.value,
     registratiedatumVanaf: fromDate.value,
-    registratiedatumTot: untilDate.value
+    registratiedatumTot: untilDateExclusive.value
   });
 </script>