@7365admin1/layer-common 1.11.15 → 1.11.16

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @iservice365/layer-common
 
+## 1.11.16
+
+### Patch Changes
+
+- 59db5ff: Update Layer common register
+- acbb54d: Update Visitor Management
+
 ## 1.11.15
 
 ### Patch Changes

package/components/EquipmentManagementMain.vue

@@ -249,6 +249,7 @@ 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";
 
 const props = defineProps({
   orgId: { type: String, default: "" },
@@ -497,7 +498,8 @@ async function _deleteEquipment() {
   }
 }
 
-const { createStock, requestItem } = useStock();
+const { createStock } = useStock();
+const { checkOutItemSingle } = useEquipmentManagement();
 
 const stockActionQuantity = ref<number>(0);
 const stockActionRemarks = ref("");
@@ -535,9 +537,10 @@ async function _requestItem() {
 
     const payload: TStockCreate = {
       qty: stockActionQuantity.value,
+      serviceType: props.serviceType,
     };
 
-    const response = await requestItem(props.site, id, payload);
+    const response = await checkOutItemSingle(props.site, id, payload);
     showMessage(response?.message, "success");
     dialogStockAction.value = false;
     stockActionQuantity.value = 0;

package/components/MemberInformation.vue

@@ -0,0 +1,121 @@
+<template>
+    <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-row no-gutters class="pt-5 ga-2">
+                        <v-col cols="12">
+                            <InputLabel class="text-capitalize" title="Full Name" required />
+                            <v-text-field v-model.trim="memberForm.name" density="compact" hide-details
+                                :rules="[requiredRule]" />
+                        </v-col>
+
+                        <v-col cols="12">
+                            <InputLabel class="text-capitalize" title="NRIC" required />
+                            <InputNRICNumber v-model.trim="memberForm.nric" density="compact" hide-details
+                                :rules="[requiredRule]" />
+                        </v-col>
+
+                        <v-col cols="12">
+                            <v-combobox v-model="pass" v-model:search="passInput" :hide-no-data="false" class="mt-3"
+                                @update:focused="handleFocusedPass" :items="passItems" item-value="value"
+                                @update:model-value="handleSelectPass" label="Pass (optional)" variant="outlined"
+                                hide-details density="compact" persistent-hint small-chips>
+                                <template v-slot:no-data>
+                                    <v-list-item density="compact">
+                                        <v-list-item-title v-if="passInput">
+                                            No results matching "<strong>{{ passInput }}</strong>". This value will be
+                                            added as new
+                                            option.
+                                        </v-list-item-title>
+                                        <v-list-item v-else>No data available</v-list-item>
+                                    </v-list-item>
+                                </template>
+                            </v-combobox>
+                        </v-col>
+
+                        <v-col cols="12">
+                            <InputLabel class="text-capitalize" title="Phone Number" required />
+                                <InputPhoneNumberV2 v-model="memberForm.contact" density="compact" hide-details/>
+                        </v-col>
+
+                        <v-row class="pt-3" justify="space-between">
+                            <v-col cols="6">
+                                <v-btn text="Add Member" :disabled="!validForm" prepend-icon="mdi-plus"
+                                    color="primary-button" class="text-capitalize" @click="handleAddMember" />
+                            </v-col>
+                            <v-col cols="6" align="end">
+                                <v-btn text="Clear Form" prepend-icon="mdi-refresh" color="primary-button"
+                                    class="text-capitalize" @click.stop="handleClearForm" />
+                            </v-col>
+                        </v-row>
+                    </v-row>
+                </v-form>
+            </v-card-text>
+        </v-card>
+        <v-divider class="my-3" />
+        <v-row v-if="members.length > 0" no-gutters class="w-100 mt-5 ga-3">
+            <template v-for="member, index in members" :key="member.nric">
+                <CardMemberInfoSummary :member="member" @remove="handleRemoveMember(index)" />
+            </template>
+        </v-row>
+    </v-row>
+</template>
+
+<script setup lang="ts">
+
+const props = defineProps({
+})
+
+const { requiredRule } = useUtils()
+
+
+const memberForm = reactive<TMemberInfo>({
+    name: "",
+    nric: "",
+    visitorPass: "",
+    contact: ""
+})
+
+const validForm = ref(false)
+const formRef = ref<HTMLFormElement>()
+const processing = ref(false);
+const errorMessage = ref('')
+
+// pass
+const pass = ref()
+const passInput = ref('')
+const passItems = ref(['Test'])
+
+const members = defineModel<TMemberInfo[]>({required: true, default: []})
+
+
+function handleFocusedPass() {
+
+}
+
+function handleSelectPass(val: any) {
+    memberForm.visitorPass = val
+}
+
+function handleClearForm() {
+    formRef.value?.reset()
+}
+
+async function handleAddMember() {
+    members.value.push({...memberForm})
+    handleClearForm()
+}
+
+function handleRemoveMember(index: number){
+    const filtered = members.value.filter((item, qIndex) =>  qIndex !== index)
+    members.value = filtered
+}
+
+
+
+</script>
+
+<style scoped></style>

package/components/PassInformation.vue

@@ -0,0 +1,126 @@
+<template>
+    <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-combobox v-model="pass" v-model:search="passInput" :hide-no-data="false" class="mt-3"
+                    @update:focused="handleFocusedPass" :items="passItems" :rules="props.passRules" item-title="prefixAndName" item-value="_id"
+                    @update:model-value="handleSelectPass" label="Pass" variant="outlined" hide-details
+                    density="compact" persistent-hint small-chips>
+                    <template v-slot:no-data>
+                        <v-list-item density="compact">
+                            <v-list-item-title v-if="passInput">
+                                No results matching "<strong>{{ passInput }}</strong>". This value will be
+                                added as new
+                                option.
+                            </v-list-item-title>
+                            <v-list-item v-else>No data available</v-list-item>
+                        </v-list-item>
+                    </template>
+                </v-combobox>
+
+                <v-divider class="my-4 w-100" />
+            
+
+                <template v-if="selectedType">
+                    <v-number-input v-model="count" variant="outlined" :min="1" :precision="0" density="compact" :rules="countRules"  />
+                </template>
+            </v-card-text>
+        </v-card>
+    </v-row>
+</template>
+
+<script setup lang="ts">
+import type { PropType } from 'vue'
+import type { ValidationRule } from 'vuetify/lib/types.mjs'
+import usePassKey from '../composables/usePassKey'
+
+const props = defineProps({
+    passRules: {
+        type: Array as PropType<ValidationRule[]>,
+        default: []
+    },
+    countRules: {
+        type: Array as PropType<ValidationRule[]>,
+        default: []
+    },
+    site: {
+        type: String,
+        required: true
+    },
+    type: {
+        type: String as PropType<TVisitorType>,
+        required: true
+    },
+    contractorType: {
+        type: String,
+        default: ""
+    }
+})
+
+const pass = ref("")
+const passInput = ref('')
+const passItems = ref([])
+const selectedType = ref<'qr-pass' | 'nfc-card'>()
+const count = ref(1)
+
+const { getPassKeysByPageSearch } = usePassKey()
+
+const typeItems = [
+    {
+        label: "QR Pass",
+        value: "qr-pass"
+    },
+    {
+        label: "NFC Card",
+        value: "nfc-card"
+    }
+]
+
+const passTypesComputed = computed(() => {
+   if(props.type === 'contractor'){
+    if(props.contractorType === 'property-agent'){
+        return ["agent-pass"]
+    } else {
+        return ["contractor-pass"]
+    }
+   } else {
+    return ["visitor-pass"]
+   }
+})
+
+const { data: passesData, refresh: refreshPassesData, pending: fetchPassesPending } = await useLazyAsyncData('get-pass-keys', () => {
+    return getPassKeysByPageSearch({
+        search: passInput.value,
+        page: 1,
+        limit: 500,
+        passTypes: passTypesComputed.value,
+        sites: [props.site],
+        statuses: ["Available"]
+    })
+})
+
+watch(passesData, (data: any) => {
+    passItems.value = data?.items || []
+})
+
+
+function handleFocusedPass() {
+
+}
+
+function handleSelectPass() {
+
+}
+
+//prevent negative value;
+watch(count, (newCount) => {
+    if(newCount < 1){
+        count.value = 1
+    }
+})
+
+</script>
+
+<style scoped></style>

package/components/VisitorForm.vue

@@ -184,7 +184,7 @@
           </v-col>
 
           <v-col v-if="prop.type === 'contractor' && contractorStep === 2" cols="12">
-            <PassInformation />
+            <PassInformation :site="prop.site" :type="prop.type" :contractor-type="visitor.contractorType" />
             <EntryPassInformation
               v-if="entryPassSettings?.data?.settings?.nfcPass"
               v-model="passType"
@@ -866,7 +866,7 @@ async function submit() {
     site: prop.site,
   };
 
-  if (prop.mode === "add") {
+  if (prop.mode === "add" || prop.mode === "register") {
     const allowedFields = typeFieldMap[prop.type];
     for (const key of allowedFields as (keyof TVisitorPayload)[]) {
       if (visitor[key] !== undefined) {
@@ -876,11 +876,6 @@ async function submit() {
         };
       }
     }
-  } else if (prop.mode === 'register') {
-    payload = {
-      ...payload,
-      status: "registered",
-    }
   }
 
 
@@ -975,7 +970,7 @@ watch(
 );
 
 onMounted(() => {
-  contractorStep.value = 1;
+  contractorStep.value = 2;
   currentAutofillSource.value = null;
 
   if (prop.mode === 'register' && prop.visitorData) {

package/components/VisitorManagement.vue

@@ -22,7 +22,7 @@
             </v-checkbox>
             <InputDateTimePicker v-model:utc="dateFrom" density="compact" hide-details />
             <InputDateTimePicker v-model:utc="dateTo" density="compact" hide-details />
-            <v-select v-if="activeTab !== 'guests'" v-model="filterTypes" label="Filter by types" item-title="label"
+            <v-select v-if="activeTab == 'registered'" v-model="filterTypes" label="Filter by types" item-title="label"
               item-value="value" :items="visitorSelection" density="compact" clearable multiple max-width="200"
               hide-details>
               <template v-slot:selection="{ item, index }">
@@ -108,7 +108,7 @@
               <TooltipInfo text="Manual Checkout" density="compact" size="x-small" />
             </span>
           </template>
-          <span v-else-if="!item?.checkOut && item?.status === 'registered'">
+          <span v-else-if="!item?.checkOut && (item?.status === 'registered' || item?.status === 'unregistered')">
             <v-btn size="x-small" class="text-capitalize" color="red" text="Checkout"
               :loading="loading.checkingOut && item?._id === selectedVisitorId" @click.stop="handleCheckout(item._id)"
               v-if="canCheckoutVisitor" />
@@ -282,6 +282,7 @@ const tabOptions = [
   { name: "Registered", value: "registered" },
   { name: "Unregistered", value: "unregistered" },
   { name: "Guests", value: "guests" },
+  { name: "Resident Transactions", value: "resident-transactions" },
 ];
 
 const selectedVisitorDataObject = computed(() => {
@@ -350,11 +351,21 @@ const {
       checkedOut: displayNotCheckedOut.value ? false : undefined
     }
 
-    if (activeTab.value !== "guests") {
-      params.status = activeTab.value
-    } else if (activeTab.value === "guests") {
+    // if (activeTab.value !== "guests") {
+    //   params.status = activeTab.value
+    // } else if (activeTab.value === "guests") {
+    //   params.type = "guest"
+    //   params.status = "pending"
+    // }
+
+    if(activeTab.value === "guests"){
       params.type = "guest"
       params.status = "pending"
+    } else if (activeTab.value === "resident-transactions") {
+      params.status = "registered"
+      params.type = "resident,tenant"
+    } else {
+      params.status = activeTab.value
     }
 
     return await getVisitors(params)

package/composables/useEquipmentManagement.ts

@@ -1,5 +1,11 @@
 export default function useEquipmentManagement() {
-  function getSupplies({ page = 1, search = "", limit = 10, site = "", serviceType = "" } = {}) {
+  function getSupplies({
+    page = 1,
+    search = "",
+    limit = 10,
+    site = "",
+    serviceType = "",
+  } = {}) {
     return useNuxtApp().$api<Record<string, any>>(
       `/api/hygiene-supplies/site/${site}`,
       {
@@ -53,11 +59,26 @@ export default function useEquipmentManagement() {
     );
   }
 
+  function checkOutItemSingle(site: string, id: string, payload: TStockCreate) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/hygiene-checkout-items/site/${site}/supply/${id}`,
+      {
+        method: "POST",
+        body: {
+          qty: payload.qty,
+          serviceType: payload.serviceType,
+        },
+      }
+    );
+  }
+
   return {
     getSupplies,
     getSupplyById,
     createSupply,
     updateSupply,
     deleteSupply,
+    checkOutItemSingle,
+
   };
 }

package/composables/useStock.ts

@@ -27,21 +27,10 @@ export default function useStock() {
     );
   }
 
-  function requestItem(site: string, id: string, payload: TStockCreate) {
-    return useNuxtApp().$api<Record<string, any>>(
-      `/api/hygiene-request-items/site/${site}/supply/${id}`,
-      {
-        method: "POST",
-        body: {
-          qty: payload.qty,
-        },
-      }
-    );
-  }
+
 
   return {
     createStock,
     getStockBySupply,
-    requestItem,
   };
 }

package/package.json

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