@7365admin1/layer-common 1.11.23 → 1.11.24

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/layer-common
 
+## 1.11.24
+
+### Patch Changes
+
+- 68d57fd: Update Enhancement in VMS
+
 ## 1.11.23
 
 ### Patch Changes

package/components/AreaChecklistHistoryMain.vue

@@ -97,7 +97,7 @@ const props = defineProps({
   site: { type: String, required: true, default: "" },
   scheduleAreaId: { type: String, required: true, default: "" },
   type: { type: String, required: true, default: "cleaner" },
-  scheduleRoute: { type: String, default: "cleaning-schedule" },
+  scheduleRoute: { type: String, default: "pest-schedule" },
 });
 
 const { formatDate, back, debounce } = useUtils();

package/components/CleaningScheduleMain.vue

@@ -76,6 +76,15 @@
             {{ value || "No Status" }}
           </v-chip>
         </template>
+        <template #item.completedAt="{ value }">
+          {{
+            formatDate
+              ? formatDate(value)
+              : value
+              ? new Date(value).toLocaleString()
+              : ""
+          }}
+        </template>
         <template #item.download="{ item }">
           <v-btn
             v-if="canDownloadSchedule"
@@ -136,7 +145,7 @@ const headers = [
   { title: "Created Date", value: "createdAt" },
   { title: "Close in", value: "closeIn" },
   { title: "Status", value: "status" },
-  { title: "Completion Date", value: "completionDate" },
+  { title: "Completion Date", value: "completedAt" },
   { title: "", value: "download" },
 ];
 const remainingTime = ref({} as Record<string, string>);

package/components/EquipmentItemMain.vue

@@ -441,7 +441,6 @@
 
 <script setup lang="ts">
 import useEquipmentItem from "../composables/useEquipmentItem";
-import { useEquipmentItemPermission } from "../composables/useEquipmentItemPermission";
 import useEquipmentManagement from "../composables/useEquipmentManagement";
 import useFile from "../composables/useFile";
 import useUtils from "../composables/useUtils";
@@ -450,9 +449,12 @@ const props = defineProps({
   orgId: { type: String, default: "" },
   site: { type: String, default: "" },
   serviceType: { type: String, default: "" },
+  canViewAllEquipmentItems: { type: Boolean, default: true },
+  canCreateEquipmentItem: { type: Boolean, default: false },
 });
 
-const { canCreateEquipmentItem } = useEquipmentItemPermission();
+const canViewAllEquipmentItems = computed(() => props.canViewAllEquipmentItems);
+const canCreateEquipmentItem = computed(() => props.canCreateEquipmentItem);
 
 const items = ref<Array<Record<string, any>>>([]);
 const siteName = ref<string>("");

package/components/EquipmentManagementMain.vue

@@ -247,7 +247,6 @@
 <script setup lang="ts">
 import useEquipment from "../composables/useEquipment";
 import useStock from "../composables/useStock";
-import { useEquipmentPermission } from "../composables/useEquipmentPermission";
 import useUtils from "../composables/useUtils";
 import useEquipmentManagement from "../composables/useEquipmentManagement";
 
@@ -255,17 +254,22 @@ const props = defineProps({
   orgId: { type: String, default: "" },
   site: { type: String, default: "" },
   serviceType: { type: String, default: "" },
+  canViewEquipments: { type: Boolean, default: true },
+  canAddEquipment: { type: Boolean, default: false },
+  canUpdateEquipment: { type: Boolean, default: false },
+  canDeleteEquipment: { type: Boolean, default: false },
+  canAddStock: { type: Boolean, default: false },
+  canViewStock: { type: Boolean, default: true },
+  canRequestItem: { type: Boolean, default: false },
 });
 
-const {
-  canViewEquipments,
-  canAddEquipment,
-  canUpdateEquipment,
-  canDeleteEquipment,
-  canAddStock,
-  canViewStock,
-  canRequestItem,
-} = useEquipmentPermission();
+const canViewEquipments = computed(() => props.canViewEquipments);
+const canAddEquipment = computed(() => props.canAddEquipment);
+const canUpdateEquipment = computed(() => props.canUpdateEquipment);
+const canDeleteEquipment = computed(() => props.canDeleteEquipment);
+const canAddStock = computed(() => props.canAddStock);
+const canViewStock = computed(() => props.canViewStock);
+const canRequestItem = computed(() => props.canRequestItem);
 
 const items = ref<Array<Record<string, any>>>([]);
 const siteName = ref<string>("");

package/components/ManageChecklistMain.vue

@@ -17,7 +17,7 @@
         </v-col>
       </v-row>
       <TableHygiene
-        :title="'Cleaner Checklist'"
+        :title="scheduleTitle"
         :headers="headers"
         :items="items"
         :item-value="'unit'"
@@ -319,6 +319,18 @@ const props = defineProps({
 const { getUnitCleanerChecklist, updateUnitChecklist } = useCleaningSchedules();
 const { getBySiteAsServiceProvider } = useCustomerSite();
 const { back } = useUtils();
+
+const route = useRoute();
+const scheduleTitle = computed(() => {
+  const path = route.path;
+  if (path.includes('cleaning-schedule')) return 'Cleaning Checklist';
+  if (path.includes('technician-schedule')) return 'Technician Checklist';
+  if (path.includes('landscape-schedule')) return 'Landscape Checklist';
+  if (path.includes('pool-schedule')) return 'Pool Checklist';
+  if (path.includes('pest-schedule')) return 'Pest Checklist';
+  return 'Cleaner Checklist';
+});
+
 const canAddRemarks = computed(() => props.canAddRemarks);
 const canManageScheduleTasks = computed(() => props.canManageScheduleTasks);
 

package/components/ScanVisitorQRCode.vue

@@ -32,7 +32,7 @@
           <!-- This is where the QR code scanner will be displayed -->
         </div>
         <!-- Show Error Messages -->
-        <div v-if="showNotFoundMessage" class="text-error mt-4">
+        <div v-if="showNotFoundMessage" class="text-error mt-4 text-h5">
           <p>{{ errorMessage }}</p>
         </div>
         <!-- Switch camera button inside the reader box -->
@@ -58,6 +58,8 @@ const props = defineProps({
   },
 });
 
+const { standardFormatDate } = useUtils();
+
 const { validateVisitorQrCode } = useVisitor();
 
 const emits = defineEmits([
@@ -109,9 +111,14 @@ const handleScanVisitorQRCode = async () => {
             console.log("validateVisitorQrCode", response);
             if (response.errorMessage) {
               showNotFoundMessage.value = true;
-              errorMessage.value = response.errorMessage;
+              errorMessage.value =
+                response.errorMessage +
+                (response.scheduledDate
+                  ? standardFormatDate(response.scheduledDate)
+                  : "");
               showMessage(errorMessage.value, "error");
             } else {
+              closeDialog();
               emits("openVisitorDataFromScannedQrCodeDialog", response);
             }
           } else {

package/components/ScheduleAreaMain.vue

@@ -192,7 +192,6 @@ const headers = [
   { title: "Status", value: "status" },
   { title: "Type", value: "type" },
   { title: "No. of Visits", value: "set" },
-  { title: "Created By", value: "createdByName" },
 ];
 
 const { formatDate, back } = useUtils();

package/components/VisitorDataFromScannedQRCodeForm.vue

@@ -28,7 +28,7 @@
           />
         </v-col>
 
-        <v-col cols="12">
+        <v-col v-if="!visitorInfo.checkIn" cols="12">
           <InputLabel class="text-capitalize" title="NRIC/Passport/ID No." />
           <v-text-field
             v-if="!visitorInfo.checkIn"
@@ -46,7 +46,7 @@
           />
         </v-col>
 
-        <v-col cols="12" class="mt-4">
+        <v-col v-if="!visitorInfo.checkIn" cols="12" class="mt-4">
           <InputLabel
             class="text-capitalize"
             title="Vehicle Number (Optional)"
@@ -67,7 +67,7 @@
           />
         </v-col>
 
-        <v-col cols="12" class="mt-4">
+        <!-- <v-col cols="12" class="mt-4">
           <InputLabel class="text-capitalize" title="Type" />
           <v-text-field
             v-model="visitorInfo.type"
@@ -75,9 +75,9 @@
             hide-details
             readonly
           />
-        </v-col>
+        </v-col> -->
 
-        <v-col cols="12" class="mt-4">
+        <v-col v-if="!visitorInfo.checkIn" cols="12" class="mt-4">
           <InputLabel class="text-capitalize" title="Phone Number" />
           <InputPhoneNumberV2
             v-model="visitorInfo.contact"
@@ -87,32 +87,62 @@
         </v-col>
 
         <v-col cols="12">
+          <InputLabel class="text-capitalize" title="Location" />
+          <v-text-field v-model="location" density="comfortable" readonly />
+        </v-col>
+
+        <v-col v-if="!visitorInfo.checkIn" cols="12">
           <InputLabel class="text-capitalize" title="Purpose" />
           <v-textarea
             v-model="visitorInfo.purpose"
             density="comfortable"
-            :rows="3"
+            :rows="2"
             no-resize
             readonly
           />
         </v-col>
 
-        <v-col cols="12">
-          <InputLabel class="text-capitalize" title="Location" />
-          <v-text-field v-model="location" density="comfortable" />
+        <v-col v-if="!visitorInfo.checkIn" cols="12">
+          <InputLabel class="text-capitalize" title="Remarks" />
+          <v-textarea
+            v-model="visitorInfo.remarks"
+            density="comfortable"
+            :rows="2"
+            no-resize
+          />
         </v-col>
 
-        <v-col cols="12">
+        <v-col v-if="!visitorInfo.checkIn" cols="12">
           <InputLabel class="text-capitalize" title="Visitor Pass" />
           <PassInformation
             v-model:pass="visitorInfo.visitorPass"
             :site="prop.site"
             :type="visitorInfo.type"
+            :hideKeys="true"
             :clearable="true"
           />
         </v-col>
 
-        <v-col cols="12" class="mt-4">
+        <v-col v-else cols="12">
+          <v-card elevation="4" height="100%" width="100%">
+            <v-col cols="12" class="d-flex justify-center pb-0">
+              <span
+                class="text-h6 font-weight-bold d-flex text-center text-success"
+              >
+                {{
+                  visitorInfo.checkIn
+                    ? standardFormatDateTime(visitorInfo.checkIn)
+                    : "N/A"
+                }}
+              </span>
+            </v-col>
+            <v-col cols="12" class="d-flex justify-center">
+              Actual Check In
+            </v-col>
+          </v-card>
+        </v-col>
+
+        <!-- <v-col cols="12" class="mt-4">
           <v-row no-gutters class="pt-2">
             <v-col cols="6" class="pr-1">
               <v-card elevation="3" height="100%" width="100%">
@@ -151,7 +181,7 @@
               </v-card>
             </v-col>
           </v-row>
-        </v-col>
+        </v-col> -->
       </v-row>
       <!-- </v-form> -->
     </v-card-text>
@@ -177,7 +207,7 @@
           <v-btn
             v-if="visitorInfo.checkIn && !visitorInfo.checkOut"
             block
-            text="Check Out"
+            text="Confirm Check Out"
             variant="flat"
             color="error"
             size="48"
@@ -229,13 +259,13 @@ const visitorPlateNumber = computed({
   set: () => {}, // readonly, do nothing on set
 });
 
-watchEffect(() => {
-  if (visitorInfo.value.plateNumber) {
-    visitorInfo.value.type = "guest";
-  } else {
-    visitorInfo.value.type = "walk-in";
-  }
-});
+// watchEffect(() => {
+//   if (visitorInfo.value.plateNumber) {
+//     visitorInfo.value.type = "guest";
+//   } else {
+//     visitorInfo.value.type = "walk-in";
+//   }
+// });
 
 const location = computed({
   get: () => {

package/components/VisitorForm.vue

@@ -475,15 +475,13 @@ async function handleAddNewContractorType() {
 
 async function handleSelectCompanyName(company: string) {
   visitor.company = company
+  // const selected = companyAutofillDataArray.value.find(x => x.companyName?.includes(company))
+  // if (!selected) return
 
-  const selected = companyAutofillDataArray.value.find(x => x.companyName?.includes(company))
-  if (!selected) return
-
-  visitor.block = selected.block || ""
-  visitor.level = selected.level || ""
-  visitor.unit = selected.unit || ""
-  visitor.unitName = selected.unitName || ""
-
+  // visitor.block = selected.block || ""
+  // visitor.level = selected.level || ""
+  // visitor.unit = selected.unit || ""
+  // visitor.unitName = selected.unitName || ""
 }
 
 const companyCombo = ref(null)

package/components/VisitorManagement.vue

@@ -297,6 +297,36 @@
         </v-row>
       </template>
 
+      <template v-slot:item.arrival-date-time="{ item }">
+        <v-row no-gutters class="d-flex flex-column py-2">
+          <span class="d-flex align-center ga-2">
+            <v-icon icon="mdi-calendar" size="20" />
+            {{ standardFormatDate(item.expectedCheckIn) || "-" }}
+          </span>
+          <span class="d-flex align-center ga-2">
+            <v-icon icon="mdi-clock-time-four-outline" size="20" />
+            {{ formatTime(item.expectedCheckIn) || "-" }}
+          </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>
+
       <template v-slot:item.action="{ item }">
         <v-btn
           v-if="activeTab === 'unregistered' && canAddVisitor"
@@ -496,6 +526,25 @@
           <p class="text-body-2 mb-3">
             Please ensure all passes and keys are returned before checking out.
           </p>
+
+          <div>
+            <InputLabel class="text-capitalize" title="Full Name" />
+            <v-text-field
+              v-model="selectedVisitorObject.name"
+              density="comfortable"
+              readonly
+            />
+          </div>
+
+          <div>
+            <InputLabel class="text-capitalize" title="Location" />
+            <v-text-field
+              v-model="selectedVisitorObject.location"
+              density="comfortable"
+              readonly
+            />
+          </div>
+
           <div v-if="passReturnStatuses.length > 0" class="mb-2">
             <p class="text-caption text-medium-emphasis mb-1">Passes</p>
             <v-row
@@ -709,10 +758,16 @@ const {
   visitorSelection,
   typeFieldMap,
   updateVisitor,
-  visitorDataFromScannedQRCodeCheckInOut,
+  visitorDataFromScannedQRCodeCheckIn,
 } = useVisitor();
-const { debounce, formatCamelCaseToWords, formatDate, UTCToLocalTIme } =
-  useUtils();
+const {
+  debounce,
+  formatCamelCaseToWords,
+  formatDate,
+  formatTime,
+  UTCToLocalTIme,
+  standardFormatDate,
+} = useUtils();
 const { formatLocation } = useSecurityUtils();
 const { getFileUrlAnpr } = useFile();
 // const { status: visitorStatus, search } = useRoute().query as { status: string, search: string};
@@ -775,7 +830,9 @@ const headers = computed(() => [
   { title: "Type/Company", value: "type-company" },
   { title: "Location", value: "location" },
   { title: "Contact/Vehicle No.", value: "contact-vehicleNumber" },
-  { title: "Check In/Out", value: "checkin-out" },
+  ...(activeTab.value != "guests"
+    ? [{ title: "Check In/Out", value: "checkin-out" }]
+    : [{ title: "Arrival Date / Time", value: "arrival-date-time" }]),
   ...(activeTab.value === "resident-transactions"
     ? [
         { title: "Check-in Remarks", value: "checkInRemarks" },
@@ -880,7 +937,7 @@ const {
 
     if (activeTab.value === "guests") {
       params.type = "guest";
-      params.status = "pending";
+      params.status = "approved";
     } else if (activeTab.value === "resident-transactions") {
       params.status = "registered";
       params.type = "resident,tenant";
@@ -916,7 +973,9 @@ watch(getVisitorReq, (newData: any) => {
 const selectedVisitorObject = computed(() => {
   const obj = items.value.find((x: any) => x?._id === selectedVisitorId.value);
   if (!obj) return {};
+
   const type = obj?.type as TVisitorType | undefined;
+
   let includedKeys: string[] = [
     "checkIn",
     "checkOut",
@@ -925,9 +984,23 @@ const selectedVisitorObject = computed(() => {
     "snapshotExitImage",
   ];
   includedKeys.unshift(...(typeFieldMap[type] ?? []));
-  return Object.fromEntries(
-    Object.entries(obj).filter(([key]) => includedKeys.includes(key))
-  );
+
+  let locationString = "N/A";
+
+  if (obj?.block || obj?.level || obj?.unitName) {
+    locationString = `${obj.block} / ${obj.level} / ${obj.unitName}`;
+  } else if (obj?.block) {
+    locationString = obj.block;
+  } else {
+    locationString = "N/A";
+  }
+
+  return {
+    ...Object.fromEntries(
+      Object.entries(obj).filter(([key]) => includedKeys.includes(key))
+    ),
+    location: locationString,
+  };
 });
 
 function formatValues(key: string, value: any) {
@@ -947,9 +1020,20 @@ function formatValues(key: string, value: any) {
 const visitorDataFromScannedQRCode = ref<Record<string, any>>({});
 
 function handleShowVisitorDataFromScannedQRCodeDialog(
-  _visitorDataFromScannedQRCode: Record<string, any>
+  scannedData: Record<string, any>
 ) {
-  visitorDataFromScannedQRCode.value = _visitorDataFromScannedQRCode;
+  visitorDataFromScannedQRCode.value = scannedData;
+
+  const { checkIn, checkOut, _id, visitorPass } = scannedData;
+  const hasPasses = (visitorPass?.length ?? 0) > 0;
+
+  // 1. If they are checked in and HAVE passes/keys, go to the Return screen
+  if (checkIn && !checkOut && hasPasses) {
+    handleCheckout(_id);
+    return;
+  }
+
+  // 2. Default Case: Show visitor data (Entry, already checked out, or checked in with no passes)
   dialog.showVisitorDataFromScannedQRCode = true;
 }
 
@@ -961,24 +1045,31 @@ async function handleVisitorDataFromScannedQRCodeCheckInOut(
 ) {
   try {
     isVisitorDataFromScannedQRCodeCheckingInOut.value = true;
-    await visitorDataFromScannedQRCodeCheckInOut({
-      type,
-      filter: {
-        _id: visitorData._id,
-      },
-      update: {
-        updatedBy: currentUser.value._id,
-        visitorPassIds: visitorData.visitorPass.map(
-          (i: Record<string, any>) => i.keyId
-        ),
-        nric: visitorData.nric ?? "",
-        plateNumber: visitorData.plateNumber ?? "",
-      },
-      userType: "site",
-    });
-
-    dialog.scanVisitorQRCode = false;
+    if (type != "checkOut") {
+      await visitorDataFromScannedQRCodeCheckIn({
+        type,
+        filter: {
+          _id: visitorData._id,
+        },
+        update: {
+          updatedBy: currentUser.value._id,
+          visitorPass: visitorData.visitorPass.find(
+            (i: Record<string, any>) => i.keyId === null
+          )
+            ? undefined
+            : visitorData.visitorPass,
+          nric: visitorData.nric ?? "",
+          plateNumber: visitorData.plateNumber ?? "",
+        },
+        userType: "site",
+      });
+      showMessage("Visitor successfully checked-in!", "info");
+    } else {
+      selectedVisitorId.value = visitorData._id;
+      await proceedCheckout();
+    }
     handleCloseVisitorDataFromScannedQRCodeDialog();
+    getVisitorRefresh();
   } catch (error) {
     showMessage(errorConverter(error), "error");
   } finally {
@@ -1171,6 +1262,11 @@ const canConfirmCheckout = computed(() => {
   });
 });
 
+async function handleCheckIn(user: Record<string, any>) {
+  visitorDataFromScannedQRCode.value = user;
+  dialog.showVisitorDataFromScannedQRCode = true;
+}
+
 function handleCheckout(userId: string) {
   if (!userId) {
     showMessage("Invalid userId", "error");

package/composables/useVisitor.ts

@@ -174,7 +174,7 @@ export default function () {
     );
   }
 
-  function visitorDataFromScannedQRCodeCheckInOut(payload: any) {
+  function visitorDataFromScannedQRCodeCheckIn(payload: any) {
     return useNuxtApp().$api<Record<string, any>>("/api/visitors/update-one", {
       method: "PUT",
       body: payload,
@@ -191,6 +191,6 @@ export default function () {
     deleteVisitor,
     validateVisitorQrCode,
     updateVisitorPassKey,
-    visitorDataFromScannedQRCodeCheckInOut,
+    visitorDataFromScannedQRCodeCheckIn,
   };
 }

package/package.json

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