@7365admin1/layer-common 1.8.6 → 1.10.0

package/components/WorkOrder/Main.vue

@@ -65,6 +65,9 @@
           @click:row="tableRowClickHandler"
           style="max-height: calc(100vh - (200px))"
         >
+          <template v-slot:item.createdAt="{ item }">
+            {{ formatDateDDMMYYYYLocal(item.createdAt) }}
+          </template>
         </v-data-table>
       </v-card>
     </v-col>
@@ -88,6 +91,39 @@
     @submit="submitWorkOrder"
   />
 
+  <ConfirmDialog
+    v-model="showDeleteDialog"
+    :loading="submitting"
+    @submit="submitDelete"
+    :image-src="'/images/icons/delete-icon.png'"
+  >
+    <template #image>
+      <v-img
+        height="120"
+        src="/images/icons/delete-icon.png"
+        alt="Delete Icon"
+        contain
+      />
+    </template>
+
+    <template #title>
+      Are you sure you want to delete this work order?
+    </template>
+
+    <template #footer>
+      <v-btn
+        color="primary-button"
+        variant="flat"
+        class="font-weight-bold py-5 d-flex align-center justify-center"
+        @click="submitDelete"
+        :loading="submitting"
+        block
+      >
+        Confirm
+      </v-btn>
+    </template>
+  </ConfirmDialog>
+
   <Snackbar v-model="messageSnackbar" :text="message" :color="messageColor" />
 
   <!-- Preview Dialog -->
@@ -235,7 +271,8 @@ const message = ref("");
 const messageColor = ref("");
 const messageSnackbar = ref(false);
 
-const { getColorStatus, formatDate, debounce } = useUtils();
+const { getColorStatus, formatDate, debounce, formatDateDDMMYYYYLocal } =
+  useUtils();
 
 const _workOrder = ref<TWorkOrderCreate>({
   attachments: [],
@@ -272,12 +309,14 @@ const submitting = ref(false);
 const selected = ref<string[]>([]);
 const route = useRoute();
 const { customers } = useCustomer();
+const showDeleteDialog = ref(false);
 
 const {
   getWorkOrders: _getWorkOrders,
   createWorkOrder,
   getWorkOrderById,
   updateWorkOrder,
+  deleteWorkOrder,
 } = useWorkOrder();
 
 const page = ref(1);
@@ -444,8 +483,8 @@ async function submitWorkOrder() {
 
     showMessage(res.message, "success");
     showCreateDialog.value = false;
+    await getAllReqRefresh();
     resetWorkOrderForm();
-    getAllReqRefresh();
   } catch (err) {
     showMessage((err as Error).message, "error");
   } finally {
@@ -468,7 +507,6 @@ function onViewWorkOrder(item: any) {
 async function editWorkOrder(item: any) {
   try {
     const _workOrders = await getWorkOrderById(item._id);
-    console.log(_workOrders);
     _workOrder.value = {
       attachments: (_workOrders.attachments || []) as string[],
       category: _workOrders.category || "",
@@ -488,7 +526,30 @@ async function editWorkOrder(item: any) {
 
 async function _updateWorkOrder() {}
 
-function confirmDeleteWorkOrder(item: any) {}
+function confirmDeleteWorkOrder(item: any) {
+  workOrderToDelete.value = item;
+  showDeleteDialog.value = true;
+}
+
+const workOrderToDelete = ref<any>(null);
+
+async function submitDelete() {
+  if (!workOrderToDelete.value) return;
+  submitting.value = true;
+  try {
+    const response = await deleteWorkOrder(workOrderToDelete.value._id);
+    showMessage(response.message, "success");
+    await getAllReqRefresh();
+  } catch (error) {
+    console.error("Failed to delete work order:", error);
+    showMessage("Failed to delete work order!", "error");
+  } finally {
+    submitting.value = false;
+    showDeleteDialog.value = false;
+    workOrderToDelete.value = null;
+    dialogPreview.value = false;
+  }
+}
 
 function tableRowClickHandler(_: any, data: any) {
   selectedWorkOrder.value = data.item;

package/composables/useBuildingUnit.ts

@@ -73,7 +73,7 @@ export default function useBuildingUnit() {
     });
   }
 
-  function add(data: { labels: string[]; unit: TBuildingUnit; qty?: number }) {
+  function add(data: { labels: string[]; unit: Partial<TBuildingUnit>; qty?: number }) {
     return useNuxtApp().$api("/api/building-units", {
       method: "POST",
       body: data,

package/composables/useDOBEntries.ts

@@ -0,0 +1,13 @@
+export default function () {
+  async function confirmPassword({ userId, password} : { userId: string; password: string}) {
+    return await useNuxtApp().$api<Record<string, any>>(`/api/auth/verify-password/id/${userId}`, {
+      method: "POST",
+      body: { password},
+    });
+  }
+
+
+  return {
+    confirmPassword
+  };
+}

package/composables/useDocument.ts

@@ -26,8 +26,9 @@ export default function useDocument() {
   }
 
   function deleteById(id: string) {
-    return useNuxtApp().$api(`/api/documents/${id}`, {
-      method: "DELETE",
+    return useNuxtApp().$api<Record<string, any>>(`/api/documents/deleted/document`, {
+      method: "PUT",
+      query: { id },
     });
   }
 

package/composables/useFeedback.ts

@@ -75,8 +75,9 @@ export default function useFeedback() {
   }
 
   function deleteFeedback(id: string) {
-    return useNuxtApp().$api<Record<string, any>>(`/api/feedbacks/${id}`, {
+    return useNuxtApp().$api<Record<string, any>>(`/api/feedbacks/deleted/feedback`, {
       method: "DELETE",
+      query: { id },
     });
   }
 
@@ -94,7 +95,7 @@ export default function useFeedback() {
 
   function updateStatusComplete(id: string, payload: TFeedbackStatusComplete) {
     return useNuxtApp().$api<Record<string, any>>(
-      `/api/feedbacks/${id}/status-complete`,
+      `/api/feedbacks/${id}/status/complete`,
       {
         method: "PUT",
         body: payload,

package/composables/useFile.ts

@@ -30,12 +30,10 @@ export default function useFile() {
   }
 
   function deleteFile(attachmentId: string) {
-    return useNuxtApp().$api<Record<string, any>>(
-      `/api/files/${attachmentId}`,
-      {
-        method: "DELETE",
-      }
-    );
+    return useNuxtApp().$api<Record<string, any>>(`/api/files/deleted/file`, {
+      method: "PUT",
+      query: { id: attachmentId },
+    });
   }
 
   function getFileById(id: string) {

package/composables/useNFCPatrolSettings.ts

@@ -1,6 +1,6 @@
 export default function useNFCPatrolSettings() {
   async function getBySite(site: string) {
-    return await useNuxtApp().$api<Record<string, any>>(
+    return useNuxtApp().$api<Record<string, any>>(
       `/api/nfc-patrol-settings/site/${site}`
     );
   }

package/composables/useRole.ts

@@ -58,8 +58,9 @@ export default function useRole() {
   }
 
   function deleteRole(_id: string) {
-    return useNuxtApp().$api<Record<string, any>>(`/api/roles/${_id}`, {
-      method: "DELETE",
+    return useNuxtApp().$api<Record<string, any>>(`/api/roles/deleted/role`, {
+      method: "PUT",
+      query: { id: _id },
     });
   }
 

package/composables/useWorkOrder.ts

@@ -71,6 +71,13 @@ export default function useWorkOrder() {
     });
   }
 
+  function deleteWorkOrder(id: string) {
+    return useNuxtApp().$api<Record<string, any>>(`/api/work-orders/deleted/work-order`, {
+      method: "DELETE",
+      query: { id },
+    });
+  }
+
   return {
     workOrders,
     workOrder,
@@ -81,5 +88,6 @@ export default function useWorkOrder() {
     getWorkOrders,
     getWorkOrderById,
     updateWorkOrder,
+    deleteWorkOrder,
   };
 }

package/package.json

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

package/types/card.d.ts

@@ -19,4 +19,9 @@ declare type TCard = {
   site?: string | ObjectId;
   unit: string;
   assign: string;
+  quantity?: number;
+  showAssign?: boolean;
+  assignBuilding?: string;
+  assignLevel?: string;
+  assignUnit?: string;
 };

package/types/verification.d.ts

@@ -5,7 +5,7 @@ declare type TVerificationMetadata = {
 
 declare type TMiniVerification = Pick<
   TVerification,
-  "createdAt" | "email" | "_id"
+  "createdAt" | "email" | "_id" | "status"
 >;
 
 declare type TVerification = {