@7365admin1/layer-common 3.0.1 → 3.0.3

package/components/DashboardPanel.vue

@@ -0,0 +1,44 @@
+<template>
+  <v-card
+    flat
+    border
+    rounded="lg"
+    class="d-flex flex-column w-100"
+    style="min-height: 200px"
+  >
+    <div class="d-flex align-center justify-space-between pa-5 pb-3">
+      <h2 class="text-body-1 font-weight-black text-blue-grey-darken-4 mb-0">
+        {{ title }}
+      </h2>
+      <v-btn
+        v-if="actionLabel"
+        variant="text"
+        color="primary"
+        size="small"
+        class="text-none font-weight-bold"
+        @click="$emit('action')"
+      >
+        {{ actionLabel }}
+      </v-btn>
+    </div>
+
+    <div class="flex-1-1-100 overflow-y-auto pa-5 pt-0" style="max-height: 400px">
+      <slot />
+    </div>
+  </v-card>
+</template>
+
+<script setup lang="ts">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  actionLabel: {
+    type: String,
+    default: '',
+  },
+});
+
+defineEmits(['action']);
+</script>

package/components/DocumentForm.vue

@@ -125,17 +125,35 @@ const routeParentId = computed(() =>
 );
 const effectiveParentId = computed(() => prop.parentId || routeParentId.value);
 
+function getAttachmentId(attachment: any): string {
+  if (!attachment) return "";
+  if (Array.isArray(attachment)) {
+    const first = attachment[0];
+    if (!first) return "";
+    if (typeof first === "string") return first;
+    return String(first?._id || first?.id || "");
+  }
+  if (typeof attachment === "string") return attachment;
+  return String(attachment?._id || attachment?.id || "");
+}
+
 if (prop.mode === "edit") {
   document.value.name = prop.document.name;
-  document.value.attachment = [prop.document.attachment];
+  
+  const extractedId = getAttachmentId(prop.document.attachment);
+  document.value.attachment = extractedId ? [extractedId] : [];
+  
   document.value.type = prop.document.type;
 }
 
 watch(
   () => document.value.attachment,
-  async (newVal) => {
-    if (newVal && prop.mode !== "edit") {
-      const fileId = Array.isArray(newVal) ? newVal[0] : newVal;
+  async (newVal, oldVal) => {
+    const newId = Array.isArray(newVal) ? newVal[0] : newVal;
+    const oldId = Array.isArray(oldVal) ? oldVal[0] : oldVal;
+
+    if (newId && newId !== oldId) {
+      const fileId = newId;
       const fileData = await getFileById(fileId);
       if (fileData) {
         document.value.name = fileData.data.name;

package/components/DocumentManagement.vue

@@ -177,6 +177,7 @@
     <!-- Create Dialog -->
     <v-dialog v-model="createDialog" width="450" persistent>
       <DocumentForm
+        v-if="createDialog"
         :parent-id="activeParentId"
         @cancel="createDialog = false"
         @success="successCreate()"
@@ -253,6 +254,7 @@
     <!-- Edit Dialog -->
     <v-dialog v-model="editDialog" width="450" persistent>
       <DocumentForm
+        v-if="editDialog"
         mode="edit"
         @cancel="editDialog = false"
         @success="successUpdate()"
@@ -277,13 +279,19 @@
                 <v-col cols="6" class="text-right text-body-1">
                   <NuxtLink
                     v-if="selectedDocument?.attachment && isViewable"
-                    :to="getFileUrl(selectedDocument.attachment)"
+                    :to="
+                      getFileUrl(getAttachmentId(selectedDocument.attachment))
+                    "
                     external
                     target="_blank"
                   >
                     View Document
                   </NuxtLink>
-                  <span v-else-if="selectedDocument?.attachment" class="text-grey" style="opacity: 0.6; cursor: not-allowed;">
+                  <span
+                    v-else-if="selectedDocument?.attachment"
+                    class="text-grey"
+                    style="opacity: 0.6; cursor: not-allowed"
+                  >
                     View Document
                   </span>
                   <span v-else>N/A</span>
@@ -528,6 +536,20 @@ const {
 } = documentService;
 const { getFileUrl } = useFile();
 
+function getAttachmentId(attachment: any): string {
+  if (!attachment) return "";
+
+  if (Array.isArray(attachment)) {
+    const first = attachment[0];
+    if (!first) return "";
+    if (typeof first === "string") return first;
+    return String(first?._id || first?.id || "");
+  }
+  if (typeof attachment === "string") return attachment;
+
+  return String(attachment?._id || attachment?.id || "");
+}
+
 const router = useRouter();
 const route = useRoute();
 
@@ -627,11 +649,26 @@ function formatBytes(bytes = 0) {
   return `${parseFloat((b / Math.pow(k, i)).toFixed(2))} ${sizes[i]}`;
 }
 
+const KNOWN_FILE_TYPES = new Set(["pdf", "csv", "doc", "docx", "folder", "mixed"]);
+
+function inferDisplayType(doc: any): string {
+  if (doc.type === "folder") return "Folder";
+  // If stored type is a known file format, use it directly
+  const t = String(doc.type || "").toLowerCase().trim();
+  if (t && KNOWN_FILE_TYPES.has(t)) return t;
+  // Otherwise infer from the document name (handles legacy "public" ACL type)
+  const name = String(doc.name || "").toLowerCase();
+  if (name.endsWith(".pdf")) return "pdf";
+  if (name.endsWith(".csv")) return "csv";
+  if (name.endsWith(".docx") || name.endsWith(".doc")) return "doc";
+  return t || "N/A";
+}
+
 const tableItems = computed(() => {
   return items.value.map((doc: any) => ({
     ...doc,
     _raw: doc,
-    file_type: doc.type === "folder" ? "Folder" : doc.type || "N/A",
+    file_type: inferDisplayType(doc),
     file_size:
       doc.type === "folder"
         ? "—"
@@ -664,8 +701,8 @@ const selectedDocument = ref<TDocument>({
 });
 
 const isViewable = computed(() => {
-  const lowerType = String(selectedDocument.value?.type || "").trim().toLowerCase();
-  return ["pdf", "doc", "csv"].includes(lowerType);
+  const effectiveType = inferDisplayType(selectedDocument.value as any).toLowerCase();
+  return ["pdf", "doc", "csv"].includes(effectiveType);
 });
 
 const previewDetails = computed(() => {
@@ -769,7 +806,7 @@ function downloadDocument(document?: TDocument) {
     return;
   }
 
-  const fileUrl = getFileUrl(document.attachment);
+  const fileUrl = getFileUrl(getAttachmentId(document.attachment));
   if (fileUrl) {
     window.open(fileUrl, "_blank", "noopener,noreferrer");
   }

package/components/Editor.vue

@@ -1,19 +1,25 @@
 <template>
   <ClientOnly>
     <v-row no-gutters class="ckeditor-container w-100">
-      <ckeditor v-model="data" :editor="ClassicEditor" :config="config" @ready="onReady" :key="prop.readOnly" />
+      <ckeditor
+        v-model="data"
+        :editor="ClassicEditor"
+        :config="config"
+        @ready="onReady"
+        :key="prop.readOnly"
+      />
     </v-row>
   </ClientOnly>
 </template>
 
 <script setup>
-
 const prop = defineProps({
   readOnly: {
     type: Boolean,
-    required: false
-  }
-})
+    required: false,
+    default: false,
+  },
+});
 import {
   ClassicEditor,
   Essentials,
@@ -25,28 +31,50 @@ import {
   Link,
   Alignment,
   Font,
-} from 'ckeditor5'
-import { Ckeditor } from '@ckeditor/ckeditor5-vue'
-import 'ckeditor5/ckeditor5.css';
+} from "ckeditor5";
+import { Ckeditor } from "@ckeditor/ckeditor5-vue";
+import "ckeditor5/ckeditor5.css";
 
-import 'ckeditor5/ckeditor5.css'
+import "ckeditor5/ckeditor5.css";
 
-const data = defineModel({ required: true, default: "" })
+const data = defineModel({ required: true, default: "" });
 
 const editorInstance = ref(null);
 
 const config = computed(() => ({
-  licenseKey: 'GPL',
-  plugins: [Essentials, Paragraph, Bold, Italic, Heading, List, Alignment, Font],
+  licenseKey: "GPL",
+  plugins: [
+    Essentials,
+    Paragraph,
+    Bold,
+    Italic,
+    Heading,
+    List,
+    Alignment,
+    Font,
+  ],
   toolbar: [
-    'undo', 'redo',
-    '|', 'bold', 'italic',
-    '|', 'fontSize', 'fontColor', 'fontBackgroundColor',
-    '|', 'bulletedList', 'numberedList',
-    '|', 'heading', '|', 'alignment:left', 'alignment:center', 'alignment:right', 'alignment:justify',
+    "undo",
+    "redo",
+    "|",
+    "bold",
+    "italic",
+    "|",
+    "fontSize",
+    "fontColor",
+    "fontBackgroundColor",
+    "|",
+    "bulletedList",
+    "numberedList",
+    "|",
+    "heading",
+    "|",
+    "alignment:left",
+    "alignment:center",
+    "alignment:right",
+    "alignment:justify",
   ],
-}))
-
+}));
 
 function onReady(editor) {
   editorInstance.value = editor;
@@ -56,7 +84,6 @@ function onReady(editor) {
 function toggleReadOnly(isReadOnly) {
   if (!editorInstance.value) return;
 
-
   if (isReadOnly) {
     editorInstance.value.enableReadOnlyMode("view-mode-lock");
   } else {
@@ -70,8 +97,6 @@ watch(
     toggleReadOnly(newVal);
   }
 );
-
-
 </script>
 
 <style scoped>

package/components/Facility/BookingSetup.vue

@@ -501,7 +501,7 @@
           </v-col>
           <v-col cols="3" class="d-flex align-center justify-end">
             <v-switch
-              v-model="facility.isBookingUnitLimitEnabled"
+              v-model="isBookingUnitLimitEnabled"
               class="d-flex align-center"
               color="primary"
               hide-details
@@ -519,7 +519,7 @@
               :min="1"
               :max="500"
               hide-details
-              :disabled="!facility.isBookingUnitLimitEnabled"
+              :disabled="!isBookingUnitLimitEnabled"
             />
           </v-col>
         </v-row>
@@ -539,7 +539,7 @@
           </v-col>
           <v-col cols="3" class="d-flex align-center justify-end">
             <v-switch
-              v-model="facility.isMaxNumberGuestLimitEnabled"
+              v-model="isMaxNumberGuestLimitEnabled"
               class="d-flex align-center"
               color="primary"
               hide-details
@@ -557,7 +557,7 @@
               :min="1"
               :max="500"
               hide-details
-              :disabled="!facility.isMaxNumberGuestLimitEnabled"
+              :disabled="!isMaxNumberGuestLimitEnabled"
             />
           </v-col>
         </v-row>
@@ -576,7 +576,7 @@
           </v-col>
           <v-col cols="3" class="d-flex align-center justify-end">
             <v-switch
-              v-model="facility.isCancelAllowedLimitEnabled"
+              v-model="isCancelAllowedLimitEnabled"
               class="d-flex align-center"
               color="primary"
               hide-details
@@ -594,7 +594,7 @@
               :min="1"
               :max="500"
               hide-details
-              :disabled="!facility.isCancelAllowedLimitEnabled"
+              :disabled="!isCancelAllowedLimitEnabled"
             />
           </v-col>
         </v-row>
@@ -1013,32 +1013,56 @@ const handlePolicy = (newContent: string) => {
   facility.value.bookingPolicy = newContent;
 };
 
+const isBookingUnitLimitEnabled = ref<boolean>(false);
+const isMaxNumberGuestLimitEnabled = ref<boolean>(false);
+const isCancelAllowedLimitEnabled = ref<boolean>(false);
+
+watchEffect(() => {
+  if (facility.value.bookingUnitLimit > 0) {
+    isBookingUnitLimitEnabled.value = true;
+  } else {
+    isBookingUnitLimitEnabled.value = false;
+  }
+
+  if (facility.value.maxNumberGuestLimit > 0) {
+    isMaxNumberGuestLimitEnabled.value = true;
+  } else {
+    isMaxNumberGuestLimitEnabled.value = false;
+  }
+
+  if (facility.value.daysAllowedCancel > 0) {
+    isCancelAllowedLimitEnabled.value = true;
+  } else {
+    isCancelAllowedLimitEnabled.value = false;
+  }
+});
+
 function onToggleBookingUnitLimit(val: any) {
   if (val) {
-    facility.value.isBookingUnitLimitEnabled = true;
+    isBookingUnitLimitEnabled.value = true;
     facility.value.bookingUnitLimit = 1;
   } else {
-    facility.value.isBookingUnitLimitEnabled = false;
+    isBookingUnitLimitEnabled.value = false;
     facility.value.bookingUnitLimit = null;
   }
 }
 
 function onToggleMaxNumberGuestLimit(val: any) {
   if (val) {
-    facility.value.isMaxNumberGuestLimitEnabled = true;
+    isMaxNumberGuestLimitEnabled.value = true;
     facility.value.maxNumberGuestLimit = 1;
   } else {
-    facility.value.isMaxNumberGuestLimitEnabled = false;
+    isMaxNumberGuestLimitEnabled.value = false;
     facility.value.maxNumberGuestLimit = null;
   }
 }
 
 function onToggleCancelAllowedLimit(val: any) {
   if (val) {
-    facility.value.isCancelAllowedLimitEnabled = true;
+    isCancelAllowedLimitEnabled.value = true;
     facility.value.daysAllowedCancel = 1;
   } else {
-    facility.value.isCancelAllowedLimitEnabled = false;
+    isCancelAllowedLimitEnabled.value = false;
     facility.value.daysAllowedCancel = null;
   }
 }

package/components/MyAttendanceMain.vue

@@ -62,7 +62,6 @@
   <AttendanceCheckInOutDialog
     v-model="dialogShowForm"
     :action="currentAction"
-    :serviceType="props.serviceType"
     @saved="onAttendanceSaved"
     @close="dialogShowForm = false"
   />
@@ -203,7 +202,7 @@ const onAttendanceSaved = async (
   try {
     let response;
     if (currentAction.value === "checkIn") {
-      response = await checkIn(props.site, payload as TAttendanceCheckIn);
+      response = await checkIn(props.site, payload as TAttendanceCheckIn, props.serviceType);
     } else {
       if (!todayAttendance.value?._id) {
         throw new Error("Attendance ID not found");

package/components/VisitorDataFromScannedQRCodeForm.vue

@@ -29,8 +29,8 @@
         </v-col>
 
         <v-col v-if="!visitorInfo.checkIn" cols="12">
-          <InputLabel class="text-capitalize" title="NRIC/Passport/ID No." />
-          <v-text-field
+          <InputLabel class="text-capitalize" title="NRIC" />
+          <!-- <v-text-field
             v-if="!visitorInfo.checkIn"
             v-model="visitorInfo.nric"
             density="comfortable"
@@ -43,7 +43,17 @@
             density="comfortable"
             hide-details
             readonly
-          />
+          /> -->
+          <NRICNumber  v-if="!visitorInfo.checkIn"
+            v-model="visitorInfo.nric"
+            density="comfortable"
+            hide-details
+            clearable />
+          <NRICNumber v-else
+            v-model="visitorNric"
+            density="comfortable"
+            hide-details
+            readonly />
         </v-col>
 
         <v-col v-if="!visitorInfo.checkIn" cols="12" class="mt-4">
@@ -222,6 +232,8 @@
   </v-card>
 </template>
 <script setup lang="ts">
+import NRICNumber from './Input/NRICNumber.vue';
+
 const prop = defineProps({
   site: {
     type: String,
@@ -271,15 +283,15 @@ const location = computed({
   get: () => {
     if (
       visitorInfo.value &&
-      visitorInfo.value.block &&
-      visitorInfo.value.level &&
+      visitorInfo.value.block?.name &&
+      visitorInfo.value.level?.name &&
       visitorInfo.value.unitName
     ) {
-      return `${visitorInfo.value.block} / ${visitorInfo.value.level} / ${visitorInfo.value.unitName}`;
+      return `${visitorInfo.value.block?.name} / ${visitorInfo.value.level?.name} / ${visitorInfo.value.unitName}`;
     } else if (
       visitorInfo.value &&
-      visitorInfo.value.block &&
-      !visitorInfo.value.level &&
+      visitorInfo.value.block?.name &&
+      !visitorInfo.value.level?.name &&
       !visitorInfo.value.unitName
     ) {
       return visitorInfo.value.block;

package/components/VisitorManagement.vue

@@ -1446,8 +1446,8 @@ function generateCSVData(visitors: any[]): string {
     visitor.name || "",
     formatExportTypes(formatType(visitor)) || "",
     visitor.company || "",
-    visitor.block || "",
-    visitor.level || "",
+    visitor.block?.name || "",
+    visitor.level?.name || "",
     visitor.unitName || "",
     visitor.contact || "",
     visitor.plateNumber || "",

package/components/VisitorsReportPreview.vue

@@ -40,8 +40,8 @@
                                 <v-icon icon="mdi-storefront-outline" size="15" />
                                 <span class="text-capitalize" style="word-break: break-word;">{{
                                     formatLocation({
-                                        block: item.block,
-                                        level: item.level,
+                                        block: item.block?.name || "",
+                                        level: item.level?.name,
                                         unit: item.unitName,
                                     })
                                 }}</span>
@@ -182,10 +182,10 @@ watch(getSitesReq, (newData: any) => {
     }
 })
 
-const formatLocation = ({ block, level, unit }: { block: number, level: string, unit: string | TBuildingUnit }) => {
+const formatLocation = ({ block, level, unit }: { block: string, level: string, unit: string | TBuildingUnit }) => {
     const parts = [];
 
-    if (block) parts.push(`Block ${block}`);
+    if (block) parts.push(`${block}`);
     if (level) parts.push(level);
     if (unit) parts.push(unit);
 

package/composables/useAttendance.ts

@@ -37,12 +37,12 @@ export default function useAttendance() {
     });
   }
 
-  function checkIn(site: string, payload: TAttendanceCheckIn) {
+  function checkIn(site: string, payload: TAttendanceCheckIn, serviceType: string = "") {
     return useNuxtApp().$api<Record<string, any>>(
       `/api/attendances/site/${site}/check-in`,
       {
         method: "POST",
-        body: payload,
+        body: { ...payload, serviceType },
       }
     );
   }

package/composables/useDashboard.ts

@@ -1,31 +1,90 @@
-export default function(){
-
-
-      type TGetAllParams = {
-        site?: string;
+export default function () {
+  function getDashboardHygiene(
+    site = "",
+    period: TDashboardValues = "today",
+    serviceType: TServiceType
+  ) {
+    return useNuxtApp().$api<THygieneDashboardData>(
+      `/api/dashboard/serviceType/${serviceType}/site/${site}`,
+      {
+        method: "GET",
+        query: {
+          period,
+        },
       }
+    );
+  }
 
+  function getDashboardHygieneWeeklyActivity(
+    site = "",
+    serviceType: TServiceType = "cleaning_services"
+  ) {
+    return useNuxtApp().$api<THygieneWeeklyActivityItem[]>(
+      `/api/dashboard/serviceType/${serviceType}/site/${site}/weekly-activity`,
+      {
+        method: "GET",
+      }
+    );
+  }
 
+  function getDashboardHygieneTaskSchedule(
+    site = "",
+    serviceType: TServiceType,
+    page = 1,
+    limit = 4
+  ) {
+    return useNuxtApp().$api<
+      THygienePaginatedResponse<THygieneTaskScheduleItem>
+    >(`/api/dashboard/serviceType/${serviceType}/site/${site}/task-schedule`, {
+      method: "GET",
+      query: {
+        page,
+        limit,
+      },
+    });
+  }
 
-    async function getDashboardData({
-   site
-  } : TGetAllParams) {
-    return await useNuxtApp().$api<Record<string, any>>(
-      "/api/dashboard",
+  function getDashboardHygieneAttendance(
+    site = "",
+    serviceType: TServiceType,
+    page = 1,
+    limit = 4
+  ) {
+    return useNuxtApp().$api<THygienePaginatedResponse<THygieneAttendanceItem>>(
+      `/api/dashboard/serviceType/${serviceType}/site/${site}/attendance`,
       {
         method: "GET",
         query: {
-          
+          page,
+          limit,
         },
       }
     );
   }
 
+  function getDashboardHygieneFeedbacks(
+    site = "",
+    serviceType: TServiceType,
+    page = 1,
+    limit = 4
+  ) {
+    return useNuxtApp().$api<THygienePaginatedResponse<THygieneFeedbackItem>>(
+      `/api/dashboard/serviceType/${serviceType}/site/${site}/feedbacks`,
+      {
+        method: "GET",
+        query: {
+          page,
+          limit,
+        },
+      }
+    );
+  }
 
-
-
-    return {
-        getDashboardData,
-  
-    }
-}
+  return {
+    getDashboardHygiene,
+    getDashboardHygieneWeeklyActivity,
+    getDashboardHygieneTaskSchedule,
+    getDashboardHygieneAttendance,
+    getDashboardHygieneFeedbacks,
+  };
+}

package/composables/useDocument.ts

@@ -18,6 +18,7 @@ export default function useDocument() {
       page,
       search,
       limit,
+      type,
       site,
       parentId,
     };