@7365admin1/layer-common 1.11.11 → 1.11.13

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 1.11.13
+
+### Patch Changes
+
+- 9c88e03: Update Vehicle Management Changes
+
+## 1.11.12
+
+### Patch Changes
+
+- f66afb1: Bug fixes and other updates
+
 ## 1.11.11
 
 ### Patch Changes

package/components/AreaMain.vue

@@ -614,18 +614,18 @@ async function onFileSelected(event: Event) {
 
   if (!file) return;
 
-  try {
-    submitting.value = true;
-    const response = await uploadAreas(file, props.site);
-    showMessage(response?.message, "success");
+    try {
+      submitting.value = true;
+      const response = await uploadAreas(file, props.site, props.serviceType);
+      showMessage(response?.message, "success");
 
-    await getTaskRefresh();
-  } catch (err: any) {
-    showMessage(err?.data?.message, "error");
-  } finally {
-    submitting.value = false;
-    if (target) target.value = "";
-  }
+      await getTaskRefresh();
+    } catch (err: any) {
+      showMessage(err?.data?.message, "error");
+    } finally {
+      submitting.value = false;
+      if (target) target.value = "";
+    }
 }
 
 function onCreateItem() {

package/components/AttendanceMain.vue

@@ -46,12 +46,14 @@
   <AttendanceDetailsDialog
     v-model="dialogShowMoreActions"
     :attendance-id="selectedAttendanceId"
+    :serviceType="props.serviceType"
     @close="dialogShowMoreActions = false"
   />
 
   <AttendanceSettingsDialog
     v-model="dialogShowSettings"
     :site="props.site"
+    :serviceType="props.serviceType"
     @saved="onSettingsSaved"
     @close="dialogShowSettings = false"
   />
@@ -60,10 +62,12 @@
 <script setup lang="ts">
 import useAttendance from "../composables/useAttendance";
 import { useAttendancePermission } from "../composables/useAttendancePermission";
+import useUtils from "../composables/useUtils";
 
 const props = defineProps({
   orgId: { type: String, default: "" },
   site: { type: String, default: "" },
+  serviceType: { type: String, default: "" },
 });
 
 const {
@@ -117,7 +121,8 @@ const {
     getAttendances({
       page: page.value,
       search: searchInput.value,
-      site: props.site,
+        site: props.site,
+        serviceType: props.serviceType,
     }),
   {
     watch: [page, searchInput, () => props.site],

package/components/AttendanceSettingsDialog.vue

@@ -181,6 +181,7 @@ const showDialog = defineModel({ type: Boolean, default: false });
 
 const props = defineProps({
   site: { type: String, required: true },
+  serviceType: { type: String, default: "" },
 });
 
 const emit = defineEmits(["saved", "close"]);
@@ -211,9 +212,9 @@ const {
   pending: loading,
 } = await useLazyAsyncData(
   `attendance-settings-${props.site}`,
-  () => getAttendanceSettings(props.site),
+  () => getAttendanceSettings(props.site, props.serviceType),
   {
-    watch: [() => props.site],
+    watch: [() => props.site, () => props.serviceType],
     immediate: false,
   }
 );

package/components/MemberMain.vue

@@ -76,9 +76,9 @@
           <template #item.action-table="{ item }">
             <v-menu
               v-if="
-                (status === 'active' &&
+                (currentStatus === 'active' &&
                   (canSuspendMembers || canDeleteMembers)) ||
-                (status === 'suspended' &&
+                (currentStatus === 'suspended' &&
                   (canActivateMembers || canDeleteMembers))
               "
               v-model="item.menuOpen"
@@ -104,13 +104,13 @@
                 </v-list-item>
 
                 <v-list-item
-                  v-if="status === 'active' && canSuspendMembers"
+                  v-if="currentStatus === 'active' && canSuspendMembers"
                   @click="openUpdateDialog(item._id, 'suspended')"
                 >
                   Suspend
                 </v-list-item>
                 <v-list-item
-                  v-if="status === 'suspended' && canActivateMembers"
+                  v-if="currentStatus === 'suspended' && canActivateMembers"
                   @click="openUpdateDialog(item._id, 'active')"
                 >
                   Activate
@@ -330,9 +330,20 @@ const { headerSearch } = useLocal();
 const { replaceMatch, setRouteParams, requiredRule } = useUtils();
 
 const selectedStatus = ref(props.status);
+const currentStatus = computed(() => selectedStatus.value || props.status);
 const route = useRoute();
-const orgId = route.params.org as string;
 const routeName = (useRoute().name as string) ?? "";
+const normalizedRouteParams = computed(() => {
+  const params: Record<string, string> = {};
+  Object.entries(route.params as Record<string, unknown>).forEach(
+    ([key, value]) => {
+      if (typeof value === "string") {
+        params[key] = value;
+      }
+    }
+  );
+  return params;
+});
 
 const tabOptions = [
   { name: "Active", status: "active" },
@@ -345,15 +356,19 @@ function toRoute(status: any) {
   page.value = 1;
   navigateTo({
     name: routeName,
-    params: {
-      org: orgId,
-    },
-    query: {
-      status: obj.status,
-    },
+    params: setRouteParams(normalizedRouteParams.value, { status: obj.status }),
   });
 }
 
+watch(
+  () => props.status,
+  (status) => {
+    if (status && status !== selectedStatus.value) {
+      selectedStatus.value = status;
+    }
+  }
+);
+
 const {
   data: getAllReq,
   refresh: getAll,
@@ -362,14 +377,14 @@ const {
   "get-all-members",
   () =>
     _getAll({
-      status: selectedStatus.value,
-      org: orgId,
+      status: currentStatus.value,
+      org: props.orgId,
       search: headerSearch.value,
       page: page.value,
       type: props.type,
     }),
   {
-    watch: [page, () => route.query],
+    watch: [page, currentStatus],
   }
 );
 

package/components/QrTemplate/PrintDialog.vue

@@ -53,7 +53,7 @@
                 <v-autocomplete
                   :items="
                     localTemplateList.filter(
-                      (item) => !['All', 'Manually Added'].includes(item.name)
+                      (item) => !['All', 'Manually Added'].includes(item.name),
                     )
                   "
                   item-title="name"
@@ -833,7 +833,7 @@ watch(
   () => props.templateList,
   (newVal) => {
     localTemplateList.value = newVal;
-  }
+  },
 );
 
 // interset start
@@ -973,6 +973,7 @@ watch(
   () => props.open,
   async (newVal: any) => {
     if (newVal) {
+      selectAll.value = false;
       if (props.template.name !== "All") {
         selectedTemplate.value = props.template;
       } else {
@@ -998,7 +999,7 @@ watch(
       }
     }
   },
-  { immediate: true }
+  { immediate: true },
 );
 
 const router = useRouter();
@@ -1030,7 +1031,7 @@ const printContent = () => {
   if (printOrientation == "KeyCard") {
     localStorage.setItem(
       "selectedKeysToPrint",
-      JSON.stringify(selectedKeysToPrint.value)
+      JSON.stringify(selectedKeysToPrint.value),
     );
   }
 
@@ -1082,14 +1083,14 @@ watch(selectedChoicePaperSizeOrientation, async (newVal: any) => {
   resultKeys2.value.sort(
     (firstItem: { value: string }, secondItem: { value: string }) => {
       const numericValueOfFirstItem = Number(
-        firstItem.value.replace(/\D/g, "")
+        firstItem.value.replace(/\D/g, ""),
       );
       const numericValueOfSecondItem = Number(
-        secondItem.value.replace(/\D/g, "")
+        secondItem.value.replace(/\D/g, ""),
       );
 
       return numericValueOfFirstItem - numericValueOfSecondItem;
-    }
+    },
   );
 
   startRange.value = props.start.toString();
@@ -1106,7 +1107,7 @@ watch(startRange, (newVal: any, oldVal: any) => {
 
 const endRangeKeys = computed(() => {
   return resultKeys2.value.filter(
-    (item: any) => item.value >= startRange.value
+    (item: any) => item.value >= startRange.value,
   );
 });
 const message = ref("");
@@ -1126,7 +1127,7 @@ const showSnackbarEndRange = () => {
         ? "Please select a start range first."
         : `No ${tab.value == "key" ? "Key" : "Pass"} found. Please try to
       generate first.`,
-      "error"
+      "error",
     );
   }
 };

package/components/UnitMain.vue

@@ -364,7 +364,7 @@ async function onFileSelected(event: Event) {
   try {
     submitting.value = true;
 
-    const response = await uploadUnits(file, props.site);
+    const response = await uploadUnits(file, props.site, props.serviceType);
     showMessage(response?.message, "success");
 
     await getUnitsRefresh();

package/components/VehicleForm.vue

@@ -54,7 +54,7 @@
 
           <v-col v-if="shouldShowField('nric')" cols="12">
             <InputLabel class="text-capitalize" title="NRIC" required />
-            <InputNRICNumber v-model="vehicle.nric" density="comfortable" :rules="[requiredRule]" :disabled="disablePrefilledInputs" />
+            <InputNRICNumber v-model="vehicle.nric" density="comfortable" :rules="[requiredRule]" :disabled="disablePrefilledInputs && type !== 'blocklist'" />
           </v-col>
 
           <v-col v-if="shouldShowField('name')" cols="12">
@@ -184,7 +184,7 @@
     </v-toolbar>
 
     <v-dialog v-model="showMatchingPeopleDialog" max-width="700" persistent>
-      <v-card :loading="checkingNRIC">
+      <v-card :loading="checkingUnit">
         <v-toolbar>
           <v-toolbar-title>
             <v-row no-gutters class="d-flex align-center justify-space-between">
@@ -192,14 +192,14 @@
                 Matching Records for "{{ searchUnitName ?? "-" }}"
               </span>
               <span>
-                <v-btn v-if="matchingPeople.length === 0" icon="mdi-close" variant="text"
-                  @click="showMatchingPeopleDialog = false" />
+                <v-btn icon="mdi-close" variant="text"
+                  @click="handleCloseMatchDialog" />
               </span>
             </v-row>
           </v-toolbar-title>
         </v-toolbar>
 
-        <v-card-text>
+        <v-card-text max-height="400" style="overflow-y: auto">
 
           <v-list lines="three">
             <v-list-item v-if="matchingPeople.length > 0 || checkingUnit" v-for="v in matchingPeople" :key="v._id"
@@ -743,6 +743,13 @@ const resetVehicleDetails = () => {
 }
 
 
+function handleCloseMatchDialog() {
+  showMatchingPeopleDialog.value = false;
+  if(matchingPeople.value.length > 0) {
+    vehicle.unit = null
+  }
+}
+
 
 
 

package/components/VehicleManagement.vue

@@ -89,17 +89,18 @@
       </DialogUpdateMoreAction>
     </v-dialog>
     <v-dialog v-model="dialog.deleteVehicle" persistent width="540">
-      <DialogDeleteConfirmation :message="message" :loading="deletingVehicle"   :prompt-title="`Are you sure want to delete this vehicle - ${selectedPlateNumberObject?.plateNumber}?`"
+      <DialogDeleteConfirmation :loading="deletingVehicle"   :prompt-title="`Are you sure want to delete this vehicle - ${selectedPlateNumberObject?.plateNumber}?`"
         @delete="submitDelete" @close="closeDeleteDialog" />
     </v-dialog>
     <v-dialog v-model="dialog.approveVehicle" persistent width="540">
-      <DialogReusablePrompt :message="message" :loading="approvingVehicle" :prompt-title="`Are you sure want to approve this vehicle - ${selectedPlateNumberObject?.plateNumber}?`"
+      <DialogReusablePrompt :loading="approvingVehicle" :prompt-title="`Are you sure want to approve this vehicle - ${selectedPlateNumberObject?.plateNumber}?`"
         @approve="submitApprove" @close="dialog.approveVehicle = false"  />
     </v-dialog>
     <v-dialog v-model="dialog.restoreVehicle" persistent width="540">
-      <DialogReusablePrompt :message="message" :loading="restoringVehicle" :prompt-title="`Are you sure want to restore this vehicle - ${selectedPlateNumberObject?.plateNumber}?`"
-        @approve="submitRestore" @close="dialog.restoreVehicle = false"  />
+      <DialogReusablePrompt :loading="restoringVehicle" :prompt-title="`Are you sure want to restore this vehicle - ${selectedPlateNumberObject?.plateNumber}?`"
+        @proceed="submitRestore" @close="dialog.restoreVehicle = false"  />
     </v-dialog>
+    <Snackbar v-model="messageSnackbar" :text="message" :color="messageColor" />
   </v-row>
 </template>
 
@@ -199,7 +200,7 @@ const formattedFields: Partial<Record<keyof TVehicle, string>> = {
   nric: "NRIC",
   block: "Block",
   level: "Level",
-  unit: "Unit",
+  unitName: "Unit",
   start: "Start",
   end: "End",
   category: "Category",
@@ -365,7 +366,10 @@ async function submitDelete() {
 
 async function submitRestore() {
 
+  console.log("Submitting restore for plate number ID:", selectedPlateNumberObject.value);
   const plateNumberId = selectedPlateNumberObject.value?._id;
+
+
   if (!plateNumberId) {
     showMessage("Invalid plate number selected for restoration.", "error");
     return;
@@ -382,7 +386,9 @@ async function submitRestore() {
     getVehiclesRefresh();
   } catch (error: any) {
     console.error("Error restoring vehicle:", error);
-    message.value = error.response._data.message;
+    const errMessage = error?.response?._data?.message || "Failed to restore vehicle";
+    showMessage(errMessage, "error");
+    // message.value = error.response._data.message;
   } finally {
     restoringVehicle.value = false;
   }
@@ -408,7 +414,8 @@ async function submitApprove() {
     getVehiclesRefresh();
   } catch (error: any) {
     console.error("Error approving vehicle:", error);
-    message.value = error.response._data.message;
+    const errMessage = error?.response?._data?.message || "Failed to approve vehicle";
+    showMessage(errMessage, "error");
   } finally {
     approvingVehicle.value = false;
   }

package/composables/useAreas.ts

@@ -71,9 +71,12 @@ export default function useAreas() {
     );
   }
 
-  function uploadAreas(file: File, site: string) {
+  function uploadAreas(file: File, site: string, serviceType?: string) {
     const formData = new FormData();
     formData.append("file", file);
+    if (serviceType) {
+      formData.append("serviceType", serviceType);
+    }
     return useNuxtApp().$api<Record<string, any>>(
       `/api/hygiene-areas/site/${site}/upload`,
       {

package/composables/useAttendance.ts

@@ -4,12 +4,13 @@ export default function useAttendance() {
     page = 1,
     limit = 10,
     search = "",
+    serviceType = "",
   } = {}) {
     return useNuxtApp().$api<Record<string, any>>(
       `/api/attendances/site/${site}`,
       {
         method: "GET",
-        query: { page, limit, search },
+        query: { page, limit, search, serviceType },
       }
     );
   }
@@ -19,12 +20,13 @@ export default function useAttendance() {
     page = 1,
     limit = 10,
     search = "",
+    serviceType = "",
   } = {}) {
     return useNuxtApp().$api<Record<string, any>>(
       `/api/attendances/site/${site}/user`,
       {
         method: "GET",
-        query: { page, limit, search },
+        query: { page, limit, search, serviceType },
       }
     );
   }
@@ -55,11 +57,12 @@ export default function useAttendance() {
     );
   }
 
-  function getAttendanceSettings(site: string) {
+  function getAttendanceSettings(site: string, serviceType: string) {
     return useNuxtApp().$api<TAttendanceSettings>(
       `/api/attendance-settings/site/${site}`,
       {
         method: "GET",
+        query: { serviceType },
       }
     );
   }

package/composables/useFacility.ts

@@ -322,6 +322,7 @@ export default function usetFacility() {
     maintenanceDatesWithTimes = [],
     maintenanceWeekly = [],
     maintenanceMonthly = [],
+    userType,
     updatedBy,
   }: {
     _id: string;
@@ -329,6 +330,7 @@ export default function usetFacility() {
     maintenanceDatesWithTimes: Record<string, any>[] | null;
     maintenanceWeekly?: String[] | null;
     maintenanceMonthly?: String[] | null;
+    userType?: string;
     updatedBy?: string;
   }) {
     return useNuxtApp().$api("/api/facilities/maintenance/v1", {
@@ -339,6 +341,7 @@ export default function usetFacility() {
         maintenanceDatesWithTimes,
         maintenanceWeekly,
         maintenanceMonthly,
+        userType,
         updatedBy,
       },
     });
@@ -353,6 +356,8 @@ export default function usetFacility() {
     maintenanceWeekly = [],
     maintenanceMonthly = [],
     status = "",
+    userType,
+    updatedBy,
   }: {
     page?: number;
     limit?: number;
@@ -362,6 +367,8 @@ export default function usetFacility() {
     maintenanceWeekly?: String[];
     maintenanceMonthly?: String[];
     status?: string;
+    userType?: string;
+    updatedBy?: string;
   }) {
     return useNuxtApp().$api(
       "/api/facilities-booking/maintenance-affected/v1",
@@ -376,6 +383,8 @@ export default function usetFacility() {
           maintenanceWeekly,
           maintenanceMonthly,
           status,
+          userType,
+          updatedBy,
         },
       }
     );

package/composables/useUnits.ts

@@ -54,9 +54,12 @@ export default function useUnits() {
     );
   }
 
-  function uploadUnits(file: File, site: string) {
+  function uploadUnits(file: File, site: string, serviceType?: string) {
     const formData = new FormData();
     formData.append("file", file);
+    if (serviceType) {
+      formData.append("serviceType", serviceType);
+    }
 
     return useNuxtApp().$api<Record<string, any>>(
       `/api/hygiene-units/site/${site}/upload`,

package/composables/useVehicle.ts

@@ -75,7 +75,7 @@ export default function useVehicle() {
 
   async function approveVehicle({ site, org, id }: { site: string, org: string, id: string}){
     return await useNuxtApp().$api<Record<string, any>>(
-      `/api/vehicles/approve/ ${id}`,
+      `/api/vehicles/approve/${id}`,
       {
         method: "PUT",
         body: {

package/package.json

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