@7365admin1/layer-common 1.11.22 → 1.11.24

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 1.11.24
+
+### Patch Changes
+
+- 68d57fd: Update Enhancement in VMS
+
+## 1.11.23
+
+### Patch Changes
+
+- 6d68511: Update layer-comon qr code package
+
 ## 1.11.22
 
 ### 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/AttendanceMain.vue

@@ -61,20 +61,20 @@
 
 <script setup lang="ts">
 import useAttendance from "../composables/useAttendance";
-import { useAttendancePermission } from "../composables/useAttendancePermission";
 import useUtils from "../composables/useUtils";
 
 const props = defineProps({
   orgId: { type: String, default: "" },
   site: { type: String, default: "" },
   serviceType: { type: String, default: "" },
+  canViewAllAttendance: { type: Boolean, default: true },
+  canViewAttendanceDetails: { type: Boolean, default: true },
+  canManageAttendanceSettings: { type: Boolean, default: false },
 });
 
-const {
-  canViewAllAttendance,
-  canViewAttendanceDetails,
-  canManageAttendanceSettings,
-} = useAttendancePermission();
+const canViewAllAttendance = computed(() => props.canViewAllAttendance);
+const canViewAttendanceDetails = computed(() => props.canViewAttendanceDetails);
+const canManageAttendanceSettings = computed(() => props.canManageAttendanceSettings);
 
 const submitting = ref(false);
 const page = ref(1);

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"
@@ -102,7 +111,6 @@
 </template>
 
 <script lang="ts" setup>
-import { useCleaningSchedulePermission } from "../composables/useCleaningSchedulePermission";
 import useCleaningSchedules from "../composables/useCleaningSchedules";
 import useUtils from "../composables/useUtils";
 
@@ -112,6 +120,10 @@ const props = defineProps({
   type: { type: String, required: true },
   serviceType: { type: String, default: "" },
   scheduleRoute: { type: String, default: "cleaning-schedule" },
+  canViewSchedules: { type: Boolean, default: true },
+  canViewScheduleDetails: { type: Boolean, default: true },
+  canDownloadSchedule: { type: Boolean, default: false },
+  canManageScheduleTasks: { type: Boolean, default: false },
 });
 
 const startDate = ref("");
@@ -133,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>);
@@ -172,12 +184,10 @@ const getCloseInColor = (id: string): string => {
   return "primary";
 };
 
-const {
-  canDownloadSchedule,
-  canViewSchedules,
-  canViewScheduleDetails,
-  canManageScheduleTasks,
-} = useCleaningSchedulePermission();
+const canDownloadSchedule = computed(() => props.canDownloadSchedule);
+const canViewSchedules = computed(() => props.canViewSchedules);
+const canViewScheduleDetails = computed(() => props.canViewScheduleDetails);
+const canManageScheduleTasks = computed(() => props.canManageScheduleTasks);
 
 const {
   data: getCleanerChecklistReq,

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'"
@@ -300,7 +300,6 @@
 </template>
 
 <script setup lang="ts">
-import { useCleaningSchedulePermission } from "../composables/useCleaningSchedulePermission";
 import useCleaningSchedules from "../composables/useCleaningSchedules";
 import useCustomerSite from "../composables/useCustomerSite";
 import useFile from "../composables/useFile";
@@ -313,13 +312,27 @@ const props = defineProps({
   scheduleAreaId: { type: String, default: "" },
   type: { type: String, default: "cleaner" },
   serviceType: { type: String, default: "" },
+  canAddRemarks: { type: Boolean, default: false },
+  canManageScheduleTasks: { type: Boolean, default: false },
 });
 
 const { getUnitCleanerChecklist, updateUnitChecklist } = useCleaningSchedules();
 const { getBySiteAsServiceProvider } = useCustomerSite();
 const { back } = useUtils();
-const { canAddRemarks, canManageScheduleTasks } =
-  useCleaningSchedulePermission();
+
+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);
 
 const selectedScheduleStatus = useState<string>(
   "selectedScheduleStatus",

package/components/MemberInformation.vue

@@ -2,9 +2,9 @@
     <v-row no-gutters class="w-100">
         <v-card class="w-100">
             <v-card-text>
-                <v-btn block color="primary-button" :height="40" text="Scan QR Code" class="text-capitalize" disabled
-                    prepend-icon="mdi-qrcode" />
-                <v-form ref="formRef" v-model="validForm" :disabled="processing" @click="errorMessage = ''">
+                <v-btn block color="primary-button" :height="40" text="Scan QR Code" class="text-capitalize"
+                    prepend-icon="mdi-qrcode" @click="handleScanQRPass" />
+                <v-form ref="formRef" v-model="validForm" :disabled="processing" @click="errorScanPassMessage = ''">
                     <v-row no-gutters class="pt-5 ga-2">
                         <v-col cols="12">
                             <InputLabel class="text-capitalize" title="Full Name" required />
@@ -19,10 +19,10 @@
                         </v-col>
 
                         <v-col cols="12">
-                            <v-autocomplete v-model="selectedPass" v-model:search="passInput"
-                                :hide-no-data="false" class="mt-3" :items="passItemsFilteredFinal"
-                                item-title="prefixAndName" item-value="_id" label="Pass (optional)" variant="outlined"
-                                hide-details density="compact" persistent-hint small-chips>
+                            <v-autocomplete v-model="selectedPass" v-model:search="passInput" :hide-no-data="false"
+                                class="mt-3" :items="passItemsFilteredFinal" item-title="prefixAndName" item-value="_id"
+                                label="Pass (optional)" variant="outlined"  density="compact" :error-messages="errorScanPassMessage"
+                                persistent-hint small-chips>
                                 <template v-slot:no-data>
                                     <v-list-item density="compact">
                                         <v-list-item-title v-if="passInput">
@@ -35,8 +35,7 @@
                                 </template>
 
                                 <template v-slot:chip="{ props, item }">
-                                    <v-chip v-if="selectedPass" v-bind="props"
-                                        prepend-icon="mdi-card-bulleted-outline"
+                                    <v-chip v-if="selectedPass" v-bind="props" prepend-icon="mdi-card-bulleted-outline"
                                         :text="item.raw?.prefixAndName"></v-chip>
                                 </template>
                             </v-autocomplete>
@@ -62,12 +61,15 @@
                 </v-form>
             </v-card-text>
         </v-card>
+        <visitor-pass-key-q-r-scanner :dialog="dialog.scanQRCode" v-model:scannedValue="scannedPassValue"
+        @close-dialog="dialog.scanQRCode = false" />
         <v-divider class="my-3" />
         <v-row v-if="committedMembers.length > 0" no-gutters class="w-100 mt-5 ga-3">
             <template v-for="member, index in committedMembers" :key="member.nric">
                 <CardMemberInfoSummary :member="membersDisplayed[index]" @remove="handleRemoveMember(index)" />
             </template>
         </v-row>
+        <!-- <Snackbar v-model="messageSnackbar" :text="message" :color="messageColor" /> -->
     </v-row>
 </template>
 
@@ -103,18 +105,33 @@ const { getPassKeysByPageSearch } = usePassKey()
 const memberForm = reactive<TMemberInfo>({
     name: "",
     nric: "",
-    visitorPass: "",
+    visitorPass: [] as { keyId: string }[],
     contact: ""
 })
 
 const validForm = ref(false)
 const formRef = ref<HTMLFormElement>()
 const processing = ref(false);
-const errorMessage = ref('')
+const errorScanPassMessage = ref('')
+
+const message = ref("");
+const messageColor = ref("");
+const messageSnackbar = ref(false);
+
+function showMessage(msg: string, color: string) {
+    message.value = msg;
+    messageColor.value = color;
+    messageSnackbar.value = true;
+}
 
 // pass
 const passInput = ref('')
 const passItems = ref<TPassKey[]>([])
+const scannedPassValue = ref<string>("")
+
+const dialog = reactive({
+    scanQRCode: false,
+})
 
 const selectedPass = ref<string>('')
 
@@ -160,7 +177,7 @@ watch(passesData, (data: any) => {
 
 const passItemsFilteredFinal = computed(() => {
     return passItems.value.filter((item: TPassKey) => {
-        return !props.selectedVisitorPass.some((pass: TPassKeyPayload) => pass.keyId === item._id) && !committedMembers.value.some((member: TMemberInfo) => member.visitorPass === item._id)
+        return !props.selectedVisitorPass.some((pass: TPassKeyPayload) => pass.keyId === item._id) && !committedMembers.value.some((member: TMemberInfo) => member.visitorPass?.some((pass) => pass.keyId === item._id))
     })
 })
 
@@ -168,15 +185,34 @@ const membersDisplayed = computed(() => {
     return committedMembers.value.map((member: TMemberInfo) => {
         return {
             ...member,
-            visitorPass: passItems.value.find((item: TPassKey) => item._id === member.visitorPass)?.prefixAndName || ""
+            visitorPass: passItems.value.find((item: TPassKey) => item._id === member.visitorPass?.[0]?.keyId)?.prefixAndName || ""
         }
     })
 })
 
+function handleScanQRPass() {
+    errorScanPassMessage.value = ""
+    dialog.scanQRCode = true
+}
+
 watch(selectedPass, (newVal) => {
     memberForm.visitorPass = [{ keyId: newVal }]
 })
 
+watch(scannedPassValue, (newVal) => {
+    if (!newVal) return
+
+    const matchedPass = passItemsFilteredFinal.value.find((p) => p.prefixAndName === newVal)
+
+    if (matchedPass) {
+        selectedPass.value = matchedPass._id ?? ""
+        return
+    }
+
+    errorScanPassMessage.value = "Scanned pass not available"
+    showMessage("Scanned pass not available", "error")
+})
+
 
 
 function handleClearForm() {

package/components/MyAttendanceMain.vue

@@ -79,16 +79,19 @@
 
 <script setup lang="ts">
 import useAttendance from "../composables/useAttendance";
-import { useAttendancePermission } from "../composables/useAttendancePermission";
 
 const props = defineProps({
   orgId: { type: String, default: "" },
   site: { type: String, default: "" },
   serviceType: { type: String, default: "" },
+  canViewOwnAttendance: { type: Boolean, default: true },
+  canCheckInOut: { type: Boolean, default: false },
+  canViewAttendanceDetails: { type: Boolean, default: true },
 });
 
-const { canViewOwnAttendance, canCheckInOut, canViewAttendanceDetails } =
-  useAttendancePermission();
+const canViewOwnAttendance = computed(() => props.canViewOwnAttendance);
+const canCheckInOut = computed(() => props.canCheckInOut);
+const canViewAttendanceDetails = computed(() => props.canViewAttendanceDetails);
 
 const searchInput = ref("");
 const dialogShowForm = ref(false);