@7365admin1/layer-common 3.1.1 → 3.1.2-staging.30

package/components/ServiceProviderMain.vue

@@ -548,7 +548,7 @@
               variant="flat"
               class="text-none sp-invite-submit-btn"
               height="76"
-              :disabled="!validServiceProvider"
+              :disabled="!canSubmitInvite"
               :loading="disableServiceProvider"
               @click="submitServiceProviderInvite()"
             >
@@ -574,6 +574,7 @@ type ListTab = "active" | "pending" | "inactive";
 
 type TableRow = {
   _id: string;
+  userId: string;
   serviceProviderOrgId: string;
   companyName: string;
   email: string;
@@ -733,11 +734,10 @@ const {
   updateStatus: updateServiceProviderStatus,
   invite,
 } = useServiceProvider();
-const { getAll: getAllMembers } = useMember();
+const { getAllByUserId } = useMember();
 
 const { getVerifications, cancelUserInvitation, getVerificationByEmail } =
   useVerification();
-const { getOrgsByMembership } = useMember();
 
 const existingAccount = ref<any>(null);
 const checkingExistingAccount = ref(false);
@@ -757,11 +757,10 @@ const createInviteDialog = ref(false);
 // const loadingInviteRoles = ref(false);
 // const serviceProviderInviteRoles = ref<Array<Record<string, any>>>([]);
 
-const { getByUserType } = useMember();
-const { getOrgs } = useOrg();
 
 async function checkExistingAccount(email: string) {
   existingAccount.value = null;
+  messageServiceProvider.value = "";
 
   if (!email.trim() || emailRule(email) !== true) return;
 
@@ -770,30 +769,50 @@ async function checkExistingAccount(email: string) {
   try {
     const user = await getUserByEmail(email);
 
-    if (!user?._id) return;
+if (!user?._id) return;
 
-    const orgs = await getOrgs({
-      user: user._id,
-    });
+const members = await getAllByUserId(user._id);
 
-    const matchedOrg = orgs.items?.find(
-      (org: any) => org.type === serviceProviderInvite.value.app
-    );
+const appMember = (members.items ?? []).find(
+  (member: any) => member.type === serviceProviderInvite.value.app
+);
+
+if (!appMember) {
+  existingAccount.value = null;
+  return;
+}
+
+if (
+  appMember.org === props.orgId &&
+  (appMember.siteId || "") === (props.siteId || "")
+) {
+  existingAccount.value = null;
+  messageServiceProvider.value =
+    "This user is already a member of this service provider.";
+  return;
+}
+
+existingAccount.value = {
+  _id: appMember.org,
+  text: appMember.orgName,
+  org: appMember.org,
+  orgName: appMember.orgName,
+  siteId: appMember.siteId,
+  siteName: appMember.siteName,
+};
 
-    if (matchedOrg) {
-      existingAccount.value = {
-        _id: matchedOrg.value,
-        text: matchedOrg.text,
-        ...matchedOrg,
-      };
-    }
   } catch (error) {
     existingAccount.value = null;
   } finally {
     checkingExistingAccount.value = false;
   }
 }
-
+const canSubmitInvite = computed(() => {
+  return (
+    validServiceProvider.value &&
+    !messageServiceProvider.value
+  );
+});
 watch(
   () => serviceProviderInvite.value.email,
   async (value) => {
@@ -939,6 +958,7 @@ function formatEmailCell(value: unknown): string {
 function mapProviderRows(raw: Record<string, any>[]): TableRow[] {
   return raw.map((row) => ({
     _id: String(row._id ?? ""),
+    userId: String(row.user ?? ""),
     serviceProviderOrgId: String(row.serviceProviderOrgId ?? ""),
     companyName: row.name ?? "-",
     email: formatEmailCell(row.email),
@@ -961,6 +981,7 @@ function inviteTypeLabel(t: string) {
 function mapInviteRows(raw: Record<string, any>[]): TableRow[] {
   return raw.map((row) => ({
     _id: String(row._id ?? ""),
+    userId: String(row.user ?? ""),
     serviceProviderOrgId: String(row.metadata?.serviceProviderOrgId ?? ""),
     companyName: row.metadata?.name || "-",
     email: formatEmailCell(row.email),
@@ -1029,16 +1050,12 @@ async function openView(row: TableRow) {
 
   loadingMembers.value = true;
   try {
-    const data = await getAllMembers({
-      page: 1,
-      limit: 1000,
-      org: row.serviceProviderOrgId,
-      status: "active",
-    });
+    const data = await getAllByUserId(row.userId);
+
     serviceProviderMembers.value = (data.items ?? []).map((member: any) => ({
-      _id: String(member._id ?? ""),
-      name: member.name || member.fullName || member.email || "-",
-      role: member.roleName || member.role?.name || "-",
+      _id: member._id,
+      name: member.name || "-",
+      role: member.role || "-",
     }));
   } catch (error: any) {
     showMessage(errorConverter(error), "error");

package/components/VisitorForm.vue

@@ -308,10 +308,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 +319,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 +1044,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;

package/components/VisitorManagement.vue

@@ -315,7 +315,9 @@
                 style="cursor: pointer"
               >
                 <v-chip
-                  v-for="pass in item.visitorPass"
+                  v-for="pass in item.visitorPass.filter(
+                    (i) => i.status != 'Removed'
+                  )"
                   :key="(pass as any)._id ?? (pass as any).keyId"
                   prepend-icon="mdi-card-bulleted-outline"
                   size="x-small"
@@ -325,7 +327,9 @@
                   {{ (pass as any)?.prefixAndName }}
                 </v-chip>
                 <v-chip
-                  v-for="key in item.passKeys"
+                  v-for="key in item.passKeys.filter(
+                    (i) => i.status != 'Removed'
+                  )"
                   :key="(key as any)._id ?? (key as any).keyId"
                   prepend-icon="mdi-key"
                   size="x-small"
@@ -404,9 +408,16 @@
           </v-menu>
 
           <!-- QRCODE identifier -->
-          <div v-if="item.accessCards?.type === 'QRCODE' && item.accessCards?.cardNo" class="d-flex align-center ga-1 mt-1">
+          <div
+            v-if="
+              item.accessCards?.type === 'QRCODE' && item.accessCards?.cardNo
+            "
+            class="d-flex align-center ga-1 mt-1"
+          >
             <v-icon size="15" icon="mdi-qrcode" color="teal" />
-            <v-chip size="x-small" variant="tonal" color="teal">QR · ({{ item.cards?.flat().length ?? 1 }})</v-chip>
+            <v-chip size="x-small" variant="tonal" color="teal"
+              >QR · ({{ item.cards?.flat().length ?? 1 }})</v-chip
+            >
           </div>
         </v-row>
       </template>
@@ -814,7 +825,9 @@
                 item-title="label"
                 item-value="value"
                 v-model="pass.status"
-                :disabled="selectedVisitorObject.checkOut"
+                :disabled="
+                  selectedVisitorObject.checkOut || pass.status == 'Removed'
+                "
               ></v-select>
               <v-textarea
                 v-if="pass.status === 'Lost' || pass.status === 'Damaged'"
@@ -851,7 +864,9 @@
                 item-title="label"
                 item-value="value"
                 v-model="key.status"
-                :disabled="selectedVisitorObject.checkOut"
+                :disabled="
+                  selectedVisitorObject.checkOut || key.status == 'Removed'
+                "
               ></v-select>
               <v-textarea
                 v-if="key.status === 'Lost' || key.status === 'Damaged'"
@@ -911,37 +926,87 @@
     <v-dialog v-model="dialog.returnNfcCard" max-width="450" persistent>
       <v-card>
         <v-toolbar density="compact" color="">
-          <v-row no-gutters class="d-flex fill-height justify-space-between align-center px-4">
+          <v-row
+            no-gutters
+            class="d-flex fill-height justify-space-between align-center px-4"
+          >
             <span class="font-weight-bold">Return NFC Card</span>
-            <v-btn icon="mdi-close" variant="text" @click="dialog.returnNfcCard = false" />
+            <v-btn
+              icon="mdi-close"
+              variant="text"
+              @click="dialog.returnNfcCard = false"
+            />
           </v-row>
         </v-toolbar>
         <v-card-text class="px-4 pb-2">
-          <p class="text-body-2 mb-3">Please indicate the status of the NFC card before checking out.</p>
+          <p class="text-body-2 mb-3">
+            Please indicate the status of the NFC card before checking out.
+          </p>
           <div>
             <InputLabel class="text-capitalize" title="Full Name" />
-            <v-text-field v-model="selectedVisitorObject.name" density="comfortable" readonly />
+            <v-text-field
+              v-model="selectedVisitorObject.name"
+              density="comfortable"
+              readonly
+            />
           </div>
           <div>
             <InputLabel class="text-capitalize" title="Location" />
-            <v-text-field v-model="selectedVisitorObject.location" density="comfortable" readonly />
+            <v-text-field
+              v-model="selectedVisitorObject.location"
+              density="comfortable"
+              readonly
+            />
           </div>
-          <div v-for="(card, idx) in nfcCardReturnStatuses" :key="card.cardId" class="mb-4">
+          <div
+            v-for="(card, idx) in nfcCardReturnStatuses"
+            :key="card.cardId"
+            class="mb-4"
+          >
             <div class="d-flex align-center ga-2 mb-2">
               <v-icon size="18" icon="mdi-credit-card-outline" color="purple" />
-              <v-chip size="small" variant="tonal" color="purple">{{ card.cardNo }}</v-chip>
+              <v-chip size="small" variant="tonal" color="purple">{{
+                card.cardNo
+              }}</v-chip>
             </div>
-            <v-select v-model="nfcCardReturnStatuses[idx].status" :items="nfcPassStatusOptions" item-title="label" item-value="value" density="comfortable" hide-details />
-            <v-textarea v-if="card.status === 'Lost' || card.status === 'Damage'" v-model="nfcCardReturnStatuses[idx].remarks" label="Remarks (required)" no-resize rows="3" class="mt-2" density="compact" />
+            <v-select
+              v-model="nfcCardReturnStatuses[idx].status"
+              :items="nfcPassStatusOptions"
+              item-title="label"
+              item-value="value"
+              density="comfortable"
+              hide-details
+            />
+            <v-textarea
+              v-if="card.status === 'Lost' || card.status === 'Damage'"
+              v-model="nfcCardReturnStatuses[idx].remarks"
+              label="Remarks (required)"
+              no-resize
+              rows="3"
+              class="mt-2"
+              density="compact"
+            />
           </div>
         </v-card-text>
         <v-toolbar class="pa-0" density="compact">
           <v-row no-gutters>
             <v-col cols="6">
-              <v-btn variant="text" block @click="dialog.returnNfcCard = false">Close</v-btn>
+              <v-btn variant="text" block @click="dialog.returnNfcCard = false"
+                >Close</v-btn
+              >
             </v-col>
             <v-col cols="6">
-              <v-btn color="red" variant="flat" height="48" rounded="0" block :loading="loading.checkingOut" :disabled="!canConfirmNfcCheckout" @click="handleNfcCheckout">Confirm Checkout</v-btn>
+              <v-btn
+                color="red"
+                variant="flat"
+                height="48"
+                rounded="0"
+                block
+                :loading="loading.checkingOut"
+                :disabled="!canConfirmNfcCheckout"
+                @click="handleNfcCheckout"
+                >Confirm Checkout</v-btn
+              >
             </v-col>
           </v-row>
         </v-toolbar>
@@ -971,7 +1036,7 @@
         @close="dialog.editPassKey = false"
         @done="
           () => {
-            dialog.editPassKey = false;
+            // dialog.editPassKey = false;
             getVisitorRefresh();
           }
         "
@@ -1826,7 +1891,8 @@ const nfcCardReturnStatuses = ref<
 const canConfirmCheckout = computed(() => {
   const allEntries = [...passReturnStatuses.value, ...keyReturnStatuses.value];
   return allEntries.every((entry) => {
-    if (!entry.status || ["In Use","Not Returned"].includes(entry.status)) return false;
+    if (!entry.status || ["In Use", "Not Returned"].includes(entry.status))
+      return false;
     if (
       (entry.status === "Lost" || entry.status === "Damaged") &&
       !entry.remarks.trim()
@@ -1840,7 +1906,8 @@ const canConfirmNfcCheckout = computed(() => {
   if (nfcCardReturnStatuses.value.length === 0) return false;
   return nfcCardReturnStatuses.value.every(({ status, remarks }) => {
     if (!status || status === "In Use") return false;
-    if ((status === "Lost" || status === "Damage") && !remarks.trim()) return false;
+    if ((status === "Lost" || status === "Damage") && !remarks.trim())
+      return false;
     return true;
   });
 });
@@ -1883,17 +1950,28 @@ function handleCheckout(userId: string) {
     return;
   }
 
-  const hasNfc = visitor?.accessCards?.type === "NFC" && !!visitor?.accessCards?.cardNo;
+  const hasNfc =
+    visitor?.accessCards?.type === "NFC" && !!visitor?.accessCards?.cardNo;
   if (hasNfc) {
     const allCards: any[] = visitor.cards?.flat() ?? [];
     nfcCardReturnStatuses.value = allCards.map((card: any) => ({
       cardId: card._id,
-      cardNo: card._id === visitor.accessCards._id ? visitor.accessCards.cardNo : card._id,
+      cardNo:
+        card._id === visitor.accessCards._id
+          ? visitor.accessCards.cardNo
+          : card._id,
       status: "In Use",
       remarks: "",
     }));
     if (nfcCardReturnStatuses.value.length === 0) {
-      nfcCardReturnStatuses.value = [{ cardId: visitor.accessCards._id, cardNo: visitor.accessCards.cardNo, status: "In Use", remarks: "" }];
+      nfcCardReturnStatuses.value = [
+        {
+          cardId: visitor.accessCards._id,
+          cardNo: visitor.accessCards.cardNo,
+          status: "In Use",
+          remarks: "",
+        },
+      ];
     }
     dialog.returnNfcCard = true;
     return;
@@ -1961,7 +2039,9 @@ async function handleNfcCheckout() {
       })),
     });
     if (res) {
-      await updateVisitor(userId as string, { checkOut: new Date().toISOString() });
+      await updateVisitor(userId as string, {
+        checkOut: new Date().toISOString(),
+      });
       showMessage("Visitor successfully checked-out!", "info");
       await getVisitorRefresh();
       dialog.returnNfcCard = false;
@@ -1969,7 +2049,10 @@ async function handleNfcCheckout() {
     }
   } catch (error: any) {
     const errorMessage = error?.response?._data?.message;
-    showMessage(errorMessage || "Something went wrong. Please try again later.", "error");
+    showMessage(
+      errorMessage || "Something went wrong. Please try again later.",
+      "error"
+    );
   } finally {
     loading.checkingOut = false;
   }
@@ -2241,11 +2324,7 @@ const syncVisitorFiltersFromRoute = () => {
 
 onMounted(syncVisitorFiltersFromRoute);
 
-watch(
-  () => route.query,
-  syncVisitorFiltersFromRoute,
-  { deep: true }
-);
+watch(() => route.query, syncVisitorFiltersFromRoute, { deep: true });
 
 const { socketUnregisteredVisitorTrigger, visitorSocketData } =
   useVisitorSocket();

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

@@ -63,15 +63,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),
       ]);