@7365admin1/layer-common 3.0.20 → 3.0.22

package/components/HygieneUpdateMoreAction.vue

@@ -19,7 +19,7 @@
 
     <v-toolbar class="pa-0" density="compact">
       <v-row no-gutters>
-        <v-col cols="6" class="pa-0">
+        <v-col :cols="showMoreActions ? 6 : 12" class="pa-0">
           <v-btn
             block
             variant="text"
@@ -32,7 +32,7 @@
           </v-btn>
         </v-col>
 
-        <v-col cols="6" class="pa-0">
+        <v-col v-if="showMoreActions" cols="6" class="pa-0">
           <v-menu>
             <template #activator="{ props }">
               <v-btn
@@ -204,6 +204,11 @@ const prop = defineProps({
     type: String,
     default: "Actions",
   },
+
+  showMoreActions: {
+    type: Boolean,
+    default: true,
+  },
 });
 
 const emit = defineEmits([

package/components/InvitationMain.vue

@@ -90,7 +90,7 @@
               v-if="props.cancelInvitation"
             >
               <template v-slot:activator="{ props }">
-                <v-icon v-bind="props">mdi-dots-horizontal</v-icon>
+                <v-icon v-bind="props">mdi-dots-vertical</v-icon>
               </template>
               <v-list>
                 <v-list-item @click="openConfirmDialog(item._id ?? '')" v-if="item.status === 'pending'">
@@ -99,6 +99,9 @@
               </v-list>
             </v-menu>
           </template>
+          <template #item.status="{value}">
+            {{ formatStatus(value) }}
+          </template>
         </v-data-table>
       </v-card>
     </v-col>
@@ -198,14 +201,27 @@ authenticate();
 
 const headers = computed(() => {
   const baseHeaders = [
+    {
+      title: "E-mail",
+      value: "email",
+    },
+    {
+      title: "Roles and Permission",
+      value: "roleName",
+    },
     {
       title: "Date",
       value: "createdAt",
     },
     {
-      title: "E-mail",
-      value: "email",
+      title: "Site Invited To",
+      value: "metadata.siteName",
+    },
+    {
+      title: "Status",
+      value: "status",
     },
+    
   ];
 
   if (props.status === "pending" && props.cancelInvitation) {
@@ -318,6 +334,19 @@ watchEffect(() => {
   }
 });
 
+const formatStatus = (status: string) => {
+  switch (status) {
+    case "pending":
+      return "Pending Invite";
+    case "expired":
+      return "Invitation expired";
+    case "accepted":
+      return "Accepted";
+    default:
+      return status?.[0]?.toUpperCase() + status?.slice(1) || "";
+  }
+};
+
 const dialogMember = ref(false);
 
 function inviteMember() {

package/components/MemberMain.vue

@@ -73,6 +73,9 @@
           <template #item.nature="{ item }">
             {{ replaceMatch(item.nature, "_", " ") }}
           </template>
+          <template #item.dateInvited="{ item }">
+            {{ formatDateInvited(item.dateInvited) }}
+          </template>
           <template #item.action-table="{ item }">
             <v-menu
               v-if="
@@ -87,7 +90,7 @@
               width="150"
             >
               <template v-slot:activator="{ props }">
-                <v-icon v-bind="props">mdi-dots-horizontal</v-icon>
+                <v-icon v-bind="props">mdi-dots-vertical</v-icon>
               </template>
               <v-list>
                 <v-list-item
@@ -289,19 +292,24 @@ const props = defineProps({
         value: "name",
       },
       {
-        title: "Role",
+        title: "Email",
+
+        value: "email",
+      },
+      {
+        title: "Roles and Permission",
 
         value: "roleName",
       },
       {
-        title: "Organization",
+        title: "Site Invited To",
 
-        value: "orgName",
+        value: "siteName",
       },
       {
-        title: "Status",
+        title: "Date",
 
-        value: "status",
+        value: "dateInvited",
       },
       {
         title: "Action",
@@ -347,7 +355,7 @@ const normalizedRouteParams = computed(() => {
 
 const tabOptions = [
   { name: "Active", status: "active" },
-  { name: "Suspended", status: "suspended" },
+  { name: "Inactive", status: "suspended" },
 ];
 
 function toRoute(status: any) {
@@ -477,6 +485,29 @@ function showMessage(msg: string, color: string) {
   messageSnackbar.value = true;
 }
 
+function formatDateInvited(value?: string | null) {
+  if (!value) return "";
+
+  const date = new Date(value);
+  if (Number.isNaN(date.getTime())) return "";
+
+  const parts = new Intl.DateTimeFormat("en-US", {
+    month: "long",
+    day: "numeric",
+    year: "numeric",
+    hour: "2-digit",
+    minute: "2-digit",
+    hour12: true,
+  }).formatToParts(date);
+
+  const getPart = (type: Intl.DateTimeFormatPartTypes) =>
+    parts.find((part) => part.type === type)?.value ?? "";
+
+  return `${getPart("month")} ${getPart("day")}, ${getPart("year")} ${getPart(
+    "hour"
+  )}:${getPart("minute")}${getPart("dayPeriod").toUpperCase()}`;
+}
+
 async function handleUpdateMemberStatus() {
   if (!selectedMemberId.value) return;
   updateLoading.value = true;

package/components/Nfc/NFCPatrolReportMain.vue

@@ -13,18 +13,7 @@
             Patrol Report Log
           </v-btn>
         </v-col>
-        <v-col cols="12" md="6" class="d-flex justify-end">
-          <v-btn
-            color="primary"
-         
-            variant="flat"
-            size="large"
-            class="text-none px-8"
-            prepend-icon="mdi-plus"
-          >
-            Create Routes & Schedule
-          </v-btn>
-        </v-col>
+    
       </v-row>
 
       <!-- Tabs -->
@@ -74,18 +63,7 @@
                 bg-color="white"
               />
             </v-col>
-            <v-col cols="12" md="3" class="px-md-2 mb-2 mb-md-0">
-              <v-btn
-                color="primary"
-                block
-                size="large"
-                rounded="lg"
-                class="text-none"
-                @click="loadReport"
-              >
-                Select Routes & Schedule
-              </v-btn>
-            </v-col>
+          
             <v-col cols="12" md="2" class="pl-md-2">
               <v-btn
                 variant="outlined"
@@ -312,7 +290,7 @@
             size="small"
             @click="dialogSelectRoute = false"
           />
-          <span class="text-h6 ml-2">Select Routes & Schedule</span>
+          <span class="text-h6 ml-2">Select Routes & Schedule </span>
         </v-card-title>
 
         <v-card-text class="px-6 pb-6">

package/components/ScheduleTaskMain.vue

@@ -162,7 +162,9 @@
                   class="mb-2"
                 >
                   <v-col cols="12">
-                    <div class="text-subtitle-2 font-weight-bold mb-2">Units Under Selected Areas:</div>
+                    <div class="text-subtitle-2 font-weight-bold mb-2">
+                      Units Under Selected Areas:
+                    </div>
                     <v-card variant="outlined" rounded>
                       <v-list density="compact" nav>
                         <template
@@ -179,33 +181,62 @@
                               <v-icon size="16">
                                 {{
                                   openViewAreas.includes(area.value || area._id)
-                                    ? 'mdi-chevron-down'
-                                    : 'mdi-chevron-right'
+                                    ? "mdi-chevron-down"
+                                    : "mdi-chevron-right"
                                 }}
                               </v-icon>
                             </template>
                             <template #append>
                               <v-progress-circular
-                                v-if="loadingViewUnits && !(area.value || area._id in fetchedViewAreaUnits)"
+                                v-if="
+                                  loadingViewUnits &&
+                                  !(
+                                    area.value ||
+                                    area._id in fetchedViewAreaUnits
+                                  )
+                                "
                                 size="14"
                                 width="2"
                                 indeterminate
                                 color="primary"
                               />
-                              <v-chip v-else size="x-small" variant="tonal" color="primary">
-                                {{ (fetchedViewAreaUnits[area.value || area._id] || []).length }}
+                              <v-chip
+                                v-else
+                                size="x-small"
+                                variant="tonal"
+                                color="primary"
+                              >
+                                {{
+                                  (
+                                    fetchedViewAreaUnits[
+                                      area.value || area._id
+                                    ] || []
+                                  ).length
+                                }}
                               </v-chip>
                             </template>
                           </v-list-item>
                           <v-expand-transition>
-                            <div v-show="openViewAreas.includes(area.value || area._id)">
+                            <div
+                              v-show="
+                                openViewAreas.includes(area.value || area._id)
+                              "
+                            >
                               <v-card-text class="px-3 py-2">
                                 <div
-                                  v-if="(fetchedViewAreaUnits[area.value || area._id] || []).length > 0"
+                                  v-if="
+                                    (
+                                      fetchedViewAreaUnits[
+                                        area.value || area._id
+                                      ] || []
+                                    ).length > 0
+                                  "
                                   class="d-flex flex-wrap ga-3"
                                 >
                                   <v-chip
-                                    v-for="unit in fetchedViewAreaUnits[area.value || area._id]"
+                                    v-for="unit in fetchedViewAreaUnits[
+                                      area.value || area._id
+                                    ]"
                                     :key="unit.unit"
                                     size="small"
                                     variant="tonal"
@@ -213,7 +244,9 @@
                                     {{ unit.name }}
                                   </v-chip>
                                 </div>
-                                <span v-else class="text-caption text-disabled">No units configured</span>
+                                <span v-else class="text-caption text-disabled"
+                                  >No units configured</span
+                                >
                               </v-card-text>
                             </div>
                           </v-expand-transition>
@@ -371,7 +404,9 @@ const messageSnackbar = ref(false);
 const messageColor = ref("success");
 
 const loadingViewUnits = ref(false);
-const fetchedViewAreaUnits = ref<Record<string, { name: string; unit: string }[]>>({});
+const fetchedViewAreaUnits = ref<
+  Record<string, { name: string; unit: string }[]>
+>({});
 const openViewAreas = ref<string[]>([]);
 
 const toggleViewArea = (id: string) => {
@@ -528,7 +563,7 @@ async function _deleteScheduleTask() {
 
     const response = await deleteScheduleTask(id);
     dialogDeleteTask.value = false;
-    showMessage(response?.message, "success");
+    showMessage("Scheduled task successfully deleted.", "success");
 
     await getTaskRefresh();
   } catch (error: any) {

package/components/UnitMain.vue

@@ -197,7 +197,11 @@
     </v-card>
   </v-dialog>
 
-  <Snackbar v-model="messageSnackbar" :text="message" :color="messageColor" />
+  <Snackbar
+    v-model="messageSnackbar"
+    :text="snackBarMessage"
+    :color="messageColor"
+  />
 
   <input
     ref="fileInput"
@@ -297,8 +301,11 @@ const dialogMode = ref<"add" | "edit">("add");
 const editingUnit = ref<Record<string, any>>({});
 const areaName = ref("");
 
+const snackBarMessage = ref("");
+
 function showMessage(msg: string, color: string = "error") {
   message.value = msg;
+  snackBarMessage.value = msg;
   messageColor.value = color;
   messageSnackbar.value = true;
 }

package/components/VisitorForm.vue

@@ -1269,6 +1269,8 @@ async function submit() {
       payload.visitorPass = visitor.visitorPass;
       payload.passKeys = visitor.passKeys;
     }
+
+    delete payload.createdBy;
   }
 
   if (prop.type === "contractor") {

package/components/VisitorManagement.vue

@@ -2034,6 +2034,29 @@ onMounted(() => {
       (route.query.checkedOut as string) == "true" || false;
   }
 });
+
+const { socketUnregisteredVisitorTrigger, visitorSocketData } =
+  useVisitorSocket();
+
+  watchEffect(async () => {
+    if (visitorSocketData.value && visitorSocketData.value.reload && activeTab.value === "unregistered") {
+      await getVisitorRefresh();
+      visitorSocketData.value = null;
+      socketUnregisteredVisitorTrigger.value = false;
+    }
+
+    if(visitorSocketData.value && visitorSocketData.value.plateNumber && socketUnregisteredVisitorTrigger.value && activeTab.value === "unregistered" && dialog.showSelection === false) {
+      // await getVisitorRefresh();
+      // visitorSocketData.value = null;
+      // socketUnregisteredVisitorTrigger.value = false;
+      setTimeout(async() => {
+        const { _id } = visitorSocketData.value;
+        await handleRegistrationUnregisteredVisitor({ _id });
+        socketUnregisteredVisitorTrigger.value = false;
+      }, 1000)
+    }
+  })
+
 </script>
 
 <style scoped></style>