@7365admin1/layer-common 1.11.2 → 1.11.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 1.11.4
+
+### Patch Changes
+
+- 8dba5eb: Update redirect org
+
+## 1.11.3
+
+### Patch Changes
+
+- 20a463d: Update Layer-common package
+
 ## 1.11.2
 
 ### Patch Changes

package/components/AccessCardAddForm.vue

@@ -146,7 +146,7 @@
               type="number"
               :min="1"
               hide-spin-buttons
-              @input="enforceMinQuantity"
+              @blur="enforceMinQuantity"
             />
           </v-col>
           <v-col cols="12" class="px-1 pb-5" v-if="!isNonPhysicalCard">
@@ -224,7 +224,7 @@
                 density="compact"
                 :items="accessGroupItems"
                 item-title="name"
-                item-value="no"
+                item-value="name"
                 hide-details
                 :rules="[requiredRule]"
                 multiple

package/components/AreaMain.vue

@@ -358,11 +358,13 @@ import useAreas from "../composables/useAreas";
 import useUnits from "../composables/useUnits";
 import { useAreaPermission } from "../composables/useAreaPermission";
 import useSiteSettings from "../composables/useSiteSettings";
+import useUtils from "../composables/useUtils";
 
 const props = defineProps({
   orgId: { type: String, default: "" },
   site: { type: String, default: "" },
   type: { type: String, default: "" },
+  serviceType: { type: String, default: "" },
 });
 
 const isCleanerArea = computed(() => {
@@ -458,6 +460,7 @@ const {
       site: props.site,
       search: searchInput.value,
       type: areaTypeFilter.value === "all" ? undefined : areaTypeFilter.value,
+      serviceType: props.serviceType,
     }),
   {
     watch: [page, () => props.site, () => props.type, areaTypeFilter],
@@ -646,6 +649,7 @@ async function _createArea() {
       set: itemSet.value,
       type: (itemType.value || "common").toLowerCase(),
       units: units.value,
+      serviceType: props.serviceType,
     };
 
     let response;

package/components/DashboardMain.vue

@@ -91,7 +91,7 @@ const props = defineProps({
     default: false,
   },
   cardPeriods: {
-    type: Object as () => TPeriodState,
+    type: Object as () => Record<string, TDashboardValues>,
     required: true,
   },
   currentSiteName: {
@@ -134,7 +134,7 @@ const countCardList = computed(() => {
     : [];
 
   return sourceCards.map((card: any, idx: number) => {
-    const periodKey = card.periodKey as keyof TPeriodState;
+    const periodKey = card.periodKey as keyof Record<string, TDashboardValues>;
     const apiPeriod = props.cardPeriods[periodKey] || "today";
     const displayPeriod = datePeriod[apiPeriod] || "Today";
 

package/components/{SupplyManagementMain.vue → EquipmentManagementMain.vue}

@@ -10,15 +10,15 @@
         v-model:page="page"
         :pages="pages"
         :pageRange="pageRange"
-        :no-data-text="`No supplies found for ${siteName}.`"
-        @refresh="getSuppliesRefresh"
-        :canCreate="canAddSupply"
-        createLabel="Add Supply"
+        :no-data-text="`No equipment found for ${siteName}.`"
+        @refresh="getEquipmentsRefresh"
+        :canCreate="canAddEquipment"
+        createLabel="Add Equipment"
         @row-click="handleRowClick"
       >
         <template #actions>
           <v-row no-gutters align="center" class="w-100">
-            <v-col cols="auto" v-if="canAddSupply">
+            <v-col cols="auto" v-if="canAddEquipment">
               <v-btn
                 class="text-none"
                 rounded="pill"
@@ -26,7 +26,7 @@
                 size="large"
                 @click="onCreateUnit()"
               >
-                Add Supply
+                Add Equipment
               </v-btn>
             </v-col>
 
@@ -57,28 +57,27 @@
     </v-col>
   </v-row>
 
-  <AddSupplyForm
+  <AddEqupmentForm
     v-model="dialogShowForm"
-    v-model:name="supplyName"
-    v-model:qty="supplyQuantity"
-    v-model:unitOfMeasurement="supplyUnit"
+    v-model:name="equipmentName"
+    v-model:unitOfMeasurement="equipmentUnit"
     :mode="dialogMode"
-    :supplyData="editingSupply"
+    :equipmentData="editingEquipment"
     :site="props.site"
-    @saved="_createSupply"
+    @saved="_createEquipment"
   />
 
   <v-dialog v-model="dialogShowMoreActions" width="400" persistent>
     <HygieneUpdateMoreAction
-      :title="selectedSupply?.name || 'Unit Actions'"
-      :canUpdate="canUpdateSupply"
-      :canDelete="canDeleteSupply"
+      :title="selectedEquipment?.name || 'Unit Actions'"
+      :canUpdate="canUpdateEquipment"
+      :canDelete="canDeleteEquipment"
       :showAddStock="canAddStock"
       :showViewStock="canViewStock"
       :showRequestItem="canRequestItem"
       :manageButtonLabel="''"
-      :editButtonLabel="'Edit Supply'"
-      :deleteButtonLabel="'Delete Supply'"
+      :editButtonLabel="'Edit Equipment'"
+      :deleteButtonLabel="'Delete Equipment'"
       :addStockButtonLabel="'Add Stock'"
       :viewButtonLabel="'View Stock'"
       :requestItemButtonLabel="'Checkout Item'"
@@ -91,13 +90,13 @@
     >
       <template #content>
         <v-row no-gutters>
-          <v-col v-if="selectedSupply" cols="12" class="mb-2">
+          <v-col v-if="selectedEquipment" cols="12" class="mb-2">
             <v-row no-gutters class="mb-2">
               <v-col cols="5" class="text-subtitle-2 font-weight-bold">
                 Name:
               </v-col>
               <v-col cols="7" class="text-subtitle-2">
-                {{ selectedSupply.name || "N/A" }}
+                {{ selectedEquipment.name || "N/A" }}
               </v-col>
             </v-row>
 
@@ -106,7 +105,7 @@
                 Quantity:
               </v-col>
               <v-col cols="7" class="text-subtitle-2">
-                {{ selectedSupply.qty || "N/A" }}
+                {{ selectedEquipment.qty || "N/A" }}
               </v-col>
             </v-row>
 
@@ -115,7 +114,7 @@
                 Unit of Measurement:
               </v-col>
               <v-col cols="7" class="text-subtitle-2">
-                {{ selectedSupply.unitOfMeasurement || "N/A" }}
+                {{ selectedEquipment.unitOfMeasurement || "N/A" }}
               </v-col>
             </v-row>
 
@@ -128,18 +127,18 @@
     </HygieneUpdateMoreAction>
   </v-dialog>
 
-  <v-dialog v-model="dialogDeleteSupply" max-width="450">
+  <v-dialog v-model="dialogDeleteEquipment" max-width="450">
     <v-card>
       <v-toolbar>
         <v-row no-gutters class="fill-height px-6" align="center">
           <span class="font-weight-bold text-h6 text-capitalize">
-            Delete {{ selectedSupply?.name || "Unit" }}
+            Delete {{ selectedEquipment?.name || "Unit" }}
           </span>
         </v-row>
       </v-toolbar>
       <v-card-text>
         <span class="text-subtitle-2"
-          >Are you sure you want to delete this unitOfMeasurement?</span
+          >Are you sure you want to delete this equipment?</span
         >
       </v-card-text>
 
@@ -151,7 +150,7 @@
               variant="text"
               class="text-none"
               size="large"
-              @click="dialogDeleteSupply = false"
+              @click="dialogDeleteEquipment = false"
               height="48"
             >
               Cancel
@@ -166,7 +165,7 @@
               class="text-none font-weight-bold"
               height="48"
               :loading="submitting"
-              @click="_deleteSupply"
+              @click="_deleteEquipment"
             >
               Delete
             </v-btn>
@@ -245,11 +244,11 @@
 
   <Snackbar v-model="messageSnackbar" :text="message" :color="messageColor" />
 </template>
-
 <script setup lang="ts">
-import useSupply from "../composables/useSupply";
+import useEquipment from "../composables/useEquipment";
 import useStock from "../composables/useStock";
-import { useSupplyPermission } from "../composables/useSupplyPermission";
+import { useEquipmentPermission } from "../composables/useEquipmentPermission";
+import useUtils from "../composables/useUtils";
 
 const props = defineProps({
   orgId: { type: String, default: "" },
@@ -257,14 +256,14 @@ const props = defineProps({
 });
 
 const {
-  canViewSupplies,
-  canAddSupply,
-  canUpdateSupply,
-  canDeleteSupply,
+  canViewEquipments,
+  canAddEquipment,
+  canUpdateEquipment,
+  canDeleteEquipment,
   canAddStock,
   canViewStock,
   canRequestItem,
-} = useSupplyPermission();
+} = useEquipmentPermission();
 
 const items = ref<Array<Record<string, any>>>([]);
 const siteName = ref<string>("");
@@ -276,8 +275,13 @@ const headers = [
   { title: "Status", value: "status" },
 ];
 
-const { getSupplies, getSupplyById, createSupply, updateSupply, deleteSupply } =
-  useSupply();
+const {
+  getEquipments,
+  getEquipmentById,
+  createEquipment,
+  updateEquipment,
+  deleteEquipment,
+} = useEquipment();
 const { debounce, requiredRule } = useUtils();
 
 const searchInput = ref("");
@@ -288,13 +292,13 @@ const pages = ref(0);
 const pageRange = ref("-- - -- of --");
 
 const {
-  data: getSuppliesReq,
-  refresh: getSuppliesRefresh,
+  data: getEquipmentsReq,
+  refresh: getEquipmentsRefresh,
   pending: loading,
-} = await useLazyAsyncData(
-  "get-all-supplies",
+} = await useLazyAsyncData<any>(
+  "get-all-equipments",
   () =>
-    getSupplies({
+    getEquipments({
       page: page.value,
       search: searchInput.value,
       site: props.site,
@@ -305,14 +309,14 @@ const {
 );
 
 watchEffect(() => {
-  if (getSuppliesReq.value) {
-    items.value = getSuppliesReq.value.items;
-    pages.value = getSuppliesReq.value.pages;
-    pageRange.value = getSuppliesReq.value.pageRange;
+  if (getEquipmentsReq.value) {
+    items.value = getEquipmentsReq.value.items;
+    pages.value = getEquipmentsReq.value.pages;
+    pageRange.value = getEquipmentsReq.value.pageRange;
   }
 });
 
-const debounceSearch = debounce(getSuppliesRefresh, 500);
+const debounceSearch = debounce(getEquipmentsRefresh, 500);
 watch(
   [searchInput, endDate, startDate],
   ([]) => {
@@ -321,23 +325,21 @@ watch(
   { immediate: false, deep: true }
 );
 
-const selectedSupply = ref<Record<string, any>>({});
+const selectedEquipment = ref<Record<string, any>>({});
 const message = ref("");
 const messageSnackbar = ref(false);
 const messageColor = ref("");
-const fileInput = ref<HTMLInputElement | null>(null);
 
 const dialogShowMoreActions = ref(false);
 const dialogShowForm = ref(false);
-const dialogDeleteSupply = ref(false);
+const dialogDeleteEquipment = ref(false);
 const dialogStockAction = ref(false);
 const stockActionMode = ref<"add" | "request">("add");
 const dialogMode = ref<"add" | "edit">("add");
 
-const editingSupply = ref<Record<string, any>>({});
-const supplyName = ref("");
-const supplyQuantity = ref(0);
-const supplyUnit = ref("");
+const editingEquipment = ref<Record<string, any>>({});
+const equipmentName = ref("");
+const equipmentUnit = ref("");
 
 const stockActionFormRef = ref<any>(null);
 const stockActionValid = ref(false);
@@ -350,49 +352,39 @@ function showMessage(msg: string, color: string = "error") {
 
 function onCreateUnit() {
   dialogMode.value = "add";
-  editingSupply.value = {};
-  supplyName.value = "";
-  supplyQuantity.value = 0;
-  supplyUnit.value = "";
+  editingEquipment.value = {};
+  equipmentName.value = "";
+  equipmentUnit.value = "";
   dialogShowForm.value = true;
 }
 
-function onSaveSupply(data: {
-  name: string;
-  qty: number;
-  unitOfMeasurement: string;
-}) {
-  showMessage("Supply saved successfully", "success");
-  getSuppliesRefresh();
-}
-
-async function _createSupply() {
+async function _createEquipment() {
   submitting.value = true;
   try {
-    const payload: TSupplyCreate = {
-      name: supplyName.value,
-      unitOfMeasurement: supplyUnit.value,
+    const payload: TEquipmentCreate = {
+      name: equipmentName.value,
+      unitOfMeasurement: equipmentUnit.value,
     };
 
     let response;
 
-    if (dialogMode.value === "edit" && editingSupply.value) {
+    if (dialogMode.value === "edit" && editingEquipment.value) {
       const id =
-        (editingSupply.value as any)._id || (editingSupply.value as any).id;
-      if (!id) throw new Error("Invalid supply id for update");
-      response = await updateSupply(id, payload);
+        (editingEquipment.value as any)._id ||
+        (editingEquipment.value as any).id;
+      if (!id) throw new Error("Invalid equipment id for update");
+      response = await updateEquipment(id, payload);
     } else {
-      response = await createSupply(payload, props.site);
+      response = await createEquipment(payload, props.site);
     }
 
     showMessage(response?.message, "success");
     dialogShowForm.value = false;
-    editingSupply.value = {};
-    supplyName.value = "";
-    supplyQuantity.value = 0;
-    supplyUnit.value = "";
+    editingEquipment.value = {};
+    equipmentName.value = "";
+    equipmentUnit.value = "";
 
-    await getSuppliesRefresh();
+    await getEquipmentsRefresh();
   } catch (error: any) {
     console.error(error);
     showMessage(error?.data?.message, "error");
@@ -401,60 +393,59 @@ async function _createSupply() {
   }
 }
 
-const selectedSupplyId = ref("");
+const selectedEquipmentId = ref("");
 
 const {
-  data: getSupplyByIdReq,
-  refresh: getSupplyByIdRefresh,
-  status: getSupplyByIdStatus,
-} = await useLazyAsyncData(
-  "get-supply-by-id",
-  () => getSupplyById(selectedSupplyId.value),
+  data: getEquipmentByIdReq,
+  refresh: getEquipmentByIdRefresh,
+  status: getEquipmentByIdStatus,
+} = await useLazyAsyncData<any>(
+  "get-equipment-by-id",
+  () => getEquipmentById(selectedEquipmentId.value),
   {
-    watch: [selectedSupplyId],
+    watch: [selectedEquipmentId],
     immediate: false,
   }
 );
 
 watchEffect(() => {
-  if (getSupplyByIdReq.value && getSupplyByIdStatus.value === "success") {
-    selectedSupply.value = getSupplyByIdReq.value;
+  if (getEquipmentByIdReq.value && getEquipmentByIdStatus.value === "success") {
+    selectedEquipment.value = getEquipmentByIdReq.value;
   }
 });
 
 async function handleRowClick(data: any) {
-  selectedSupply.value = data?.item;
+  selectedEquipment.value = data?.item;
   message.value = "";
 
-  selectedSupplyId.value = selectedSupply.value._id;
-  await getSupplyByIdRefresh();
+  selectedEquipmentId.value = selectedEquipment.value._id;
+  await getEquipmentByIdRefresh();
 
   dialogShowMoreActions.value = true;
 }
 
 const onEditFromMoreAction = async () => {
   dialogShowMoreActions.value = false;
-  if (!selectedSupply.value) return;
+  if (!selectedEquipment.value) return;
 
   submitting.value = true;
-  selectedSupplyId.value = selectedSupply.value._id;
-  await getSupplyByIdRefresh();
+  selectedEquipmentId.value = selectedEquipment.value._id;
+  await getEquipmentByIdRefresh();
   submitting.value = false;
 
-  const response = getSupplyByIdReq.value;
+  const response = getEquipmentByIdReq.value;
   if (!response) return;
 
   dialogMode.value = "edit";
-  editingSupply.value = response;
-  supplyName.value = response.name || "";
-  supplyQuantity.value = response.qty || 0;
-  supplyUnit.value = response.unitOfMeasurement || "";
+  editingEquipment.value = response;
+  equipmentName.value = response.name || "";
+  equipmentUnit.value = response.unitOfMeasurement || "";
   dialogShowForm.value = true;
 };
 
 const onDeleteFromMoreAction = () => {
   dialogShowMoreActions.value = false;
-  dialogDeleteSupply.value = true;
+  dialogDeleteEquipment.value = true;
 };
 
 const onAddStockFromMoreAction = () => {
@@ -469,8 +460,8 @@ const onViewStockFromMoreAction = () => {
   dialogShowMoreActions.value = false;
   const org = props.orgId;
   const site = props.site;
-  const id = selectedSupply.value._id;
-  useRouter().push(`/${org}/${site}/supply-management/stock/${id}`);
+  const id = selectedEquipment.value._id;
+  useRouter().push(`/${org}/${site}/equipment-management/stock/${id}`);
 };
 
 const onRequestItemFromMoreAction = () => {
@@ -481,20 +472,21 @@ const onRequestItemFromMoreAction = () => {
   dialogStockAction.value = true;
 };
 
-async function _deleteSupply() {
-  if (!selectedSupply.value) return;
+async function _deleteEquipment() {
+  if (!selectedEquipment.value) return;
 
   try {
     submitting.value = true;
     const id =
-      (selectedSupply.value as any)._id || (selectedSupply.value as any).id;
-    if (!id) throw new Error("Invalid supply id");
+      (selectedEquipment.value as any)._id ||
+      (selectedEquipment.value as any).id;
+    if (!id) throw new Error("Invalid equipment id");
 
-    const response = await deleteSupply(id);
-    dialogDeleteSupply.value = false;
+    const response = await deleteEquipment(id);
+    dialogDeleteEquipment.value = false;
     showMessage(response?.message, "success");
 
-    await getSuppliesRefresh();
+    await getEquipmentsRefresh();
   } catch (error: any) {
     showMessage(error?.data?.message, "error");
   } finally {
@@ -510,7 +502,7 @@ const stockActionRemarks = ref("");
 async function _addStock() {
   submitting.value = true;
   try {
-    const id = selectedSupply.value._id || selectedSupply.value.id;
+    const id = selectedEquipment.value._id || selectedEquipment.value.id;
 
     const payload: TStockCreate = {
       qty: stockActionQuantity.value,
@@ -523,7 +515,7 @@ async function _addStock() {
     stockActionQuantity.value = 0;
     stockActionRemarks.value = "";
 
-    await getSuppliesRefresh();
+    await getEquipmentsRefresh();
   } catch (error: any) {
     console.error(error);
     showMessage(error?.data?.message, "error");
@@ -535,7 +527,7 @@ async function _addStock() {
 async function _requestItem() {
   submitting.value = true;
   try {
-    const id = selectedSupply.value._id || selectedSupply.value.id;
+    const id = selectedEquipment.value._id || selectedEquipment.value.id;
 
     const payload: TStockCreate = {
       qty: stockActionQuantity.value,
@@ -546,7 +538,7 @@ async function _requestItem() {
     dialogStockAction.value = false;
     stockActionQuantity.value = 0;
 
-    await getSuppliesRefresh();
+    await getEquipmentsRefresh();
   } catch (error: any) {
     console.error(error);
     showMessage(error?.data?.message, "error");

package/components/ManageChecklistMain.vue

@@ -117,20 +117,45 @@
             </v-col>
           </v-row>
         </template>
+        <template #group-header-chips> </template>
         <template #group-header-append="{ group }">
-          <v-btn
-            v-if="group.attachments && group.attachments.length > 0"
-            size="x-small"
-            variant="tonal"
-            color="primary"
-            class="text-none"
-            prepend-icon="mdi-paperclip"
-            @click.stop="openAttachmentDialog(group.set, group.attachments)"
-          >
-            {{ group.attachments.length }} attachment{{
-              group.attachments.length > 1 ? "s" : ""
-            }}
-          </v-btn>
+          <v-row no-gutters align="center" class="ga-2">
+            <v-col v-if="isGroupAnyApproved(group)" cols="auto">
+              <v-chip
+                size="x-small"
+                :color="isGroupComplete(group) ? 'success' : 'warning'"
+                variant="tonal"
+                :prepend-icon="
+                  isGroupComplete(group)
+                    ? 'mdi-check-circle-outline'
+                    : 'mdi-progress-clock'
+                "
+                class="text-none"
+              >
+                {{ isGroupComplete(group) ? "Completed" : "Ongoing" }}
+                <template v-if="getGroupCompletedByName(group)">
+                  · {{ getGroupCompletedByName(group) }}
+                </template>
+              </v-chip>
+            </v-col>
+            <v-col
+              v-if="group.attachments && group.attachments.length > 0"
+              cols="auto"
+            >
+              <v-btn
+                size="x-small"
+                variant="tonal"
+                color="primary"
+                class="text-none"
+                prepend-icon="mdi-paperclip"
+                @click.stop="openAttachmentDialog(group.set, group.attachments)"
+              >
+                {{ group.attachments.length }} attachment{{
+                  group.attachments.length > 1 ? "s" : ""
+                }}
+              </v-btn>
+            </v-col>
+          </v-row>
         </template>
       </TableHygiene>
     </v-col>
@@ -328,6 +353,36 @@ function getKey(item: any, set?: number): string {
   return `${item.unit}_${set ?? ""}`;
 }
 
+function isGroupComplete(group: { set: number; items: any[] }): boolean {
+  return (
+    group.items.length > 0 &&
+    group.items.every(
+      (item: any) =>
+        item.approve === true ||
+        activeActions[getKey(item, group.set)] === "approve"
+    )
+  );
+}
+
+function isGroupAnyApproved(group: { set: number; items: any[] }): boolean {
+  return group.items.some(
+    (item: any) =>
+      item.approve === true ||
+      activeActions[getKey(item, group.set)] === "approve"
+  );
+}
+
+function getGroupCompletedByName(group: {
+  completedByName: string | null;
+  items: any[];
+}): string | null {
+  return (
+    group.completedByName ??
+    group.items.find((item: any) => item.completedByName)?.completedByName ??
+    null
+  );
+}
+
 function isSetFullyApproved(setNumber: number): boolean {
   const group = items.value.find((g: any) => g.set === setNumber);
   if (!group) return false;