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

package/components/Nfc/PatrolReport/ReportDatePicker.vue

@@ -0,0 +1,61 @@
+<template>
+  <div class="d-flex flex-column">
+    <v-text-field
+      v-bind="$attrs"
+      :model-value="formattedDate"
+      autocomplete="off"
+      placeholder="DD/MM/YY"
+      readonly
+      @click="openDatePicker"
+    >
+      <template #append-inner>
+        <v-icon icon="mdi-calendar" @click.stop="openDatePicker" />
+      </template>
+    </v-text-field>
+
+    <input
+      ref="dateInput"
+      v-model="date"
+      class="native-date-input"
+      type="date"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+defineOptions({ inheritAttrs: false });
+
+const date = defineModel<string>({ default: "" });
+const dateInput = ref<HTMLInputElement | null>(null);
+
+const formattedDate = computed(() => {
+  const match = date.value.match(/^(\d{4})-(\d{2})-(\d{2})$/);
+
+  if (!match) return "";
+
+  const [, year, month, day] = match;
+  return `${day}/${month}/${year.slice(-2)}`;
+});
+
+function openDatePicker() {
+  const input = dateInput.value;
+
+  if (!input) return;
+
+  if (input.showPicker) {
+    input.showPicker();
+  } else {
+    input.click();
+  }
+}
+</script>
+
+<style scoped>
+.native-date-input {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  opacity: 0;
+  pointer-events: none;
+}
+</style>

package/components/Nfc/PatrolReport/ReportFilters.vue

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

package/components/Nfc/PatrolReport/SummaryReportTable.vue

@@ -8,6 +8,8 @@
           <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>
@@ -20,6 +22,17 @@
               <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>
@@ -45,7 +58,16 @@ 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,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/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 { getAll: getAllMembers, getAllByUserId } = useMember();
 
 const { getVerifications, cancelUserInvitation, getVerificationByEmail } =
   useVerification();
-const { getOrgsByMembership } = useMember();
 
 const existingAccount = ref<any>(null);
 const checkingExistingAccount = ref(false);
@@ -759,41 +759,77 @@ 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;
+if (!user?._id) return;
 
-    const orgs = await getOrgs({
-      user: user._id,
-    });
+    // 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 (serviceProviders?.length) {
+      messageServiceProvider.value =
+        "This service provider already exists.";
+      return;
+    }
+
+    // Check existing memberships
+    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 (matchedOrg) {
-      existingAccount.value = {
-        _id: matchedOrg.value,
-        text: matchedOrg.text,
-        ...matchedOrg,
-      };
+    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 {
     checkingExistingAccount.value = false;
   }
 }
-
+const canSubmitInvite = computed(() => {
+  return (
+    validServiceProvider.value &&
+    !messageServiceProvider.value
+  );
+});
 watch(
   () => serviceProviderInvite.value.email,
   async (value) => {
@@ -939,6 +975,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 +998,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 +1067,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

@@ -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>