@7365admin1/layer-common 3.1.3 → 3.1.4-staging.47

package/components/Nfc/NFCPatrolRouteMain.vue

@@ -4,6 +4,7 @@
       <v-row no-gutters class="mb-4" align="center">
         <v-col cols="12" md="6">
           <v-btn
+            v-if="props.canCreateNfcPatrol"
             rounded="pill"
             variant="outlined"
   
@@ -82,7 +83,12 @@
     </v-col>
 
     <!-- Add Dialog -->
-    <v-dialog v-model="dialogAdd" persistent max-width="900">
+    <v-dialog
+      v-if="props.canCreateNfcPatrol"
+      v-model="dialogAdd"
+      persistent
+      max-width="900"
+    >
       <NFCPatrolRouteForm
         title="Add Route"
         :site="props.site"
@@ -94,7 +100,12 @@
     </v-dialog>
 
     <!-- Edit Dialog -->
-    <v-dialog v-model="dialogEdit" persistent max-width="900">
+    <v-dialog
+      v-if="props.canUpdateNfcPatrol"
+      v-model="dialogEdit"
+      persistent
+      max-width="900"
+    >
       <NFCPatrolRouteForm
         title="Edit Route"
         :site="props.site"
@@ -190,7 +201,10 @@
 
         <v-toolbar class="pa-0" density="compact">
           <v-row no-gutters>
-            <v-col cols="6" class="pa-0">
+            <v-col
+              :cols="props.canUpdateNfcPatrol || props.canDeleteNfcPatrol ? 6 : 12"
+              class="pa-0"
+            >
               <v-btn
                 block
                 variant="text"
@@ -203,7 +217,11 @@
               </v-btn>
             </v-col>
 
-            <v-col cols="6" class="pa-0">
+            <v-col
+              v-if="props.canUpdateNfcPatrol || props.canDeleteNfcPatrol"
+              cols="6"
+              class="pa-0"
+            >
               <v-menu>
                 <template #activator="{ props }">
                   <v-btn
@@ -220,13 +238,17 @@
                 </template>
 
                 <v-list class="pa-0">
-                  <v-list-item @click="openDialogEdit()">
+                  <v-list-item v-if="props.canUpdateNfcPatrol" @click="openDialogEdit()">
                     <v-list-item-title class="text-subtitle-2">
                       Edit Route
                     </v-list-item-title>
                   </v-list-item>
 
-                  <v-list-item @click="openDialogDelete()" class="text-red">
+                  <v-list-item
+                    v-if="props.canDeleteNfcPatrol"
+                    @click="openDialogDelete()"
+                    class="text-red"
+                  >
                     <v-list-item-title class="text-subtitle-2">
                       Delete Route
                     </v-list-item-title>
@@ -240,7 +262,12 @@
     </v-dialog>
 
     <!-- Delete Dialog -->
-    <v-dialog v-model="dialogDelete" persistent width="540">
+    <v-dialog
+      v-if="props.canDeleteNfcPatrol"
+      v-model="dialogDelete"
+      persistent
+      width="540"
+    >
       <v-card width="100%">
         <v-card-text
           style="max-height: 100vh; overflow-y: auto"
@@ -304,6 +331,18 @@ const props = defineProps({
     type: String,
     required: true,
   },
+  canCreateNfcPatrol: {
+    type: Boolean,
+    default: false,
+  },
+  canUpdateNfcPatrol: {
+    type: Boolean,
+    default: false,
+  },
+  canDeleteNfcPatrol: {
+    type: Boolean,
+    default: false,
+  },
   headers: {
     type: Array as PropType<Array<any>>,
     default: () => [
@@ -406,6 +445,8 @@ const messageSnackbar = ref(false);
 const messageColor = ref("");
 
 async function openDialogEdit() {
+  if (!props.canUpdateNfcPatrol) return;
+
   try {
     // Fetch the full route details from the API
     const response = await getRouteById(selectedRoute.value._id);
@@ -431,6 +472,8 @@ async function openDialogEdit() {
 }
 
 function openDialogDelete() {
+  if (!props.canDeleteNfcPatrol) return;
+
   dialogDelete.value = true;
 
   if (dialogPreview.value) dialogPreview.value = false;
@@ -502,6 +545,8 @@ function handleRowClick(_: any, data: any) {
 }
 
 async function submitDelete() {
+  if (!props.canDeleteNfcPatrol) return;
+
   try {
     await deleteRouteById(selectedRoute.value._id ?? "");
     await getRoutesRefresh();

package/components/PhotoUpload.vue

@@ -59,6 +59,21 @@
     </v-col>
   </v-row>
 
+  <v-dialog v-model="showPhotoPreview" max-width="900">
+    <v-card>
+      <v-card-actions class="pa-2 justify-end">
+        <v-btn
+          icon="mdi-close"
+          variant="text"
+          @click="showPhotoPreview = false"
+        />
+      </v-card-actions>
+      <v-card-text class="pa-2 pt-0">
+        <v-img :src="selectedPhoto" contain max-height="80vh" />
+      </v-card-text>
+    </v-card>
+  </v-dialog>
+
   <v-dialog v-model="photoOptionsDialog" max-width="420">
     <v-card>
       <v-card-title class="d-flex align-center pa-4">
@@ -196,6 +211,8 @@ const photos = ref<string[]>([...props.modelValue]);
 const photosIds = ref<string[]>([...props.photoIds]);
 const photoOptionsDialog = ref(false);
 const showCameraDialog = ref(false);
+const showPhotoPreview = ref(false);
+const selectedPhoto = ref("");
 const videoRef = ref<HTMLVideoElement | null>(null);
 const canvasRef = ref<HTMLCanvasElement | null>(null);
 const fileInputRef = ref<HTMLInputElement | null>(null);
@@ -205,10 +222,8 @@ const uploading = ref(false);
 const { addFile } = useFile();
 
 function viewPhoto(photoData: string) {
-  const link = document.createElement("a");
-  link.href = photoData;
-  link.target = "_blank";
-  link.click();
+  selectedPhoto.value = photoData;
+  showPhotoPreview.value = true;
 }
 
 watch(

package/components/RolePermissionFormPreviewUpdate.vue

@@ -19,7 +19,7 @@
               :error-messages="errorMessages"
               :readonly="!edit"
               :hint="
-                edit ? 'Select permissions' : 'Permissions are not editable'
+                edit && 'Select permissions'
               "
               persistent-hint
             />

package/components/ServiceProviderMain.vue

@@ -734,7 +734,7 @@ const {
   updateStatus: updateServiceProviderStatus,
   invite,
 } = useServiceProvider();
-const { getAllByUserId } = useMember();
+const { getAll: getAllMembers, getAllByUserId } = useMember();
 
 const { getVerifications, cancelUserInvitation, getVerificationByEmail } =
   useVerification();
@@ -757,6 +757,9 @@ const createInviteDialog = ref(false);
 // const loadingInviteRoles = ref(false);
 // const serviceProviderInviteRoles = ref<Array<Record<string, any>>>([]);
 
+const { getByUserType } = useMember();
+const { getOrgs } = useOrg();
+const { getByEmail } = useServiceProvider();
 
 async function checkExistingAccount(email: string) {
   existingAccount.value = null;
@@ -767,40 +770,54 @@ async function checkExistingAccount(email: string) {
   checkingExistingAccount.value = true;
 
   try {
+    // Check if user exists
     const user = await getUserByEmail(email);
 
 if (!user?._id) return;
 
-const members = await getAllByUserId(user._id);
+    // Check if this service provider already exists in current org/site
+    const serviceProviders = await getByEmail({
+  email,
+  orgId: props.orgId,
+  siteId: props.siteId,
+});
 
-const appMember = (members.items ?? []).find(
-  (member: any) => member.type === serviceProviderInvite.value.app
-);
+console.log("serviceProviders", serviceProviders);
 
-if (!appMember) {
-  existingAccount.value = null;
-  return;
-}
+    if (serviceProviders?.length) {
+      messageServiceProvider.value =
+        "This service provider already exists.";
+      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;
-}
+    // Check existing memberships
+    const members = await getAllByUserId(user._id);
 
-existingAccount.value = {
-  _id: appMember.org,
-  text: appMember.orgName,
-  org: appMember.org,
-  orgName: appMember.orgName,
-  siteId: appMember.siteId,
-  siteName: appMember.siteName,
-};
+    const appMember = (members.items ?? []).find(
+      (member: any) => member.type === serviceProviderInvite.value.app
+    );
+
+    if (!appMember) return;
 
+    // Already belongs to the same org/site
+    if (
+      appMember.org === props.orgId &&
+      (appMember.siteId || "") === (props.siteId || "")
+    ) {
+      messageServiceProvider.value =
+        "This user is already a member of this service provider.";
+      return;
+    }
+
+    // Existing account in another org/site
+    existingAccount.value = {
+      _id: appMember.org,
+      text: appMember.orgName,
+      org: appMember.org,
+      orgName: appMember.orgName,
+      siteId: appMember.siteId,
+      siteName: appMember.siteName,
+    };
   } catch (error) {
     existingAccount.value = null;
   } finally {

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

@@ -675,6 +675,24 @@
                   />
                 </div>
               </span>
+              <span
+                v-else-if="
+                  key === 'snapshotEntryImage' || key === 'snapshotExitImage'
+                "
+                class="d-flex flex-column"
+              >
+                <strong class="w-full">{{ label }}:</strong>
+                <div class="d-flex flex-wrap ga-2">
+                  <AttachmentsViewer
+                    :files="
+                      mappedSnapshots([selectedVisitorObject.snapshotEntryImage])
+                    "
+                    anpr
+                    :site="siteId"
+                    title="Snapshot"
+                  />
+                </div>
+              </span>
 
               <span
                 v-else-if="selectedVisitorObject[key]"
@@ -825,10 +843,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 +852,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 +879,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 +888,7 @@
                 class="w-100"
                 density="compact"
                 v-model="key.remarks"
-                :disabled="selectedVisitorObject.checkOut"
-              ></v-textarea>
+              />
             </v-row>
           </div>
 
@@ -886,11 +898,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 +912,9 @@
                 variant="text"
                 block
                 @click="dialog.returnPassesKeys = false"
-                >Close</v-btn
               >
+                Close
+              </v-btn>
             </v-col>
             <v-col cols="6">
               <v-btn
@@ -915,8 +928,9 @@
                   !canConfirmCheckout || selectedVisitorObject.checkOut
                 "
                 @click="proceedCheckout"
-                >Confirm Checkout</v-btn
               >
+                Confirm Checkout
+              </v-btn>
             </v-col>
           </v-row>
         </v-toolbar>
@@ -1442,6 +1456,15 @@ function mappedAttachments(attachments: string[]) {
   });
 }
 
+function mappedSnapshots(attachments: string[]) {
+  return attachments.map((x, index) => {
+    return {
+      id: x,
+      name: `Snapshot - ${x}`,
+    };
+  });
+}
+
 function normalizeDateOnly(value: string) {
   if (!value) return "";
   if (/^\d{4}-\d{2}-\d{2}$/.test(value)) return value;

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"),
   };
 }