@7365admin1/layer-common 3.1.2-staging.38 → 3.1.2

package/components/Nfc/PatrolReport/PatrolReportTab.vue

@@ -4,9 +4,9 @@
       :model-value="filters"
       :options="options"
       @update:model-value="$emit('update:filters', $event)"
-      @export="(type) => $emit('export', type)"
+      @export="$emit('export')"
     />
-    <div class="report-export">
+
     <v-divider :thickness="1" class="border-opacity-100" />
 
     <template v-if="report">
@@ -30,7 +30,6 @@
     <ReportEmptyState v-else-if="!loading" />
 
     <RemarksDialog v-model="dialogRemarks" :remarks="selectedActivityRemarks" />
-    </div>
   </div>
 </template>
 
@@ -56,7 +55,7 @@ const props = defineProps<{
 
 defineEmits<{
   "update:filters": [value: NFCPatrolReportFilters];
-  export: [type: "pdf" | "csv"];
+  export: [];
 }>();
 
 const {
@@ -78,5 +77,4 @@ watch(
   },
   { immediate: true },
 );
-
 </script>

package/components/Nfc/PatrolReport/ReportFilters.vue

@@ -16,12 +16,7 @@
       />
     </v-col>
 
-    <v-col
-      v-if="showTimeFilter"
-      cols="12"
-      md="2"
-      class="px-md-2 mb-2 mb-md-0"
-    >
+    <v-col cols="12" md="2" class="px-md-2 mb-2 mb-md-0">
       <v-select
         :model-value="modelValue.timeRange"
         :items="options.timeRanges"
@@ -35,14 +30,10 @@
       />
     </v-col>
 
-    <v-col
-      v-if="showDateFilter"
-      cols="12"
-      md="2"
-      class="px-md-2 mb-2 mb-md-0"
-    >
-      <ReportDatePicker
+    <v-col cols="12" md="2" class="px-md-2 mb-2 mb-md-0">
+      <v-text-field
         :model-value="modelValue.date"
+        type="date"
         variant="outlined"
         density="comfortable"
         rounded="lg"
@@ -55,31 +46,17 @@
     <v-spacer />
 
     <v-col cols="12" md="2" class="pl-md-2">
-      <v-menu>
-        <template #activator="{ props: menuProps }">
-          <v-btn
-            v-bind="menuProps"
-            variant="outlined"
-            block
-            size="large"
-            rounded="lg"
-            class="text-none"
-            prepend-icon="mdi-export"
-          >
-            Export
-          </v-btn>
-        </template>
-
-        <v-list density="compact">
-          <v-list-item @click="$emit('export', 'pdf')">
-            <v-list-item-title>PDF</v-list-item-title>
-          </v-list-item>
-
-          <v-list-item @click="$emit('export', 'csv')">
-            <v-list-item-title>CSV</v-list-item-title>
-          </v-list-item>
-        </v-list>
-      </v-menu>
+      <v-btn
+        variant="outlined"
+        block
+        size="large"
+        rounded="lg"
+        class="text-none"
+        prepend-icon="mdi-export"
+        @click="$emit('export')"
+      >
+        Export
+      </v-btn>
     </v-col>
   </v-row>
 </template>
@@ -89,24 +66,15 @@ import type {
   NFCPatrolReportFilterOptions,
   NFCPatrolReportFilters,
 } from "../../../types/nfc-patrol-report";
-import ReportDatePicker from "./ReportDatePicker.vue";
 
-const props = withDefaults(
-  defineProps<{
-    modelValue: NFCPatrolReportFilters;
-    options: NFCPatrolReportFilterOptions;
-    showTimeFilter?: boolean;
-    showDateFilter?: boolean;
-  }>(),
-  {
-    showTimeFilter: true,
-    showDateFilter: true,
-  },
-);;
+const props = defineProps<{
+  modelValue: NFCPatrolReportFilters;
+  options: NFCPatrolReportFilterOptions;
+}>();
 
 const emit = defineEmits<{
   "update:modelValue": [value: NFCPatrolReportFilters];
-  export: [type: "pdf" | "csv"];
+  export: [];
 }>();
 
 function updateFilter(key: keyof NFCPatrolReportFilters, value: unknown) {

package/components/Nfc/PatrolReport/SummaryReportTable.vue

@@ -8,8 +8,6 @@
           <tr>
             <th>Patrol Route Name</th>
             <th>Security Check Schedule</th>
-            <th>Security Personnel</th>
-            <th>Signature</th>
             <th>Checked</th>
             <th>Missed</th>
             <th>Status</th>
@@ -22,17 +20,6 @@
               <v-icon size="small" class="mr-1">mdi-clock-outline</v-icon>
               {{ row.securityCheckSchedule }}
             </td>
-            <td>{{ row.guardName || "-" }}</td>
-            <td>
-              <v-img
-                v-if="row.guardSignatureFileId"
-                :src="getFileUrl(row.guardSignatureFileId)"
-                :alt="`${row.guardName || 'Guard'} signature`"
-                class="guard-signature"
-                contain
-              />
-              <span v-else>-</span>
-            </td>
             <td>{{ row.checked }}</td>
             <td>{{ row.missed }}</td>
             <td>
@@ -58,16 +45,7 @@ defineProps<{
   rows: NFCPatrolReportSummaryRow[];
 }>();
 
-const { getFileUrl } = useFile();
-
 function statusClass(status: NFCPatrolReportSummaryStatus) {
   return status === "Completed" ? "text-success" : "text-error";
 }
 </script>
-
-<style scoped>
-.guard-signature {
-  width: 80px;
-  height: 40px;
-}
-</style>

package/components/PhotoUpload.vue

@@ -59,21 +59,6 @@
     </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">
@@ -211,8 +196,6 @@ 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);
@@ -222,8 +205,10 @@ const uploading = ref(false);
 const { addFile } = useFile();
 
 function viewPhoto(photoData: string) {
-  selectedPhoto.value = photoData;
-  showPhotoPreview.value = true;
+  const link = document.createElement("a");
+  link.href = photoData;
+  link.target = "_blank";
+  link.click();
 }
 
 watch(

package/components/ServiceProviderMain.vue

@@ -548,7 +548,7 @@
               variant="flat"
               class="text-none sp-invite-submit-btn"
               height="76"
-              :disabled="!canSubmitInvite"
+              :disabled="!validServiceProvider"
               :loading="disableServiceProvider"
               @click="submitServiceProviderInvite()"
             >
@@ -574,7 +574,6 @@ type ListTab = "active" | "pending" | "inactive";
 
 type TableRow = {
   _id: string;
-  userId: string;
   serviceProviderOrgId: string;
   companyName: string;
   email: string;
@@ -734,10 +733,11 @@ const {
   updateStatus: updateServiceProviderStatus,
   invite,
 } = useServiceProvider();
-const { getAll: getAllMembers, getAllByUserId } = useMember();
+const { getAll: getAllMembers } = useMember();
 
 const { getVerifications, cancelUserInvitation, getVerificationByEmail } =
   useVerification();
+const { getOrgsByMembership } = useMember();
 
 const existingAccount = ref<any>(null);
 const checkingExistingAccount = ref(false);
@@ -759,77 +759,41 @@ const createInviteDialog = ref(false);
 
 const { getByUserType } = useMember();
 const { getOrgs } = useOrg();
-const { getByEmail } = useServiceProvider();
 
 async function checkExistingAccount(email: string) {
   existingAccount.value = null;
-  messageServiceProvider.value = "";
 
   if (!email.trim() || emailRule(email) !== true) return;
 
   checkingExistingAccount.value = true;
 
   try {
-    // Check if user exists
     const user = await getUserByEmail(email);
 
-if (!user?._id) return;
-
-    // Check if this service provider already exists in current org/site
-    const serviceProviders = await getByEmail({
-  email,
-  orgId: props.orgId,
-  siteId: props.siteId,
-});
-
-console.log("serviceProviders", serviceProviders);
+    if (!user?._id) return;
 
-    if (serviceProviders?.length) {
-      messageServiceProvider.value =
-        "This service provider already exists.";
-      return;
-    }
-
-    // Check existing memberships
-    const members = await getAllByUserId(user._id);
+    const orgs = await getOrgs({
+      user: user._id,
+    });
 
-    const appMember = (members.items ?? []).find(
-      (member: any) => member.type === serviceProviderInvite.value.app
+    const matchedOrg = orgs.items?.find(
+      (org: any) => org.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;
+    if (matchedOrg) {
+      existingAccount.value = {
+        _id: matchedOrg.value,
+        text: matchedOrg.text,
+        ...matchedOrg,
+      };
     }
-
-    // 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 {
     checkingExistingAccount.value = false;
   }
 }
-const canSubmitInvite = computed(() => {
-  return (
-    validServiceProvider.value &&
-    !messageServiceProvider.value
-  );
-});
+
 watch(
   () => serviceProviderInvite.value.email,
   async (value) => {
@@ -975,7 +939,6 @@ 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),
@@ -998,7 +961,6 @@ 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),
@@ -1067,12 +1029,16 @@ async function openView(row: TableRow) {
 
   loadingMembers.value = true;
   try {
-    const data = await getAllByUserId(row.userId);
-
+    const data = await getAllMembers({
+      page: 1,
+      limit: 1000,
+      org: row.serviceProviderOrgId,
+      status: "active",
+    });
     serviceProviderMembers.value = (data.items ?? []).map((member: any) => ({
-      _id: member._id,
-      name: member.name || "-",
-      role: member.role || "-",
+      _id: String(member._id ?? ""),
+      name: member.name || member.fullName || member.email || "-",
+      role: member.roleName || member.role?.name || "-",
     }));
   } catch (error: any) {
     showMessage(errorConverter(error), "error");

package/components/VisitorForm.vue

@@ -36,17 +36,10 @@
                   </template>
 
                   <v-list v-if="nricSearchResults.length" class="pa-1 phone-search-results">
-                    <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-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>
                   </v-list>
                 </v-menu>
               </v-col>
@@ -65,17 +58,10 @@
                   </template>
 
                   <v-list v-if="phoneSearchResults.length" class="pa-1 phone-search-results">
-                    <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-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>
                   </v-list>
                 </v-menu>
               </v-col>
@@ -91,23 +77,15 @@
                 <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="handleFocusPlateNumber"
+                      @update:model-value="handleUpdateVehicleNumber" @focus="isPlateNumberFieldFocused = true"
                       @blur="isPlateNumberFieldFocused = false" />
                   </template>
 
                   <v-list v-if="vehicleSearchResults.length" class="pa-1 phone-search-results">
-                    <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-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>
                   </v-list>
                 </v-menu>
               </v-col>
@@ -330,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 v-if="!visitor.nric || currentAutofillSource === 'nric'" class="text-no-wrap">NRIC: {{ selectedNricSearchResult.nric || "N/A" }}</span>
+            <span class="text-no-wrap">NRIC: {{ selectedNricSearchResult.nric || "N/A" }}</span>
           </div>
 
-          <template v-if="(!visitor.contact || currentAutofillSource === 'contact') && selectedNricContactOptions.length >= 1">
+          <template v-if="!visitor.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"
@@ -341,7 +319,7 @@
             </v-radio-group>
           </template>
 
-          <template v-if="(!visitor.plateNumber || currentAutofillSource === 'vehicleNumber') && selectedNricPlateOptions.length >= 1">
+          <template v-if="!visitor.plateNumber && 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"
@@ -1066,8 +1044,8 @@ function selectAutofillSearchResult(item: Partial<TPeople>, source: Exclude<Auto
   const selectedPlate =
     findMatchingPlateOption(plateOptions, visitor.plateNumber) || plateOptions[0] || "";
 
-  const needsContactChoice = (!visitor.contact?.trim() || source === 'contact') && contactOptions.length > 1;
-  const needsPlateChoice = (!visitor.plateNumber?.trim() || source === 'vehicleNumber') && plateOptions.length > 1;
+  const needsContactChoice = !visitor.contact?.trim() && contactOptions.length > 1;
+  const needsPlateChoice = !visitor.plateNumber?.trim() && plateOptions.length > 1;
 
   if (needsContactChoice || needsPlateChoice) {
     nricSearchMenu.value = false;
@@ -1088,23 +1066,6 @@ 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;
@@ -1542,15 +1503,6 @@ function handleUpdateVehicleNumber() {
   debounceFetchPlateNumber();
 }
 
-const handleFocusPlateNumber = () => {
-  isPlateNumberFieldFocused.value = true;
-  if (prop.mode === 'register') {
-
-    handleUpdateVehicleNumber();
-  }
-};
-
-
 function backToSelection() {
   emit("back");
   message.value = "";
@@ -2156,22 +2108,10 @@ 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,8 +825,10 @@
                 item-title="label"
                 item-value="value"
                 v-model="pass.status"
-                :disabled="pass.status == 'Removed'"
-              />
+                :disabled="
+                  selectedVisitorObject.checkOut || pass.status == 'Removed'
+                "
+              ></v-select>
               <v-textarea
                 v-if="pass.status === 'Lost' || pass.status === 'Damaged'"
                 no-resize
@@ -834,7 +836,8 @@
                 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">
@@ -861,8 +864,10 @@
                 item-title="label"
                 item-value="value"
                 v-model="key.status"
-                :disabled="key.status == 'Removed'"
-              />
+                :disabled="
+                  selectedVisitorObject.checkOut || key.status == 'Removed'
+                "
+              ></v-select>
               <v-textarea
                 v-if="key.status === 'Lost' || key.status === 'Damaged'"
                 no-resize
@@ -870,7 +875,8 @@
                 class="w-100"
                 density="compact"
                 v-model="key.remarks"
-              />
+                :disabled="selectedVisitorObject.checkOut"
+              ></v-textarea>
             </v-row>
           </div>
 
@@ -880,11 +886,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">
@@ -894,9 +900,8 @@
                 variant="text"
                 block
                 @click="dialog.returnPassesKeys = false"
+                >Close</v-btn
               >
-                Close
-              </v-btn>
             </v-col>
             <v-col cols="6">
               <v-btn
@@ -910,9 +915,8 @@
                   !canConfirmCheckout || selectedVisitorObject.checkOut
                 "
                 @click="proceedCheckout"
+                >Confirm Checkout</v-btn
               >
-                Confirm Checkout
-              </v-btn>
             </v-col>
           </v-row>
         </v-toolbar>