@7365admin1/layer-common 1.11.13 → 1.11.15

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 1.11.15
+
+### Patch Changes
+
+- 1f2fbb4: Update Layer-commmon pacakge
+
+## 1.11.14
+
+### Patch Changes
+
+- f0184df: updates
+
 ## 1.11.13
 
 ### Patch Changes

package/components/AreaMain.vue

@@ -570,7 +570,7 @@ async function handleDownloadExcel() {
       return;
     }
 
-    const excelBuffer = await exportAreas(props.site);
+    const excelBuffer = await exportAreas(props.site, props.serviceType);
 
     if (!excelBuffer) {
       showMessage("Failed to download areas.", "error");

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.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/OvernightParkingManagement.vue

@@ -66,6 +66,22 @@
       </template>
     </TableMain>
 
+    <v-dialog v-model="viewDialog" width="450" persistent>
+      <VehicleUpdateMoreAction title="Preview" :can-update="false" :can-delete="false"
+        @close="viewDialog = false">
+        <template v-slot:content>
+          <v-row no-gutters class="mb-4">
+            <v-col v-for="(label, key) in formattedFields" :key="key" cols="12">
+              <span v-if="selectedItem?.[key] !== undefined && selectedItem?.[key] !== null && selectedItem?.[key] !== ''" class="d-flex ga-3 align-center">
+                <strong>{{ label }}:</strong>
+                {{ formatItemValue(key, selectedItem[key]) }}
+              </span>
+            </v-col>
+          </v-row>
+        </template>
+      </VehicleUpdateMoreAction>
+    </v-dialog>
+
     <v-dialog v-model="actionDialog.open" max-width="520" persistent>
       <v-card>
         <v-card-title class="text-subtitle-1 font-weight-bold pt-4 px-4">
@@ -109,7 +125,7 @@ const props = defineProps({
 
 });
 
-const emits = defineEmits(["refresh", "create", "row-click", "update:page"]);
+const emits = defineEmits(["refresh", "create", "update:page"]);
 
 const searchInput = defineModel<string>("search", { default: "" });
 
@@ -124,6 +140,35 @@ const extensionHeight = ref(0)
 const offset = ref(0)
 const createLabel = "New Overnight Parking Request"
 
+const viewDialog = ref(false)
+const selectedItem = ref<TOvernightParkingRequest | null>(null)
+
+const formattedFields = {
+  name: "Name",
+  email: "Email",
+  contact: "Contact",
+  isOvernightParking: "Overnight Parking",
+  numberOfPassengers: "No. of Passengers",
+  purposeOfVisit: "Purpose of Visit",
+  status: "Status",
+  remarks: "Remarks",
+  createdAt: "Date Requested",
+} as const
+
+function formatItemValue(key: string, value: any) {
+  if (value === undefined || value === null || value === '') return ''
+  switch (key) {
+    case 'createdAt':
+    case 'updatedAt':
+      return formatDateDDMMYYYYLocal(value)
+    case 'isOvernightParking':
+      return value ? 'Yes' : 'No'
+    case 'status':
+      return formatStatus(value as TOvernightParkingRequest['status']).label
+  }
+  return value
+}
+
 const remarks = ref('')
 const actionLoading = ref(false)
 const actionDialog = reactive<{
@@ -197,7 +242,8 @@ watch(overnightParkingRequests, (data: any) => {
 // }
 
 function handleRowClick(data: { item?: TOvernightParkingRequest }) {
-  emits("row-click", data);
+  selectedItem.value = data?.item ?? null
+  viewDialog.value = true
 }
 
 function handleUpdatePage(value: number) {

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/ScheduleTaskForm.vue

@@ -377,7 +377,7 @@ const submitTask = async () => {
         (props.taskData as any)?._id || (props.taskData as any)?.id;
       response = await updateScheduleTask(taskId, payload);
     } else {
-      response = await createScheduleTask({ ...payload, site: props.site });
+      response = await createScheduleTask({ ...payload, site: props.site, serviceType: props.serviceType });
     }
 
     showMessage(

package/components/ScheduleTaskMain.vue

@@ -88,8 +88,10 @@
           :title="selectedTask?.title || 'Schedule Task Actions'"
           :canUpdate="canUpdateScheduleTask"
           @close="dialogShowMoreActions = false"
-          :canDelete="false"
+          :canDelete="canDeleteScheduleTask"
+          :deleteButtonLabel="'Delete Schedule Task'"
           @edit="onEditFromMoreAction"
+          @delete="onDeleteFromMoreAction"
           :editButtonLabel="'Edit Schedule Task'"
         >
           <template #content>
@@ -198,6 +200,52 @@
         </HygieneUpdateMoreAction>
       </v-dialog>
 
+      <v-dialog v-model="dialogDeleteTask" max-width="450">
+        <v-card>
+          <v-toolbar>
+            <v-row no-gutters class="fill-height px-6" align="center">
+              <span class="font-weight-bold text-h6 text-capitalize">
+                Delete {{ selectedTask?.title || 'Schedule Task' }}
+              </span>
+            </v-row>
+          </v-toolbar>
+          <v-card-text>
+            <span class="text-subtitle-2">Are you sure you want to delete this schedule task?</span>
+          </v-card-text>
+
+          <v-toolbar class="pa-0" density="compact">
+            <v-row no-gutters>
+              <v-col cols="6" class="pa-0">
+                <v-btn
+                  block
+                  variant="text"
+                  class="text-none"
+                  size="large"
+                  @click="dialogDeleteTask = false"
+                  height="48"
+                >
+                  Cancel
+                </v-btn>
+              </v-col>
+
+              <v-col cols="6" class="pa-0">
+                <v-btn
+                  block
+                  variant="flat"
+                  color="black"
+                  class="text-none font-weight-bold"
+                  height="48"
+                  :loading="submitting"
+                  @click="_deleteScheduleTask"
+                >
+                  Delete
+                </v-btn>
+              </v-col>
+            </v-row>
+          </v-toolbar>
+        </v-card>
+      </v-dialog>
+
       <Snackbar
         v-model="messageSnackbar"
         :text="message"
@@ -219,7 +267,7 @@ const props = defineProps({
 });
 
 const { formatDate, debounce } = useUtils();
-const { getScheduleTasks, getScheduleTaskById } = useScheduleTask();
+const { getScheduleTasks, getScheduleTaskById, deleteScheduleTask } = useScheduleTask();
 const {
   canViewScheduleTasks,
   canCreateScheduleTask,
@@ -349,4 +397,30 @@ const onEditFromMoreAction = async () => {
   formMode.value = "edit";
   showForm.value = true;
 };
+
+const onDeleteFromMoreAction = () => {
+  dialogShowMoreActions.value = false;
+  dialogDeleteTask.value = true;
+};
+
+async function _deleteScheduleTask() {
+  if (!selectedTask.value) return;
+
+  try {
+    submitting.value = true;
+    const id =
+      (selectedTask.value as any)._id || (selectedTask.value as any).id;
+    if (!id) throw new Error("Invalid schedule task id");
+
+    const response = await deleteScheduleTask(id);
+    dialogDeleteTask.value = false;
+    showMessage(response?.message, "success");
+
+    await getTaskRefresh();
+  } catch (error: any) {
+    showMessage(error?.data?.message, "error");
+  } finally {
+    submitting.value = false;
+  }
+}
 </script>

package/components/UnitMain.vue

@@ -317,7 +317,7 @@ async function handleDownloadExcel() {
       return;
     }
 
-    const excelBuffer = await downloadUnits(props.site);
+    const excelBuffer = await downloadUnits(props.site, props.serviceType);
 
     if (!excelBuffer) {
       showMessage("Failed to download units.", "error");

package/components/VisitorManagement.vue

@@ -50,7 +50,7 @@
           <v-icon icon="mdi-user" size="15" />
           <span v-if="item.type === 'contractor'" class="text-capitalize">{{
             formatCamelCaseToWords(item.contractorType)
-          }}</span>
+            }}</span>
           <span v-else class="text-capitalize">{{ formatType(item) }}</span>
         </span>
         <span class="d-flex align-center ga-2">
@@ -88,9 +88,10 @@
           <v-icon icon="mdi-clock-time-four-outline" color="green" size="20" />
           <span class="text-capitalize">{{
             UTCToLocalTIme(item.checkIn) || "-"
-          }}</span>
+            }}</span>
           <span>
-            <v-icon v-if="item?.snapshotEntryImage" size="17" icon="mdi-image" @click.stop="handleViewImage(item.snapshotEntryImage)" />
+            <v-icon v-if="item?.snapshotEntryImage" size="17" icon="mdi-image"
+              @click.stop="handleViewImage(item.snapshotEntryImage)" />
           </span>
         </span>
         <span class="d-flex align-center ga-2">
@@ -98,9 +99,10 @@
           <template v-if="item.checkOut">
             <span class="text-capitalize">{{
               UTCToLocalTIme(item.checkOut) || "-"
-            }}</span>
+              }}</span>
             <span>
-              <v-icon v-if="item?.snapshotExitImage" size="17" icon="mdi-image" @click.stop="handleViewImage(item.snapshotExitImage)" />
+              <v-icon v-if="item?.snapshotExitImage" size="17" icon="mdi-image"
+                @click.stop="handleViewImage(item.snapshotExitImage)" />
             </span>
             <span v-if="item?.manualCheckout">
               <TooltipInfo text="Manual Checkout" density="compact" size="x-small" />
@@ -149,7 +151,7 @@
               </span>
 
               <span v-else-if="selectedVisitorObject[key]" class="d-flex ga-3 align-center"><strong>{{ label
-              }}:</strong>
+                  }}:</strong>
                 {{ formatValues(key, selectedVisitorObject[key]) }}
                 <TooltipInfo v-if="key === 'checkOut'" text="Manual Checkout" density="compact" size="x-small" />
               </span>
@@ -165,6 +167,18 @@
         @delete="handleProceedDeleteVisitor" />
     </v-dialog>
 
+    <v-dialog v-model="dialog.snapshotImage" max-width="700">
+      <v-card>
+        <v-card-title class="d-flex justify-space-between align-center">
+          <span>Snapshot</span>
+          <v-btn icon="mdi-close" variant="text" @click="dialog.snapshotImage = false" />
+        </v-card-title>
+        <v-card-text class="pa-2 d-flex justify-center">
+          <v-img :src="snapshotImageUrl" max-height="600" contain />
+        </v-card-text>
+      </v-card>
+    </v-dialog>
+
     <Snackbar v-model="messageSnackbar" :text="message" :color="messageColor" />
   </v-row>
 </template>
@@ -207,7 +221,7 @@ const {
 const { debounce, formatCamelCaseToWords, formatDate, UTCToLocalTIme } =
   useUtils();
 const { formatLocation } = useSecurityUtils();
-const {  getFileUrlAnpr } = useFile();
+const { getFileUrlAnpr } = useFile();
 // const { status: visitorStatus, search } = useRoute().query as { status: string, search: string};
 
 const route = useRoute()
@@ -249,8 +263,11 @@ const dialog = reactive({
   showForm: false,
   viewVisitor: false,
   deleteConfirmation: false,
+  snapshotImage: false,
 });
 
+const snapshotImageUrl = ref("");
+
 const headers = computed(() => [
   { title: "Name", value: "name" },
   { title: "Type/Company", value: "type-company" },
@@ -447,8 +464,8 @@ function handleRegistrationUnregisteredVisitor(item: Partial<TVisitor>) {
 
 function handleViewImage(imageId: string) {
   const imageEndpoint = `${siteId}/${imageId}`;
-  const imageUrl = getFileUrlAnpr(imageEndpoint);
-  window.open(imageUrl, "_blank");
+  snapshotImageUrl.value = getFileUrlAnpr(imageEndpoint);
+  dialog.snapshotImage = true;
 }
 
 

package/composables/useAreas.ts

@@ -74,22 +74,21 @@ export default function useAreas() {
   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`,
       {
         method: "POST",
         body: formData,
+        query: { serviceType },
       },
     );
   }
 
-  async function exportAreas(site: string) {
+  async function exportAreas(site: string, serviceType: string) {
     return useNuxtApp().$api<Blob>(`/api/hygiene-areas/site/${site}/download`, {
       method: "GET",
       responseType: "blob",
+      query: { serviceType },
     });
   }
 

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/useScheduleTask.ts

@@ -37,6 +37,7 @@ export default function useScheduleTask() {
     description?: string;
     areas: { name: string; value: string }[];
     site: string;
+    serviceType: string;
   }) {
     return useNuxtApp().$api<Record<string, any>>(
       `/api/hygiene-schedule-tasks/site/${payload.site}`,
@@ -48,6 +49,7 @@ export default function useScheduleTask() {
           dates: payload.dates,
           description: payload.description,
           areas: payload.areas,
+          serviceType: payload.serviceType,
         },
       },
     );
@@ -78,10 +80,20 @@ export default function useScheduleTask() {
     );
   }
 
+  function deleteScheduleTask(id: string) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/hygiene-schedule-tasks/id/${id}`,
+      {
+        method: "DELETE",
+      },
+    );
+  }
+
   return {
     getScheduleTasks,
     createScheduleTask,
     updateScheduleTask,
     getScheduleTaskById,
+    deleteScheduleTask,
   };
 }

package/composables/useUnits.ts

@@ -57,23 +57,22 @@ export default function useUnits() {
   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`,
       {
         method: "POST",
         body: formData,
+        query: { serviceType },
       }
     );
   }
 
-  function downloadUnits(site: string) {
+  function downloadUnits(site: string, serviceType: string) {
     return useNuxtApp().$api<Blob>(`/api/hygiene-units/site/${site}/download`, {
       method: "GET",
       responseType: "blob",
+      query: { serviceType },
     });
   }
 

package/package.json

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