@7365admin1/layer-common 1.10.7 → 1.10.9

package/composables/useEquipmentManagementPermission.ts

@@ -0,0 +1,96 @@
+import useCleaningPermission from "./useCleaningPermission";
+import { useLocalSetup } from "./useLocalSetup";
+import usePermission from "./usePermission";
+
+export function useEquipmentManagementPermission() {
+  const { hasPermission } = usePermission();
+  const { permissions } = useCleaningPermission();
+  const { userAppRole } = useLocalSetup();
+
+  const canViewEquipments = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "supply-mgmt",
+      "see-all-supplies"
+    );
+  });
+
+  const canAddEquipment = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "supply-mgmt",
+      "add-supply"
+    );
+  });
+
+  const canUpdateEquipment = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "supply-mgmt",
+      "update-supply"
+    );
+  });
+
+  const canDeleteEquipment = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "supply-mgmt",
+      "delete-supply"
+    );
+  });
+
+  const canAddStock = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "supply-mgmt",
+      "add-stock"
+    );
+  });
+
+  const canViewStock = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "supply-mgmt",
+      "view-stock"
+    );
+  });
+
+  const canRequestItem = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "supply-mgmt",
+      "request-item"
+    );
+  });
+
+  return {
+    canViewEquipments,
+    canAddEquipment,
+    canUpdateEquipment,
+    canDeleteEquipment,
+    canAddStock,
+    canViewStock,
+    canRequestItem,
+  };
+}

package/composables/{useSupplyPermission.ts → useEquipmentPermission.ts}

@@ -1,9 +1,9 @@
-export function useSupplyPermission() {
+export function useEquipmentPermission() {
   const { hasPermission } = usePermission();
   const { permissions } = useCleaningPermission();
   const { userAppRole } = useLocalSetup();
 
-  const canViewSupplies = computed(() => {
+  const canViewEquipments = computed(() => {
     if (!userAppRole.value) return true;
     if (userAppRole.value.permissions.includes("*")) return true;
     return hasPermission(
@@ -14,7 +14,7 @@ export function useSupplyPermission() {
     );
   });
 
-  const canAddSupply = computed(() => {
+  const canAddEquipment = computed(() => {
     if (!userAppRole.value) return true;
     if (userAppRole.value.permissions.includes("*")) return true;
     return hasPermission(
@@ -25,7 +25,7 @@ export function useSupplyPermission() {
     );
   });
 
-  const canUpdateSupply = computed(() => {
+  const canUpdateEquipment = computed(() => {
     if (!userAppRole.value) return true;
     if (userAppRole.value.permissions.includes("*")) return true;
     return hasPermission(
@@ -36,7 +36,7 @@ export function useSupplyPermission() {
     );
   });
 
-  const canDeleteSupply = computed(() => {
+  const canDeleteEquipment = computed(() => {
     if (!userAppRole.value) return true;
     if (userAppRole.value.permissions.includes("*")) return true;
     return hasPermission(
@@ -81,10 +81,10 @@ export function useSupplyPermission() {
   });
 
   return {
-    canViewSupplies,
-    canAddSupply,
-    canUpdateSupply,
-    canDeleteSupply,
+    canViewEquipments,
+    canAddEquipment,
+    canUpdateEquipment,
+    canDeleteEquipment,
     canAddStock,
     canViewStock,
     canRequestItem,

package/composables/useFeedback.ts

@@ -32,58 +32,90 @@ export default function useFeedback() {
     })
   );
 
+  const { currentUser } = useLocalAuth();
+
   async function getFeedbacks({
     page = 1,
-    site = "",
-    status = "to-do",
-    search = "",
     limit = 10,
-    from = "",
-    category = "",
+    search = "",
+    site = "",
+    dateFrom = "",
+    dateTo = "",
+    date,
+    status = "",
+    provider = "",
+    service = "",
+    userId = "",
+  }: {
+    page?: number;
+    limit?: number;
+    search?: string;
+    site?: string;
+    dateFrom?: any;
+    dateTo?: any;
+    date?: any;
+    status?: string;
+    provider?: string;
+    service?: string;
+    userId?: string;
   } = {}) {
     try {
-      return useNuxtApp().$api<Record<string, any>>(
-        `/api/feedbacks/site/${site}/status/${status}`,
-        {
-          method: "GET",
-          query: { page, search, limit, from, category },
-        }
-      );
+      return useNuxtApp().$api<Record<string, any>>("/api/feedbacks2", {
+        method: "GET",
+        query: {
+          page,
+          limit,
+          search,
+          site,
+          dateFrom,
+          dateTo,
+          date,
+          status,
+          provider,
+          service,
+          ...(currentUser.value.type != "site" && {
+            userId,
+          }),
+        },
+      });
     } catch (err) {
       console.error("Error fetching feedbacks:", err);
     }
   }
 
   function getFeedbackById(id: string) {
-    return useNuxtApp().$api<TFeedback>(`/api/feedbacks/${id}`, {
+    return useNuxtApp().$api<TFeedback>(`/api/feedbacks2/${id}`, {
       method: "GET",
     });
   }
 
   function createFeedback(payload: TFeedbackCreate) {
-    return useNuxtApp().$api<Record<string, any>>("/api/feedbacks", {
+    return useNuxtApp().$api<Record<string, any>>("/api/feedbacks2", {
       method: "POST",
       body: payload,
     });
   }
 
   function updateFeedback(id: string, payload: TFeedbackUpdate) {
-    return useNuxtApp().$api<Record<string, any>>(`/api/feedbacks/${id}`, {
+    return useNuxtApp().$api<Record<string, any>>(`/api/feedbacks2/${id}`, {
       method: "PUT",
       body: payload,
     });
   }
 
   function deleteFeedback(id: string) {
-    return useNuxtApp().$api<Record<string, any>>(`/api/feedbacks/deleted/feedback/${id}`, {
-      method: "PUT",
-      // query: { id },
-    });
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/feedbacks/deleted/feedback/${id}`,
+      {
+        method: "PUT",
+        // query: { id },
+      }
+    );
   }
 
   function updateFeedbackServiceProvider(id: string, serviceProvider: string) {
     return useNuxtApp().$api<Record<string, any>>(
-      `/api/feedbacks/${id}/service-provider`,
+      `/api/feedbacks2/${id}/service-provider`,
       {
         method: "PATCH",
         body: {
@@ -95,7 +127,7 @@ export default function useFeedback() {
 
   function updateStatusComplete(id: string, payload: TFeedbackStatusComplete) {
     return useNuxtApp().$api<Record<string, any>>(
-      `/api/feedbacks/${id}/status/complete`,
+      `/api/feedbacks2/${id}/status/complete`,
       {
         method: "PUT",
         body: payload,

package/composables/useLocalAuth.ts

@@ -1,7 +1,35 @@
 export default function useLocalAuth() {
   const { cookieConfig } = useRuntimeConfig().public;
 
-  const currentUser = useState<TUser | null>("currentUser", () => null);
+  const _address = {
+    country: "",
+    address1: "",
+    address2: "",
+    city: "",
+    province: "",
+    postalCode: "",
+  };
+
+  const user = {
+    _id: "",
+    givenName: "",
+    middleName: "",
+    surname: "",
+    address: _address,
+    email: "",
+    password: "",
+    type: "",
+    createdAt: "",
+    organization: "",
+    role: "",
+    primaryPhone: "",
+    mobilePhone: "",
+  };
+
+  const currentUser = useState(
+    "currentUser",
+    (): TUser => JSON.parse(JSON.stringify(user))
+  );
 
   async function authenticate() {
     const user = useCookie("user", cookieConfig).value;

package/composables/useUploadFiles.ts

@@ -0,0 +1,94 @@
+export default function useUploadFiles() {
+  let files = ref<any>([]);
+
+  type TFile = {
+    name: string;
+    data: File;
+    progress: number;
+    url?: string;
+    type?: string;
+    id?: string;
+  };
+
+  const attachedFiles = useState("attachedFiles", (): TFile[] => []);
+  const filesUrlUploaded = useState(
+    "filesUrlUploaded",
+    (): Array<{ data: File }> => [],
+  );
+  const isFileUploading = useState("isFileUploading", () => false);
+
+  function uploadFile(file: any): Promise<object> {
+    isFileUploading.value = true;
+    return new Promise((resolve, reject) => {
+      const formData = new FormData();
+      formData.append("file", file.data);
+
+      const xhr = new XMLHttpRequest();
+      xhr.open("POST", `/api/files/upload/v2?status=draft`);
+
+      xhr.upload.onprogress = (event) => {
+        if (event.lengthComputable) {
+          file.progress = Math.round((event.loaded / event.total) * 100);
+          // Handle progress (optional)
+          if (file.progress === 100)
+            setTimeout(() => {
+              isFileUploading.value = false;
+            }, 2000);
+        }
+      };
+
+      xhr.onload = () => {
+        if (xhr.status === 200) {
+          try {
+            const response = JSON.parse(xhr.responseText);
+            resolve({ _id: response.id, name: file.name, type: file.type }); // Resolve with the id from the response
+          } catch (error) {
+            reject(new Error("Failed to parse server response"));
+          }
+        } else {
+          reject(new Error(`Upload failed with status ${xhr.status}`));
+        }
+      };
+
+      xhr.onerror = () => reject(new Error("Network error"));
+      xhr.send(formData);
+    });
+  }
+
+  // Use async/await to handle the file uploads
+  async function uploadFileUtil(fileString: any): Promise<any> {
+    const results: any = [];
+    // Iterate over file objects asynchronously
+    for (const file of fileString) {
+      try {
+        if (typeof file === "string") {
+          results.push(file);
+          continue;
+        }
+        const fileId = await uploadFile(file); // Await the file upload
+        results.push(fileId); // Collect the file ID
+        files.value = [];
+      } catch (e) {
+        console.log("Error occurred while attaching images.", e);
+      }
+    }
+
+    return results; // Return array of file IDs
+  }
+
+  // Show uploaded files
+  function showUploadedFiles(fileString: any) {
+    const fileStr = toRaw(fileString);
+    filesUrlUploaded.value = fileStr.map((i: { url: string }) => i.url);
+  }
+
+  return {
+    files,
+    attachedFiles,
+    filesUrlUploaded,
+    isFileUploading,
+    uploadFile,
+    uploadFileUtil,
+    showUploadedFiles,
+  };
+}

package/composables/useUtils.ts

@@ -247,6 +247,18 @@ export default function useUtils() {
     }
   };
 
+  function getStatusColor(status: string) {
+    return status === "In-Progress"
+      ? "#FB8C00"
+      : ["Completed", "Resolved"].includes(status)
+      ? "#4CAF50"
+      : status === "Deleted"
+      ? "error"
+      : status === "For Review"
+      ? "primary"
+      : "grey-lighten-3";
+  }
+
   function getOrigin() {
     if (process.client) {
       return window.location.origin;
@@ -272,23 +284,23 @@ export default function useUtils() {
 
   // returns 16/10/2025, 15:45 format
   function UTCToLocalTIme(UTCDateTime: string) {
-  if (!UTCDateTime) return "";
-  const local = new Date(UTCDateTime);
-
-  const formatted = local.toLocaleString("en-GB", {
-    day: "2-digit",
-    month: "2-digit",
-    year: "numeric",
-    hour: "2-digit",
-    minute: "2-digit",
-    hour12: false, // 24-hour format
-  });
+    if (!UTCDateTime) return "";
+    const local = new Date(UTCDateTime);
 
-  return formatted;
-}
+    const formatted = local.toLocaleString("en-GB", {
+      day: "2-digit",
+      month: "2-digit",
+      year: "numeric",
+      hour: "2-digit",
+      minute: "2-digit",
+      hour12: false, // 24-hour format
+    });
+
+    return formatted;
+  }
 
-// dd/mm/yyyy in local time
-function formatDateDDMMYYYYLocal(dateString: string) {
+  // dd/mm/yyyy in local time
+  function formatDateDDMMYYYYLocal(dateString: string) {
     if (!dateString) return "-";
 
     const date = new Date(dateString);
@@ -297,7 +309,7 @@ function formatDateDDMMYYYYLocal(dateString: string) {
     const year = date.getFullYear();
 
     return `${day}/${month}/${year}`;
-    }
+  }
 
   function formatNature(value: string): string {
     if (!value) return "";
@@ -332,13 +344,13 @@ function formatDateDDMMYYYYLocal(dateString: string) {
   }
 
   function formatDateISO8601(date: Date): string {
-    const pad = (n: number) => n.toString().padStart(2, '0');
-      const year = date.getFullYear();
-      const month = pad(date.getMonth() + 1);
-      const day = pad(date.getDate());
-      const hours = pad(date.getHours());
-      const minutes = pad(date.getMinutes());
-      return `${year}-${month}-${day}T${hours}:${minutes}`;
+    const pad = (n: number) => n.toString().padStart(2, "0");
+    const year = date.getFullYear();
+    const month = pad(date.getMonth() + 1);
+    const day = pad(date.getDate());
+    const hours = pad(date.getHours());
+    const minutes = pad(date.getMinutes());
+    return `${year}-${month}-${day}T${hours}:${minutes}`;
   }
 
   function isValidBaseURL(baseURL: string | null) {
@@ -370,39 +382,119 @@ function formatDateDDMMYYYYLocal(dateString: string) {
     }
   }
 
-  function formatCamelCaseToWords(key: string){
-    if(!key) return "";
+  function formatCamelCaseToWords(key: string) {
+    if (!key) return "";
     return key
-      .replace(/([A-Z])/g, ' $1')
-      .replace(/^./, str => str.toUpperCase());
+      .replace(/([A-Z])/g, " $1")
+      .replace(/^./, (str) => str.toUpperCase());
   }
 
-  
-function calculateRemainingTime(
-  item: Date | string | number | null | undefined
-) {
-  if (!item) return -1;
-  const _date = new Date(item);
-  if (isNaN(_date.getTime())) return -1;
-  const creationTime = _date.getTime();
-  const currentTime = Date.now();
-  const differenceInMillis = currentTime - creationTime;
-  const differenceInSeconds = Math.floor(differenceInMillis / 1000);
-  const desiredDurationInSeconds = 24 * 60 * 60;
-  const remainingTimeInSeconds = desiredDurationInSeconds - differenceInSeconds;
-  console.log(remainingTimeInSeconds);
-  return remainingTimeInSeconds;
-}
+  function calculateRemainingTime(
+    item: Date | string | number | null | undefined
+  ) {
+    if (!item) return -1;
+    const _date = new Date(item);
+    if (isNaN(_date.getTime())) return -1;
+    const creationTime = _date.getTime();
+    const currentTime = Date.now();
+    const differenceInMillis = currentTime - creationTime;
+    const differenceInSeconds = Math.floor(differenceInMillis / 1000);
+    const desiredDurationInSeconds = 24 * 60 * 60;
+    const remainingTimeInSeconds =
+      desiredDurationInSeconds - differenceInSeconds;
+    console.log(remainingTimeInSeconds);
+    return remainingTimeInSeconds;
+  }
+
+  const formatTime = (seconds: number) => {
+    if (seconds <= 0 || isNaN(seconds)) return "00h 00m";
+    const hours = Math.floor(seconds / 3600);
+    const minutes = Math.floor((seconds % 3600) / 60);
+    return `${String(hours).padStart(2, "0")}h ${String(minutes).padStart(
+      2,
+      "0"
+    )}m`;
+  };
+
+  function standardFormatDateTime(date: string | Date) {
+    if (!date) return "";
+
+    const today = new Date(date);
+    const year = today.getFullYear();
+    let month = today.getMonth() + 1;
+    let day = today.getDate();
+
+    let hour = today.getHours();
+    let minute =
+      today.getMinutes() <= 9 ? `0${today.getMinutes()}` : today.getMinutes();
 
-const formatTime = (seconds: number) => {
-  if (seconds <= 0 || isNaN(seconds)) return "00h 00m";
-  const hours = Math.floor(seconds / 3600);
-  const minutes = Math.floor((seconds % 3600) / 60);
-  return `${String(hours).padStart(2, "0")}h ${String(minutes).padStart(
-    2,
-    "0"
-  )}m`;
-};
+    if (day < 10) day = `0${day}`;
+    if (month < 10) month = `0${month}`;
+
+    return `${day}/${month}/${year} ${hour}:${minute}`;
+  }
+
+  function standardFormatDate(date: string | Date) {
+    const today = new Date(date);
+    const year = today.getFullYear();
+    let month = today.getMonth() + 1;
+    let day = today.getDate();
+
+    if (day < 10) day = `0${day}`;
+    if (month < 10) month = `0${month}`;
+
+    return `${day}/${month}/${year}`;
+  }
+
+  const materialColors = [
+    "red",
+    "deep-purple",
+    "light-blue",
+    "green",
+    "yellow",
+    "deep-orange",
+    "pink",
+    "indigo",
+    "cyan",
+    "light-green",
+    "amber",
+    "brown",
+    "purple",
+    "blue",
+    "teal",
+    "lime",
+    "orange",
+    "blue-grey",
+  ];
+
+  function getInitial(name: string): string {
+    if (typeof name !== "string") {
+      return "";
+    }
+    const rgx: RegExp = /\b\w/g;
+
+    const initials: string[] = name?.match(rgx) || [];
+
+    return initials.join("").toUpperCase();
+  }
+
+  const fileToBase64 = (file: any): Promise<string> => {
+    return new Promise((resolve, reject) => {
+      const reader = new FileReader();
+      reader.readAsDataURL(file);
+      reader.onload = () => resolve(reader.result as string);
+      reader.onerror = reject;
+    });
+  };
+
+  async function getImage(url: string) {
+    try {
+      const response = await fetch(url, { method: "GET" });
+      return response.blob();
+    } catch (error: any) {
+      console.log(error);
+    }
+  }
 
   return {
     requiredRule,
@@ -427,6 +519,7 @@ const formatTime = (seconds: number) => {
     redirect,
     computeTieredCost,
     getColorStatus,
+    getStatusColor,
     getOrigin,
     search,
     formatDate,
@@ -440,6 +533,12 @@ const formatTime = (seconds: number) => {
     formatCamelCaseToWords,
     calculateRemainingTime,
     formatTime,
-    formatDateDDMMYYYYLocal
+    formatDateDDMMYYYYLocal,
+    standardFormatDateTime,
+    materialColors,
+    getInitial,
+    fileToBase64,
+    getImage,
+    standardFormatDate,
   };
 }