@7365admin1/layer-common 3.0.15 → 3.0.17

package/components/OnlineFormFill.vue

@@ -27,6 +27,15 @@
         size="x-small"
         class="text-capitalize"
       >{{ submissionStatus }}</v-chip>
+      <span v-if="(initialValues as any).block" class="text-caption text-medium-emphasis">
+        Block: <strong>{{ (initialValues as any).block }}</strong>
+      </span>
+      <span v-if="(initialValues as any).level" class="text-caption text-medium-emphasis">
+        Level: <strong>{{ (initialValues as any).level }}</strong>
+      </span>
+      <span v-if="submissionUnit" class="text-caption text-medium-emphasis">
+        Unit: <strong>{{ submissionUnit }}</strong>
+      </span>
       <template v-if="requiresPayment">
         <v-chip
           v-if="initialManagementValues?.paymentStatus"
@@ -53,7 +62,7 @@
       class="pa-6"
     >
       <v-form v-model="validForm">
-        <template v-for="(block, i) in definition.blocks" :key="i">
+        <template v-for="(block, i) in displayBlocks" :key="i">
 
           <!-- ADDRESS BLOCK -->
           <div
@@ -630,6 +639,47 @@ function initValues(def: FormDefinition) {
 }
 
 values.value = { ...initValues(props.definition), ...props.initialValues };
+// Seed unitNo from the top-level submission unit when not already in fields
+if (props.submissionUnit && !values.value.unitNo) {
+  values.value.unitNo = props.submissionUnit;
+}
+
+const LOCATION_KEYS = new Set(["block", "level", "floor", "unitNo"]);
+
+const displayBlocks = computed<FormBlock[]>(() => {
+  const filtered = props.definition.blocks.reduce<FormBlock[]>((acc, b) => {
+    if (b.type === "field" && LOCATION_KEYS.has((b as any).field?.key)) return acc;
+    if (b.type === "row") {
+      const remaining = (b as any).fields.filter((f: any) => !LOCATION_KEYS.has(f.key));
+      if (remaining.length === 0) return acc;
+      if (remaining.length !== (b as any).fields.length) {
+        acc.push({ ...b, fields: remaining } as any);
+        return acc;
+      }
+    }
+    acc.push(b);
+    return acc;
+  }, []);
+
+  const locationRow = {
+    type: "row" as const,
+    fields: [
+      { key: "block",  label: "Block",    fieldType: "text", cols: 4 },
+      { key: "level",  label: "Level",    fieldType: "text", cols: 4 },
+      { key: "unitNo", label: "Unit No.", fieldType: "text", cols: 4 },
+    ],
+  };
+
+  const addressIdx = filtered.findIndex((b) => b.type === "address");
+  if (addressIdx >= 0) {
+    return [
+      ...filtered.slice(0, addressIdx + 1),
+      locationRow,
+      ...filtered.slice(addressIdx + 1),
+    ] as FormBlock[];
+  }
+  return [locationRow, ...filtered] as FormBlock[];
+});
 
 const NAME_LABELS = new Set([
   "name",

package/components/VehicleManagement.vue

@@ -87,7 +87,7 @@
                               title="Edit Vehicle" prepend-icon="mdi-pencil"
                               @click="handleEditVehicleAction(plateNumberItem as TPlateNumber)" />
                             <v-list-item
-                              v-if="props.app === 'property_management_agency' && (plateNumberItem as TPlateNumber)?.status == 'pending'"
+                              v-if="canApproveVehicle && (plateNumberItem as TPlateNumber)?.status == 'pending'"
                               title="Approve" prepend-icon="mdi-check-circle" base-color="success"
                               @click="handleApproveVehicle(plateNumberItem as TPlateNumber)" />
                             <v-list-item v-if="(plateNumberItem as TPlateNumber)?.status == 'deleted'" title="Restore"
@@ -164,6 +164,7 @@ const props = defineProps({
   canUpdateVehicle: { type: Boolean, default: true },
   canDeleteVehicle: { type: Boolean, default: true },
   canViewVehicleDetails: { type: Boolean, default: true },
+  canApproveVehicle: { type: Boolean, default: false },
   site: { type: String, required: true },
   org: { type: String, required: true },
   app: { type: String, required: true },
@@ -194,6 +195,10 @@ const plateHeaders = [
 const { formatCamelCaseToWords, formatDate, debounce, maskNRIC } = useUtils();
 const { getVehicles, deleteVehicle, formatVehicleStatus, approveVehicle, updateVehicle, getSpecificVehicleById } = useVehicle();
 
+const canApproveVehicle = computed(() => {
+  return true;
+})
+
 const items = ref<Array<Record<string, any>>>([]);
 const page = ref(1);
 const pages = ref(0);
@@ -390,7 +395,7 @@ function hasVehicleActions(item: TPlateNumber) {
 
   return (
     isActive ||
-    (props.app === "property_management_agency" && isPending) ||
+    (props.canApproveVehicle && isPending) ||
     isDeleted ||
     (canUpdateType && isActive) ||
     (props.canDeleteVehicle && isActive)

package/composables/useOrg.ts

@@ -232,6 +232,21 @@ export default function useOrg() {
     )
   }
 
+  function updateStatus(
+    id: string,
+    status: "active" | "suspended",
+  ) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/organizations/${id}/status`,
+      {
+        method: "PATCH",
+        body: {
+          status,
+        },
+      },
+    );
+  }
+
 
   return {
     org,
@@ -252,6 +267,7 @@ export default function useOrg() {
     updateOrg,
     getOrgsByEmail,
     getOrganizationsWithSubscription,
-    completeOnboarding
+    completeOnboarding,
+    updateStatus
   };
 }

package/composables/usePDFDownload.ts

@@ -11,15 +11,35 @@ export default function(){
     const downloadUrl = window.URL.createObjectURL(res);
     const a = document.createElement("a");
     a.href = downloadUrl;
-    a.download = title; // Specify the file name
+    a.download = title.toLowerCase().endsWith(".pdf") ? title : `${title}.pdf`; // Specify the file name
     document.body.appendChild(a);
     a.click(); // Trigger the download
     window.URL.revokeObjectURL(downloadUrl); // Clean up
   }
 
+  /**
+   * Generate a PDF directly from HTML content (no Puppeteer navigation / auth needed).
+   * The HTML is POSTed to the server which uses page.setContent() to render it.
+   */
+  async function downloadPDFFromHtml({ htmlContent, title, orientation }: { htmlContent: string; title: string; orientation: "P" | "L" }) {
+    const res = await useNuxtApp().$api<Blob | MediaSource>("/api/site-soa/generate-pdf-html", {
+      method: "POST",
+      body: { htmlContent, title, orientation },
+    });
+    if (!res) throw new Error("Error downloading PDF");
+    const downloadUrl = window.URL.createObjectURL(res);
+    const a = document.createElement("a");
+    a.href = downloadUrl;
+    a.download = title.toLowerCase().endsWith(".pdf") ? title : `${title}.pdf`;
+    document.body.appendChild(a);
+    a.click();
+    window.URL.revokeObjectURL(downloadUrl);
+  }
+
   return {
-    downloadPDF
+    downloadPDF,
+    downloadPDFFromHtml,
   }
 
 
-}
+}

package/package.json

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