@7365admin1/layer-common 1.11.14 → 1.11.15

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/layer-common
 
+## 1.11.15
+
+### Patch Changes
+
+- 1f2fbb4: Update Layer-commmon pacakge
+
 ## 1.11.14
 
 ### 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

@@ -388,7 +388,7 @@ const submit = async () => {
     }
 
     if (props.serviceType) {
-      payload[props.action].serviceType = props.serviceType;
+      payload.serviceType = props.serviceType;
     }
 
     emit("saved", payload);

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