@7365admin1/layer-common 3.1.2 → 3.1.3-staging.40

package/components/VisitorForm.vue

@@ -36,10 +36,17 @@
                   </template>
 
                   <v-list v-if="nricSearchResults.length" class="pa-1 phone-search-results">
-                    <v-list-item v-for="(item, index) in nricSearchResults" :key="item._id || index"
-                      @click="selectNricSearchResult(item)" class="cursor-pointer nric-search-item">
-                      <VisitorSearchResultSummary :item="item" />
-                    </v-list-item>
+                    <div class="search-results-scroll">
+                      <v-list-item v-for="(item, index) in nricSearchResults" :key="item._id || index"
+                        @click="selectNricSearchResult(item)" class="cursor-pointer nric-search-item">
+                        <VisitorSearchResultSummary :item="item" />
+                      </v-list-item>
+                    </div>
+                    <div class="search-results-close pa-1">
+                      <v-btn block variant="flat" color="red" @click.stop="closeAutofillSearchResults('nric')">
+                        Close
+                      </v-btn>
+                    </div>
                   </v-list>
                 </v-menu>
               </v-col>
@@ -58,10 +65,17 @@
                   </template>
 
                   <v-list v-if="phoneSearchResults.length" class="pa-1 phone-search-results">
-                    <v-list-item v-for="(item, index) in phoneSearchResults" :key="item._id || index"
-                      @click="selectPhoneNumberSearchResult(item)" class="cursor-pointer nric-search-item">
-                      <VisitorSearchResultSummary :item="item" />
-                    </v-list-item>
+                    <div class="search-results-scroll">
+                      <v-list-item v-for="(item, index) in phoneSearchResults" :key="item._id || index"
+                        @click="selectPhoneNumberSearchResult(item)" class="cursor-pointer nric-search-item">
+                        <VisitorSearchResultSummary :item="item" />
+                      </v-list-item>
+                    </div>
+                    <div class="search-results-close pa-1">
+                      <v-btn block variant="flat" color="red" @click.stop="closeAutofillSearchResults('contact')">
+                        Close
+                      </v-btn>
+                    </div>
                   </v-list>
                 </v-menu>
               </v-col>
@@ -77,15 +91,23 @@
                 <v-menu v-model="vehicleSearchMenu" location="bottom" offset-y :close-on-content-click="false">
                   <template #activator="{ props }">
                     <InputVehicleNumber v-bind="props" v-model="visitor.plateNumber" density="comfortable"
-                      @update:model-value="handleUpdateVehicleNumber" @focus="isPlateNumberFieldFocused = true"
+                      @update:model-value="handleUpdateVehicleNumber" @focus="handleFocusPlateNumber"
                       @blur="isPlateNumberFieldFocused = false" />
                   </template>
 
                   <v-list v-if="vehicleSearchResults.length" class="pa-1 phone-search-results">
-                    <v-list-item v-for="(item, index) in vehicleSearchResults" :key="item._id || index"
-                      @click="selectPlateNumberSearchResult(item)" class="cursor-pointer nric-search-item">
-                      <VisitorSearchResultSummary :item="item" />
-                    </v-list-item>
+                    <div class="search-results-scroll">
+                      <v-list-item v-for="(item, index) in vehicleSearchResults" :key="item._id || index"
+                        @click="selectPlateNumberSearchResult(item)" class="cursor-pointer nric-search-item">
+                        <VisitorSearchResultSummary :item="item" />
+                      </v-list-item>
+                    </div>
+                    <div class="search-results-close pa-1">
+                      <v-btn block variant="flat" color="red"
+                        @click.stop="closeAutofillSearchResults('vehicleNumber')">
+                        Close
+                      </v-btn>
+                    </div>
                   </v-list>
                 </v-menu>
               </v-col>
@@ -308,10 +330,10 @@
 
           <div class="nric-selected-person d-flex align-center justify-space-between ga-3 mb-5">
             <span>{{ selectedNricSearchResult.name || "Unknown" }}</span>
-            <span class="text-no-wrap">NRIC: {{ selectedNricSearchResult.nric || "N/A" }}</span>
+            <span v-if="!visitor.nric || currentAutofillSource === 'nric'" class="text-no-wrap">NRIC: {{ selectedNricSearchResult.nric || "N/A" }}</span>
           </div>
 
-          <template v-if="!visitor.contact && selectedNricContactOptions.length >= 1">
+          <template v-if="(!visitor.contact || currentAutofillSource === 'contact') && selectedNricContactOptions.length >= 1">
             <h3 class="nric-options-section-title font-weight-bold mb-2">Contact</h3>
             <v-radio-group v-model="selectedNricContact" hide-details color="success" class="nric-option-group">
               <v-radio v-for="contact in selectedNricContactOptions" :key="contact" :label="contact" :value="contact"
@@ -319,7 +341,7 @@
             </v-radio-group>
           </template>
 
-          <template v-if="!visitor.plateNumber && selectedNricPlateOptions.length >= 1">
+          <template v-if="(!visitor.plateNumber || currentAutofillSource === 'vehicleNumber') && selectedNricPlateOptions.length >= 1">
             <h3 class="nric-options-section-title font-weight-bold mb-2 mt-5">Vehicle</h3>
             <v-radio-group v-model="selectedNricPlate" hide-details color="success" class="nric-option-group">
               <v-radio v-for="plate in selectedNricPlateOptions" :key="plate" :label="plate" :value="plate"
@@ -1044,8 +1066,8 @@ function selectAutofillSearchResult(item: Partial<TPeople>, source: Exclude<Auto
   const selectedPlate =
     findMatchingPlateOption(plateOptions, visitor.plateNumber) || plateOptions[0] || "";
 
-  const needsContactChoice = !visitor.contact?.trim() && contactOptions.length > 1;
-  const needsPlateChoice = !visitor.plateNumber?.trim() && plateOptions.length > 1;
+  const needsContactChoice = (!visitor.contact?.trim() || source === 'contact') && contactOptions.length > 1;
+  const needsPlateChoice = (!visitor.plateNumber?.trim() || source === 'vehicleNumber') && plateOptions.length > 1;
 
   if (needsContactChoice || needsPlateChoice) {
     nricSearchMenu.value = false;
@@ -1066,6 +1088,23 @@ function selectAutofillSearchResult(item: Partial<TPeople>, source: Exclude<Auto
   });
 }
 
+function closeAutofillSearchResults(source: Exclude<AutofillSource, null>) {
+  if (source === "nric") {
+    nricSearchMenu.value = false;
+    nricSearchResults.value = [];
+  }
+
+  if (source === "contact") {
+    phoneSearchMenu.value = false;
+    phoneSearchResults.value = [];
+  }
+
+  if (source === "vehicleNumber") {
+    vehicleSearchMenu.value = false;
+    vehicleSearchResults.value = [];
+  }
+}
+
 function closeNricAutofillOptions() {
   dialog.nricAutofillOptions = false;
   selectedNricSearchResult.value = null;
@@ -1503,6 +1542,15 @@ function handleUpdateVehicleNumber() {
   debounceFetchPlateNumber();
 }
 
+const handleFocusPlateNumber = () => {
+  isPlateNumberFieldFocused.value = true;
+  if (prop.mode === 'register') {
+
+    handleUpdateVehicleNumber();
+  }
+};
+
+
 function backToSelection() {
   emit("back");
   message.value = "";
@@ -2108,10 +2156,22 @@ onMounted(() => {
 }
 
 .phone-search-results {
+  display: flex;
+  flex-direction: column;
   max-height: 400px;
+  overflow: hidden;
+}
+
+.search-results-scroll {
+  flex: 1 1 auto;
+  min-height: 0;
   overflow-y: auto;
 }
 
+.search-results-close {
+  flex: 0 0 auto;
+}
+
 .nric-options-card {
   border-radius: 16px !important;
 }

package/components/VisitorManagement.vue

@@ -825,10 +825,8 @@
                 item-title="label"
                 item-value="value"
                 v-model="pass.status"
-                :disabled="
-                  selectedVisitorObject.checkOut || pass.status == 'Removed'
-                "
-              ></v-select>
+                :disabled="pass.status == 'Removed'"
+              />
               <v-textarea
                 v-if="pass.status === 'Lost' || pass.status === 'Damaged'"
                 no-resize
@@ -836,8 +834,7 @@
                 class="w-100"
                 density="compact"
                 v-model="pass.remarks"
-                :disabled="selectedVisitorObject.checkOut"
-              ></v-textarea>
+              />
             </v-row>
           </div>
           <div v-if="keyReturnStatuses.length > 0" class="mb-2">
@@ -864,10 +861,8 @@
                 item-title="label"
                 item-value="value"
                 v-model="key.status"
-                :disabled="
-                  selectedVisitorObject.checkOut || key.status == 'Removed'
-                "
-              ></v-select>
+                :disabled="key.status == 'Removed'"
+              />
               <v-textarea
                 v-if="key.status === 'Lost' || key.status === 'Damaged'"
                 no-resize
@@ -875,8 +870,7 @@
                 class="w-100"
                 density="compact"
                 v-model="key.remarks"
-                :disabled="selectedVisitorObject.checkOut"
-              ></v-textarea>
+              />
             </v-row>
           </div>
 
@@ -886,11 +880,11 @@
               color="blue"
               density="comfortable"
               class="text-capitalize"
-              :disabled="selectedVisitorObject.checkOut"
               :loading="loading.updatingPassKeys"
               @click.stop="handleUpdatePassKeys"
-              >Update Pass/Keys</v-btn
             >
+              Update Pass/Keys
+            </v-btn>
           </v-row>
         </v-card-text>
         <v-toolbar class="pa-0" density="compact">
@@ -900,8 +894,9 @@
                 variant="text"
                 block
                 @click="dialog.returnPassesKeys = false"
-                >Close</v-btn
               >
+                Close
+              </v-btn>
             </v-col>
             <v-col cols="6">
               <v-btn
@@ -915,8 +910,9 @@
                   !canConfirmCheckout || selectedVisitorObject.checkOut
                 "
                 @click="proceedCheckout"
-                >Confirm Checkout</v-btn
               >
+                Confirm Checkout
+              </v-btn>
             </v-col>
           </v-row>
         </v-toolbar>

package/composables/useCleaningSchedulePermission.ts

@@ -1,58 +1,23 @@
 export function useCleaningSchedulePermission() {
-  const { hasPermission } = usePermission();
-  const { permissions } = useCleaningPermission();
-
   const { userAppRole } = useLocalSetup();
 
-  const canViewSchedules = computed(() => {
-    if (!userAppRole.value) return false;
-    if (userAppRole.value.permissions.includes("*")) return true;
-    return hasPermission(userAppRole.value, permissions, "cleaning-schedule-mgmt", "see-all-schedules");
-  });
-
-  const canViewScheduleDetails = computed(() => {
-    if (!userAppRole.value) return false;
-    if (userAppRole.value.permissions.includes("*")) return true;
-    return hasPermission(userAppRole.value, permissions, "cleaning-schedule-mgmt", "see-schedule-details");
-  });
-
-  const canDownloadSchedule = computed(() => {
-    if (!userAppRole.value) return false;
-    if (userAppRole.value.permissions.includes("*")) return true;
-    return hasPermission(userAppRole.value, permissions, "cleaning-schedule-mgmt", "download-schedule");
-  });
-
-  const canManageScheduleTasks = computed(() => {
-    if (!userAppRole.value) return false;
-    if (userAppRole.value.permissions.includes("*")) return true;
-    return hasPermission(userAppRole.value, permissions, "cleaning-schedule-mgmt", "manage-schedule-tasks");
-  });
-
-  const canGenerateChecklist = computed(() => {
-    if (!userAppRole.value) return false;
-    if (userAppRole.value.permissions.includes("*")) return true;
-    return hasPermission(userAppRole.value, permissions, "cleaning-schedule-mgmt", "generate-checklist");
-  });
-
-  const canViewHistory = computed(() => {
-    if (!userAppRole.value) return false;
-    if (userAppRole.value.permissions.includes("*")) return true;
-    return hasPermission(userAppRole.value, permissions, "cleaning-schedule-mgmt", "view-history");
-  });
-
-  const canAddRemarks = computed(() => {
-    if (!userAppRole.value) return false;
-    if (userAppRole.value.permissions.includes("*")) return true;
-    return hasPermission(userAppRole.value, permissions, "cleaning-schedule-mgmt", "add-remarks");
-  });
+  const can = (action: string) =>
+    computed(() => {
+      const permissions = userAppRole.value?.permissions;
+      if (!permissions) return false;
+      if (permissions.includes("*")) return true;
+      return permissions.some((permission) =>
+        permission.endsWith(`-schedule-mgmt:${action}`),
+      );
+    });
 
   return {
-    canViewSchedules,
-    canViewScheduleDetails,
-    canDownloadSchedule,
-    canManageScheduleTasks,
-    canGenerateChecklist,
-    canViewHistory,
-    canAddRemarks,
+    canViewSchedules: can("see-all-schedules"),
+    canViewScheduleDetails: can("see-schedule-details"),
+    canDownloadSchedule: can("download-schedule"),
+    canManageScheduleTasks: can("manage-schedule-tasks"),
+    canGenerateChecklist: can("generate-checklist"),
+    canViewHistory: can("view-history"),
+    canAddRemarks: can("add-remarks"),
   };
 }

package/composables/useEquipment.ts

@@ -27,6 +27,7 @@ export default function useEquipment() {
           name: payload.name,
           unitOfMeasurement: payload.unitOfMeasurement,
           serviceType,
+          ...(payload.attachment ? { attachment: payload.attachment } : {}),
         },
       }
     );
@@ -40,6 +41,7 @@ export default function useEquipment() {
         body: {
           name: payload.name,
           unitOfMeasurement: payload.unitOfMeasurement,
+          ...(payload.attachment ? { attachment: payload.attachment } : {}),
         },
       }
     );

package/composables/useLocalAuth.ts

@@ -183,4 +183,4 @@ export default function useLocalAuth() {
     updateVerificationStatus,
     signUp,
   };
-}
+}

package/composables/useNFCPatrolDailyReport.ts

@@ -34,6 +34,8 @@ function mapLogToSummaryRow(log: Record<string, any>, index: number): NFCPatrolS
     id: log._id,
     routeName: `${index + 1}. ${log.route?.name ?? "-"}`,
     securityCheckSchedule: log.route?.startTime ?? "-",
+    guardName: log.sign?.guardName,
+    guardSignatureFileId: log.sign?.guardSignatureFileId,
     checked,
     missed,
     status: missed === 0 ? "Completed" : "Incomplete",
@@ -63,15 +65,12 @@ export function useNFCPatrolDailyReport(
 
     try {
       const [logsRes, siteInfo] = await Promise.all([
-        getPatrolLogs<NFCPatrolLogListResponse>({
+        getPatrolLogs({
           page: 1,
           limit: 100,
           site,
           date: filters.date,
           routeId: filters.route,
-          routeStartTime: filters.timeRange
-            ? filters.timeRange.split(" - ")[0]
-            : undefined,
         }),
         getSiteById(site),
       ]);

package/composables/useNFCPatrolMonthlyReport.ts

@@ -2,6 +2,8 @@ import type {
   NFCPatrolReportFilters,
   NFCPatrolSummaryReport,
   NFCPatrolReportSummaryRow,
+  NFCPatrolMonthlyReportRow,
+  NFCPatrolMonthlyReport,
 } from "../types/nfc-patrol-report";
 import useNFCPatrolLog from "./useNFCPatrolLog";
 import useSite from "./useSite";
@@ -12,6 +14,55 @@ interface NFCPatrolLogListResponse {
   pageRange?: string;
 }
 
+const MONTHS = [
+  "January",
+  "February",
+  "March",
+  "April",
+  "May",
+  "June",
+  "July",
+  "August",
+  "September",
+  "October",
+  "November",
+  "December",
+];
+function mapLogsToMonthlyRows(
+  logs: Record<string, any>[],
+): NFCPatrolMonthlyReportRow[] {
+  const rows = MONTHS.map((month) => ({
+    month,
+    checked: 0,
+    checkedPercentage: 0,
+    missed: 0,
+    missedPercentage: 0,
+  }));
+
+  logs.forEach((log) => {
+    const monthIndex = new Date(log.date).getMonth();
+
+    for (const checkpoint of log.checkPoints ?? []) {
+      if (checkpoint.status === "Completed") {
+        rows[monthIndex].checked++;
+      } else if (checkpoint.status === "Skipped") {
+        rows[monthIndex].missed++;
+      }
+    }
+  });
+
+  rows.forEach((row) => {
+    const total = row.checked + row.missed;
+
+    if (total > 0) {
+      row.checkedPercentage = Math.round((row.checked / total) * 100);
+      row.missedPercentage = Math.round((row.missed / total) * 100);
+    }
+  });
+
+  return rows;
+}
+
 function buildAddress(address?: Record<string, string>) {
   if (!address) return undefined;
 
@@ -27,23 +78,7 @@ function buildAddress(address?: Record<string, string>) {
   return parts.length ? parts.join(", ") : undefined;
 }
 
-function mapLogToSummaryRow(
-  log: Record<string, any>,
-  index: number,
-): NFCPatrolReportSummaryRow {
-  const checkpoints: Record<string, any>[] = log.checkPoints ?? [];
-  const checked = checkpoints.filter((cp) => cp.status === "Completed").length;
-  const missed = checkpoints.filter((cp) => cp.status === "Skipped").length;
 
-  return {
-    id: log._id,
-    routeName: `${index + 1}. ${log.route?.name ?? "-"}`,
-    securityCheckSchedule: log.route?.startTime ?? "-",
-    checked,
-    missed,
-    status: missed === 0 ? "Completed" : "Incomplete",
-  };
-}
 
 export function useNFCPatrolMonthlyReport(
   filters: NFCPatrolReportFilters,
@@ -52,12 +87,12 @@ export function useNFCPatrolMonthlyReport(
   const { getAll: getPatrolLogs } = useNFCPatrolLog();
   const { getSiteById } = useSite();
 
-  const report = ref<NFCPatrolSummaryReport | null>(null);
+  const report = ref<NFCPatrolMonthlyReport | null>(null);
   const loading = ref(false);
   const notFound = ref(false);
 
   async function fetchReport() {
-    if (!site || !filters.date || !filters.route) {
+    if (!site || !filters.route) {
       report.value = null;
       notFound.value = false;
       return;
@@ -65,19 +100,16 @@ export function useNFCPatrolMonthlyReport(
 
     loading.value = true;
     notFound.value = false;
-
+    const currentYear = new Date().getFullYear().toString();
     try {
       const [logsRes, siteInfo] = await Promise.all([
-        getPatrolLogs<NFCPatrolLogListResponse>({
-          page: 1,
-          limit: 100,
-          site,
-          date: filters.date,
-          routeId: filters.route,
-          routeStartTime: filters.timeRange
-            ? filters.timeRange.split(" - ")[0]
-            : undefined,
-          type: "month",
+        getPatrolLogs({
+            page: 1,
+            limit: 100,
+            site,
+            routeId: filters.route,
+            date: currentYear,
+            type: "month",
         }),
         getSiteById(site),
       ]);
@@ -93,7 +125,7 @@ export function useNFCPatrolMonthlyReport(
             address: buildAddress(siteInfo.address),
           },
           title: `Patrol Route Summary: ${routeName}`,
-          rows: logs.map(mapLogToSummaryRow),
+          rows: mapLogsToMonthlyRows(logs),
         };
       } else {
         report.value = null;

package/composables/useNFCPatrolReport.ts

@@ -51,6 +51,8 @@ function mapLogToPatrolReport(
   const activities: NFCPatrolActivity[] = checkpoints.map((cp) => ({
     id: cp.nfcTag_id,
     checkpoint: cp.nfcTag_name,
+    guardName: log.sign?.guardName,
+    guardSignatureFileId: log.sign?.guardSignatureFileId,
     startTime: formatTime(cp.startDateTime),
     endTime: formatTime(cp.endDateTime),
     actualTime: diffMinutes(cp.startDateTime, cp.endDateTime),

package/composables/useServiceProvider.ts

@@ -236,6 +236,26 @@ export default function useServiceProvider() {
     );
   }
 
+   async function getByEmail({
+    email = "",
+    orgId = "",
+    siteId = "",
+    serviceProviderOrgId = "",
+  } = {}) {
+    return useNuxtApp().$api<Record<string, any>>(
+      "/api/service-providers/email",
+      {
+        method: "GET",
+        query: {
+          email,
+          ...(orgId ? { orgId } : {}),
+          ...(siteId ? { siteId } : {}),
+          ...(serviceProviderOrgId ? { serviceProviderOrgId } : {}),
+        },
+      }
+    );
+  }
+
   return {
     serviceProviders,
     serviceProvider,
@@ -254,5 +274,6 @@ export default function useServiceProvider() {
     add,
     addViaInvite,
     updateStatus,
+    getByEmail,
   };
 }

package/package.json

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

package/types/customer.d.ts

@@ -41,4 +41,5 @@ type TSiteCategory =
   | "shopping_mall"
   | "mix_development"
   | "industrial"
-  | "co_working_co_living";
+  | "co_working"
+  | "co_living";

package/types/equipment.d.ts

@@ -6,6 +6,10 @@ declare type TEquipment = {
   unitOfMeasurement: string;
   createdAt: string;
   updatedAt: string;
+  attachment?: string;
 };
 
-declare type TEquipmentCreate = Pick<TEquipment, "name" | "unitOfMeasurement">;
+declare type TEquipmentCreate = Pick<
+  TEquipment,
+  "name" | "unitOfMeasurement" | "attachment"
+>;

package/types/nfc-patrol-report.ts

@@ -26,7 +26,7 @@ export interface NFCPatrolReportFilterOptions {
 
 export interface NFCPatrolReportLocation {
   name?: string;
-  address?: string; 
+  address?: string;
 }
 
 export interface NFCPatrolRouteSummary {
@@ -47,6 +47,8 @@ export interface NFCPatrolRouteSummary {
 export interface NFCPatrolActivity {
   id: string;
   checkpoint: string;
+  guardName?: string;
+  guardSignatureFileId?: string;
   startTime: string;
   endTime: string;
   actualTime: string;
@@ -67,6 +69,8 @@ export interface NFCPatrolReportSummaryRow {
   id: string;
   routeName: string;
   securityCheckSchedule: string;
+  guardName?: string;
+  guardSignatureFileId?: string;
   checked: number;
   missed: number;
   status: NFCPatrolReportSummaryStatus;
@@ -77,3 +81,17 @@ export interface NFCPatrolSummaryReport {
   title: string;
   rows: NFCPatrolReportSummaryRow[];
 }
+
+export interface NFCPatrolMonthlyReportRow {
+  month: string;
+  checked: number;
+  checkedPercentage: number;
+  missed: number;
+  missedPercentage: number;
+}
+
+export interface NFCPatrolMonthlyReport {
+  location: NFCPatrolReportLocation;
+  title: string;
+  rows: NFCPatrolMonthlyReportRow[];
+}