@7365admin1/layer-common 4.117.0 → 4.118.1

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @iservice365/layer-common
 
+## 4.118.1
+
+### Patch Changes
+
+- 83b3d6d: Incident Report PDF: the header now carries the report status (new optional
+  `status` prop on `IncidentInformationDownload`), cells use one consistent 1px
+  border with no half-row page splits, and the dates print as DD/MM/YYYY in
+  Singapore time. They printed as MM/DD/YYYY, and from a UTC server an 8 Oct date
+  showed as 07/10. No field removed; NRIC masking unchanged.
+
+## 4.118.0
+
+### Minor Changes
+
+- 42930fa: Robot screens: Add robot, Edit, Remove and the building-map editor show only for Seven365 Super Admin. Commands on a HERO Fleet Core robot show only for Seven365 Super Admin; other users see status and position (view only). Matches the server rule that Fleet Core and robot setup are Super Admin only.
+
 ## 4.117.0
 
 ### Minor Changes
@@ -3117,11 +3133,11 @@ Monthly report: a month that had patrols opens the list of that month's patrol r
   `utils/console-tier.ts` + `composables/useConsoleTier.ts` mirror the server's
   own rule from two endpoints the console already calls, unprojected:
 
-                                                                                                                                                                                                                                                                                                                                                                                                      GET /api/members/user/:user/app/admin    the Seven365 staff membership
-                                                                                                                                                                                                                                                                                                                                                                                                      GET /api/roles/id/:role                  that membership's role document
+                                                                                                                                                                                                                                                                                                                                                                                                          GET /api/members/user/:user/app/admin    the Seven365 staff membership
+                                                                                                                                                                                                                                                                                                                                                                                                          GET /api/roles/id/:role                  that membership's role document
 
-                                                                                                                                                                                                                                                                                                                                                                                                      owner  = member.type === "admin" && role.type === "admin" && role.default === true
-                                                                                                                                                                                                                                                                                                                                                                                                      staff  = member.type === "admin" && role.type === "admin"
+                                                                                                                                                                                                                                                                                                                                                                                                          owner  = member.type === "admin" && role.type === "admin" && role.default === true
+                                                                                                                                                                                                                                                                                                                                                                                                          staff  = member.type === "admin" && role.type === "admin"
 
   `role.default` is the marker because it is the only property of a platform
   staff role no API caller can set - `role.controller.ts` validates create and

package/components/IncidentReport/IncidentInformationDownload.vue

@@ -1,42 +1,40 @@
 <template>
-  <v-row no-gutters class="px-5 pt-4">
-    <!-- Site Information -->
-    <p
-      class="text-uppercase text-center w-100 text-h6 bg-error text-on-error"
-      style="padding: 10px"
-    >
-      Incident Report
-    </p>
-    <v-row no-gutters class="mt-5 border pb-5">
-      <p
-        class="w-100 text-h6 pa-2 text-center bg-warning text-on-warning"
-      >
+  <div class="ir-doc px-5 pt-4">
+    <!-- Report header: title with the status inside it, so the two never float apart. -->
+    <div class="ir-title bg-error text-on-error">
+      <p class="text-uppercase text-h6 ma-0">Incident Report</p>
+      <p v-if="status" class="ir-status ma-0 mt-2" :class="`ir-status--${statusKey}`">
+        Status: {{ String(status).toUpperCase() }}
+      </p>
+    </div>
+    <v-row no-gutters class="ir-box mt-5">
+      <p class="ir-section w-100 text-h6 pa-2 text-center bg-warning text-on-warning">
         Incident Information
       </p>
 
-      <v-col cols="6" class="pa-3 border-b border-e">
+      <v-col cols="6" class="pa-3 ir-cell ir-e">
         <p class="font-weight-bold">Site</p>
         <p>{{ siteName || "-" }}</p>
       </v-col>
-      <v-col cols="6" class="pa-3 border-b">
+      <v-col cols="6" class="pa-3 ir-cell">
         <p class="font-weight-bold">Reference</p>
         <p>{{ incidentInformation?.siteInfo?.irNumber || "-" }}</p>
       </v-col>
 
-      <v-col cols="6" class="pa-3 border-b border-e">
+      <v-col cols="6" class="pa-3 ir-cell ir-e">
         <p class="font-weight-bold">Place of Incident</p>
         <p>
           {{ incidentInformation?.placeOfIncident?.incidentLocation || "-" }}
         </p>
       </v-col>
-      <v-col cols="6" class="pa-3 border-b">
+      <v-col cols="6" class="pa-3 ir-cell">
         <p class="font-weight-bold">Type of Incident</p>
         <p>
           {{ incidentInformation?.incidentTypeAndTime?.typeOfIncident || "-" }}
         </p>
       </v-col>
 
-      <v-col cols="6" class="pa-3 border-b border-e">
+      <v-col cols="6" class="pa-3 ir-cell ir-e">
         <p class="font-weight-bold">Date of Incident</p>
         <p>
           {{
@@ -46,55 +44,58 @@
           }}
         </p>
       </v-col>
-      <v-col cols="6" class="pa-3 border-b">
+      <v-col cols="6" class="pa-3 ir-cell">
         <p class="font-weight-bold">Incident Start Time</p>
         <p>
           {{ incidentInformation?.incidentTypeAndTime?.incidentStart || "-" }}
         </p>
       </v-col>
 
-      <v-col cols="6" class="pa-3 border-b border-e">
+      <v-col cols="6" class="pa-3 ir-cell ir-e">
         <p class="font-weight-bold">Time of Response (From 1st Contact)</p>
         <p>
           {{ incidentInformation?.incidentTypeAndTime?.timeOfResponse || "-" }}
         </p>
       </v-col>
-      <v-col cols="6" class="pa-3 border-b">
+      <v-col cols="6" class="pa-3 ir-cell">
         <p class="font-weight-bold">Incident End Time</p>
         <p>
           {{ incidentInformation?.incidentTypeAndTime?.incidentEnd || "-" }}
         </p>
       </v-col>
 
-      <v-col cols="6" class="pa-3 border-b border-e">
+      <v-col cols="6" class="pa-3 ir-cell ir-e">
         <p class="font-weight-bold">Date of Report Submission</p>
-        {{
-          toLocalDate(incidentInformation?.submissionForm?.dateOfReport) || "NA"
-        }}
+        <p>
+          {{
+            toLocalDate(incidentInformation?.submissionForm?.dateOfReport) ||
+            "NA"
+          }}
+        </p>
       </v-col>
-      <v-col cols="6" class="pa-3 border-b">
+      <v-col cols="6" class="pa-3 ir-cell">
         <p class="font-weight-bold">Time of Report Submission</p>
         <p>{{ incidentInformation?.submissionForm?.time || "-" }}</p>
       </v-col>
 
-      <v-col cols="6" class="pa-3 border-b border-e">
+      <v-col cols="6" class="pa-3 ir-cell ir-e">
         <p class="font-weight-bold">Report Submitted By</p>
         <p>{{ incidentInformation?.siteInfo?.submittedBy || "-" }}</p>
       </v-col>
-      <v-col cols="6" class="pa-3 border-b">
+      <v-col cols="6" class="pa-3 ir-cell">
         <p class="font-weight-bold">Designation</p>
         <p>{{ incidentInformation?.siteInfo?.designation || "-" }}</p>
       </v-col>
 
-      <v-col cols="4" class="pa-3 border-b border-e">
+      <v-col cols="4" class="pa-3 ir-cell ir-e">
         <p class="font-weight-bold">Name of Informant/Complainant</p>
         <p>{{ incidentInformation?.complaintInfo?.complainant || "-" }}</p>
       </v-col>
-      <v-col cols="4" class="pa-3 border-b border-e">
+      <v-col cols="4" class="pa-3 ir-cell ir-e">
         <p class="font-weight-bold">Contact No.</p>
         <p>{{ incidentInformation?.complaintInfo?.contact || "-" }}</p>
       </v-col>
-      <v-col cols="4" class="pa-3 border-b">
+      <v-col cols="4" class="pa-3 ir-cell">
         <p class="font-weight-bold">NRIC/WP No.</p>
         <p>
           {{
@@ -105,17 +106,17 @@
         </p>
       </v-col>
 
-      <v-col cols="4" class="pa-3 border-b border-e">
+      <v-col cols="4" class="pa-3 ir-cell ir-e">
         <p class="font-weight-bold">
           Name of Recipient of Complaint (1st Contact)
         </p>
         <p>{{ incidentInformation?.recipientOfComplaint?.recipient || "-" }}</p>
       </v-col>
-      <v-col cols="4" class="pa-3 border-b border-e">
+      <v-col cols="4" class="pa-3 ir-cell ir-e">
         <p class="font-weight-bold">Contact No.</p>
         <p>{{ incidentInformation?.recipientOfComplaint?.contact || "-" }}</p>
       </v-col>
-      <v-col cols="4" class="pa-3 border-b">
+      <v-col cols="4" class="pa-3 ir-cell">
         <p class="font-weight-bold">NRIC/WP No.</p>
         <p>
           {{
@@ -126,7 +127,7 @@
         </p>
       </v-col>
 
-      <v-col cols="12" class="pa-3 border-b border-e">
+      <v-col cols="12" class="pa-3 ir-cell">
         <p class="font-weight-bold">Complaint Received through</p>
         <p
           v-if="
@@ -142,7 +143,7 @@
           }}
         </p>
       </v-col>
-      <v-col cols="12" class="pa-3">
+      <v-col cols="12" class="pa-3 ir-cell ir-last">
         <p class="font-weight-bold">Brief Description</p>
         <p>
           {{
@@ -151,7 +152,7 @@
         </p>
       </v-col>
     </v-row>
-  </v-row>
+  </div>
 </template>
 
 <script lang="ts" setup>
@@ -162,8 +163,15 @@ const props = defineProps({
     type: Object as PropType<Record<string, any> | null>,
     required: true,
   },
+  // Optional report status (pending/approved/rejected), printed inside the header.
+  status: {
+    type: String,
+    default: "",
+  },
 });
 
+const statusKey = computed(() => String(props.status || "").toLowerCase());
+
 // utilities
 const { getSiteById } = useSiteSettings();
 const route = useRoute();
@@ -204,11 +212,16 @@ watch(
   { immediate: true }
 );
 
+// DD/MM/YYYY in Singapore time. The PDF is rendered on a server whose clock is
+// UTC, so without the zone an 8 Oct (SGT) date prints as 07/10.
 function toLocalDate(utcString: string) {
-  return new Date(utcString).toLocaleString("en-US", {
+  const d = new Date(utcString);
+  if (!utcString || isNaN(d.getTime())) return "";
+  return d.toLocaleDateString("en-GB", {
     year: "numeric",
     month: "2-digit",
     day: "2-digit",
+    timeZone: "Asia/Singapore",
   });
 }
 
@@ -218,3 +231,48 @@ const maskNRIC = (value: any) => {
   return value.replace(/.(?=.{3})/g, "*");
 };
 </script>
+
+<style scoped>
+/* One consistent 1px grey rule for every cell edge; rows never split across pages. */
+.ir-title {
+  text-align: center;
+  padding: 10px;
+}
+.ir-status {
+  display: inline-block;
+  background: #fff;
+  color: #b26a00;
+  border: 1px solid currentColor;
+  border-radius: 4px;
+  padding: 2px 14px;
+  font-size: 0.95rem;
+  font-weight: 700;
+  letter-spacing: 0.03em;
+}
+.ir-status--approved { color: #2e7d32; }
+.ir-status--rejected { color: #c62828; }
+.ir-box {
+  border: 1px solid #8a8a8a;
+}
+.ir-cell {
+  border-bottom: 1px solid #8a8a8a;
+  break-inside: avoid;
+  page-break-inside: avoid;
+}
+.ir-e {
+  border-right: 1px solid #8a8a8a;
+}
+.ir-last {
+  border-bottom: 0;
+  /* The long free-text answer may flow onto the next page, but never leave
+     one or two stray lines behind. */
+  break-inside: auto;
+  page-break-inside: auto;
+  orphans: 3;
+  widows: 3;
+}
+.ir-section {
+  break-after: avoid;
+  border-bottom: 1px solid #8a8a8a;
+}
+</style>

package/components/Robot/Detail.vue

@@ -138,7 +138,7 @@
       <div v-if="commands.length" class="hero-detail__commands">
         <RobotCommandBar
           :capabilities="caps"
-          :can-command="canCommand"
+          :can-command="cmdOk"
           :online="live?.ok === true && live.online === true"
           :mode="statusMode"
           :type="robotType"
@@ -151,7 +151,7 @@
           {{ commandResult.text }}
         </div>
       </div>
-      <RobotViewOnlyNotice v-if="!canCommand" />
+      <RobotViewOnlyNotice v-if="!cmdOk" />
     </section>
   </div>
 
@@ -369,11 +369,13 @@ const props = withDefaults(
     canEdit?: boolean;
     canCommand?: boolean;
     canDelete?: boolean;
+    /** Seven365 Super Admin: the only one who may command a HERO Fleet Core robot (owner, 12 Oct 2026). */
+    superAdmin?: boolean;
     /** The robot types this app presents - the edit dialog shows Type only with both. */
     types?: Array<"cleaning" | "security">;
     tickMs?: number;
   }>(),
-  { backLabel: "", canEdit: false, canCommand: false, canDelete: false, types: () => [], tickMs: 1200 },
+  { backLabel: "", canEdit: false, canCommand: false, canDelete: false, superAdmin: false, types: () => [], tickMs: 1200 },
 );
 const emit = defineEmits<{
   back: [];
@@ -398,6 +400,7 @@ const {
 } = useRobots();
 
 const record = ref<Record<string, any> | null>(null);
+const cmdOk = computed(() => props.canCommand && (props.superAdmin || record.value?.brand !== "fleet-core"));
 const topEl = ref<HTMLElement | null>(null);
 const brands = ref<Array<Record<string, any>>>([]);
 const error = ref("");
@@ -478,7 +481,7 @@ const makerApp = computed(() => (live.value?.ok ? live.value.profile?.makerApp :
 
 const online = computed(() => live.value?.ok === true && live.value.online === true);
 const commands = computed(() =>
-  visibleCommands({ capabilities: caps.value, canCommand: props.canCommand, online: online.value, mode: statusMode.value, type: robotType.value, resumable: resumable.value }),
+  visibleCommands({ capabilities: caps.value, canCommand: cmdOk.value, online: online.value, mode: statusMode.value, type: robotType.value, resumable: resumable.value }),
 );
 
 /* ---- the plan ---- */
@@ -506,7 +509,7 @@ watch(
 const readout = computed(() => `${positionText(live.value, caps.value, now.value)} · ${speedText(prevPose.value, nextPose.value, statusMode.value)}`);
 
 const spot = ref<Array<{ x: number; y: number }>>([]);
-const spotOn = computed(() => showSpotClean({ canCommand: props.canCommand, capabilities: caps.value, online: online.value, type: robotType.value }));
+const spotOn = computed(() => showSpotClean({ canCommand: cmdOk.value, capabilities: caps.value, online: online.value, type: robotType.value }));
 
 // The route drawn on the plan: the shown map's first route, else the first with placed checkpoints (the rest are listed by name).
 const route = computed<TPatrolRouteView | null>(() =>
@@ -839,9 +842,9 @@ function onPick(p: TSavedPoint) {
 const livePanel = ref<{ show(): void } | null>(null);
 const hasCamera = computed(() => caps.value?.liveVideo === true || canDrive.value);
 const driveOpen = ref(false);
-const canDrive = computed(() => props.canCommand && caps.value?.manualDrive === true && online.value);
+const canDrive = computed(() => cmdOk.value && caps.value?.manualDrive === true && online.value);
 const canResolve = computed(
-  () => props.canCommand && caps.value?.resolveAlerts === true && faultBadge(fault.value) === "ALARM" && typeof fault.value?.code === "string",
+  () => cmdOk.value && caps.value?.resolveAlerts === true && faultBadge(fault.value) === "ALARM" && typeof fault.value?.code === "string",
 );
 const resolving = ref(false);
 async function resolveFault() {

package/components/Robot/SiteScreen.vue

@@ -26,9 +26,10 @@
         :key="robotId"
         :robot-id="robotId"
         :back-label="siteName || names.siteName ? `${siteName || names.siteName} fleet` : ''"
-        :can-edit="canEdit"
+        :can-edit="canEdit && superAdmin"
         :can-command="canCommand"
-        :can-delete="canDelete"
+        :super-admin="superAdmin"
+        :can-delete="canDelete && superAdmin"
         :types="types"
         @back="emit('back')"
         @removed="onRemoved"
@@ -42,7 +43,7 @@
         :site-name="siteName"
         :client-name="clientName"
         :type="type"
-        :can-edit-map="canSetup && canEdit"
+        :can-edit-map="canSetup && canEdit && superAdmin"
         :back-to-network="backToNetwork"
         @open="(id) => emit('open', id)"
         @network="emit('network')"
@@ -57,7 +58,7 @@
         :client-name="clientName"
         :type="type"
         :can-command="canCommand"
-        :can-edit-map="canSetup && canEdit"
+        :can-edit-map="canSetup && canEdit && superAdmin"
         :back-to-network="backToNetwork"
         @open="(id) => emit('open', id)"
         @network="emit('network')"
@@ -90,7 +91,7 @@
         :site-name="siteName"
         :client-name="clientName"
         :type="type"
-        :can-setup="canSetup"
+        :can-setup="canSetup && superAdmin"
         :back-to-network="backToNetwork"
         :reload-key="reloadKey"
         @open="(r) => emit('open', String(r._id))"

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.117.0",
+  "version": "4.118.1",
   "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.",