@7365admin1/layer-common 4.97.1-staging.589 → 4.97.1-staging.590

package/components/AreaFormDialog.vue

@@ -37,7 +37,7 @@
       <v-card-text class="screen-modal__body">
         <v-form ref="formRef" v-model="valid">
           <v-row no-gutters class="pa-0">
-            <v-col v-if="prop.showType" cols="12" class="pa-0 mb-2">
+            <v-col v-if="prop.showType && !prop.hideTypeField" cols="12" class="pa-0 mb-2">
               <InputLabel for="type" title="Type" required class="mb-1" />
               <v-select
                 v-model="typeModel"
@@ -169,6 +169,9 @@ const prop = defineProps({
   label: { type: String, default: "Name" },
   entityType: { type: String, default: "Area" }, // values: "Area", "Unit"
   showType: { type: Boolean, default: true },
+  // Keeps the type in the saved payload (as loaded, or "Common") but does not
+  // offer the Common / Toilet choice - for apps where it means nothing.
+  hideTypeField: { type: Boolean, default: false },
   showOptional: { type: Boolean, default: true },
   showUnits: { type: Boolean, default: false },
   site: { type: String, default: "" },

package/components/AreaMain.vue

@@ -17,7 +17,7 @@
         @create="onCreateItem"
         @row-click="handleRowClick"
       >
-        <template #extension>
+        <template v-if="props.showAreaType" #extension>
           <v-row no-gutters class="w-100 d-flex flex-column">
             <!--
               A bare `v-card` here paints Vuetify's own `surface`, a slab a
@@ -138,6 +138,7 @@
     :label="formLabel"
     :entityType="entityTypeLabel"
     :showUnits="true"
+    :hideTypeField="!props.showAreaType"
     :site="props.site"
     :serviceType="props.serviceType"
     @saved="_createArea"
@@ -314,7 +315,9 @@
     title="Import Areas from Excel"
     noun="areas"
     name-label="Area"
-    fill-hint="One area per row: its name, Type (Common or Toilet, from the dropdown), Set and the units to check, separated by commas."
+    :fill-hint="props.showAreaType
+      ? 'One area per row: its name, Type (Common or Toilet, from the dropdown), Set and the units to check, separated by commas.'
+      : 'One area per row: its name, Set and the units to check, separated by commas. Leave Type as Common.'"
     duplicate-note="Areas already on the list (same name and type) are skipped and left unchanged."
     template-file-name="areas-import-template.xlsx"
     :download-template="() => downloadTemplate('areas', importQuery)"
@@ -345,6 +348,10 @@ const props = defineProps({
   canUpdateArea: { type: Boolean, default: false },
   canDeleteArea: { type: Boolean, default: false },
   canImportArea: { type: Boolean, default: false },
+  // Common / Toilet is a cleaning distinction (Toilet areas get the toilet
+  // checklist QR). Apps without it hide the Type filter, column and field;
+  // the saved `type` value is untouched (new areas stay "common").
+  showAreaType: { type: Boolean, default: true },
 });
 
 const isCleanerArea = computed(() => {
@@ -403,7 +410,7 @@ const isDownloading = ref(false);
 
 const headers = [
   { title: "AREA", value: "name" },
-  { title: "TYPE", value: "type" },
+  ...(props.showAreaType ? [{ title: "TYPE", value: "type" }] : []),
   { title: "SETS", value: "set" },
 ];
 

package/components/BuildingForm.vue

@@ -120,7 +120,7 @@
 
 
         <v-col cols="12" class="px-6">
-          <InputLabel class="text-capitalize font-weight-bold" title="Building Floor plan" />
+          <InputLabel class="text-capitalize font-weight-bold" title="Block floor plan" />
           <InputFileV2 v-model="building.buildingFiles" :multiple="true" accept="*" :max-length="10"
             title="Upload Files" />
         </v-col>

package/components/BuildingManagement/buildings.vue

@@ -97,13 +97,13 @@
                 <v-list class="pa-0">
                   <v-list-item v-if="canUpdateBuilding" @click="openEditDialog()">
                     <v-list-item-title class="text-subtitle-2">
-                      Edit Building
+                      Edit Block
                     </v-list-item-title>
                   </v-list-item>
 
                   <v-list-item v-if="canDeleteBuilding" @click="openDeleteDialog()" class="text-red">
                     <v-list-item-title class="text-subtitle-2">
-                      Delete Building
+                      Delete Block
                     </v-list-item-title>
                   </v-list-item>
                 </v-list>
@@ -144,7 +144,7 @@
             <v-col cols="6">
               <v-btn tile block size="48" color="black" variant="flat" class="text-none" @click="handleDeleteBuilding"
                 :loading="deleteLoading">
-                Delete Building
+                Delete Block
               </v-btn>
             </v-col>
           </v-row>

package/components/ScheduleAreaMain.vue

@@ -56,6 +56,7 @@
               />
 
               <v-select
+                v-if="props.showAreaType"
                 v-model="areaTypeFilter"
                 :items="typeOptions"
                 density="compact"
@@ -155,6 +156,9 @@ const props = defineProps({
   canGenerateChecklist: { type: Boolean, default: false },
   canViewHistory: { type: Boolean, default: false },
   canManageScheduleTasks: { type: Boolean, default: false },
+  // Common / Toilet is a cleaning distinction; apps without it hide the Type
+  // filter and column (saved `type` values are untouched).
+  showAreaType: { type: Boolean, default: true },
 });
 
 // "Daily Checklist – Cleaning" / "– Landscape" / ... (same title as the day list)
@@ -172,7 +176,7 @@ const pageRange = ref("-- - -- of --");
 const headers = [
   { title: "Area", value: "name" },
   { title: "Status", value: "status" },
-  { title: "Type", value: "type" },
+  ...(props.showAreaType ? [{ title: "Type", value: "type" }] : []),
   { title: "Visits per day", value: "set" },
 ];
 

package/components/UnitMain.vue

@@ -187,7 +187,9 @@
     title="Import Units from Excel"
     noun="units"
     name-label="Unit"
-    fill-hint="One unit per row, e.g. Toilet Bowl, Sofa."
+    :fill-hint="/mechanical/i.test(props.serviceType)
+      ? 'One unit per row, e.g. Air-con Unit, Water Pump.'
+      : 'One unit per row, e.g. Toilet Bowl, Sofa.'"
     duplicate-note="Units already on the list are skipped and left unchanged."
     template-file-name="units-import-template.xlsx"
     :download-template="() => downloadTemplate('units', importQuery)"

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.97.1-staging.589",
+  "version": "4.97.1-staging.590",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "//files": "What a consumer extending this layer actually loads. Without this npm ships the whole working tree - the changesets, the CI workflows, the render harness in tools/ and any scratch directory that happened to exist at publish time. Nuxt resolves a layer by directory, so every runtime directory below has to stay listed; adding a new top-level runtime directory means adding it here too.",