@7365admin1/layer-common 1.11.23 → 1.11.26

package/components/DocumentViewer.vue

@@ -0,0 +1,75 @@
+<template>
+    <v-dialog :model-value="modelValue" :max-width="fileType === 'image' ? '1200' : '900'" scrollable
+        @update:model-value="emit('update:modelValue', $event)">
+        <v-card>
+            <v-toolbar density="compact">
+                <v-toolbar-title class="text-subtitle-2 text-truncate">{{ fileName }}</v-toolbar-title>
+                <v-spacer />
+                <v-btn icon="mdi-open-in-new" variant="text" size="small" @click="openInNewTab()" />
+                <v-btn icon="mdi-close" variant="text" size="small" @click="emit('update:modelValue', false)" />
+            </v-toolbar>
+            <v-card-text class="pa-0"
+                :style="{ height: fileType === 'image' ? 'auto' : '75vh', 'overflow-y': fileType === 'image' ? 'auto' : 'auto' }">
+                <!-- Image Viewer -->
+                <v-img v-if="fileType === 'image'" :src="getFileUrl(fileId)" :alt="fileName" class="w-100" />
+
+                <!-- Video Viewer -->
+                <video v-else-if="fileType === 'video'" width="100%" height="100%" controls
+                    style="background-color: #000;">
+                    <source :src="getFileUrl(fileId)" :type="mimeType" />
+                    Your browser does not support the video tag.
+                </video>
+
+                <!-- Document Viewer (PDF, Word, etc.) -->
+                <iframe v-else :src="getFileUrl(fileId)" width="100%" height="100%" style="border: none;"
+                    :title="fileName" />
+            </v-card-text>
+            <v-card-actions>
+                <v-spacer />
+                <v-btn variant="text" class="text-none" @click="openInNewTab()">
+                    <v-icon start>mdi-download</v-icon>
+                    Open / Download
+                </v-btn>
+            </v-card-actions>
+        </v-card>
+    </v-dialog>
+</template>
+
+<script setup lang="ts">
+const props = defineProps({
+    modelValue: {
+        type: Boolean,
+        default: false,
+    },
+    fileId: {
+        type: String,
+        required: true,
+    },
+    fileName: {
+        type: String,
+        default: "Document",
+    },
+    mimeType: {
+        type: String,
+        default: "application/octet-stream",
+    },
+});
+
+const emit = defineEmits(['update:modelValue']);
+
+const { getFileUrl } = useFile();
+
+const fileType = computed(() => {
+    if (props.mimeType.startsWith('image/')) {
+        return 'image';
+    } else if (props.mimeType.startsWith('video/')) {
+        return 'video';
+    } else {
+        return 'document';
+    }
+});
+
+function openInNewTab() {
+    window.open(getFileUrl(props.fileId), '_blank', 'noopener,noreferrer');
+}
+</script>

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)