@7365admin1/layer-common 1.11.19 → 1.11.20

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/layer-common
 
+## 1.11.20
+
+### Patch Changes
+
+- e9bd022: fix feedbacks page when refreshing or reloading the page
+
 ## 1.11.19
 
 ### Patch Changes

package/components/AreaChecklistHistoryMain.vue

@@ -14,6 +14,22 @@
         @refresh="getAreaChecklistHistoryRefresh"
         @row-click="handleRowClick"
       >
+        <template #actions>
+          <v-row class="w-100" align="center" no-gutters>
+            <v-col cols="auto">
+              <v-btn
+                variant="text"
+                color="primary"
+                class="text-none"
+                @click="back"
+              >
+                <v-icon left>mdi-arrow-left</v-icon>
+                Back
+              </v-btn>
+            </v-col>
+          </v-row>
+        </template>
+
         <template #extension>
           <v-row no-gutters class="w-100 d-flex flex-column">
             <v-card
@@ -84,7 +100,7 @@ const props = defineProps({
   scheduleRoute: { type: String, default: "cleaning-schedule" },
 });
 
-const { formatDate } = useUtils();
+const { formatDate, back, debounce } = useUtils();
 
 const loading = ref(false);
 const message = ref("");
@@ -160,6 +176,18 @@ watchEffect(() => {
   }
 });
 
+const debouncedSearchRefresh = debounce(() => {
+  const wasPage = page.value;
+  page.value = 1;
+  if (wasPage === 1) {
+    getAreaChecklistHistoryRefresh();
+  }
+}, 450);
+
+watch(searchInput, () => {
+  debouncedSearchRefresh();
+});
+
 function handleRowClick(data: any) {
   const item = data?.item ?? data;
   const id = item?._id || item?.id || item?.areaId;

package/components/CleaningScheduleMain.vue

@@ -116,7 +116,7 @@ const props = defineProps({
 
 const startDate = ref("");
 const endDate = ref("");
-const status = ref<TScheduleAreaStatus>("All");
+const status = ref<TScheduleAreaStatus>("all");
 const statusOptions = [
   { title: "All", value: "all" },
   { title: "Open", value: "open" },
@@ -191,7 +191,7 @@ const {
       site: props.site,
       startDate: startDate.value,
       endDate: endDate.value,
-      status: status.value === "All" ? undefined : status.value,
+      status: status.value === "all" ? undefined : status.value,
       serviceType: props.serviceType,
     }),
   {

package/components/Input/DateTimePicker.vue

@@ -1,13 +1,13 @@
 <template>
     <div class="d-flex flex-column">
         <v-text-field v-bind="$attrs" ref="dateTimePickerRef" :model-value="dateTimeFormattedReadOnly" autocomplete="off"
-            :placeholder="placeholder" :rules="rules" style="z-index: 10" @click="openDatePicker">
+            :placeholder="inputPlaceholder" :rules="rules" style="z-index: 10" @click="openDatePicker">
             <template #append-inner>
                 <v-icon icon="mdi-calendar" @click.stop="openDatePicker" />
             </template>
         </v-text-field>
         <div class="w-100 d-flex align-end ga-3 hidden-input">
-            <input ref="dateInput" type="datetime-local" v-model="dateTime" />
+            <input ref="dateInput" :type="inputType" v-model="dateTime" />
         </div>
     </div>
 </template>
@@ -23,6 +23,10 @@ const prop = defineProps({
     placeholder: {
         type: String,
         default: 'DD/MM/YYYY, HH:MM AM/PM'
+    },
+    dateOnly: {
+        type: Boolean,
+        default: false
     }
 })
 
@@ -31,6 +35,10 @@ const dateTime = defineModel<string | null>({ default: null }) //2025-10-10T13:0
 const dateTimeUTC = defineModel<string | null>('utc', { default: null }) // UTC format
 
 const dateTimeFormattedReadOnly = ref<string | null>(null)
+const inputType = computed(() => (prop.dateOnly ? 'date' : 'datetime-local'))
+const inputPlaceholder = computed(() => (
+    prop.placeholder || (prop.dateOnly ? 'MM/DD/YYYY' : 'DD/MM/YYYY, HH:MM AM/PM')
+))
 
 
 
@@ -55,11 +63,16 @@ function convertToReadableFormat(dateStr: string): string {
     if (!dateStr) return "";
 
     const date = new Date(dateStr)
+    if (Number.isNaN(date.getTime())) return "";
 
-    const day = String(date.getDate()).padStart(2, '0')
     const month = String(date.getMonth() + 1).padStart(2, '0')
+    const day = String(date.getDate()).padStart(2, '0')
     const year = date.getFullYear()
 
+    if (prop.dateOnly) {
+        return `${month}/${day}/${year}`
+    }
+
     let hours = date.getHours()
     const minutes = String(date.getMinutes()).padStart(2, '0')
 
@@ -72,17 +85,36 @@ function convertToReadableFormat(dateStr: string): string {
     return `${day}/${month}/${year}, ${formattedTime}`
 }
 
+function toDateOnlyInputValue(dateStr: string): string {
+    if (!dateStr) return ''
+    if (/^\d{4}-\d{2}-\d{2}$/.test(dateStr)) return dateStr
+    const date = new Date(dateStr)
+    if (Number.isNaN(date.getTime())) return ''
+    const year = date.getFullYear()
+    const month = String(date.getMonth() + 1).padStart(2, '0')
+    const day = String(date.getDate()).padStart(2, '0')
+    return `${year}-${month}-${day}`
+}
+
 function handleInitialDate(){
     const dateDefault = dateTime.value
     const dateUTC = dateTimeUTC.value
     if(dateDefault){
         dateTimeFormattedReadOnly.value = convertToReadableFormat(dateDefault)
-        const localDate = new Date(dateDefault)
-        dateTimeUTC.value = localDate.toISOString()
+        if (prop.dateOnly) {
+            dateTimeUTC.value = toDateOnlyInputValue(dateDefault)
+        } else {
+            const localDate = new Date(dateDefault)
+            dateTimeUTC.value = localDate.toISOString()
+        }
     } else if (dateUTC){
         dateTimeFormattedReadOnly.value = convertToReadableFormat(dateUTC)
-        const localDate = new Date(dateUTC)
-        dateTime.value = formatDateISO8601(localDate)
+        if (prop.dateOnly) {
+            dateTime.value = toDateOnlyInputValue(dateUTC)
+        } else {
+            const localDate = new Date(dateUTC)
+            dateTime.value = formatDateISO8601(localDate)
+        }
     } else {
         dateTimeFormattedReadOnly.value = null
     }
@@ -98,8 +130,12 @@ watch(dateTime, (dateVal) => {
     }
 
     dateTimeFormattedReadOnly.value = convertToReadableFormat(dateVal)
-    const localDate = new Date(dateVal)
-    dateTimeUTC.value = localDate.toISOString()
+    if (prop.dateOnly) {
+        dateTimeUTC.value = toDateOnlyInputValue(dateVal)
+    } else {
+        const localDate = new Date(dateVal)
+        dateTimeUTC.value = localDate.toISOString()
+    }
 
 }, { immediate: false })
 

package/components/OvernightParkingAvailability.vue

@@ -111,7 +111,8 @@ const isHydrating = ref(true)
 
 const { requiredRule } = useUtils()
 const { generateTimeSlots, generateTimeSlotsFromStart } = useFacilityUtils()
-const { updateOvernightParkingAvailability, getOvernightParkingAvailability } = useSiteSettings()
+const { currentUser } = useLocalAuth()
+const { getOvernightParkingAvailabilityV2, createOrUpdateOvernightParkingAvailabilityV2 } = useSiteSettings()
 
 type TDay = Exclude<keyof TOvernightParkingAvailability, 'autoApproveOvernightParking'>
 type TOvernightParkingSlot = TOvernightParkingDay & { day: TDay }
@@ -139,9 +140,11 @@ const applyDialog = reactive({
 
 
 
-const { data: availabilityDataReq, refresh: refreshAvailability } = await useLazyAsyncData<TOvernightParkingAvailability>(
+const userType = computed(() => currentUser.value?.type ?? "site")
+const updatedByValue = computed(() => currentUser.value?._id ?? currentUser.value?.email ?? "system")
+const { data: availabilityDataReq, refresh: refreshAvailability } = await useLazyAsyncData<Record<string, any>>(
   `overnight-parking-availability-${props.site}`,
-  () => getOvernightParkingAvailability(props.site)
+  () => getOvernightParkingAvailabilityV2(props.site, userType.value)
 )
 
 watch(availabilityDataReq, (data) => {
@@ -152,15 +155,16 @@ watch(availabilityDataReq, (data) => {
     slot.isEnabled = data?.[day]?.isEnabled ?? false
     slot.startTime = data?.[day]?.startTime ?? null
     slot.endTime = data?.[day]?.endTime ?? null
-   setTimeout(() => {
-      isHydrating.value = false
-    }, 500)
   })
-
-  autoApproveOvernightParking.value = data?.autoApproveOvernightParking === true
+  autoApproveOvernightParking.value =
+    data?.autoApproveOvernightParking === true || data?.isAutoApproved === true
+  setTimeout(() => {
+    isHydrating.value = false
+  }, 500)
 }, { immediate: true })
 
 
+
 const overnightParkingSlotsArray = ref<TOvernightParkingSlot[]>(
   orderedDays.map((day) => ({
     day,
@@ -240,23 +244,20 @@ async function handleSave(action: 'toggle' | 'save') {
 
   let payload = {}
 
-  if(action === 'save') {
-    payload = {
-      ...model.value
-    }
-  } else if (action === 'toggle') {
-    payload = {
-      autoApproveOvernightParking: autoApproveOvernightParking.value,
-    }
+  payload = {
+    ...model.value,
+    autoApproveOvernightParking: autoApproveOvernightParking.value,
+    isAutoApproved: autoApproveOvernightParking.value,
+    updatedBy: updatedByValue.value,
   }
 
   try {
     loading.updating = true
-    await updateOvernightParkingAvailability(props.site, payload)
+    await createOrUpdateOvernightParkingAvailabilityV2(props.site, payload, userType.value)
+    refreshAvailability()
     message.value = 'Overnight parking settings updated successfully.'
     messageColor.value = 'success'
     messageSnackbar.value = true
-    refreshAvailability()
   } catch (error) {
     message.value = 'Failed to update overnight parking settings. Please try again.'
     messageColor.value = 'error'

package/components/ScheduleAreaMain.vue

@@ -208,12 +208,12 @@ const isScheduleClosed = computed(
 
 const items = ref<Array<Record<string, any>>>([]);
 
-const statusFilter = ref<TScheduleAreaStatus>("All");
+const statusFilter = ref<TScheduleAreaStatus>("all");
 const statusOptions = [
-  { title: "All", value: "All" },
-  { title: "Open", value: "Open" },
-  { title: "Ongoing", value: "Ongoing" },
-  { title: "Completed", value: "Completed" },
+  { title: "All", value: "all" },
+  { title: "Open", value: "open" },
+  { title: "Ongoing", value: "ongoing" },
+  { title: "Completed", value: "completed" },
 ];
 const areaTypeFilter = ref<TAreaType>("all");
 const typeOptions = [
@@ -235,7 +235,7 @@ const {
     getScheduleAreas({
       page: page.value,
       scheduleAreaId: props.scheduleAreaId,
-      status: statusFilter.value === "All" ? undefined : statusFilter.value,
+      status: statusFilter.value === "all" ? undefined : statusFilter.value,
       type: areaTypeFilter.value === "all" ? undefined : areaTypeFilter.value,
       serviceType: props.serviceType,
     }),

package/components/VisitorManagement.vue

@@ -20,8 +20,8 @@
                 <span class="text-caption">Not Checked Out</span>
               </template>
             </v-checkbox>
-            <InputDateTimePicker v-model:utc="dateFrom" density="compact" hide-details />
-            <InputDateTimePicker v-model:utc="dateTo" density="compact" hide-details />
+            <InputDatePicker v-model="dateFrom" density="compact" hide-details />
+            <InputDatePicker v-model="dateTo" density="compact" hide-details />
             <v-select v-if="activeTab == 'registered'" v-model="filterTypes" label="Filter by types" item-title="label"
               item-value="value" :items="visitorSelection" density="compact" clearable multiple max-width="200"
               hide-details>
@@ -418,6 +418,19 @@ const tabOptions = [
   { name: "Resident Transactions", value: "resident-transactions" },
 ];
 
+function normalizeDateOnly(value: string) {
+  if (!value) return "";
+  if (/^\d{4}-\d{2}-\d{2}$/.test(value)) return value;
+
+  const parsedDate = new Date(value);
+  if (Number.isNaN(parsedDate.getTime())) return "";
+
+  const year = parsedDate.getFullYear();
+  const month = String(parsedDate.getMonth() + 1).padStart(2, "0");
+  const day = String(parsedDate.getDate()).padStart(2, "0");
+  return `${year}-${month}-${day}`;
+}
+
 const selectedVisitorDataObject = computed(() => {
   return items.value.find((x: any) => x?._id === selectedVisitorId.value) || {};
 });
@@ -486,8 +499,8 @@ const {
       page: page.value,
       site: siteId,
       search: searchInput.value,
-      dateTo: dateTo.value,
-      dateFrom: dateFrom.value,
+      dateTo: normalizeDateOnly(dateTo.value),
+      dateFrom: normalizeDateOnly(dateFrom.value),
       type: (filterTypes.value.length === 0 && activeTab.value === 'registered' ? "contractor,delivery,walk-in,pick-up,drop-off,guest" : filterTypes.value.filter(Boolean).join(",")),
       checkedOut: displayNotCheckedOut.value ? false : undefined
     }
@@ -805,8 +818,13 @@ const updateRouteQuery = debounce(
 watch(
   [searchInput, dateFrom, dateTo, filterTypes, activeTab, displayNotCheckedOut],
   ([search, from, to, types, tab, checkedOut]) => {
+    const normalizedFrom = normalizeDateOnly(from);
+    const normalizedTo = normalizeDateOnly(to);
+    dateFrom.value = normalizedFrom;
+    dateTo.value = normalizedTo;
+
     // updateRouteQuery(search, from, to, types, status, checkedOut)
-    updateRouteQuery({ search, from, to, types, tab, checkedOut })
+    updateRouteQuery({ search, from: normalizedFrom, to: normalizedTo, types, tab, checkedOut })
     getVisitorRefresh();
   },
   { deep: true }
@@ -817,8 +835,8 @@ watch(
 onMounted(() => {
   activeTab.value = (route.query.tab as string) || "unregistered"
   searchInput.value = (route.query.search as string) || "";
-  dateFrom.value = (route.query.dateFrom as string) || "";
-  dateTo.value = (route.query.dateTo as string) || "";
+  dateFrom.value = normalizeDateOnly((route.query.dateFrom as string) || "");
+  dateTo.value = normalizeDateOnly((route.query.dateTo as string) || "");
   filterTypes.value = ((route.query.type as string)?.split(",") || []).filter(Boolean) as TVisitorType[];
   displayNotCheckedOut.value = (route.query.checkedOut as string) == 'true' || false
 })

package/composables/useFeedback.ts

@@ -100,7 +100,7 @@ export default function useFeedback() {
           status,
           provider,
           service,
-          ...(currentUser.value.type != "site" && {
+          ...(currentUser.value?.type != "site" && {
             userId,
           }),
         },

package/composables/useSiteSettings.ts

@@ -140,6 +140,33 @@ export default function () {
     );
   }
 
+  async function getOvernightParkingAvailabilityV2(
+    siteId: string,
+    userType = "site"
+  ) {
+    return await useNuxtApp().$api<Record<string, any>>(
+      `/api/overnight-parking-approval-settings2/v1`,
+      {
+        method: "PATCH",
+        body: JSON.stringify({ site: siteId, userType }),
+      }
+    );
+  }
+
+  async function createOrUpdateOvernightParkingAvailabilityV2(
+    siteId: string,
+    payload: Record<string, any>,
+    userType = "site"
+  ) {
+    return await useNuxtApp().$api<Record<string, any>>(
+      `/api/overnight-parking-approval-settings2/v1`,
+      {
+        method: "POST",
+        body: JSON.stringify({ site: siteId, userType, ...payload }),
+      }
+    );
+  }
+
   return {
     getSiteById,
     getSiteLevels,
@@ -153,6 +180,8 @@ export default function () {
     updateSitebyId,
     updateSiteInformation,
     getOvernightParkingAvailability,
-    updateOvernightParkingAvailability
+    updateOvernightParkingAvailability,
+    getOvernightParkingAvailabilityV2,
+    createOrUpdateOvernightParkingAvailabilityV2,
   };
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "1.11.19",
+  "version": "1.11.20",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {