Preserve date filter on registration table (#2047)

Preserve date filter on registration table
bcgov · Oct 25, 2024 · 967bdab · 967bdab
1 parent 3d59dbf
commit 967bdab
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/ppr-ui/src/components/common/RangeDatePicker.vue b/ppr-ui/src/components/common/RangeDatePicker.vue
@@ -15,6 +15,7 @@
         </b>
         <BaseDatePicker
           class="date-selection__picker mt-2"
+          :default-selected-date="startDate"
           :error="startDate === null && datePickerErr"
           :resetTrigger="resetTrigger"
           :setMaxDate="endDate || defaultMaxDate"
@@ -30,6 +31,7 @@
         </b>
         <BaseDatePicker
           class="date-selection__picker mt-2"
+          :default-selected-date="endDate"
           :error="endDate === null && datePickerErr"
           :resetTrigger="resetTrigger"
           :setMinDate="startDate"

diff --git a/ppr-ui/src/components/tables/RegistrationTable.vue b/ppr-ui/src/components/tables/RegistrationTable.vue
@@ -9,6 +9,8 @@
       v-if="showDatePicker"
       id="ranged-date-picker"
       ref="datePicker"
+      :defaultStartDate="getPstDateObj(submittedStartDate)"
+      :defaultEndDate="getPstDateObj(submittedEndDate)"
       :defaultMaxDate="new Date()"
       @submit="updateDateRange($event)"
     />
@@ -419,7 +421,7 @@ import {
 import { storeToRefs } from 'pinia'
 import { useTableFeatures, useTransferOwners } from '@/composables'
 import { RangeDatePicker } from '@/components/common'
-import { dateToYyyyMmDd, localTodayDate } from '@/utils'
+import { dateToYyyyMmDd, yyyyMmDdToPacificDate, localTodayDate } from '@/utils'
 import TableObserver from '@/components/tables/common/TableObserver.vue'
 
 export default defineComponent({
@@ -728,7 +730,7 @@ export default defineComponent({
     const updateDateRange = (dates: { endDate: Date, startDate: Date }) => {
       if (!(dates.endDate && dates.startDate)) dateTxt.value = ''
       else dateTxt.value = 'Custom'
-
+      
       submittedStartDate.value = dateToYyyyMmDd(dates.startDate)
       submittedEndDate.value = dateToYyyyMmDd(dates.endDate)
       localState.showDatePicker = false
@@ -755,7 +757,16 @@ export default defineComponent({
         }, 2000)
       }
     })
-
+    const getPstDateObj = (date: string): Date => {
+      if(!date) return null
+      // Regular expression to match timezone offset (e.g., +05:00 or Z for UTC)
+      const timeZoneRegex = /([+-]\d{2}:\d{2}|Z)$/;
+      
+      if(timeZoneRegex.test(date)) {
+        return new Date(date)
+      }
+      return new Date(yyyyMmDdToPacificDate(date))
+    }
     watch(() => dateTxt.value, (val) => {
       if (!val) {
         submittedStartDate.value = null
@@ -845,6 +856,7 @@ export default defineComponent({
       isMiscTransfersEnabled,
       getNext,
       localTodayDate,
+      yyyyMmDdToPacificDate,
       dateSortHandler,
       datePicker,
       dateTxt,
@@ -888,6 +900,7 @@ export default defineComponent({
       clientReferenceIdRef,
       toggleGroup,
       hideAllGroups,
+      getPstDateObj,
       ...toRefs(localState)
     }
   }

diff --git a/ppr-ui/src/composables/useRegistration.ts b/ppr-ui/src/composables/useRegistration.ts
@@ -14,7 +14,7 @@ import { RegistrationSortIF, RegistrationSummaryIF } from '@/interfaces'
 
 export const useRegistration = (setSort: RegistrationSortIF) => {
   const localState = reactive({
-    dateTxt: '',
+    dateTxt: (setSort?.startDate && setSort.endDate) ? 'Custom' : '',
     registrationNumber: setSort?.regNum || '',
     registrationType: setSort?.regType || '',
     status: setSort?.status || '',

diff --git a/ppr-ui/src/utils/date-helper.ts b/ppr-ui/src/utils/date-helper.ts
@@ -189,7 +189,7 @@ export function dateToYyyyMmDd (date: Date): string {
     day: 'numeric', // 31
     year: 'numeric' // 2020
   })
-
+  
   return convertDateFormat(localDate)
 }