@7365admin1/layer-common 3.0.25 → 3.0.27

package/components/DashboardMain.vue

@@ -1542,72 +1542,108 @@ const {
 } = useDashboard();
 
 const { userAppRole } = useLocalSetup();
-const { hasPermission } = usePermission();
-const { dashboardPermissions } = useCommonPermissions();
 const { downloadPDF } = usePDFDownload();
 const route = useRoute();
 
-function canViewWidget(key: string) {
-  if (!userAppRole.value) return true;
-  if (userAppRole.value.permissions?.includes("*")) return true;
-
-  const widgetToModulePermissionMap: Record<string, string[]> = {
-    workOrders: ["work-orders:see-all-work-orders"],
-    incidents: [
-      "incident-reports:see-incident-reports",
-      "incident-reports:see-all-incident-reports",
-    ],
-    visitors: ["visitor:see-all-visitor"],
-    facilityBookings: ["facility-booking:see-all-facility-booking"],
-    patrolCompliance: [
-      "virtual-patrol:see-all-virtual-patrol-logs",
-      "virtual-patrol:see-all-virtual-patrol-route",
-    ],
-    staffStatus: ["attendance:see-all-attendance"],
-    attendance: ["attendance:see-all-attendance"],
-    feedbacks: ["feedbacks:see-all-feedbacks"],
-    upcomingEvents: [
-      "bulletin-boards:see-all-bulletin-boards",
-      "bulletin-board:see-all-bulletin-board",
-    ],
-    workOrderStatus: ["work-orders:see-all-work-orders"],
-    activePatrol: [
-      "virtual-patrol:see-all-virtual-patrol-logs",
-      "virtual-patrol:see-all-virtual-patrol-route",
-    ],
-    taskSchedule: ["cleaning-schedule-mgmt:see-all-schedules"],
-  };
+const dashboardWidgetPermissions: Record<string, string> = {
+  activity: "dashboard:view-activity",
+  recentActivity: "dashboard:view-activity",
+  taskSchedule: "dashboard:view-task-schedule",
+  staffStatus: "dashboard:view-attendance-widget",
+  attendance: "dashboard:view-attendance-widget",
+  feedbacks: "dashboard:view-feedbacks-widget",
+  workOrderStatus: "dashboard:view-work-order-status",
+  activePatrol: "dashboard:view-active-patrol",
+  upcomingEvents: "dashboard:view-upcoming-events",
+  todayReminders: "dashboard:view-today-reminders",
+  todayAttentions: "dashboard:view-today-attentions",
+};
 
-  const modulePerms = widgetToModulePermissionMap[key];
-  if (
-    modulePerms &&
-    modulePerms.some((p) => userAppRole.value.permissions?.includes(p))
-  ) {
-    return true;
-  }
+const propertyWidgetPermissions: Record<string, string[]> = {
+  workOrders: ["workOrder:see-all-work-orders"],
+  incidents: ["incident-reports:see-incident-reports"],
+  visitors: ["visitorManagement:see-all-visitor"],
+  facilityBookings: ["facility-booking-mgmt:see-all-facility-booking"],
+  activity: ["workOrder:see-all-work-orders"],
+  upcomingEvents: ["event-mgmt:see-all-event"],
+  todayReminders: ["event-mgmt:see-all-event"],
+  todayAttentions: [
+    "incident-reports:see-incident-reports",
+    "facility-booking-mgmt:see-all-facility-booking",
+  ],
+  workOrderStatus: ["workOrder:see-all-work-orders"],
+  feedbacks: ["feedbacks:see-all-feedback"],
+  activePatrol: ["virtual-patrol:see-all-virtual-patrol-logs"],
+};
 
-  const actionMap: Record<string, string> = {
-    activity: "view-activity",
-    taskSchedule: "view-task-schedule",
-    staffStatus: "view-attendance-widget",
-    attendance: "view-attendance-widget",
-    feedbacks: "view-feedbacks-widget",
-    upcomingEvents: "view-upcoming-events",
-    todayReminders: "view-today-reminders",
-    todayAttentions: "view-today-attentions",
-    workOrderStatus: "view-work-order-status",
-    activePatrol: "view-active-patrol",
-  };
+const moduleWidgetPermissions: Record<string, string[]> = {
+  openWorkOrder: [
+    "work_order:see-all-work-orders",
+    "work-order:see-all-work-orders",
+    "work-orders:see-all-work-orders",
+  ],
+  workOrders: [
+    "work_order:see-all-work-orders",
+    "work-order:see-all-work-orders",
+    "work-orders:see-all-work-orders",
+  ],
+  taskSchedule: [
+    "cleaning-schedule-mgmt:see-all-schedules",
+    "schedule-task-mgmt:see-all-schedule-tasks",
+  ],
+  taskCompleted: [
+    "cleaning-schedule-mgmt:see-all-schedules",
+    "schedule-task-mgmt:see-all-schedule-tasks",
+  ],
+  staffStatus: ["attendance-mgmt:see-all-attendance"],
+  attendance: ["attendance-mgmt:see-all-attendance"],
+  supplyAlert: ["supply-mgmt:see-all-supplies"],
+  feedbacks: [
+    "feedbacks:see-all-feedback",
+    "feedback:see-all-feedback",
+    "feedbacks:see-all-feedbacks",
+  ],
+  incidents: [
+    "incident-reports:see-incident-reports",
+    "incident-reports:see-all-incident-reports",
+  ],
+  visitors: ["visitor:see-all-visitor"],
+  facilityBookings: ["facility-booking:see-all-facility-booking"],
+  patrolCompliance: [
+    "virtual-patrol:see-all-virtual-patrol-logs",
+    "virtual-patrol:see-all-virtual-patrol-route",
+  ],
+  activePatrol: ["virtual-patrol:see-all-virtual-patrol-logs"],
+};
+
+function canViewWidget(key: string) {
+  const permissions = userAppRole.value?.permissions;
+  const dashboardPermission = dashboardWidgetPermissions[key];
+  const modulePermissions = isPropertyMode.value
+    ? propertyWidgetPermissions[key]
+    : moduleWidgetPermissions[key];
+
+  if (!permissions) return true;
+  if (permissions.includes("*")) return true;
+
+  if (isPropertyMode.value && modulePermissions) {
+    return modulePermissions.some((permission) =>
+      permissions.includes(permission)
+    );
+  }
 
-  const action = actionMap[key];
-  if (!action) return true;
+  if (dashboardPermission || modulePermissions) {
+    return (
+      (dashboardPermission && permissions.includes(dashboardPermission)) ||
+      Boolean(
+        modulePermissions?.some((permission) =>
+          permissions.includes(permission)
+        )
+      )
+    );
+  }
 
-  return hasPermission(
-    userAppRole.value,
-    { dashboard: dashboardPermissions },
-    "dashboard",
-    action
-  );
+  return true;
 }
 
 // ─── State ────────────────────────────────────────────────────────────────────

package/components/DocumentManagement.vue

@@ -332,6 +332,7 @@
                 class="text-none"
                 size="large"
                 @click="editFolderDialog = false"
+                :disabled="folderUpdateLoading"
                 height="48"
               >
                 Cancel
@@ -345,6 +346,7 @@
                 class="text-none"
                 size="large"
                 @click="handleApplyFolderEdit"
+                :loading="folderUpdateLoading"
                 height="48"
               >
                 Apply
@@ -382,6 +384,7 @@
                 variant="text"
                 class="text-none"
                 @click="deleteFolderDialog = false"
+                :disabled="folderDeleteLoading"
               >
                 Cancel
               </v-btn>
@@ -395,6 +398,7 @@
                 variant="flat"
                 class="text-none"
                 @click="handleDeleteFolderUiConfirm"
+                :loading="folderDeleteLoading"
               >
                 Confirm
               </v-btn>
@@ -684,6 +688,8 @@ const documentService = useDocument();
 const {
   getAll: _getAllDocuments,
   deleteById,
+  deleteFolderById,
+  updateFolderById,
   createFolder,
   create,
 } = documentService;
@@ -848,6 +854,8 @@ const selectedFolder = ref<(Partial<TDocument> & Record<string, any>) | null>(
 );
 const editFolderDialog = ref(false);
 const deleteFolderDialog = ref(false);
+const folderUpdateLoading = ref(false);
+const folderDeleteLoading = ref(false);
 const editFolderTitle = ref("");
 const editFolderRemarks = ref("");
 const validEditFolderForm = ref(false);
@@ -1022,7 +1030,10 @@ function closeFolderActionMenu(folderId?: string) {
 function openEditFolderDialog(
   folder: Partial<TDocument> & Record<string, any>
 ) {
-  selectedFolder.value = folder;
+  selectedFolder.value = {
+    ...folder,
+    parentId: folder.parentId || activeParentId.value,
+  };
   editFolderTitle.value = String(folder.name || "");
   editFolderRemarks.value = String(folder.remarks || "");
   editFolderDialog.value = true;
@@ -1037,12 +1048,67 @@ function openDeleteFolderDialog(
   closeFolderActionMenu(String(folder._id || ""));
 }
 
-function handleApplyFolderEdit() {
-  editFolderDialog.value = false;
+async function handleApplyFolderEdit() {
+  const folderId = String(selectedFolder.value?._id || "");
+
+  if (!folderId) {
+    showMessage("Failed to update folder", "error");
+    return;
+  }
+
+  if (!editFolderTitle.value) {
+    showMessage("Folder title is required", "error");
+    return;
+  }
+
+  folderUpdateLoading.value = true;
+  try {
+    const response: any = await updateFolderById(folderId, {
+      name: editFolderTitle.value,
+      remarks: editFolderRemarks.value,
+      parentId: selectedFolder.value?.parentId || activeParentId.value,
+    });
+
+    showMessage(
+      response?.message || "Folder updated successfully!",
+      "success"
+    );
+    await getDocuments();
+    selectedFolder.value = null;
+    editFolderDialog.value = false;
+  } catch (error: any) {
+    showMessage(
+      error?.response?._data?.message || "Failed to update folder",
+      "error"
+    );
+  } finally {
+    folderUpdateLoading.value = false;
+  }
 }
 
-function handleDeleteFolderUiConfirm() {
-  deleteFolderDialog.value = false;
+async function handleDeleteFolderUiConfirm() {
+  const folderId = String(selectedFolder.value?._id || "");
+
+  if (!folderId) {
+    showMessage("Failed to delete folder", "error");
+    return;
+  }
+
+  folderDeleteLoading.value = true;
+  try {
+    const response = await deleteFolderById(folderId);
+    showMessage(response.message || "Folder deleted successfully!", "success");
+    await getDocuments();
+    selectedFolder.value = null;
+    deleteFolderDialog.value = false;
+  } catch (error: any) {
+    showMessage(
+      error?.response?._data?.message || "Failed to delete folder",
+      "error"
+    );
+  } finally {
+    folderDeleteLoading.value = false;
+  }
 }
 
 async function handleCreateFolder() {

package/components/EntryPassInformation.vue

@@ -59,21 +59,39 @@
           No printer is configured in the settings. QR Pass may not print.
         </v-alert>
         <template v-else>
-          <div class="d-flex align-center justify-space-between mt-3">
-            <InputLabel title="Quantity" />
-            <span v-if="availableCount !== null" class="text-caption text-grey">
-              {{ availableCount }} available
-            </span>
-            <v-progress-circular v-else-if="cardsLoading" size="14" width="2" indeterminate color="grey" />
+          <!-- Generating / loading state -->
+          <div v-if="generating || cardsLoading" class="d-flex align-center ga-2 mt-3 text-caption text-grey-darken-1">
+            <v-progress-circular size="14" width="2" indeterminate color="grey" />
+            <span>{{ generating ? 'Generating QR passes...' : 'Checking availability...' }}</span>
           </div>
-          <v-text-field
-            v-model.number="quantity"
-            type="number"
-            density="comfortable"
-            :min="1"
-            :max="availableCount ?? undefined"
-            hide-details
-          />
+          <!-- 0 available after all loading -->
+          <v-alert
+            v-else-if="availableCount === 0"
+            type="warning"
+            variant="tonal"
+            density="compact"
+            class="mt-3"
+            icon="mdi-information-outline"
+          >
+            No QR passes available. Add at least 1 non-physical card to this unit in Access Management to enable auto-generation.
+          </v-alert>
+          <!-- Normal: quantity input -->
+          <template v-else>
+            <div class="d-flex align-center justify-space-between mt-3">
+              <InputLabel title="Quantity" />
+              <span v-if="availableCount !== null" class="text-caption text-grey">
+                {{ availableCount }} available
+              </span>
+            </div>
+            <v-text-field
+              v-model.number="quantity"
+              type="number"
+              density="comfortable"
+              :min="1"
+              :max="availableCount ?? undefined"
+              hide-details
+            />
+          </template>
         </template>
       </template>
 
@@ -83,7 +101,7 @@
           <InputLabel title="Select Cards" />
           <v-select
             v-model="selectedCards"
-            :items="cardItems"
+            :items="filteredCardItems"
             :loading="cardsLoading"
             item-title="cardNo"
             item-value="_id"
@@ -265,9 +283,13 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  excludedCardIds: {
+    type: Array as PropType<string[]>,
+    default: () => [],
+  },
 });
 
-const emit = defineEmits(["update:modelValue", "update:quantity", "update:cards"]);
+const emit = defineEmits(["update:modelValue", "update:quantity", "update:cards", "update:availableQrCount"]);
 
 const { getAvailableContractorCards, generateQrVms } = useAccessManagement();
 
@@ -309,12 +331,19 @@ function showSnackbar(text: string, color = "error") {
 
 // ─── Card fetching ────────────────────────────────────────────────
 const cardItems = ref<any[]>([]);
+const filteredCardItems = computed(() =>
+  props.excludedCardIds.length
+    ? cardItems.value.filter((c) => !props.excludedCardIds.includes(c._id))
+    : cardItems.value
+);
 const cardsLoading = ref(false);
+const generating = ref(false);
 const availableCount = ref<number | null>(null);
 
 async function fetchCards(type: "NFC" | "QRCODE" = "NFC") {
   if (!props.siteId || !props.unitId) return;
   cardsLoading.value = true;
+  if (type === "QRCODE") emit("update:availableQrCount", null);
   try {
     const res = await getAvailableContractorCards({
       type,
@@ -324,7 +353,9 @@ async function fetchCards(type: "NFC" | "QRCODE" = "NFC") {
     cardItems.value = res?.data?.[0]?.items ?? [];
     availableCount.value = (res?.data?.[2] as any)?.count ?? cardItems.value.length;
 
-    if (type === "QRCODE" && props.settings?.data?._id && availableCount.value !== null && availableCount.value < 50) {
+    if (type === "QRCODE" && props.settings?.data?._id && availableCount.value !== null && availableCount.value > 0 && availableCount.value < 50) {
+      cardsLoading.value = false;
+      generating.value = true;
       await generateQrVms({
         site: props.settings.data.site,
         unitId: props.unitId,
@@ -338,14 +369,20 @@ async function fetchCards(type: "NFC" | "QRCODE" = "NFC") {
       });
       cardItems.value = refreshed?.data?.[0]?.items ?? [];
       availableCount.value = (refreshed?.data?.[2] as any)?.count ?? cardItems.value.length;
+      generating.value = false;
     }
+
+    if (type === "QRCODE") emit("update:availableQrCount", availableCount.value);
   } catch (err: any) {
     const msg = err?.data?.message ?? err?.message ?? String(err);
     showSnackbar(`Entry pass service error: ${msg}`);
     availableCount.value = null;
     cardItems.value = [];
+    generating.value = false;
+    if (type === "QRCODE") emit("update:availableQrCount", null);
   } finally {
     cardsLoading.value = false;
+    generating.value = false;
   }
 }
 
@@ -500,6 +537,7 @@ watch(
       fetchCards("QRCODE");
     } else {
       availableCount.value = null;
+      emit("update:availableQrCount", null);
       isBarcodeScanningActive.value = false;
       barcodeBuffer.value = "";
       if (barcodeTimeout.value) clearTimeout(barcodeTimeout.value);

package/components/HidIntercomManagement.vue

@@ -104,6 +104,7 @@
                       <v-list-item title="SIP Settings" @click="openSipDialog(row)" />
                       <v-list-item title="Call Settings" @click="openCallDialog(row)" />
                       <v-list-item title="Dial Code" @click="openDialCodeDialog(row)" />
+                      <v-list-item title="Make a call" @click="openMakeCallDialog(row)" />
                     </v-list>
                   </v-menu>
                 </td>
@@ -344,6 +345,55 @@
       </v-card>
     </v-dialog>
 
+    <v-dialog v-model="makeCallDialog" max-width="520" persistent>
+      <v-card class="form-dialog make-call-dialog" rounded="lg">
+        <v-card-title class="dialog-title">Make a Call</v-card-title>
+        <v-card-text class="dialog-body make-call-body">
+          <div class="make-call-field">
+            <div class="call-label">Address to dial</div>
+            <v-text-field
+              v-model="makeCallForm.target"
+              placeholder="Enter extension, address, or contact"
+              variant="outlined"
+              density="compact"
+              hide-details="auto"
+              class="call-input"
+              @keyup.enter="runMakeCall"
+            />
+          </div>
+          <div class="make-call-actions">
+            <v-btn
+              class="text-none make-call-primary"
+              variant="flat"
+              :loading="calling"
+              :disabled="!makeCallForm.target.trim()"
+              @click="runMakeCall"
+            >
+              Make a call
+            </v-btn>
+            <v-btn
+              class="text-none make-call-danger"
+              variant="flat"
+              :loading="hangingUp"
+              @click="runHangupCall"
+            >
+              Hang up call
+            </v-btn>
+          </div>
+          <div v-if="makeCallForm.status" class="make-call-status" :class="`is-${makeCallForm.statusType}`">
+            {{ makeCallForm.status }}
+          </div>
+          <div class="make-call-note">
+            The call will only be made if the equipment is on the idle or identification screen.
+          </div>
+        </v-card-text>
+        <v-card-actions class="dialog-actions pa-0">
+          <v-btn class="text-none action-cancel" variant="flat" height="44" @click="makeCallDialog = false">Cancel</v-btn>
+          <v-btn class="text-none action-submit" variant="flat" height="44" @click="makeCallDialog = false">Close</v-btn>
+        </v-card-actions>
+      </v-card>
+    </v-dialog>
+
     <v-dialog v-model="contactDialog" max-width="360" persistent>
       <v-card class="form-dialog" rounded="lg">
         <v-card-title class="dialog-title">{{ contactForm.id ? 'Edit Contact' : 'Add Contact' }}</v-card-title>
@@ -461,6 +511,8 @@ const {
   setReaderConfiguration,
   runObjectOperation,
   getIntercomStatus,
+  makeIntercomCall,
+  finalizeIntercomCall,
 } = useHidAmico();
 
 const activeTab = ref<IntercomTab>("intercom");
@@ -470,6 +522,8 @@ const contacts = ref<ContactRow[]>([]);
 const loading = ref(false);
 const saving = ref(false);
 const contactsSaving = ref(false);
+const calling = ref(false);
+const hangingUp = ref(false);
 const search = ref("");
 const statusFilter = ref("Status");
 const page = ref(1);
@@ -484,6 +538,7 @@ const rebootConfirmDialog = ref(false);
 const rebootingDialog = ref(false);
 const callDialog = ref(false);
 const dialCodeDialog = ref(false);
+const makeCallDialog = ref(false);
 const contactDialog = ref(false);
 const contactViewDialog = ref(false);
 const deleteContactDialog = ref(false);
@@ -556,6 +611,12 @@ const dialForm = reactive({
   code: "",
 });
 
+const makeCallForm = reactive({
+  target: "",
+  status: "",
+  statusType: "info" as MessageType,
+});
+
 const contactForm = reactive({
   id: undefined as number | undefined,
   readerId: "",
@@ -882,6 +943,14 @@ function openDialCodeDialog(row: IntercomRow) {
   dialCodeDialog.value = true;
 }
 
+function openMakeCallDialog(row: IntercomRow) {
+  selectedRow.value = row;
+  makeCallForm.target = row.extension !== "N/A" ? row.extension : "";
+  makeCallForm.status = "";
+  makeCallForm.statusType = "info";
+  makeCallDialog.value = true;
+}
+
 function openContactDialog(contact?: ContactRow) {
   selectedContact.value = contact || null;
   contactForm.id = contact?.id;
@@ -947,6 +1016,51 @@ async function saveDialCode() {
   dialCodeDialog.value = false;
 }
 
+async function runMakeCall() {
+  if (!selectedRow.value) return;
+  const target = makeCallForm.target.trim();
+  if (!target) {
+    makeCallForm.status = "Please enter an address to dial.";
+    makeCallForm.statusType = "warning";
+    return;
+  }
+
+  calling.value = true;
+  makeCallForm.status = "";
+  try {
+    await makeIntercomCall(selectedRow.value.reader._id, target);
+    makeCallForm.status = `Calling ${target}.`;
+    makeCallForm.statusType = "success";
+    showMessage(`Calling ${target}.`, "success");
+  } catch (error: any) {
+    const message = getErrorMessage(error);
+    makeCallForm.status = message;
+    makeCallForm.statusType = "error";
+    showMessage(message, "error");
+  } finally {
+    calling.value = false;
+  }
+}
+
+async function runHangupCall() {
+  if (!selectedRow.value) return;
+  hangingUp.value = true;
+  makeCallForm.status = "";
+  try {
+    await finalizeIntercomCall(selectedRow.value.reader._id);
+    makeCallForm.status = "Call ended.";
+    makeCallForm.statusType = "success";
+    showMessage("Intercom call ended.", "success");
+  } catch (error: any) {
+    const message = getErrorMessage(error);
+    makeCallForm.status = message;
+    makeCallForm.statusType = "error";
+    showMessage(message, "error");
+  } finally {
+    hangingUp.value = false;
+  }
+}
+
 async function savePjsip(readerId: string, payload: Record<string, string>, options: { showSuccessMessage?: boolean } = {}) {
   saving.value = true;
   try {
@@ -1745,6 +1859,78 @@ export default {
   margin-bottom: 0;
 }
 
+.make-call-dialog {
+  width: 520px;
+  max-width: 94vw;
+}
+
+.make-call-body {
+  display: grid;
+  gap: 18px;
+  padding: 20px 24px 26px;
+}
+
+.make-call-field {
+  max-width: 320px;
+}
+
+.make-call-actions {
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
+  gap: 18px;
+  align-items: center;
+}
+
+.make-call-primary,
+.make-call-danger {
+  min-height: 46px;
+  border-radius: 0;
+  color: #fff;
+  font-size: 14px;
+  letter-spacing: 0;
+}
+
+.make-call-primary {
+  background: #06324f;
+}
+
+.make-call-danger {
+  background: #d91345;
+}
+
+.make-call-status {
+  padding: 10px 12px;
+  border-radius: 4px;
+  font-size: 12px;
+  line-height: 1.4;
+}
+
+.make-call-status.is-success {
+  background: #e7f7ec;
+  color: #17833b;
+}
+
+.make-call-status.is-warning {
+  background: #fff7db;
+  color: #8a5b00;
+}
+
+.make-call-status.is-error {
+  background: #fde8e8;
+  color: #b42318;
+}
+
+.make-call-status.is-info {
+  background: #edf4ff;
+  color: #075fb7;
+}
+
+.make-call-note {
+  color: #5d6673;
+  font-size: 13px;
+  line-height: 1.45;
+}
+
 .call-two-col {
   gap: 12px;
 }