@7365admin1/layer-common 3.0.10 → 3.0.11

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/layer-common
 
+## 3.0.11
+
+### Patch Changes
+
+- fd1ebe1: Update Layer Version to 3.0.11
+
 ## 3.0.10
 
 ### Patch Changes

package/components/Layout/NavigationDrawer.vue

@@ -62,15 +62,18 @@ const { menuItem: hidFaceReaderMenu } = useHidFaceReaderMenu({
   cacheKey: "layout-navigation-hid-site",
 });
 
+const { canManageEntryPass } = useSettingsPermission();
+
 const navigationItems = computed(() => {
   const items = [...(props.navigationItems as TNavigationItem[])];
 
   if (
+    canManageEntryPass.value &&
     hidFaceReaderMenu.value &&
     !items.some((item) => item.title === hidFaceReaderMenu.value?.title)
   ) {
     const insertAfterIndex = items.findIndex(
-      (item) => item.title === "Pass & Key Mgmt",
+      (item) => item.title === "Pass & Key Mgmt"
     );
 
     if (insertAfterIndex >= 0) {

package/components/OnlineFormFill.vue

@@ -258,13 +258,14 @@
             <span class="text-caption text-medium-emphasis d-block mb-1">{{ block.label }}</span>
             <div
               v-if="initialValues[block.key]"
-              style="
-                display: inline-block;
-                border-radius: 8px;
-                background: #111111;
-                padding: 8px;
-                max-width: 100%;
-              "
+              :style="{
+                display: 'inline-block',
+                borderRadius: '8px',
+                background: sigBgLight[block.key] === false ? '#1e1e1e' : '#ffffff',
+                border: sigBgLight[block.key] === false ? '1px solid #334155' : '1px solid #e0e0e0',
+                padding: '8px',
+                maxWidth: '100%',
+              }"
             >
               <img
                 :src="initialValues[block.key]"
@@ -443,6 +444,68 @@ const { currentUser } = useLocalAuth();
 const validForm = ref(false);
 const submitting = ref(false);
 const message = ref("");
+
+// Detect signature background: true = light (black ink), false = dark (white ink)
+const sigBgLight = ref<Record<string, boolean>>({});
+
+function detectSigBackground(key: string, dataUrl: string) {
+  if (!dataUrl?.startsWith("data:image")) return;
+  const img = new Image();
+  img.onload = () => {
+    const SIZE = 32;
+    const canvas = document.createElement("canvas");
+    canvas.width = SIZE;
+    canvas.height = SIZE;
+    const ctx = canvas.getContext("2d");
+    if (!ctx) return;
+    ctx.drawImage(img, 0, 0, SIZE, SIZE);
+    const d = ctx.getImageData(0, 0, SIZE, SIZE).data;
+
+    let opaqueTotal = 0, opaqueCount = 0;
+    let inkTotal = 0, inkCount = 0;
+    for (let i = 0; i < d.length; i += 4) {
+      const alpha = d[i + 3];
+      const lum = (d[i] + d[i + 1] + d[i + 2]) / 3;
+      if (alpha > 128) {
+        opaqueTotal += lum;
+        opaqueCount++;
+        // Ink pixels are the non-background strokes (not very transparent)
+        inkTotal += lum;
+        inkCount++;
+      }
+    }
+
+    if (opaqueCount === 0) {
+      // Fully transparent PNG — can't detect, default to white bg
+      sigBgLight.value[key] = true;
+      return;
+    }
+
+    const opaqueRatio = opaqueCount / (d.length / 4);
+    if (opaqueRatio > 0.5) {
+      // Mostly opaque PNG — has a solid background; use overall brightness
+      sigBgLight.value[key] = opaqueTotal / opaqueCount > 128;
+    } else {
+      // Mostly transparent — ink-only PNG; check ink color
+      // Dark ink (< 128) = black strokes = was light mode → show white bg
+      // Light ink (≥ 128) = white strokes = was dark mode → show dark bg
+      sigBgLight.value[key] = inkTotal / inkCount < 128;
+    }
+  };
+  img.src = dataUrl;
+}
+
+watch(
+  () => props.initialValues,
+  (vals) => {
+    for (const [key, val] of Object.entries(vals)) {
+      if (typeof val === "string" && val.startsWith("data:image")) {
+        detectSigBackground(key, val);
+      }
+    }
+  },
+  { immediate: true, deep: true }
+);
 const values = ref<Record<string, any>>({});
 
 const selectedAction = ref("");

package/components/VisitorDataFromScannedQRCodeForm.vue

@@ -101,7 +101,7 @@
           <v-text-field v-model="location" density="comfortable" readonly />
         </v-col>
 
-        <v-col v-if="!visitorInfo.checkIn" cols="12">
+        <v-col cols="12">
           <InputLabel class="text-capitalize" title="Purpose" />
           <v-textarea
             v-model="visitorInfo.purpose"
@@ -253,7 +253,20 @@ const emit = defineEmits(["check-in-out", "close"]);
 
 const { standardFormatDateTime } = useUtils();
 
-const visitorInfo = ref(prop.visitorData);
+const visitorInfo = ref<Partial<TVisitor>>({});
+
+watch(
+  () => prop.visitorData,
+  (visitorData) => {
+    visitorInfo.value = {
+      ...visitorData,
+      visitorPass: Array.isArray(visitorData?.visitorPass)
+        ? [...visitorData.visitorPass]
+        : [],
+    };
+  },
+  { immediate: true }
+);
 
 const visitorNric = computed({
   get: () =>

package/components/VisitorManagement.vue

@@ -557,7 +557,7 @@
                   color="success"
                   text="Checkin"
                   :disabled="isVisitorDataFromScannedQRCodeCheckingInOut"
-                  @click="handleCheckin(selectedVisitorObject)"
+                  @click="handleCheckin(selectedVisitorDataObject)"
                   :loading="isVisitorDataFromScannedQRCodeCheckingInOut"
                 />
               </span>
@@ -1298,6 +1298,7 @@ const formattedFields = {
   block: "Block",
   level: "Level",
   unit: "Unit",
+  purpose: "Purpose",
   checkIn: "Check In",
   snapshotEntryImage: "Entry Image",
   checkOut: "Check Out",
@@ -1481,18 +1482,32 @@ async function handleVisitorDataFromScannedQRCodeCheckInOut(
   try {
     isVisitorDataFromScannedQRCodeCheckingInOut.value = true;
     if (type != "checkOut") {
+      const visitorId =
+        visitorData._id ??
+        visitorDataFromScannedQRCode.value._id ??
+        selectedVisitorId.value;
+
+      if (!visitorId) {
+        showMessage("Unable to check in visitor: missing visitor ID.", "error");
+        return;
+      }
+
+      const visitorPass = Array.isArray(visitorData.visitorPass)
+        ? visitorData.visitorPass
+        : [];
+
       await visitorDataFromScannedQRCodeCheckIn({
         type,
         filter: {
-          _id: visitorData._id,
+          _id: visitorId,
         },
         update: {
           updatedBy: currentUser.value._id,
-          visitorPass: visitorData.visitorPass.find(
+          visitorPass: visitorPass.find(
             (i: Record<string, any>) => i.keyId === null
           )
             ? undefined
-            : visitorData.visitorPass,
+            : visitorPass,
           nric: visitorData.nric ?? "",
           plateNumber: visitorData.plateNumber ?? "",
         },

package/composables/useVisitor.ts

@@ -26,6 +26,7 @@ export default function () {
       "level",
       "unit",
       "unitName",
+      "purpose",
       "remarks",
     ],
     contractor: [

package/package.json

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

package/types/visitor.d.ts

@@ -58,6 +58,7 @@ declare type TVisitorPayload = Pick<
   | "deliveryType"
   | "nric"
   | "contact"
+  | "purpose"
   | "remarks"
   | "attachments"
   | "org"