Improved: changed the logic and only converting the date format on AP…

…I call from ISO to Millis; rest remains on the basis of ISO(#619)

- Added a util function for conversion.

src/components/Filters.vue

@@ -135,7 +135,7 @@ const query = computed(() => store.getters["count/getQuery"])
 
 function openDateTimeModal(dateType: any, dateRange: any) {
   currentFilter.value = `${dateType}_${dateRange}`;
-  currentDateTimeValue.value = query.value[dateType][dateRange] ? DateTime.fromMillis(query.value[dateType][dateRange]).toISO() : DateTime.now()
+  currentDateTimeValue.value = query.value[dateType][dateRange] ? query.value[dateType][dateRange] : DateTime.now()
   dateTimeModalOpen.value = true;
 }
 
@@ -153,14 +153,14 @@ async function updateDateTimeFilter(date: any) {
     key: dateType,
     value: {
       ...query.value[dateType],
-      [dateRange]: DateTime.fromISO(date).toMillis()
+      [dateRange]: date
     }
   }
   await store.dispatch("count/updateQuery", payload)
 }
 
-function formatDateTime(date: number) {
-  const dateTime = DateTime.fromMillis(date);
+function formatDateTime(date: any) {
+  const dateTime = DateTime.fromISO(date);
   return dateTime.toFormat("dd'th' MMM yyyy");
 }
 

src/store/modules/count/actions.ts

@@ -3,7 +3,7 @@ import RootState from "@/store/RootState"
 import CountState from "./CountState"
 import * as types from "./mutation-types"
 import { CountService } from "@/services/CountService"
-import { hasError, showToast, sortListByField } from "@/utils"
+import { convertIsoToMillis, hasError, showToast, sortListByField } from "@/utils"
 import { translate } from "@/i18n"
 import router from "@/router"
 import logger from "@/logger";
@@ -45,23 +45,23 @@ const actions: ActionTree<CountState, RootState> = {
     if(state.query.createdDate) {
       // created before date
       if(state.query.createdDate?.thru) {
-        params["createdDate_thru"] = state.query.createdDate?.thru
+        params["createdDate_thru"] = convertIsoToMillis(state.query.createdDate.thru)
       }
       // created after date
       if(state.query.createdDate?.from) {
-        params["createdDate_from"] = state.query.createdDate?.from
-      } 
+        params["createdDate_from"] = convertIsoToMillis(state.query.createdDate.from)
+      }
     }
 
     if(state.query.closedDate) {
       // closed before date
       if(state.query.closedDate?.thru) {
-        params["closedDate_thru"] = state.query.closedDate?.thru
+        params["closedDate_thru"] = convertIsoToMillis(state.query.closedDate.thru)
       }
       // closed after date
       if(state.query.closedDate?.from) {
-        params["closedDate_from"] = state.query.closedDate?.from
-      } 
+        params["closedDate_from"] = convertIsoToMillis(state.query.closedDate.from)
+      }
     }
 
     try {

src/utils/index.ts

@@ -55,6 +55,10 @@ const getDateTime = (time: any) => {
   return time ? DateTime.fromMillis(time).toISO() : ''
 }
 
+function convertIsoToMillis(isoDate: any) {
+  return DateTime.fromISO(isoDate).toMillis();
+}
+
 const getDerivedStatusForCount = (count: any) => {
   const countStats = cycleCountStats(count.inventoryCountImportId)
 
@@ -178,4 +182,4 @@ function sortListByField(list: any, field = "parentProductName") {
   });
 }
 
-export { downloadCsv, jsonToCsv, showToast, hasError, handleDateTimeInput, getCycleCountStats, getDateTime, getDateWithOrdinalSuffix, getDerivedStatusForCount, getFacilityName, getPartyName, getProductIdentificationValue, timeFromNow, parseCsv, sortListByField }
+export { convertIsoToMillis, downloadCsv, jsonToCsv, showToast, hasError, handleDateTimeInput, getCycleCountStats, getDateTime, getDateWithOrdinalSuffix, getDerivedStatusForCount, getFacilityName, getPartyName, getProductIdentificationValue, timeFromNow, parseCsv, sortListByField }