@7365admin1/layer-common 3.0.30-staging.2 → 3.0.30-staging.4

package/components/DashboardMain.vue

@@ -1560,18 +1560,27 @@ const dashboardWidgetPermissions: Record<string, string> = {
 };
 
 const propertyWidgetPermissions: Record<string, string[]> = {
-  workOrders: ["workOrder:see-all-work-orders"],
+  workOrders: [
+    "workOrder:see-all-work-orders",
+    "work-order:see-all-work-orders",
+  ],
   incidents: ["incident-reports:see-incident-reports"],
   visitors: ["visitorManagement:see-all-visitor"],
   facilityBookings: ["facility-booking-mgmt:see-all-facility-booking"],
-  activity: ["workOrder:see-all-work-orders"],
+  activity: [
+    "workOrder:see-all-work-orders",
+    "work-order:see-all-work-orders",
+  ],
   upcomingEvents: ["event-mgmt:see-all-event"],
   todayReminders: ["event-mgmt:see-all-event"],
   todayAttentions: [
     "incident-reports:see-incident-reports",
     "facility-booking-mgmt:see-all-facility-booking",
   ],
-  workOrderStatus: ["workOrder:see-all-work-orders"],
+  workOrderStatus: [
+    "workOrder:see-all-work-orders",
+    "work-order:see-all-work-orders",
+  ],
   feedbacks: ["feedbacks:see-all-feedback"],
   activePatrol: ["virtual-patrol:see-all-virtual-patrol-logs"],
 };
@@ -1587,6 +1596,11 @@ const moduleWidgetPermissions: Record<string, string[]> = {
     "work-order:see-all-work-orders",
     "work-orders:see-all-work-orders",
   ],
+  activity: [
+    "work_order:see-all-work-orders",
+    "work-order:see-all-work-orders",
+    "work-orders:see-all-work-orders",
+  ],
   taskSchedule: [
     "cleaning-schedule-mgmt:see-all-schedules",
     "schedule-task-mgmt:see-all-schedule-tasks",

package/components/InvitationMain.vue

@@ -221,7 +221,7 @@ const headers = computed(() => {
       title: "Status",
       value: "status",
     },
-    
+
   ];
 
   if (props.status === "pending" && props.cancelInvitation) {
@@ -270,10 +270,11 @@ const {
       page: page.value,
       status: props.status,
       search: headerSearch.value,
-      type: "user-invite,member-invite",
+      // type: "user-invite,member-invite",
+      type: "member-invite",
       app: props.app,
       orgId: props.org,
-      siteId: props.siteId,
+      // siteId: props.siteId,
     }),
   {
     watch: [() => props.status]

package/components/ManageChecklistMain.vue

@@ -77,6 +77,53 @@
                 </v-col>
               </v-row>
             </v-col>
+            <v-col
+              v-if="item.reject && (item.remarks || item.attachment?.length)"
+              cols="12"
+              class="mt-2"
+            >
+              <v-sheet
+                border
+                rounded="lg"
+                class="d-inline-flex flex-column pa-3 bg-grey-lighten-5"
+                style="max-width: 420px"
+              >
+                <div class="d-flex align-center ga-2 mb-2">
+                  <v-icon color="error" size="18">mdi-close-circle</v-icon>
+                  <span class="text-caption font-weight-bold">
+                    Rejection details
+                  </span>
+                  <v-chip size="x-small" color="error" variant="tonal">
+                    Rejected
+                  </v-chip>
+                </div>
+                <div v-if="item.remarks" class="text-body-2 text-medium-emphasis">
+                  {{ item.remarks }}
+                </div>
+                <div
+                  v-if="item.attachment?.length"
+                  class="d-flex flex-wrap ga-2 mt-3"
+                >
+                  <v-sheet
+                    v-for="attachmentId in item.attachment"
+                    :key="attachmentId"
+                    rounded="lg"
+                    border
+                    class="overflow-hidden"
+                    style="width: 96px; height: 96px"
+                  >
+                    <v-img
+                      :src="getFileUrl(attachmentId)"
+                      width="96"
+                      height="96"
+                      cover
+                      style="cursor: zoom-in"
+                      @click="openFullImage(getFileUrl(attachmentId))"
+                    />
+                  </v-sheet>
+                </div>
+              </v-sheet>
+            </v-col>
           </v-row>
         </template>
 
@@ -97,6 +144,8 @@
                     : 'text'
                 "
                 color="error"
+                :loading="!!loadingActions[getKey(item, group.set)]"
+                :disabled="!!loadingActions[getKey(item, group.set)]"
                 @click.stop="handleItemActionClick(item, group.set, 'reject')"
               />
             </v-col>
@@ -221,6 +270,69 @@
     </v-card>
   </v-dialog>
 
+  <v-dialog v-model="showRejectModal" max-width="600" persistent>
+    <v-card>
+      <v-card-title class="text-h5 pa-4">Reject Checklist Item</v-card-title>
+
+      <v-divider />
+
+      <v-card-text class="pa-4">
+        <v-row>
+          <v-col cols="12">
+            <InputLabel title="Remarks" :required="true" class="mb-2" />
+            <v-textarea
+              v-model="rejectModal.remarks"
+              placeholder="Enter remarks"
+              rows="4"
+              variant="outlined"
+              density="comfortable"
+              hide-details
+            />
+          </v-col>
+
+          <v-col cols="12">
+            <v-divider class="mb-4" />
+            <PhotoUpload
+              title="Take/Upload Photo"
+              :required="false"
+              v-model="rejectModal.photos"
+              v-model:photo-ids="rejectModal.photoIds"
+              @error="handlePhotoError"
+            />
+          </v-col>
+        </v-row>
+      </v-card-text>
+
+      <v-divider />
+
+      <v-card-actions class="pa-0">
+        <v-btn
+          color="grey"
+          variant="flat"
+          rounded="0"
+          class="flex-grow-1 text-none"
+          height="48"
+          :disabled="rejectModal.submitting"
+          @click="closeRejectDialog"
+        >
+          Cancel
+        </v-btn>
+        <v-btn
+          color="error"
+          variant="flat"
+          rounded="0"
+          class="flex-grow-1 text-none"
+          height="48"
+          :loading="rejectModal.submitting"
+          :disabled="!isRejectModalValid || rejectModal.submitting"
+          @click="submitRejectDialog"
+        >
+          Confirm
+        </v-btn>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
+
   <v-dialog v-model="showAttachmentDialog" max-width="700" scrollable>
     <v-card>
       <v-card-title class="d-flex align-center pa-4">
@@ -492,6 +604,20 @@ const isModalValid = computed(() => {
   return modalData.remark?.trim().length > 0;
 });
 
+const showRejectModal = ref(false);
+const rejectModal = reactive({
+  item: null as TUnitChecklistItem | null,
+  set: undefined as number | undefined,
+  remarks: "",
+  photos: [] as string[],
+  photoIds: [] as string[],
+  submitting: false,
+});
+
+const isRejectModalValid = computed(
+  () => rejectModal.remarks.trim().length > 0
+);
+
 const {
   data: getUnitCleanerChecklistReq,
   refresh: getUnitCleanerChecklistRefresh,
@@ -590,6 +716,29 @@ function resetModalData(): void {
   modalData.lastApprovedKey = null;
 }
 
+function resetRejectModal(): void {
+  rejectModal.item = null;
+  rejectModal.set = undefined;
+  rejectModal.remarks = "";
+  rejectModal.photos = [];
+  rejectModal.photoIds = [];
+  rejectModal.submitting = false;
+}
+
+function closeRejectDialog(): void {
+  if (rejectModal.submitting) return;
+  showRejectModal.value = false;
+  resetRejectModal();
+}
+
+function openRejectDialog(item: TUnitChecklistItem, set: number): void {
+  rejectModal.item = item;
+  rejectModal.set = set;
+  rejectModal.remarks = item.remarks || "";
+  rejectModal.photoIds = item.attachment || [];
+  showRejectModal.value = true;
+}
+
 function closeModal(): void {
   const setNumber = modalData.currentSet;
   showCompletionModal.value = false;
@@ -661,6 +810,41 @@ async function submitModal(): Promise<void> {
   closeModal();
 }
 
+async function submitRejectDialog(): Promise<void> {
+  const item = rejectModal.item;
+  const set = rejectModal.set;
+
+  if (!item || set === undefined || !isRejectModalValid.value) return;
+
+  const key = getKey(item, set);
+  rejectModal.submitting = true;
+  loadingActions[key] = true;
+
+  try {
+    const response = await updateUnitChecklist(
+      props.scheduleAreaId,
+      item.unit,
+      set,
+      "reject",
+      rejectModal.remarks.trim(),
+      rejectModal.photoIds
+    );
+    showMessage(response?.message || "Unit rejected successfully", "success");
+    showRejectModal.value = false;
+    resetRejectModal();
+    await getUnitCleanerChecklistRefresh();
+  } catch (error: any) {
+    console.error("Error rejecting unit checklist:", error);
+    showMessage(
+      error?.data?.message || error?.message || "Failed to reject checklist",
+      "error"
+    );
+  } finally {
+    delete loadingActions[key];
+    rejectModal.submitting = false;
+  }
+}
+
 async function handleItemActionClick(
   item: TUnitChecklistItem,
   set: number | undefined,
@@ -688,13 +872,13 @@ async function handleItemActionClick(
     return;
   }
 
-  activeActions[key] = action;
-
   if (action === "reject") {
-    await _callUpdateUnitChecklist(item, set, action);
+    openRejectDialog(item, set);
     return;
   }
 
+  activeActions[key] = action;
+
   // Approve: check if this completes the entire set
   lastApprovedKey.value = key;
 

package/package.json

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