@7365admin1/layer-common 1.11.31 → 1.11.32

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/layer-common
 
+## 1.11.32
+
+### Patch Changes
+
+- fe5ced9: Update Unregistered Registration
+
 ## 1.11.31
 
 ### Patch Changes

package/components/VisitorForm.vue

@@ -924,7 +924,14 @@ async function submit() {
   }
 
   try {
-    const res = await createVisitor(payload);
+    let res;
+    if (prop.mode === "add") {
+      res = await createVisitor(payload as TVisitorPayload);
+    } else if ((prop.mode === "edit" || prop.mode === "register") && prop.visitorData?._id) {
+      const { unitName, ...rest } = payload
+      res = await updateVisitor(prop.visitorData._id, rest as TVisitorPayload);
+    }
+
     if (res) {
       if (prop.type === "contractor" && passType.value) {
         const visitorId = res as unknown as string;

package/components/VisitorManagement.vue

@@ -209,34 +209,21 @@
         <v-row no-gutters class="d-flex flex-column py-2">
           <span class="d-flex align-center ga-2">
             <v-icon
-              icon="mdi-clock-time-eight-outline"
-              color="success"
+              icon="mdi-clock-time-four-outline"
+              color="green"
               size="20"
             />
-            <template v-if="!item.checkIn && canUpdateVisitor">
-              <v-btn
-                size="x-small"
-                class="text-capitalize"
-                color="success"
-                text="Checkin"
-                :disabled="isVisitorDataFromScannedQRCodeCheckingInOut"
-                @click.stop="handleCheckin(item)"
-                :loading="isVisitorDataFromScannedQRCodeCheckingInOut"
+            <span class="text-capitalize">{{
+              UTCToLocalTIme(item.checkIn) || "-"
+            }}</span>
+            <span>
+              <v-icon
+                v-if="item?.snapshotEntryImage"
+                size="17"
+                icon="mdi-image"
+                @click.stop="handleViewImage(item.snapshotEntryImage)"
               />
-            </template>
-            <template v-else>
-              <span class="text-capitalize">{{
-                UTCToLocalTIme(item.checkIn)
-              }}</span>
-              <span>
-                <v-icon
-                  v-if="item?.snapshotEntryImage"
-                  size="17"
-                  icon="mdi-image"
-                  @click.stop="handleViewImage(item.snapshotEntryImage)"
-                />
-              </span>
-            </template>
+            </span>
           </span>
 
           <span
@@ -379,6 +366,23 @@
             <v-icon icon="mdi-clock-time-four-outline" size="20" />
             {{ item.arrivalTime ?? "N/A" }}
           </span>
+
+          <span v-if="!item.checkIn && canUpdateVisitor">
+            <span class="d-flex align-center ga-2 cursor-pointer">
+              <v-icon
+                icon="mdi-clock-time-eight-outline"
+                color="success"
+                size="20"
+              />
+              <v-btn
+                size="x-small"
+                class="text-capitalize"
+                color="success"
+                text="Checkin"
+                @click.stop="handleCheckin(item)"
+              />
+            </span>
+          </span>
         </v-row>
       </template>
 
@@ -1327,6 +1331,11 @@ const {
       params.status = activeTab.value;
     }
 
+    if (activeTab.value !== "registered") {
+      delete params.type;
+      delete params.checkedOut;
+    }
+
     return await getVisitors(params);
   },
   {
@@ -1761,6 +1770,11 @@ function buildReportParams(): any {
     params.status = activeTab.value;
   }
 
+  if (activeTab.value !== "registered") {
+    delete params.type;
+    delete params.checkedOut;
+  }
+
   return params;
 }
 
@@ -1798,6 +1812,7 @@ async function handleDownloadCSVReport() {
     showMessage("Generating CSV report...", "info");
 
     const params = buildReportParams();
+
     const reportData = await getVisitors(params);
     const csvData = generateCSVData(reportData.items ?? []);
     downloadCSVFile(csvData);
@@ -1951,11 +1966,14 @@ onMounted(() => {
   if (route.query.dateTo) {
     dateTo.value = normalizeDateOnly(route.query.dateTo as string);
   }
-  filterTypes.value = ((route.query.type as string)?.split(",") || []).filter(
-    Boolean
-  ) as TVisitorType[];
-  displayNotCheckedOut.value =
-    (route.query.checkedOut as string) == "true" || false;
+  if (activeTab.value === "registered") {
+    filterTypes.value = ((route.query.type as string)?.split(",") || []).filter(
+      Boolean
+    ) as TVisitorType[];
+
+    displayNotCheckedOut.value =
+      (route.query.checkedOut as string) == "true" || false;
+  }
 });
 </script>
 

package/components/VisitorsReportPreview.vue

@@ -10,7 +10,7 @@
                         <span style="font-size: clamp(11px, 1.1vw, 13px); word-break: break-word;">Date Range: {{
                             formatDateDDMMYYYY(dateFrom) }} - {{ formatDateDDMMYYYY(dateTo) ?? "" }}</span>
                         <span class="text-subtitle-1" style="word-break: break-word;">Site Name: {{ activeSiteName
-                            }}</span>
+                        }}</span>
                     </div>
 
                 </v-row>
@@ -26,12 +26,12 @@
                                         formatCamelCaseToWords(item.contractorType)
                                     }}</span>
                                 <span v-else class="text-capitalize" style="word-break: break-word;">{{ formatType(item)
-                                    }}</span>
+                                }}</span>
                             </span>
                             <span class="d-flex align-center ga-2" style="flex-wrap: wrap;">
                                 <v-icon icon="mdi-domain" size="15" />
                                 <span class="text-capitalize" style="word-break: break-word;">{{ item?.company || "N/A"
-                                    }}</span>
+                                }}</span>
                             </span>
                         </template>
 
@@ -52,7 +52,7 @@
                             <span class="d-flex align-center ga-2" style="flex-wrap: wrap;">
                                 <v-icon icon="mdi-phone" size="15" />
                                 <span class="text-capitalize" style="word-break: break-word;">{{ item?.contact || "N/A"
-                                    }}</span>
+                                }}</span>
                             </span>
                             <span class="d-flex align-center ga-2" style="flex-wrap: wrap;">
                                 <v-icon icon="mdi-car-back" size="15" />
@@ -64,7 +64,8 @@
                         <template v-slot:item.checkInOut="{ item }">
                             <span class="d-flex align-center ga-2" style="flex-wrap: wrap;">
                                 <v-icon icon="mdi-login" size="15" />
-                                <span class="text-capitalize" style="word-break: break-word;">{{ formatDate(item.checkIn) }}</span>
+                                <span class="text-capitalize" style="word-break: break-word;">{{
+                                    formatDate(item.checkIn) }}</span>
                             </span>
                             <span class="d-flex align-center ga-2" style="flex-wrap: wrap;">
                                 <v-icon icon="mdi-logout" size="15" />
@@ -238,6 +239,11 @@ const {
             params.status = activeTab.value;
         }
 
+        if (activeTab.value !== 'registered') {
+            delete params.type
+            delete params.checkedOut
+        }
+
         return await getVisitors(params);
     },
     {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "1.11.31",
+  "version": "1.11.32",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {