@7365admin1/layer-common 1.8.5 → 1.9.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 1.9.0
+
+### Minor Changes
+
+- b7d47c7: update layer common package new changes
+
+## 1.8.6
+
+### Patch Changes
+
+- 21990e5: Update Version for new changes
+
 ## 1.8.5
 
 ### Patch Changes

package/components/AccessCardAddForm.vue

@@ -24,7 +24,24 @@
               type="text"
             ></v-select>
           </v-col>
-          <v-col cols="12" class="px-1 pb-5">
+          <v-col cols="12" class="px-1" v-if="isNonPhysicalCard">
+            <InputLabel
+              class="text-capitalize font-weight-bold"
+              title="Quantity"
+              required
+            />
+            <v-text-field
+              v-model.number="card.quantity"
+              density="compact"
+              hide-details
+              :rules="[requiredRule]"
+              type="number"
+              :min="1"
+              hide-spin-buttons
+              @input="enforceMinQuantity"
+            />
+          </v-col>
+          <v-col cols="12" class="px-1 pb-5" v-if="!isNonPhysicalCard">
             <InputLabel
               class="text-capitalize font-weight-bold"
               :title="`Card No (${cardNoMaxLength} digits)`"
@@ -35,36 +52,38 @@
               density="compact"
               hide-details
               :rules="[requiredRule]"
-              maxlength="10"
+              :maxlength="cardNoMaxLength"
               type="number"
               hide-spin-buttons
+              :suffix="`${card.cardNumber?.toString().length || 0}/${cardNoMaxLength}`"
+              @input="limitCardNumber"
             >
             </v-text-field>
           </v-col>
-          <v-col cols="12" class="px-1">
+          <v-col cols="12" class="px-1" v-if="!isNonPhysicalCard">
             <InputLabel
               class="text-capitalize font-weight-bold"
               title="Start Date"
               required
             />
-            <InputDateTimePicker
-              ref="startDateRef"
+            <InputDatePicker
               v-model="card.startDate"
               placeholder="Start Date"
               :rules="[requiredRule]"
+              @update:model-value="updateEndDate"
             />
           </v-col>
-          <v-col cols="12" class="px-1 pb-4">
+          <v-col cols="12" class="px-1 pb-4" v-if="!isNonPhysicalCard">
             <InputLabel
               class="text-capitalize font-weight-bold"
               title="End Date"
               required
             />
-            <InputDateTimePicker
-              ref="endDateRef"
+            <InputDatePicker
               v-model="card.endDate"
               placeholder="End Date"
               :rules="[requiredRule]"
+              readonly
             />
           </v-col>
           <v-divider />
@@ -102,7 +121,7 @@
               >
               </v-select>
             </v-col>
-            <v-col cols="12">
+            <v-col cols="12" v-if="!isNonPhysicalCard">
               <InputLabel
                 class="text-capitalize font-weight-bold"
                 title="Card Type"
@@ -119,7 +138,7 @@
               >
               </v-select>
             </v-col>
-            <v-col cols="12">
+            <v-col cols="12" v-if="!isNonPhysicalCard">
               <InputLabel
                 class="text-capitalize font-weight-bold"
                 :title="`Pin No (${cardPinMaxLength} digits)`"
@@ -130,26 +149,27 @@
                 density="compact"
                 hide-details
                 :rules="[requiredRule]"
-                maxlength="10"
+                :maxlength="cardPinMaxLength"
                 type="number"
                 hide-spin-buttons
+                :suffix="`${card.pinNo?.toString().length || 0}/${cardPinMaxLength}`"
+                @input="limitPinNo"
               >
               </v-text-field>
             </v-col>
             <v-col cols="12" class="pt-5">
-              <v-btn
-                block
+              <v-switch
+                v-model="card.useAsLiftCard"
+                label="Use as Lift Card"
                 color="primary"
-                variant="text"
-                class="text-none font-weight-bold"
-                text="Use as lift Card"
-                @click="card.useAsLiftCard = !card.useAsLiftCard"
-              ></v-btn>
+                hide-details
+                density="compact"
+              />
             </v-col>
             <v-col cols="12" v-if="card.useAsLiftCard">
               <InputLabel
                 class="text-capitalize font-weight-bold"
-                title="Lift Access Label"
+                title="Lift Access Level"
                 :required="card.useAsLiftCard"
               />
               <v-select
@@ -187,6 +207,67 @@
                 </span>
               </div>
             </v-col>
+            <v-col cols="12">
+              <v-divider class="my-4" />
+            </v-col>
+            <v-col cols="12">
+              <v-switch
+                v-model="card.showAssign"
+                label="Assign (Optional)"
+                color="primary"
+                hide-details
+                density="compact"
+              />
+            </v-col>
+            <template v-if="card.showAssign">
+              <v-col cols="12">
+                <InputLabel
+                  class="text-capitalize font-weight-bold"
+                  title="Building"
+                />
+                <v-autocomplete
+                  v-model="card.assignBuilding"
+                  density="compact"
+                  :items="buildingItems"
+                  hide-details
+                  item-title="name"
+                  item-value="value"
+                  placeholder="Search building..."
+                />
+              </v-col>
+              <v-col cols="12">
+                <InputLabel
+                  class="text-capitalize font-weight-bold"
+                  title="Level"
+                />
+                <v-autocomplete
+                  v-model="card.assignLevel"
+                  density="compact"
+                  :items="levelItems"
+                  hide-details
+                  item-title="name"
+                  item-value="value"
+                  placeholder="Search level..."
+                  :disabled="!card.assignBuilding"
+                />
+              </v-col>
+              <v-col cols="12">
+                <InputLabel
+                  class="text-capitalize font-weight-bold"
+                  title="Unit"
+                />
+                <v-autocomplete
+                  v-model="card.assignUnit"
+                  density="compact"
+                  :items="unitItems"
+                  hide-details
+                  item-title="name"
+                  item-value="value"
+                  placeholder="Search unit..."
+                  :disabled="!card.assignLevel"
+                />
+              </v-col>
+            </template>
           </v-row>
         </v-row>
       </v-form>
@@ -244,6 +325,8 @@ const prop = defineProps({
 });
 
 const { add: _addCard, updateById: _updateCardById } = useCard();
+const { getAll: _getBuildings } = useBuilding();
+const { getAllUnits: _getUnits } = useBuildingUnit();
 const emit = defineEmits(["cancel", "success"]);
 
 const validForm = ref(false);
@@ -252,27 +335,43 @@ const message = ref("");
 
 const { requiredRule } = useUtils();
 
+function formatDate(date: Date): string {
+  return date.toISOString().split("T")[0];
+}
+
+const today = new Date();
+const tenYearsLater = new Date(today);
+tenYearsLater.setFullYear(today.getFullYear() + 10);
+
 const card = ref<Record<string, any>>({
-  accessCardType: "",
+  accessCardType: "Physical Access Card",
   type: "door-setup",
   cardNumber: "",
-  startDate: "",
-  endDate: "",
+  startDate: formatDate(today),
+  endDate: formatDate(tenYearsLater),
   door: "",
   accessGroup: [],
-  cardType: "",
+  cardType: "Normal",
   pinNo: "",
   isActivate: true,
   isAntiPassBack: false,
   useAsLiftCard: false,
+  isWinsland: false,
   status: "active",
   liftAccessLevel: "",
   org: "",
   site: "",
   unit: "",
   assign: "",
+  quantity: 1,
+  showAssign: false,
+  assignBuilding: "",
+  assignLevel: "",
+  assignUnit: "",
 });
 
+const isNonPhysicalCard = computed(() => card.value.accessCardType === "Non Physical Access Card");
+
 if (prop.mode === "edit") {
   card.value.accessCardType = prop.card.accessCardType;
   card.value.type = prop.card.type;
@@ -292,15 +391,19 @@ if (prop.mode === "edit") {
   card.value.site = prop.card.site;
   card.value.unit = prop.card.unit;
   card.value.assign = prop.card.assign;
+  card.value.quantity = prop.card.quantity;
+  card.value.showAssign = prop.card.showAssign;
+  card.value.assignBuilding = prop.card.assignBuilding;
+  card.value.assignLevel = prop.card.assignLevel;
+  card.value.assignUnit = prop.card.assignUnit;
 }
 
 const accessCardTypes = ["Physical Access Card", "Non Physical Access Card"];
 const typeOfVisitors = ["Contractor", "Visitor"];
 
 const accessLevelItems = ref<{ name: string; no: string }[]>([
-  { name: "All access", no: "1" },
 ]);
-const accessGroupItems = ref(["All Access", "Glass Door 1"]);
+const accessGroupItems = ref([]);
 const cardTypeItems = ref([
   {
     name: "Normal - Access Card",
@@ -321,14 +424,119 @@ const cardTypeItems = ref([
 ]);
 const cardNoMaxLength = ref(10);
 const cardPinMaxLength = ref(6);
-const startDateRef = ref<HTMLInputElement | null>(null);
-const endDateRef = ref<HTMLInputElement | null>(null);
 const liftAccessLevelItems = ref<{ name: string; no: string }[]>([]);
+const buildingItems = ref<{ name: string; value: string }[]>([]);
+const levelItems = ref<{ name: string; value: string }[]>([]);
+const unitItems = ref<{ name: string; value: string }[]>([]);
+const buildingsData = ref<Record<string, any>[]>([]);
 
 const route = useRoute();
 const siteId = route.params.site as string;
 const orgId = route.params.org as string;
 
+function limitCardNumber() {
+  if (card.value.cardNumber && card.value.cardNumber.toString().length > cardNoMaxLength.value) {
+    card.value.cardNumber = card.value.cardNumber.toString().slice(0, cardNoMaxLength.value);
+  }
+}
+
+function limitPinNo() {
+  if (card.value.pinNo && card.value.pinNo.toString().length > cardPinMaxLength.value) {
+    card.value.pinNo = card.value.pinNo.toString().slice(0, cardPinMaxLength.value);
+  }
+}
+
+function enforceMinQuantity() {
+  if (card.value.quantity < 1 || !card.value.quantity) {
+    card.value.quantity = 1;
+  }
+}
+
+function updateEndDate(startDate: string | null) {
+  if (startDate) {
+    const date = new Date(startDate);
+    date.setFullYear(date.getFullYear() + 10);
+    card.value.endDate = formatDate(date);
+  }
+}
+
+// Watch for Assign toggle to fetch buildings
+watch(() => card.value.showAssign, async (newVal) => {
+  if (newVal) {
+    try {
+      const response = await _getBuildings({
+        page: 1,
+        status: "active",
+        site: siteId,
+      });
+      buildingsData.value = response.items || [];
+      buildingItems.value = buildingsData.value.map((building: any) => ({
+        name: building.name,
+        value: building._id,
+      }));
+    } catch (error) {
+      console.error("Failed to fetch buildings:", error);
+    }
+  } else {
+    // Reset selections when toggled off
+    card.value.assignBuilding = "";
+    card.value.assignLevel = "";
+    card.value.assignUnit = "";
+    buildingItems.value = [];
+    levelItems.value = [];
+    unitItems.value = [];
+  }
+});
+
+// Watch for building selection to populate levels
+watch(() => card.value.assignBuilding, async (newVal) => {
+  if (newVal) {
+    const selectedBuilding = buildingsData.value.find((b: any) => b._id === newVal);
+    if (selectedBuilding && selectedBuilding.levels) {
+      levelItems.value = selectedBuilding.levels.map((level: string) => ({
+        name: level,
+        value: level,
+      }));
+    }
+    // Reset level and unit when building changes
+    card.value.assignLevel = "";
+    card.value.assignUnit = "";
+    unitItems.value = [];
+  } else {
+    levelItems.value = [];
+    card.value.assignLevel = "";
+    card.value.assignUnit = "";
+    unitItems.value = [];
+  }
+});
+
+// Watch for level selection to fetch units
+watch(() => card.value.assignLevel, async (newVal) => {
+  if (newVal && card.value.assignBuilding) {
+    try {
+      const response = await _getUnits({
+        page: 1,
+        status: "active",
+        site: siteId,
+        building: card.value.assignBuilding,
+      });
+      const units = response.items || [];
+      // Filter units by selected level
+      const filteredUnits = units.filter((unit: any) => unit.level === newVal);
+      unitItems.value = filteredUnits.map((unit: any) => ({
+        name: unit.name,
+        value: unit._id,
+      }));
+    } catch (error) {
+      console.error("Failed to fetch units:", error);
+    }
+    card.value.assignUnit = "";
+  } else {
+    unitItems.value = [];
+    card.value.assignUnit = "";
+  }
+});
+
 function cancel() {
   //   createMore.value = false;
   message.value = "";

package/components/BuildingManagement/buildings.vue

@@ -28,7 +28,7 @@
         </v-toolbar>
 
         <v-data-table :headers="headers" :items="items" item-value="_id" items-per-page="20" fixed-header
-          hide-default-footer hide-default-header @click:row="tableRowClickHandler"
+          hide-default-footer  @click:row="tableRowClickHandler"
           style="max-height: calc(100vh - (200px))">
           <template #item.createdAt="{ value }">
             {{ new Date(value).toLocaleDateString() }}
@@ -333,3 +333,8 @@ function setBuilding({
   }
 }
 </script>
+<style scoped>
+  .v-data-table :deep(thead th) {
+  font-weight: bold !important;
+}
+</style>

package/components/BuildingManagement/units.vue

@@ -28,7 +28,7 @@
         </v-toolbar>
 
         <v-data-table :headers="props.headers" :items="items" item-value="_id" items-per-page="20" fixed-header
-          hide-default-footer hide-default-header @click:row="tableRowClickHandler"
+          hide-default-footer  @click:row="tableRowClickHandler"
           style="max-height: calc(100vh - (200px))">
           <template #item.block="{ value }">
             {{ value ? `blk ${value}` : "" }}
@@ -348,3 +348,9 @@ function setBuilding({
   }
 }
 </script>
+
+<style scoped>
+  .v-data-table :deep(thead th) {
+  font-weight: bold !important;
+}
+</style>

package/components/BuildingUnitFormAdd.vue

@@ -8,7 +8,7 @@
     <v-card-text style="max-height: 100vh; overflow-y: auto">
       <v-form v-model="validForm" :disabled="disable">
         <v-row no-gutters>
-          <v-col cols="12" class="mt-2">
+          <!-- <v-col cols="12" class="mt-2">
             <v-row no-gutters>
               <InputLabel class="text-capitalize" title="Name" required />
               <v-col cols="12">
@@ -19,7 +19,7 @@
                 ></v-text-field>
               </v-col>
             </v-row>
-          </v-col>
+          </v-col> -->
 
           <v-col cols="12">
             <v-row>
@@ -48,7 +48,7 @@
             </v-row>
           </v-col>
 
-          <v-col cols="12">
+          <!-- <v-col cols="12">
             <v-row>
               <v-col cols="12" class="mt-2">
                 <v-row no-gutters>
@@ -67,9 +67,9 @@
                 </v-row>
               </v-col>
             </v-row>
-          </v-col>
+          </v-col> -->
 
-          <v-col cols="12">
+          <!-- <v-col cols="12">
             <v-row>
               <v-col cols="12" class="mt-2">
                 <v-row no-gutters>
@@ -87,9 +87,9 @@
                 </v-row>
               </v-col>
             </v-row>
-          </v-col>
+          </v-col> -->
 
-          <v-col cols="12">
+          <!-- <v-col cols="12">
             <v-row>
               <v-col cols="12" class="mt-2">
                 <v-row no-gutters>
@@ -129,7 +129,7 @@
                 </v-row>
               </v-col>
             </v-row>
-          </v-col>
+          </v-col> -->
 
           <v-col cols="12" class="mt-2">
             <v-row no-gutters>
@@ -221,7 +221,7 @@
             </v-row>
           </v-expand-transition>
 
-          <v-col cols="12" class="mt-5">
+          <!-- <v-col cols="12" class="mt-5">
             <InputLabel
               class="text-capitalize"
               title="Upload Files (Lease of Contract, Cert. of Occupancy)"
@@ -233,7 +233,7 @@
               title="Upload PDF Files"
               accept="application/pdf"
             />
-          </v-col>
+          </v-col> -->
 
           <v-col cols="12" class="mt-2">
             <v-checkbox v-model="createMore" density="comfortable" hide-details>
@@ -343,6 +343,7 @@ const buildingUnit = ref<TBuildingUnit>({
   leaseEnd: "",
 });
 
+
 const startDateRef = ref<HTMLInputElement | null>(null);
 const expiryDateRef = ref<HTMLInputElement | null>(null);
 
@@ -408,10 +409,11 @@ function setBuildingUnit() {
 
 async function submit() {
   disable.value = true;
+  const {buildingUnitFiles, companyName, companyRegistrationNumber, leaseStart, leaseEnd, ...rest} = buildingUnit.value;
   try {
     await add({
       labels: unitLabels.value,
-      unit: buildingUnit.value,
+      unit: rest,
       qty: buildingUnitQty.value,
     });
 

package/components/Button/Close.vue

@@ -0,0 +1,16 @@
+<template>
+    <v-btn text="Close" class="bg-grey-lighten-2 text-capitalize" :height="prop.height" @click="emit('click')" />
+</template>
+
+<script setup lang="ts">
+    const prop = defineProps<{ 
+        height?: string | number;
+    }>();
+
+    const emit = defineEmits<{
+        (e: 'click'): void;
+    }>();
+
+</script>
+
+<style scoped></style>

package/components/CameraMain.vue

@@ -11,6 +11,7 @@
 
           <template #append>
             <v-btn
+             v-if="!prop.readOnly"
               variant="flat"
               color="primary"
               class="text-none"
@@ -144,7 +145,7 @@
 
         <v-toolbar class="pa-0" density="compact">
           <v-row no-gutters>
-            <v-col cols="6" class="pa-0">
+            <v-col :cols="prop.readOnly ? 12 : 6" class="pa-0">
               <v-btn
                 block
                 variant="text"
@@ -157,7 +158,7 @@
               </v-btn>
             </v-col>
 
-            <v-col cols="6" class="pa-0">
+            <v-col v-if="!prop.readOnly" cols="6" class="pa-0">
               <v-menu>
                 <template #activator="{ props }">
                   <v-btn
@@ -176,13 +177,13 @@
                 <v-list class="pa-0">
                   <v-list-item @click="openDialogEdit()">
                     <v-list-item-title class="text-subtitle-2">
-                      Edit Building
+                      Edit
                     </v-list-item-title>
                   </v-list-item>
 
                   <v-list-item @click="openDialogDelete()" class="text-red">
                     <v-list-item-title class="text-subtitle-2">
-                      Delete Building
+                      Delete
                     </v-list-item-title>
                   </v-list-item>
                 </v-list>
@@ -268,6 +269,10 @@ const prop = defineProps({
       { text: "Actions", value: "action", sortable: false },
     ],
   },
+  readOnly: {
+    type: Boolean,
+    default: false,
+  },
 });
 
 const items = ref<Array<TCamera>>([]);

package/components/Dialog/UpdateMoreAction.vue

@@ -41,6 +41,7 @@
                 color="black"
                 class="text-none"
                 height="48"
+                :disabled="disabled"
                 v-bind="props"
                 tile
               >
@@ -78,6 +79,10 @@ const prop = defineProps({
     type: Boolean,
     default: true,
   },
+  disabled: {
+    type: Boolean,
+    default: false,
+  },
   editButtonLabel: {
     type: String,
     default: "Edit",
@@ -97,7 +102,7 @@ const prop = defineProps({
 });
 
 const emit = defineEmits(["close", "edit", "delete"]);
-const { canUpdate, editButtonLabel, deleteButtonLabel, title } = prop;
+const { canUpdate, editButtonLabel, deleteButtonLabel, title, disabled } = prop;
 </script>
 
 <style scoped></style>

package/components/FeedbackDetail.vue

@@ -305,21 +305,32 @@ async function handleCompletionFileAdded(file: File) {
 
     const res = await addFile(file);
 
-    if (res?.id && res?.name) {
-      const url = `https://seven365-storage.sgp1.cdn.digitaloceanspaces.com/dev/${res.id}`;
+    const uploadedId = res?.id;
 
-      if (!completionAttachments.value) {
-        completionAttachments.value = [];
-      }
+    if (uploadedId) {
+      const url = `${uploadedId}`;
 
+      completionAttachments.value = completionAttachments.value ?? [];
       completionAttachments.value.push(url);
+    }
 
-      completionFileNames.value[url] = res.name;
+    // if (res?.id && res?.name) {
+    //   const url = `https://seven365-storage.sgp1.cdn.digitaloceanspaces.com/dev/${res.id}`;
 
-      if (completionFileInput.value) {
-        completionFileInput.value.updateFileName(url, res.name);
-      }
-    }
+    //   if (!completionAttachments.value) {
+    //     completionAttachments.value = [];
+    //   }
+
+    //   completionAttachments.value.push(url);
+
+    //   completionFileNames.value[url] = res.name;
+
+    //   if (completionFileInput.value) {
+    //     completionFileInput.value.updateFileName(url, res.name);
+    //   }
+    // }
+
+    console.log("completionAttachments.value", completionAttachments.value);
   } catch (error) {
     console.error("Error uploading completion file:", error);
     showMessage("Failed to upload file", "error");