@7365admin1/layer-common 3.0.17 → 3.0.19

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 3.0.19
+
+### Patch Changes
+
+- 96c813f: Update Layer Common version
+
+## 3.0.18
+
+### Patch Changes
+
+- 8cf0029: Update Package Version release
+
 ## 3.0.17
 
 ### Patch Changes

package/components/BuildingManagement/buildings.vue

@@ -15,8 +15,8 @@
             <v-btn fab icon density="comfortable" @click="getBuildings()">
               <v-icon>mdi-refresh</v-icon>
             </v-btn>
-            <v-text-field v-model="searchInput" autocomplete="off" placeholder="Search" density="compact" hide-details dense clearable
-              class="mx-2" style="width: 200px;" />
+            <v-text-field v-model="searchInput" autocomplete="off" placeholder="Search" density="compact" hide-details
+              dense clearable class="mx-2" style="width: 200px;" />
           </template>
 
           <template #append>
@@ -45,7 +45,7 @@
     <v-dialog v-model="createDialog" width="450" persistent>
       <BuildingForm :site="site" mode="add" :blocks="items" @cancel="createDialog = false" @success="successCreate()"
         @success:create-more="getBuildings()" />
-    </v-dialog> 
+    </v-dialog>
 
     <!-- Edit Dialog -->
     <v-dialog v-model="editDialog" width="450" persistent>
@@ -222,7 +222,10 @@ const site = (useRoute().params.site as string) ?? "";
 const status = (useRoute().params.status as string) ?? "active";
 
 const { debounce } = useUtils();
-const { getAll: _getBuildings, deleteById } = useBuilding();
+const {
+  getAll: _getBuildings,
+  deleteById,
+} = useBuilding();
 
 const searchInput = ref("");
 const headerSearch = ref("");

package/components/BuildingManagement/units.vue

@@ -6,6 +6,13 @@
           v-if="canCreate && canCreateUnit">
           Add Unit
         </v-btn>
+        <v-btn class="text-none ml-2" rounded="pill" variant="tonal" @click="openBulkUploadFilePicker()" size="large"
+          :loading="bulkUploadLoading" v-if="canCreate && canCreateUnit">
+          <v-icon start>mdi-upload</v-icon>
+          Bulk Upload
+        </v-btn>
+        <input ref="bulkUploadFileInput" type="file" accept=".xlsx,.xls,.csv" class="d-none"
+          @change="handleBulkUploadFileChange" />
       </v-row>
     </v-col>
     <v-col cols="12">
@@ -30,8 +37,7 @@
         </v-toolbar>
 
         <v-data-table :headers="props.headers" :items="items" item-value="_id" items-per-page="20" fixed-header
-          hide-default-footer  @click:row="tableRowClickHandler"
-          style="max-height: calc(100vh - (200px))">
+          hide-default-footer @click:row="tableRowClickHandler" style="max-height: calc(100vh - (200px))">
           <template #item.block="{ value, item }">
             {{ value ? `Block ${value}` : "" }}
           </template>
@@ -44,10 +50,10 @@
       <BuildingUnitFormAdd :site="site" @cancel="createDialog = false" @success="successCreate()"
         @success:create-more="getBuildingUnit()" />
     </v-dialog>
-    
-    <v-dialog v-if="canViewUnitDetails"  v-model="dialogPreview":width="smAndUp ? '70svw' : '100%'" persistent>
-       <BuildingUnitFormEdit v-if="selectedBuildingUnit" @cancel="dialogPreview = false" @success="successUpdate()" @delete-unit="openDeleteDialog()"
-        :roomFacility="selectedBuildingUnit" />
+
+    <v-dialog v-if="canViewUnitDetails" v-model="dialogPreview" :width="smAndUp ? '70svw' : '100%'" persistent>
+      <BuildingUnitFormEdit v-if="selectedBuildingUnit" @cancel="dialogPreview = false" @success="successUpdate()"
+        @delete-unit="openDeleteDialog()" :roomFacility="selectedBuildingUnit" />
     </v-dialog>
 
     <v-dialog v-model="dialogDelete" :loading="deleteLoading" width="450" persistent>
@@ -88,6 +94,67 @@
       </v-card>
     </v-dialog>
 
+    <v-dialog v-model="bulkUploadSkippedDialog" :width="smAndUp ? '720' : '100%'" persistent>
+      <v-card width="100%">
+        <v-toolbar density="compact" class="pl-4">
+          <span class="font-weight-medium text-h5">Skipped Rows</span>
+        </v-toolbar>
+
+        <v-card-text style="max-height: 70vh; overflow-y: auto">
+          <p class="text-subtitle-2 mb-4">
+            Some rows were not imported. Review the details below and update the sheet if needed.
+          </p>
+
+          <v-alert v-if="bulkUploadSkippedSummary.length" type="warning" variant="tonal" density="compact"
+            class="mb-4">
+            {{ bulkUploadSkippedSummary.length }} row(s) skipped during bulk upload.
+          </v-alert>
+
+          <!-- <v-list v-if="bulkUploadSkippedSummary.length" density="compact" class="pa-0 mb-4">
+            <v-list-item v-for="(item, index) in bulkUploadSkippedSummary" :key="`summary-${index}`"
+              class="px-0">
+              <v-list-item-title class="text-subtitle-2">
+                Row {{ item.rowNumber ?? item.row ?? "N/A" }}
+              </v-list-item-title>
+              <v-list-item-subtitle class="text-wrap">
+                {{ formatSkippedSummaryReason(item) }}
+              </v-list-item-subtitle>
+            </v-list-item>
+          </v-list> -->
+
+          <template v-if="bulkUploadSkippedErrors.length">
+            <!-- <v-divider class="mb-4" /> -->
+            <p class="text-subtitle-2 mb-2">Details</p>
+            <v-table density="compact">
+              <thead>
+                <tr>
+                  <th class="text-left">Row</th>
+                  <th class="text-left">Block</th>
+                  <th class="text-left">Building</th>
+                  <th class="text-left">Reason</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr v-for="(item, index) in bulkUploadSkippedErrors" :key="`error-${index}`">
+                  <td>{{ item.row ?? "N/A" }}</td>
+                  <td>{{ item.block ?? "N/A" }}</td>
+                  <td>{{ item.name ?? "N/A" }}</td>
+                  <td>{{ item.reason ?? "Skipped" }}</td>
+                </tr>
+              </tbody>
+            </v-table>
+          </template>
+        </v-card-text>
+
+        <v-toolbar density="compact">
+          <v-btn tile block size="48" color="black" variant="flat" class="text-none"
+            @click="bulkUploadSkippedDialog = false">
+            Close
+          </v-btn>
+        </v-toolbar>
+      </v-card>
+    </v-dialog>
+
     <Snackbar v-model="messageSnackbar" :text="message" :color="messageColor" />
   </v-row>
 </template>
@@ -103,7 +170,7 @@ const props = defineProps({
         title: "Unit Name",
         value: "name",
       },
-       {
+      {
         title: "Level",
         value: "level.name",
       },
@@ -115,7 +182,7 @@ const props = defineProps({
         title: "Block Name",
         value: "buildingName",
       },
-     
+
       // {
       //   title: "Type",
       //   value: "type",
@@ -162,6 +229,8 @@ const { debounce, formatDateDDMMYYYYLocal, toOrdinal } = useUtils();
 
 const { getAll, deleteById } = useBuildingUnit();
 
+const { uploadSpreadsheetBuilding } = useBuilding();
+
 const searchInput = ref("");
 const headerSearch = ref("");
 const page = ref(1);
@@ -243,6 +312,12 @@ function openEditDialog() {
 
 const dialogDelete = ref(false);
 const deleteLoading = ref(false);
+const bulkUploadFile = ref<File | null>(null);
+const bulkUploadFileInput = ref<HTMLInputElement | null>(null);
+const bulkUploadLoading = ref(false);
+const bulkUploadSkippedDialog = ref(false);
+const bulkUploadSkippedErrors = ref<Array<Record<string, any>>>([]);
+const bulkUploadSkippedSummary = ref<Array<Record<string, any>>>([]);
 
 function openDeleteDialog() {
   dialogDelete.value = true;
@@ -272,6 +347,109 @@ async function handleDeleteBuildingUnit() {
   }
 }
 
+function openBulkUploadFilePicker() {
+  if (bulkUploadLoading.value) {
+    return;
+  }
+
+  bulkUploadFile.value = null;
+  bulkUploadSkippedErrors.value = [];
+  bulkUploadSkippedSummary.value = [];
+  bulkUploadSkippedDialog.value = false;
+  if (bulkUploadFileInput.value) {
+    bulkUploadFileInput.value.value = "";
+    bulkUploadFileInput.value.click();
+  }
+}
+
+function formatSkippedSummaryReason(item: Record<string, any>) {
+  if (Array.isArray(item.errors) && item.errors.length) {
+    return item.errors.join(", ");
+  }
+
+  return item.reason ?? "Skipped";
+}
+
+function getSkippedRowsCount(result: Record<string, any> | null | undefined) {
+  if (typeof result?.skippedRows === "number") {
+    return result.skippedRows;
+  }
+
+  if (Array.isArray(result?.skippedRows)) {
+    return result.skippedRows.length;
+  }
+
+  return 0;
+}
+
+function getBulkUploadSkippedErrors(result: Record<string, any> | null | undefined) {
+  if (Array.isArray(result?.skippedErrors)) {
+    return result.skippedErrors;
+  }
+
+  if (Array.isArray(result?.skippedRows)) {
+    return result.skippedRows;
+  }
+
+  return [];
+}
+
+function getBulkUploadSkippedSummary(result: Record<string, any> | null | undefined) {
+  if (Array.isArray(result?.skippedItemsSummary)) {
+    return result.skippedItemsSummary;
+  }
+
+  if (Array.isArray(result?.skippedRows)) {
+    return result.skippedRows.map((item: Record<string, any>) => ({
+      rowNumber: item.row,
+      reason: item.reason,
+      block: item.block,
+      name: item.name,
+      data: item,
+    }));
+  }
+
+  return [];
+}
+
+async function handleBulkUploadFileChange(event: Event) {
+  const input = event.target as HTMLInputElement;
+  const file = input.files?.[0] ?? null;
+
+  if (!file) {
+    return;
+  }
+
+  bulkUploadFile.value = file;
+  bulkUploadLoading.value = true;
+
+  try {
+    const result = await uploadSpreadsheetBuilding({
+      site,
+      file,
+    });
+    await getBuildingUnit();
+    bulkUploadSkippedErrors.value = getBulkUploadSkippedErrors(result);
+    bulkUploadSkippedSummary.value = getBulkUploadSkippedSummary(result);
+    bulkUploadSkippedDialog.value =
+      bulkUploadSkippedErrors.value.length > 0 ||
+      bulkUploadSkippedSummary.value.length > 0;
+    showMessage(
+      `Bulk upload completed. Inserted ${result?.insertedUnits ?? 0} unit(s). Skipped ${getSkippedRowsCount(result)} row(s).`,
+      "success"
+    );
+  } catch (error: any) {
+    showMessage(
+      error?.response?._data?.message || "Failed to upload spreadsheet.",
+      "error"
+    );
+  } finally {
+    bulkUploadLoading.value = false;
+    bulkUploadFile.value = null;
+    input.value = "";
+  }
+}
+
 function setBuilding({
   mode = "create",
   dialog = true,
@@ -290,7 +468,7 @@ function setBuilding({
 </script>
 
 <style scoped>
-  .v-data-table :deep(thead th) {
+.v-data-table :deep(thead th) {
   font-weight: bold !important;
 }
 </style>

package/components/DashboardMain.vue

@@ -3547,10 +3547,10 @@ async function exportDashboard(format: "PDF" | "Word") {
       }
 
       if (isHygieneMode.value) {
+        wordHtml += `<div class="section-title">${primaryListConfig.value.title}</div>`;
+        wordHtml += `<table class="data-table">`;
+        wordHtml += `<thead><tr><th>Task Title</th><th>Description / Subtitle</th><th>Assigned Staff</th><th>Time</th><th>Status</th></tr></thead><tbody>`;
         if (taskScheduleItems.value.length > 0) {
-          wordHtml += `<div class="section-title">${primaryListConfig.value.title}</div>`;
-          wordHtml += `<table class="data-table">`;
-          wordHtml += `<thead><tr><th>Task Title</th><th>Description / Subtitle</th><th>Assigned Staff</th><th>Time</th><th>Status</th></tr></thead><tbody>`;
           taskScheduleItems.value.forEach((item) => {
             wordHtml += `<tr>
               <td><strong>${item.title}</strong></td>
@@ -3562,13 +3562,15 @@ async function exportDashboard(format: "PDF" | "Word") {
               )}">${item.status || ""}</span></td>
             </tr>`;
           });
-          wordHtml += `</tbody></table>`;
+        } else {
+          wordHtml += `<tr><td colspan="5" style="padding: 10px; text-align: center; color: #64748b;">No data available</td></tr>`;
         }
+        wordHtml += `</tbody></table>`;
 
+        wordHtml += `<div class="section-title">Staff's Total Attendance</div>`;
+        wordHtml += `<table class="data-table">`;
+        wordHtml += `<thead><tr><th>Staff Name</th><th>Role</th><th>Total Hours</th></tr></thead><tbody>`;
         if (staffStatusItems.value.length > 0) {
-          wordHtml += `<div class="section-title">Staff's Total Attendance</div>`;
-          wordHtml += `<table class="data-table">`;
-          wordHtml += `<thead><tr><th>Staff Name</th><th>Role</th><th>Total Hours</th></tr></thead><tbody>`;
           staffStatusItems.value.forEach((item) => {
             wordHtml += `<tr>
               <td><strong>${item.name}</strong></td>
@@ -3576,69 +3578,79 @@ async function exportDashboard(format: "PDF" | "Word") {
               <td>${item.totalHours || 0} hrs</td>
             </tr>`;
           });
-          wordHtml += `</tbody></table>`;
+        } else {
+          wordHtml += `<tr><td colspan="3" style="padding: 10px; text-align: center; color: #64748b;">No data available</td></tr>`;
         }
+        wordHtml += `</tbody></table>`;
       }
 
       if (isPropertyMode.value) {
+        wordHtml += `<div class="section-title">Upcoming Events</div>`;
+        wordHtml += `<table class="data-table">`;
+        wordHtml += `<thead><tr><th>Event Title</th><th>Description / Subtitle</th></tr></thead><tbody>`;
         if (upcomingEvents.value.length > 0) {
-          wordHtml += `<div class="section-title">Upcoming Events</div>`;
-          wordHtml += `<table class="data-table">`;
-          wordHtml += `<thead><tr><th>Event Title</th><th>Description / Subtitle</th></tr></thead><tbody>`;
           upcomingEvents.value.forEach((item) => {
             wordHtml += `<tr>
               <td><strong>${item.title}</strong></td>
               <td>${item.subtitle || ""}</td>
             </tr>`;
           });
-          wordHtml += `</tbody></table>`;
+        } else {
+          wordHtml += `<tr><td colspan="2" style="padding: 10px; text-align: center; color: #64748b;">No data available</td></tr>`;
         }
+        wordHtml += `</tbody></table>`;
 
+        wordHtml += `<div class="section-title">Today's Reminder</div>`;
+        wordHtml += `<table class="data-table">`;
+        wordHtml += `<thead><tr><th>Reminder</th><th>Details / Subtitle</th></tr></thead><tbody>`;
         if (todayReminders.value.length > 0) {
-          wordHtml += `<div class="section-title">Today's Reminder</div>`;
-          wordHtml += `<table class="data-table">`;
-          wordHtml += `<thead><tr><th>Reminder</th><th>Details / Subtitle</th></tr></thead><tbody>`;
           todayReminders.value.forEach((item) => {
             wordHtml += `<tr>
               <td><strong>${item.title}</strong></td>
               <td>${item.subtitle || ""}</td>
             </tr>`;
           });
-          wordHtml += `</tbody></table>`;
+        } else {
+          wordHtml += `<tr><td colspan="2" style="padding: 10px; text-align: center; color: #64748b;">No data available</td></tr>`;
         }
+        wordHtml += `</tbody></table>`;
 
+        wordHtml += `<div class="section-title">Today's Attentions</div>`;
+        wordHtml += `<table class="data-table">`;
+        wordHtml += `<thead><tr><th>Attention</th><th>Details / Subtitle</th></tr></thead><tbody>`;
         if (todayAttentions.value.length > 0) {
-          wordHtml += `<div class="section-title">Today's Attentions</div>`;
-          wordHtml += `<table class="data-table">`;
-          wordHtml += `<thead><tr><th>Attention</th><th>Details / Subtitle</th></tr></thead><tbody>`;
           todayAttentions.value.forEach((item) => {
             wordHtml += `<tr>
               <td><strong>${item.title}</strong></td>
               <td>${item.subtitle || ""}</td>
             </tr>`;
           });
-          wordHtml += `</tbody></table>`;
+        } else {
+          wordHtml += `<tr><td colspan="2" style="padding: 10px; text-align: center; color: #64748b;">No data available</td></tr>`;
         }
+        wordHtml += `</tbody></table>`;
 
+        wordHtml += `<div class="section-title">Work Order Status</div>`;
+        wordHtml += `<table class="data-table">`;
+        wordHtml += `<thead><tr><th>Status</th><th>Count / Value</th></tr></thead><tbody>`;
         if (workOrderStatus.value.length > 0) {
-          wordHtml += `<div class="section-title">Work Order Status</div>`;
-          wordHtml += `<table class="data-table">`;
-          wordHtml += `<thead><tr><th>Status</th><th>Count / Value</th></tr></thead><tbody>`;
           workOrderStatus.value.forEach((item) => {
             wordHtml += `<tr>
               <td><strong>${item.label}</strong></td>
               <td>${item.value || 0}</td>
             </tr>`;
           });
-          wordHtml += `</tbody></table>`;
+        } else {
+          wordHtml += `<tr><td colspan="2" style="padding: 10px; text-align: center; color: #64748b;">No data available</td></tr>`;
         }
+        wordHtml += `</tbody></table>`;
       }
 
       if (isSecurityMode.value) {
+        wordHtml += `<div class="section-title">Active Patrol</div>`;
+        wordHtml += `<table class="data-table">`;
+        wordHtml += `<thead><tr><th>Patrol Route</th><th>Location</th><th>Assigned Officer</th><th>Status</th></tr></thead><tbody>`;
         if (activePatrolItems.value.length > 0) {
-          wordHtml += `<div class="section-title">Active Patrol</div>`;
-          wordHtml += `<table class="data-table">`;
-          wordHtml += `<thead><tr><th>Patrol Route</th><th>Location</th><th>Assigned Officer</th><th>Status</th></tr></thead><tbody>`;
           activePatrolItems.value.forEach((item) => {
             wordHtml += `<tr>
               <td><strong>${item.title || item.name}</strong></td>
@@ -3649,13 +3661,15 @@ async function exportDashboard(format: "PDF" | "Word") {
               )}">${item.status || ""}</span></td>
             </tr>`;
           });
-          wordHtml += `</tbody></table>`;
+        } else {
+          wordHtml += `<tr><td colspan="4" style="padding: 10px; text-align: center; color: #64748b;">No data available</td></tr>`;
         }
+        wordHtml += `</tbody></table>`;
 
+        wordHtml += `<div class="section-title">Staff Status</div>`;
+        wordHtml += `<table class="data-table">`;
+        wordHtml += `<thead><tr><th>Officer Name</th><th>Role / Designation</th><th>Status</th></tr></thead><tbody>`;
         if (securityStaffItems.value.length > 0) {
-          wordHtml += `<div class="section-title">Staff Status</div>`;
-          wordHtml += `<table class="data-table">`;
-          wordHtml += `<thead><tr><th>Officer Name</th><th>Role / Designation</th><th>Status</th></tr></thead><tbody>`;
           securityStaffItems.value.forEach((item) => {
             wordHtml += `<tr>
               <td><strong>${
@@ -3667,14 +3681,16 @@ async function exportDashboard(format: "PDF" | "Word") {
               )}">${item.status || "On duty"}</span></td>
             </tr>`;
           });
-          wordHtml += `</tbody></table>`;
+        } else {
+          wordHtml += `<tr><td colspan="3" style="padding: 10px; text-align: center; color: #64748b;">No data available</td></tr>`;
         }
+        wordHtml += `</tbody></table>`;
       }
 
+      wordHtml += `<div class="section-title">Feedbacks</div>`;
+      wordHtml += `<table class="data-table">`;
+      wordHtml += `<thead><tr><th>Title</th><th>Description / Category</th><th>Reporter / Person</th><th>Status</th></tr></thead><tbody>`;
       if (feedbackItems.value.length > 0) {
-        wordHtml += `<div class="section-title">Feedbacks</div>`;
-        wordHtml += `<table class="data-table">`;
-        wordHtml += `<thead><tr><th>Title</th><th>Description / Category</th><th>Reporter / Person</th><th>Status</th></tr></thead><tbody>`;
         feedbackItems.value.forEach((item) => {
           wordHtml += `<tr>
             <td><strong>${item.title}</strong></td>
@@ -3685,8 +3701,10 @@ async function exportDashboard(format: "PDF" | "Word") {
             )}">${item.status || "To-Do"}</span></td>
           </tr>`;
         });
-        wordHtml += `</tbody></table>`;
+      } else {
+        wordHtml += `<tr><td colspan="4" style="padding: 10px; text-align: center; color: #64748b;">No data available</td></tr>`;
       }
+      wordHtml += `</tbody></table>`;
 
       wordHtml += `
 </body>