@7365admin1/layer-common 1.11.12 → 1.11.14

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 1.11.14
+
+### Patch Changes
+
+- f0184df: updates
+
+## 1.11.13
+
+### Patch Changes
+
+- 9c88e03: Update Vehicle Management Changes
+
 ## 1.11.12
 
 ### Patch Changes

package/components/AttendanceCheckInOutDialog.vue

@@ -162,6 +162,7 @@ const emit = defineEmits(["saved", "close"]);
 
 const props = defineProps({
   action: { type: String, default: "checkIn" }, // "checkIn" or "checkOut"
+  serviceType: { type: String, default: "" },
 });
 
 const formRef = ref<any>(null);
@@ -386,6 +387,10 @@ const submit = async () => {
       payload[props.action].img = imageId;
     }
 
+    if (props.serviceType) {
+      payload[props.action].serviceType = props.serviceType;
+    }
+
     emit("saved", payload);
 
     close();

package/components/AttendanceDetailsDialog.vue

@@ -146,6 +146,7 @@ const showDialog = defineModel({ type: Boolean, default: false });
 
 const props = defineProps({
   attendanceId: { type: String, default: "" },
+  serviceType: { type: String, default: "" },
 });
 
 const emit = defineEmits(["close"]);

package/components/AttendanceSettingsDialog.vue

@@ -365,7 +365,7 @@ const onSubmit = async () => {
       payload.isGeofencingEnabled = false;
     }
 
-    await updateAttendanceSettings(props.site, payload);
+    await updateAttendanceSettings(props.site, payload, props.serviceType);
     await getAttendanceSettingsRefresh();
 
     showSnackbar("Settings updated successfully");

package/components/MyAttendanceMain.vue

@@ -62,6 +62,7 @@
   <AttendanceCheckInOutDialog
     v-model="dialogShowForm"
     :action="currentAction"
+    :serviceType="props.serviceType"
     @saved="onAttendanceSaved"
     @close="dialogShowForm = false"
   />
@@ -69,6 +70,7 @@
   <AttendanceDetailsDialog
     v-model="dialogShowMoreActions"
     :attendance-id="selectedAttendanceId"
+    :serviceType="props.serviceType"
     @close="dialogShowMoreActions = false"
   />
 
@@ -82,6 +84,7 @@ import { useAttendancePermission } from "../composables/useAttendancePermission"
 const props = defineProps({
   orgId: { type: String, default: "" },
   site: { type: String, default: "" },
+  serviceType: { type: String, default: "" },
 });
 
 const { canViewOwnAttendance, canCheckInOut, canViewAttendanceDetails } =
@@ -151,6 +154,7 @@ const {
       page: page.value,
       search: searchInput.value,
       site: props.site,
+      serviceType: props.serviceType,
     }),
   {
     watch: [page, searchInput, () => props.site],

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"
@@ -69,9 +69,9 @@
                     Select template
                     <span class="text-red font-weight-bold">*</span>
                   </template>
-                  <template v-slot:append-item>
+                  <!-- <template v-slot:append-item>
                     <div v-intersect="endIntersectTemplateList" />
-                  </template>
+                  </template> -->
                 </v-autocomplete>
               </v-col>
             </v-row>
@@ -833,57 +833,57 @@ watch(
   () => props.templateList,
   (newVal) => {
     localTemplateList.value = newVal;
-  },
+  }
 );
 
 // interset start
 
 // const page = ref(1); // replace with your actual page value
-const totalNumberOfPagesTemplateList = ref(1); // replace with your actual total number of pages value
-
-const endIntersectTemplateList = async (isIntersecting) => {
-  await getTemplateNameLists(page.value);
-  if (isIntersecting && !isFetchingTemplates.value) {
-    page.value += 1;
-    await getTemplateNameLists(page.value);
-  }
-};
-
-const getTemplateNameLists = async (page = 1, query = "") => {
-  isFetchingTemplates.value = true;
-
-  const result = await getTemplatesByPageSearch({
-    sites: [route.params.site as string],
-    limit: 10,
-    page: page,
-    statuses: ["active"],
-    search: query,
-  });
-
-  totalNumberOfPagesTemplateList.value = result?.pages;
-  if (result?.items.length) {
-    const newItems = result?.items.map((item) => ({
-      _id: item._id,
-      name: item.name,
-      prefixPass: item.prefixPass,
-      prefixKey: item.prefixKey,
-    }));
-
-    if (page === 1) {
-      newItems.unshift({ _id: null, name: "All" });
-      newItems.push({ _id: "Manually Added", name: "Manually Added" });
-    }
-
-    // Only add new items if they don't already exist in the list
-    newItems.forEach((newItem) => {
-      if (!localTemplateList.value.find((item) => item._id === newItem._id)) {
-        localTemplateList.value.push(newItem);
-      }
-    });
-  }
-
-  isFetchingTemplates.value = false;
-};
+// const totalNumberOfPagesTemplateList = ref(1); // replace with your actual total number of pages value
+
+// const endIntersectTemplateList = async (isIntersecting) => {
+//   await getTemplateNameLists(page.value);
+//   if (isIntersecting && !isFetchingTemplates.value) {
+//     page.value += 1;
+//     await getTemplateNameLists(page.value);
+//   }
+// };
+
+// const getTemplateNameLists = async (page = 1, query = "") => {
+//   isFetchingTemplates.value = true;
+
+//   const result = await getTemplatesByPageSearch({
+//     sites: [route.params.site as string],
+//     limit: 10,
+//     page: page,
+//     statuses: ["active"],
+//     search: query,
+//   });
+
+//   totalNumberOfPagesTemplateList.value = result?.pages;
+//   if (result?.items.length) {
+//     const newItems = result?.items.map((item) => ({
+//       _id: item._id,
+//       name: item.name,
+//       prefixPass: item.prefixPass,
+//       prefixKey: item.prefixKey,
+//     }));
+
+//     if (page === 1) {
+//       newItems.unshift({ _id: null, name: "All" });
+//       newItems.push({ _id: "Manually Added", name: "Manually Added" });
+//     }
+
+//     // Only add new items if they don't already exist in the list
+//     newItems.forEach((newItem) => {
+//       if (!localTemplateList.value.find((item) => item._id === newItem._id)) {
+//         localTemplateList.value.push(newItem);
+//       }
+//     });
+//   }
+
+//   isFetchingTemplates.value = false;
+// };
 
 const searchTemplate = async (query) => {
   isFetchingTemplates.value = true;
@@ -999,7 +999,7 @@ watch(
       }
     }
   },
-  { immediate: true },
+  { immediate: true }
 );
 
 const router = useRouter();
@@ -1031,7 +1031,7 @@ const printContent = () => {
   if (printOrientation == "KeyCard") {
     localStorage.setItem(
       "selectedKeysToPrint",
-      JSON.stringify(selectedKeysToPrint.value),
+      JSON.stringify(selectedKeysToPrint.value)
     );
   }
 
@@ -1083,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();
@@ -1107,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("");
@@ -1127,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/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/useAttendance.ts

@@ -57,7 +57,7 @@ export default function useAttendance() {
     );
   }
 
-  function getAttendanceSettings(site: string, serviceType: string) {
+  function getAttendanceSettings(site: string, serviceType: string = "") {
     return useNuxtApp().$api<TAttendanceSettings>(
       `/api/attendance-settings/site/${site}`,
       {
@@ -69,13 +69,14 @@ export default function useAttendance() {
 
   function updateAttendanceSettings(
     site: string,
-    payload: TAttendanceSettings
+    payload: TAttendanceSettings,
+    serviceType: string = ""
   ) {
     return useNuxtApp().$api<Record<string, any>>(
       `/api/attendance-settings/site/${site}`,
       {
         method: "PUT",
-        body: payload,
+        body: { ...payload, serviceType },
       }
     );
   }

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.12",
+  "version": "1.11.14",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {