@7365admin1/layer-common 1.10.9 → 1.11.0

package/composables/useComment.ts

@@ -0,0 +1,147 @@
+const { currentUser } = useLocalAuth();
+export default function useComment() {
+  class MComment implements TCommentChat {
+    _id?: string;
+    comment: string;
+    attachments?: TAttachment[];
+    createdBy: string;
+    workOrder: string;
+    createdAt?: string;
+    updatedAt?: string;
+    createdByName?: string;
+    createdByType?: string;
+    feedback?: string;
+    justify?: string | undefined;
+    seenByNames: string;
+
+    constructor(comment: Partial<TCommentChat> = {}) {
+      this._id = comment._id || "";
+      this.comment = comment.comment || "";
+      this.attachments = comment.attachments || [];
+      this.workOrder = comment.workOrder || "";
+      this.createdAt = comment.createdAt
+        ? comment.createdAt.toString()
+        : undefined;
+      this.updatedAt = comment.updatedAt || "";
+      this.createdBy = comment.createdBy || "";
+      this.createdByName = comment.createdByName || "";
+      this.createdByType = comment.createdByType || "";
+      this.justify = comment.justify || "";
+      this.feedback = comment.feedback || "";
+      this.seenByNames = comment.seenByNames ?? "";
+    }
+  }
+
+  const comment = useState("comment", () => new MComment());
+  const comments = useState("comments", (): TCommentChat[] => []);
+  const page = useState("commentPage", () => 1);
+  const itemsPerPage = useState("itemsPerPage", () => 2);
+  const search = useState("commentSearch", () => "");
+  const pageRange = useState("commentPageRange", () => "-- - -- of --");
+  const isCommentsLoaded = useState("isCommentsLoaded", () => false);
+
+  function addComment(payload: TCommentChat) {
+    delete payload._id;
+    return useNuxtApp().$api<{ value?: { message: string } }>(
+      "/api/comments/v1",
+      {
+        method: "POST",
+        body: payload,
+      }
+    );
+  }
+
+  function getCommentById(id: string) {
+    return useNuxtApp().$api(`/api/auth/comments/id/${id}`, {
+      method: "GET",
+    });
+  }
+
+  function setComment(data?: TCommentChat) {
+    comment.value = new MComment(data);
+  }
+
+  const isInviteValid = useState("isInviteValid", () => false);
+
+  function getCommentsByWorkOrder(id: string) {
+    return useNuxtApp().$api(`/api/comments/v1/work-order/${id}`);
+  }
+
+  function getCommentsByWorkOrderId(id: string) {
+    return useNuxtApp().$api(`/api/comments/v1/work-order/${id}`);
+  }
+
+  function getCommentsByFeedBackId(id: string, type?: string) {
+    const commentFeedbackOrWOD =
+      type === "workOrder" ? "work-order" : "feedback";
+    return useNuxtApp().$api(`/api/comments/v1/${commentFeedbackOrWOD}/${id}`);
+  }
+
+  async function setComments(id: string, type?: string) {
+    try {
+      isCommentsLoaded.value = true;
+      const _comments = (await getCommentsByFeedBackId(
+        id,
+        type
+      )) as TCommentPaginated;
+
+      let updateSeenIds: any = [];
+
+      comments.value = _comments.items
+        .map((comment: any) => {
+          if (comment.createdBy === currentUser.value._id) {
+            comment.justify = "end";
+          } else {
+            comment.justify = "start";
+            if (
+              ((Array.isArray(comment.seenBy) &&
+                !comment.seenBy.includes(currentUser.value._id)) ||
+                !comment?.seenBy) &&
+              comment?._id
+            ) {
+              updateSeenIds.push(comment._id);
+            }
+          }
+          return comment;
+        })
+        .sort(
+          (firstComment: any, secondComment: any) =>
+            new Date(firstComment.createdAt).getTime() -
+            new Date(secondComment.createdAt).getTime()
+        );
+
+      if (Array.isArray(updateSeenIds) && updateSeenIds.length > 0) {
+        const seenBy = await updateSeenBy(updateSeenIds, currentUser.value._id);
+      }
+    } catch (error) {
+      console.log("error :", error);
+    } finally {
+      isCommentsLoaded.value = false;
+    }
+  }
+
+  function updateSeenBy(ids: string[], seenById: string) {
+    return useNuxtApp().$api(`/api/comments/v1/seen-by`, {
+      method: "PUT",
+      body: { seenById, ids },
+    });
+  }
+
+  return {
+    comment,
+    comments,
+    page,
+    itemsPerPage,
+    pageRange,
+    addComment,
+    setComment,
+    search,
+    isCommentsLoaded,
+    isInviteValid,
+    setComments,
+    getCommentById,
+    getCommentsByWorkOrderId,
+    updateSeenBy,
+    getCommentsByFeedBackId,
+  };
+}

package/composables/useCommonPermission.ts

@@ -192,8 +192,35 @@ export function useCommonPermissions() {
       description:
         "Allows the user to remove a building unit from the system permanently.",
     },
+    
   };
 
+
+    const bulletinBoardPermissions: Record<string, TPermission> = {
+      "add-bulletin-board": {
+        check: true,
+        description: "Allows the user to add a new bulletin board to the system.",
+      },
+      "see-all-bulletin-boards": {
+        check: true,
+        description: "Allows the user to view the list of all bulletin boards.",
+      },
+      "see-bulletin-board-details": {
+        check: true,
+        description:
+          "Allows the user to view the details of a specific bulletin board.",
+      },
+      "update-bulletin-board": {
+        check: true,
+        description: "Allows the user to update bulletin board details.",
+      },
+      "delete-bulletin-board": {
+        check: true,
+        description:
+          "Allows the user to remove a bulletin board from the system permanently.",
+      },
+    }
+
   return {
     invitationPermissions,
     memberPermissions,
@@ -202,6 +229,7 @@ export function useCommonPermissions() {
     workOrderPermissions,
     visitorManagementPermissions,
     buildingManagementPermissions,
-    buildingUnitManagementPermissions
+    buildingUnitManagementPermissions,
+    bulletinBoardPermissions,
   };
 }

package/composables/useFeedback.ts

@@ -1,36 +1,63 @@
 export default function useFeedback() {
-  const feedbacks = useState<Array<TFeedback>>("feedbacks", () => []);
+  class MFeedback implements TFeedback {
+    _id?: string;
+    description?: string;
+    subject?: string;
+    service?: string;
+    provider?: string | null;
+    location: string;
+    status?: string;
+    createdBy?: any;
+    createdByName?: string;
+    createdByEmail?: string;
+    attachments?: TAttachment[];
+    workOrders?: object[];
+    workOrder?: Record<string, any>;
+    organization: string;
+    site: string;
+    createdAt?: string | Date;
+    updatedAt?: string | Date;
+    app: string;
+    assignee?: string;
+    assigneeName?: string;
+    assigneeInfo?: Record<string, any>;
+    statusUpdates?: any[];
+    attachedIR?: Array<Record<string, any>>;
+
+    constructor(feedback: Partial<TFeedback> = {}) {
+      this._id = feedback._id || "";
+      this.description = feedback.description || "";
+      this.subject = feedback.subject || "";
+      this.service = feedback.service || "";
+      this.status = feedback.status || "";
+      this.createdBy = feedback.createdBy || {};
+      this.provider = feedback.provider || null;
+      this.location = feedback.location || "";
+      this.attachments = feedback.attachments || [];
+      this.workOrders = feedback.workOrders || [];
+      this.workOrder = feedback.workOrder ?? {};
+      this.organization = feedback.organization || "";
+      this.site = feedback.site || "";
+      this.createdAt = "";
+      this.updatedAt = "";
+      this.app = feedback.app || "";
+      this.assignee = feedback.assignee || "";
+      this.assigneeName = feedback.assigneeName || "";
+      this.assigneeInfo = feedback.assigneeInfo ?? {};
+      this.statusUpdates = feedback.statusUpdates ?? [];
+      this.attachedIR = feedback.attachedIR ?? [];
+    }
+  }
+
+  const feedback = useState("feedback", () => new MFeedback());
+  const feedbacks = useState("feedbacks", (): TFeedback[] => []);
   const page = useState("page", () => 1);
   const pages = useState("pages", () => 0);
   const pageRange = useState("pageRange", () => "-- - -- of --");
 
-  const feedback = useState(
-    "feedback",
-    (): TFeedback => ({
-      _id: "",
-      attachments: [],
-      category: "",
-      categoryInfo: "",
-      subject: "",
-      location: "",
-      description: "",
-      createdBy: "",
-      createdAt: "",
-      updatedAt: "",
-      status: "pending",
-      metadata: {
-        serviceProvider: "",
-        assignee: "",
-        organization: "",
-        site: "",
-        name: "",
-        signature: "",
-        attachments: "",
-        completedAt: "",
-      },
-      workOrderNo: "",
-    })
-  );
+  function setFeedback(data?: TFeedback) {
+    feedback.value = data || new MFeedback();
+  }
 
   const { currentUser } = useLocalAuth();
 
@@ -89,7 +116,7 @@ export default function useFeedback() {
     });
   }
 
-  function createFeedback(payload: TFeedbackCreate) {
+  function createFeedback(payload: TFeedback) {
     return useNuxtApp().$api<Record<string, any>>("/api/feedbacks2", {
       method: "POST",
       body: payload,
@@ -135,8 +162,29 @@ export default function useFeedback() {
     );
   }
 
+  function addFeedBackWorkOrder(payload: any) {
+    return useNuxtApp().$api<Record<string, any>>(
+      "/api/feedbacks2/create-work-order",
+      {
+        method: "POST",
+        body: payload,
+      }
+    );
+  }
+
+  function updateStatusFeedback(payload: any) {
+    return useNuxtApp().$api<Record<string, any>>(
+      "/api/feedbacks2/status-update",
+      {
+        method: "POST",
+        body: payload,
+      }
+    );
+  }
+
   return {
     feedbacks,
+    setFeedback,
     feedback,
     page,
     pages,
@@ -148,5 +196,7 @@ export default function useFeedback() {
     deleteFeedback,
     updateFeedbackServiceProvider,
     updateStatusComplete,
+    addFeedBackWorkOrder,
+    updateStatusFeedback,
   };
 }

package/composables/useFile.ts

@@ -1,5 +1,6 @@
 export default function useFile() {
   const baseUrl = useRuntimeConfig().public.API_DO_STORAGE_ENDPOINT;
+  const baseUrlAnpr = useRuntimeConfig().public.API_DO_STORAGE_ENDPOINT_ANPR;
 
   function addFile(file: File | null) {
     if (!file) {
@@ -19,6 +20,10 @@ export default function useFile() {
     return `${baseUrl}/${id}`;
   }
 
+  function getFileUrlAnpr(id: string) {
+    return `${baseUrlAnpr}/${id}`;
+  }
+
   async function urlToFile(url: string, filename: string): Promise<File> {
     const response = await fetch(url);
     const blob = await response.blob();
@@ -49,5 +54,6 @@ export default function useFile() {
     urlToFile,
     getFileUrl,
     getFileById,
+    getFileUrlAnpr
   };
 }

package/composables/usePDFDownload.ts

@@ -11,7 +11,7 @@ export default function(){
     const downloadUrl = window.URL.createObjectURL(res);
     const a = document.createElement("a");
     a.href = downloadUrl;
-    a.download = `SOA DOWNLOAD.pdf`; // Specify the file name
+    a.download = title; // Specify the file name
     document.body.appendChild(a);
     a.click(); // Trigger the download
     window.URL.revokeObjectURL(downloadUrl); // Clean up

package/composables/useSiteSettings.ts

@@ -38,7 +38,7 @@ export default function () {
   }
   async function updateSitebyId(
     siteId: string,
-    payload: { field: string; value: number }
+    payload: { field?: string; value?: number, deliveryCompanyList?: string[] }
   ) {
     return await useNuxtApp().$api<Record<string, any>>(
       `/api/sites/id/${siteId}`,

package/composables/useVisitor.ts

@@ -13,11 +13,11 @@ export default function () {
     { label: "Drop-Off", value: "drop-off" },
   ];
 
-    const typeFieldMap: Record<TVisitorType, (keyof TVisitorPayload)[]> = {
+    const typeFieldMap: Record<TVisitorType, (keyof TVisitorPayload | 'delivery-company')[]> = {
       guest: ['name', 'nric', 'contact', 'block', 'plateNumber', 'level', 'unit' , 'unitName', 'remarks'],
       contractor: ['contractorType', 'name', 'nric', 'company', 'contact', 'plateNumber', 'block', 'level', 'unit', 'unitName', 'remarks'],
       'walk-in': ['name', 'company', 'nric', 'contact', 'block', 'level', 'unit' , 'unitName', 'remarks'],
-      delivery: ['attachments', 'name', 'deliveryType', 'company', 'nric', 'contact', 'plateNumber', 'block', 'level', 'unit' , 'unitName',  'remarks'],
+      delivery: ['attachments', 'name', 'deliveryType', 'delivery-company', 'nric', 'contact', 'plateNumber', 'block', 'level', 'unit' , 'unitName',  'remarks'],
       'pick-up': ['plateNumber', 'block', 'remarks'],
       'drop-off': ['plateNumber', 'block', 'remarks'],
   }
@@ -33,7 +33,7 @@ export default function () {
   type GetVisitorsParams = {
   page?: number
   limit?: number
-  // sort?: "asc" | "desc"
+  order?: "asc" | "desc"
   search?: string
   org?: string
   site?: string
@@ -48,7 +48,7 @@ export default function () {
   async function getVisitors({
     page = 1,
     limit = 10,
-    // sort = "asc",
+    order = "desc",
     search = "",
     org = "",
     site = "",
@@ -75,7 +75,8 @@ export default function () {
           type,
           status,
           checkedOut,
-          plateNumber
+          plateNumber,
+          order
         },
       }
     );

package/composables/useWorkOrder.ts

@@ -1,34 +1,68 @@
 export default function useWorkOrder() {
+  class MWorkOrder implements TWorkOrder {
+    _id?: string;
+    description: string;
+    service: string;
+    subject: string | null;
+    provider: string | null;
+    providerName?: string;
+    status?: string;
+    assignee?: string | TUser;
+    assigneeName?: string;
+    attachments?: string[];
+    createdBy?: string | TUser;
+    createdByName?: string;
+    site: string;
+    organization: string;
+    location?: string;
+    comments?: TComment[];
+    createdAt?: string | Date;
+    updatedAt?: string | Date;
+    feedback?: string;
+    statusUpdates?: any[];
+    prefix?: string;
+    noOfDigits?: any;
+    number?: number;
+    version?: number;
+    isHighPriority?: boolean;
+
+    constructor(workOrder: Partial<TWorkOrder> = {}) {
+      this._id = workOrder._id || "";
+      this.description = workOrder.description || "";
+      this.service = workOrder.service || "";
+      this.subject = workOrder.subject || null;
+      this.provider = workOrder.provider || null;
+      this.providerName = workOrder.providerName || "";
+      this.status = workOrder.status || "";
+      this.assignee = workOrder.assignee;
+      this.attachments = workOrder.attachments || [];
+      this.createdBy = workOrder.createdBy || "";
+      this.createdByName = workOrder.createdByName;
+      this.site = workOrder.site || "";
+      this.organization = workOrder.organization || "";
+      this.location = workOrder.location || "";
+      this.assigneeName = workOrder.assigneeName || "";
+      this.comments = workOrder.comments || [];
+      this.createdAt = "";
+      this.updatedAt = "";
+      this.feedback = workOrder.feedback || "";
+      this.prefix = workOrder.prefix || "";
+      this.noOfDigits = workOrder.noOfDigits || 1;
+      this.number = workOrder.number || 1;
+      this.version = workOrder.version || 0;
+      this.isHighPriority = workOrder.isHighPriority || false;
+    }
+  }
+
+  const workOrder = useState("workOrder", () => new MWorkOrder());
   const workOrders = useState<Array<TWorkOrder>>("workOrders", () => []);
   const page = useState("page", () => 1);
   const pages = useState("pages", () => 0);
   const pageRange = useState("pageRange", () => "-- - -- of --");
-  const workOrder = useState<TWorkOrder>("workOrder", () => ({
-    _id: "",
-    category: "",
-    categoryInfo: "",
-    subject: "",
-    description: "",
-    createdBy: "",
-    service: "",
-    provider: "",
-    organization: "",
-    site: "",
-    createdByName: "",
-    assignee: "",
-    location: "",
-    attachments: [],
-    feedback: "",
-    status: "",
-    createdAt: "",
-    updatedAt: "",
-    deletedAt: "",
-    highPriority: false,
-    block: "",
-    level: "",
-    unit: "",
-    serviceProvider: "",
-  }));
+
+  function setWorkOrder(data?: TWorkOrder) {
+    workOrder.value = data || new MWorkOrder();
+  }
 
   async function getWorkOrders({
     page = 1,
@@ -100,6 +134,7 @@ export default function useWorkOrder() {
 
   return {
     workOrders,
+    setWorkOrder,
     workOrder,
     page,
     pages,

package/constants/app.ts

@@ -0,0 +1,12 @@
+export const APP_CONSTANTS = {
+    PROPERTY_MANAGEMENT: "property_management_agency",
+    HYGIENE: "cleaning_services",
+    SECURITY: "security_agency",
+    MECHANICAL_ELECTRICAL: "mechanical_electrical",
+    RESIDENT: "resident",
+    LANDSCAPING: "landscaping_services",
+    PEST_CONTROL: "pest_control_services",
+    POOL_MAINTENANCE: "pool_maintenance_services"
+
+
+}

package/nuxt.config.ts

@@ -17,6 +17,8 @@ export default defineNuxtConfig({
       APP: (process.env.APP as string) ?? "App",
       API_DO_STORAGE_ENDPOINT:
         (process.env.API_DO_STORAGE_ENDPOINT as string) ?? "",
+      API_DO_STORAGE_ENDPOINT_ANPR: 
+        (process.env.API_DO_STORAGE_ENDPOINT_ANPR as string) ?? "",
       APP_NAME: (process.env.APP_NAME as string) ?? "App",
       APP_NAME_ROUTE: (process.env.APP_NAME_ROUTE as string) ?? "index",
       APP_MAIN: (process.env.APP_MAIN as string) ?? "",

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "1.10.9",
+  "version": "1.11.0",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {
@@ -35,9 +35,11 @@
     "ckeditor5": "^47.2.0",
     "html2pdf.js": "^0.10.2",
     "moment-timezone": "^0.6.0",
+    "nuxt-signature-pad": "^1.8.0",
     "qrcode": "^1.5.4",
     "qrcode.vue": "^3.4.1",
     "sass": "^1.80.6",
+    "vue-draggable-next": "^2.3.0",
     "vue3-signature": "^0.2.4",
     "zod": "^3.24.2"
   }

package/plugins/vue-draggable-next.client.ts

@@ -0,0 +1,5 @@
+import { VueDraggableNext } from 'vue-draggable-next'
+
+export default defineNuxtPlugin((nuxtApp) => {
+  nuxtApp.vueApp.component('draggable', VueDraggableNext)
+})

package/public/default-image.svg

@@ -0,0 +1,4 @@
+<svg width="500" height="500" viewBox="0 0 500 500" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="500" height="500" fill="#E0E0E0"/>
+<path d="M225.438 260.812L242.625 281.438L266.688 250.5L297.625 291.75H201.375L225.438 260.812ZM311.375 298.625V202.375C311.375 198.728 309.926 195.231 307.348 192.652C304.769 190.074 301.272 188.625 297.625 188.625H201.375C197.728 188.625 194.231 190.074 191.652 192.652C189.074 195.231 187.625 198.728 187.625 202.375V298.625C187.625 302.272 189.074 305.769 191.652 308.348C194.231 310.926 197.728 312.375 201.375 312.375H297.625C301.272 312.375 304.769 310.926 307.348 308.348C309.926 305.769 311.375 302.272 311.375 298.625Z" fill="black" fill-opacity="0.54"/>
+</svg>

package/public/placeholder-image.svg

@@ -0,0 +1,6 @@
+<svg width="421" height="256" viewBox="0 0 421 256" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.5" width="420" height="256" rx="8" fill="#FAFAFA"/>
+<rect x="1" y="0.5" width="419" height="255" rx="7.5" stroke="#B9B8C0" stroke-opacity="0.2"/>
+<rect width="64" height="64" transform="translate(178.5 96)" fill="#FAFAFA"/>
+<path d="M201.167 132L207.833 140L217.167 128L229.167 144H191.833L201.167 132ZM234.5 146.667V109.333C234.5 106.373 232.1 104 229.167 104H191.833C190.419 104 189.062 104.562 188.062 105.562C187.062 106.562 186.5 107.919 186.5 109.333V146.667C186.5 148.081 187.062 149.438 188.062 150.438C189.062 151.438 190.419 152 191.833 152H229.167C230.581 152 231.938 151.438 232.938 150.438C233.938 149.438 234.5 148.081 234.5 146.667Z" fill="#969696" fill-opacity="0.5"/>
+</svg>

package/types/comment.d.ts

@@ -0,0 +1,38 @@
+declare type TCommentChat = {
+  seenByNames: string;
+  _id?: string;
+  comment: string;
+  attachments?: TAttachment[];
+  createdBy: string;
+  workOrder: string;
+  createdAt?: string | Date;
+  updatedAt?: string;
+  createdByName?: string;
+  createdByType?: string;
+  justify?: string;
+  feedback?: string;
+  seenByNames: Person;
+};
+
+declare type TCommentResponse = {
+  items: TCommentChat[];
+  pageRange: string;
+  pages: number;
+};
+
+declare type TCommentPaginated = {
+  items: TCommentChat[];
+  pageRange: string;
+  pages: number;
+};
+
+declare type TAttachment = {
+  id: string;
+  name: string;
+  // other properties of the attachment, if any
+};
+
+declare type Person = {
+  givenName: string;
+  surname: string;
+};

package/types/dashboard.d.ts

@@ -0,0 +1,12 @@
+declare type TDashboardValues = "today" | "thisWeek" | "thisMonth";
+
+
+declare type TPeriodState = Record<string, TDashboardValues>
+
+declare type TDashboardCardValue = {
+  key: string;
+  periodKey: keyof TPeriodState;
+  title: string;
+  icon: string;
+  color: string;
+};