@7365admin1/layer-common 1.11.47 → 1.11.49

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 1.11.49
+
+### Patch Changes
+
+- ef80e57: add get member with user and org
+
+## 1.11.48
+
+### Patch Changes
+
+- 75d1ea7: add new nature business v2
+
 ## 1.11.47
 
 ### Patch Changes

package/components/CameraForm.vue

@@ -30,7 +30,7 @@
             />
           </v-col>
 
-          <v-col v-if="isANPR" cols="12">
+          <!-- <v-col v-if="isANPR" cols="12">
             <InputLabel class="text-capitalize" title="Category" required />
             <v-select
               v-model="camera.category"
@@ -38,7 +38,7 @@
               density="comfortable"
               :rules="[requiredRule]"
             />
-          </v-col>
+          </v-col> -->
 
           <v-col v-if="isANPR" cols="12">
             <InputLabel class="text-capitalize" title="Type" required />
@@ -50,14 +50,14 @@
             />
           </v-col>
 
-          <v-col v-if="isANPR" cols="12">
+          <!-- <v-col v-if="isANPR" cols="12">
             <InputLabel class="text-capitalize" title="Guard House" />
             <v-select
               v-model="camera.guardPost"
               :items="guardPostOptions"
               density="comfortable"
             />
-          </v-col>
+          </v-col> -->
 
           <v-col v-if="isANPR" cols="12">
             <InputLabel class="text-capitalize" title="User" required />
@@ -231,6 +231,8 @@ const anprDirectionOptions = computed(() => [
   { title: "Entry", value: "entry" },
   { title: "Exit", value: "exit" },
   { title: "Both Entry and Exit", value: "both" },
+  { title: "Visitors", value: "visitors" },
+  { title: "Residents", value: "residents" },
 ]);
 
 function back() {

package/components/DocumentForm.vue

@@ -178,6 +178,7 @@ async function submit() {
         name: document.value.name,
         attachment: document.value.attachment,
         type: derivedType,
+        size: fileData?.data?.size ?? fileData?.data?.file_size ?? 0,
         status: "active",
         org: orgId,
         site: siteId,
@@ -202,6 +203,7 @@ async function submit() {
         const fileName = fileData?.data?.name || String(fileId || "");
         const derivedType = deriveTypeFromFilename(fileName);
         if (derivedType) payload.type = derivedType;
+        payload.size = fileData?.data?.size ?? fileData?.data?.file_size ?? 0;
       }
 
       await updateById(prop.document._id ?? "", payload);

package/components/DocumentManagement.vue

@@ -265,21 +265,72 @@
       <v-card width="100%">
         <v-card-text style="max-height: 100vh; overflow-y: auto" class="pb-0">
           <v-row no-gutters class="mb-4">
-            <v-col cols="12">
-              <strong>Name:</strong> {{ selectedDocument?.name ?? "N/A" }}
+            <v-col cols="12" class="mb-3">
+              <div class="text-h6 font-weight-bold">
+                {{ selectedDocument?.name || "N/A" }}
+              </div>
             </v-col>
-            <v-col cols="12">
-              <strong>Type:</strong> {{ selectedDocument?.type ?? "N/A" }}
+
+            <v-col cols="12" class="mb-2">
+              <v-row no-gutters>
+                <v-col cols="6" class="text-body-1">Document</v-col>
+                <v-col cols="6" class="text-right text-body-1">
+                  <NuxtLink
+                    v-if="selectedDocument?.attachment"
+                    :to="getFileUrl(selectedDocument.attachment)"
+                    external
+                    target="_blank"
+                  >
+                    View Document
+                  </NuxtLink>
+                  <span v-else>N/A</span>
+                </v-col>
+              </v-row>
+            </v-col>
+
+            <v-col cols="12" class="mb-2">
+              <v-row no-gutters>
+                <v-col cols="6" class="text-body-1">File Type</v-col>
+                <v-col cols="6" class="text-right text-body-1">{{
+                  previewDetails.fileType
+                }}</v-col>
+              </v-row>
+            </v-col>
+
+            <v-col cols="12" class="mb-2">
+              <v-row no-gutters>
+                <v-col cols="6" class="text-body-1">File Size</v-col>
+                <v-col cols="6" class="text-right text-body-1">{{
+                  previewDetails.fileSize
+                }}</v-col>
+              </v-row>
             </v-col>
+
+            <v-col cols="12" class="mb-2">
+              <v-row no-gutters>
+                <v-col cols="6" class="text-body-1">Date Created</v-col>
+                <v-col cols="6" class="text-right text-body-1">{{
+                  previewDetails.dateCreated
+                }}</v-col>
+              </v-row>
+            </v-col>
+
+            <v-col cols="12" class="mb-2">
+              <v-row no-gutters>
+                <v-col cols="6" class="text-body-1">Date Modified</v-col>
+                <v-col cols="6" class="text-right text-body-1">{{
+                  previewDetails.dateModified
+                }}</v-col>
+              </v-row>
+            </v-col>
+
             <v-col cols="12">
-              <strong>Document: </strong>
-              <NuxtLink
-                :to="getFileUrl(selectedDocument.attachment)"
-                external
-                target="_blank"
-              >
-                View Document
-              </NuxtLink>
+              <v-row no-gutters>
+                <v-col cols="6" class="text-body-1">Remarks</v-col>
+                <v-col cols="6" class="text-right text-body-1">{{
+                  previewDetails.remarks
+                }}</v-col>
+              </v-row>
             </v-col>
           </v-row>
         </v-card-text>
@@ -511,6 +562,9 @@ const currentFolderPath = computed(() => {
   return folderStack.value.map((folder) => folder.name).join(" / ");
 });
 
+const fileTypes = ref(["all", "pdf", "csv", "doc"]);
+const selectedFileType = ref("all");
+
 const {
   data: getDocumentReq,
   refresh: getDocuments,
@@ -523,9 +577,11 @@ const {
       search: headerSearch.value,
       site: siteId,
       parentId: activeParentId.value,
+      type:
+        selectedFileType.value === "all" ? undefined : selectedFileType.value,
     }),
   {
-    watch: [page, headerSearch, activeParentId],
+    watch: [page, headerSearch, activeParentId, selectedFileType],
   }
 );
 
@@ -559,12 +615,24 @@ function formatDate(value?: string | null) {
   });
 }
 
+function formatBytes(bytes = 0) {
+  const b = Number(bytes) || 0;
+  if (b === 0) return "0 B";
+  const k = 1024;
+  const sizes = ["B", "KB", "MB", "GB", "TB"];
+  const i = Math.floor(Math.log(b) / Math.log(k));
+  return `${parseFloat((b / Math.pow(k, i)).toFixed(2))} ${sizes[i]}`;
+}
+
 const tableItems = computed(() => {
   return items.value.map((doc: any) => ({
     ...doc,
     _raw: doc,
     file_type: doc.type === "folder" ? "Folder" : doc.type || "N/A",
-    file_size: doc.type === "folder" ? "—" : doc.file_size || doc.size || "0mb",
+    file_size:
+      doc.type === "folder"
+        ? "—"
+        : formatBytes(Number(doc.file_size ?? doc.size ?? 0)),
     date_created: formatDate(doc.created_at || doc.createdAt),
     date_modified: formatDate(doc.updated_at || doc.updatedAt),
     remarks: doc.remarks || "N/A",
@@ -582,8 +650,8 @@ const folderRemarks = ref("");
 const folderLoading = ref(false);
 const validFolderForm = ref(false);
 
-const fileTypes = ref(["All", "pdf", "csv", "doc"]);
-const selectedFileType = ref("All");
+// fileTypes and selectedFileType are declared above to allow
+// the fetch to include the selected filter.
 const filterMenu = ref(false);
 const selectedDocument = ref<TDocument>({
   _id: "",
@@ -591,6 +659,26 @@ const selectedDocument = ref<TDocument>({
   attachment: "",
   type: "",
 });
+
+const previewDetails = computed(() => {
+  const document = selectedDocument.value as Record<string, any>;
+  const fileType =
+    document?.type === "folder"
+      ? "Folder"
+      : document?.type || document?.file_type || "N/A";
+  const fileSize =
+    document?.type === "folder"
+      ? "N/A"
+      : formatBytes(Number(document?.file_size ?? document?.size ?? 0));
+
+  return {
+    fileType,
+    fileSize,
+    dateCreated: formatDate(document?.created_at || document?.createdAt),
+    dateModified: formatDate(document?.updated_at || document?.updatedAt),
+    remarks: document?.remarks || "N/A",
+  };
+});
 const deleteLoading = ref(false);
 const confirmDialog = ref(false);
 const selectedDocumentId = ref<string | null>(null);
@@ -603,8 +691,35 @@ function tableRowClickHandler(data: any) {
     return;
   }
 
-  selectedDocument.value = rowData;
+  openPreviewDialog(rowData);
+}
+
+async function openPreviewDialog(document: TDocument) {
+  selectedDocument.value = document;
   previewDialog.value = true;
+
+  const documentId = String(document?._id || "");
+  if (!documentId) {
+    return;
+  }
+
+  try {
+    const response = await documentService.getById(documentId);
+    const fetchedDocument =
+      (response as any)?.item ||
+      (response as any)?.data ||
+      (response as any)?.document ||
+      response;
+
+    if (fetchedDocument && typeof fetchedDocument === "object") {
+      selectedDocument.value = {
+        ...document,
+        ...(fetchedDocument as Record<string, any>),
+      } as TDocument;
+    }
+  } catch (_error) {
+    // Keep table data in modal if detail API request fails.
+  }
 }
 
 function isFolderItem(document?: Partial<TDocument> & Record<string, any>) {
@@ -663,8 +778,11 @@ function setDocument({
     editDialog.value = dialog;
     selectedDocument.value = data;
   } else if (mode === "preview") {
-    previewDialog.value = dialog;
-    selectedDocument.value = data;
+    if (!dialog) {
+      previewDialog.value = false;
+      return;
+    }
+    openPreviewDialog(data);
   }
 }
 

package/components/Input/DatePicker.vue

@@ -1,13 +1,13 @@
 <template>
     <div class="d-flex flex-column">
         <v-text-field v-bind="$attrs" ref="datePickerRef" :model-value="dateFormattedReadOnly" autocomplete="off"
-            :placeholder="placeholder" :rules="rules" style="z-index: 10" @click="openDatePicker">
+            :placeholder="placeholder" :rules="rules" style="z-index: 10" @click="openDatePicker" @click:clear.stop="clearDate">
             <template #append-inner>
                 <v-icon icon="mdi-calendar" @click.stop="openDatePicker" />
             </template>
         </v-text-field>
         <div class="w-100 d-flex align-end ga-3 hidden-input">
-            <input ref="dateInput" type="date" v-model="date" />
+            <input ref="dateInput" type="date" v-model="date" :min="min" />
         </div>
     </div>
 </template>
@@ -22,6 +22,10 @@ const prop = defineProps({
     placeholder: {
         type: String,
         default: 'DD/MM/YYYY'
+    },
+    min: {
+        type: String,
+        default: undefined
     }
 })
 
@@ -34,6 +38,11 @@ const datePickerRef = ref<HTMLInputElement | null>(null)
 
 const isInitialLoad = ref(true)
 
+function clearDate() {
+    date.value = null
+    dateFormattedReadOnly.value = null
+}
+
 function openDatePicker() {
     setTimeout(() => {
         dateInput.value?.showPicker?.()

package/components/SiteSettings.vue

@@ -83,6 +83,56 @@
         </v-expansion-panel-title>
 
         <v-expansion-panel-text>
+          <v-container fluid class="px-0">
+            <v-row dense>
+              <v-col cols="6">
+                <v-switch
+                  v-model="ANPRSwitches.enableUnregistered"
+                  :disabled="!canManageSiteSettings"
+                  label="Enable Unregistered Vehicles"
+                  color="primary"
+                  hide-details
+                ></v-switch>
+              </v-col>
+              
+              <v-col cols="6">
+                <v-switch
+                  v-model="ANPRSwitches.openBarrierPickUpDropOff"
+                  :disabled="!canManageSiteSettings"
+                  label="Open Barrier for Pick-up and Drop-off"
+                  color="primary"
+                  hide-details
+                ></v-switch>
+              </v-col>
+
+              <v-col cols="6">
+                <v-switch
+                  v-model="ANPRSwitches.vehicleSnapshot"
+                  :disabled="!canManageSiteSettings"
+                  label="Capture Vehicle Snapshot"
+                  color="primary"
+                  hide-details
+                ></v-switch>
+              </v-col>
+            </v-row>
+
+            <v-row v-if="canManageSiteSettings">
+              <v-col cols="auto">
+                <v-btn
+                  variant="flat"
+                  color="primary"
+                  class="text-none"
+                  :loading="isSaving"
+                  @click="saveANPRSettings"
+                >
+                  Save
+                </v-btn>
+              </v-col>
+            </v-row>
+          </v-container>
+
+          <v-divider class="my-4"></v-divider>
+
           <CameraMain :site="siteId" :read-only="!canManageSiteSettings"
             :guard-posts="siteData?.metadata?.guardPosts" />
         </v-expansion-panel-text>
@@ -154,9 +204,11 @@ import useFile from '../composables/useFile';
 import useSiteSettings from '../composables/useSiteSettings';
 import useUtils from '../composables/useUtils';
 import useWorkOrder from '../composables/useWorkOrder';
+import useANPRSettings from '../composables/useANPRSettings';
 
 const props = defineProps({
   siteId: { type: String, required: true },
+  createdBy: { type: String },
   canManageSiteSettings: { type: Boolean, default: false },
   showAnprCamera: { type: Boolean, default: false },
   showCctvCamera: { type: Boolean, default: false },
@@ -173,6 +225,7 @@ const { requiredRule } = useUtils();
 const { getFileUrl } = useFile();
 const { getWorkOrderSettings, createWorkOrderSettings } = useWorkOrder();
 
+
 const blocks = ref(0);
 const guardPosts = ref(0);
 const gracePeriod = ref(0);
@@ -358,4 +411,56 @@ function show(message: string, color: string) {
   toast.message = message;
   toast.color = color;
 }
+
+
+// ANPR Settings
+const {getANPRSettingBySite, createUpdateANPRSettings} = useANPRSettings();
+const isSaving = ref(false)
+
+// Reactive object to hold the state of the 3 switches
+const ANPRSwitches = ref({
+  enableUnregistered: false,
+  openBarrierPickUpDropOff: false,
+  vehicleSnapshot: false
+})
+
+await useLazyAsyncData(
+  `anpr-settings-${props.siteId}`,
+  async () => {
+    const data = await getANPRSettingBySite({
+      site: props.siteId,
+      userType: "site",
+    });
+    console.log('data', data)
+    if(typeof data?.ANPRSwitches == "object"){
+      ANPRSwitches.value = data?.ANPRSwitches
+    }
+  }
+);
+
+const saveANPRSettings = async () => {
+  try {
+    isSaving.value = true
+    
+    // Replace this with your actual API endpoint / store action
+    // await $fetch(`/api/sites/${siteId.value}/camera-settings`, {
+    //   method: 'POST',
+    //   body: cameraSettings.value
+    // })
+    const data = {
+      site: props.siteId,
+      ANPRSwitches: ANPRSwitches.value,
+      updatedBy: props.createdBy,
+      userType: "site",
+    };
+     console.log('saveANPRSettings data:', data)
+    await createUpdateANPRSettings(data);
+    show("Saved successfully", "success");
+  } catch (error) {
+    console.error('Failed to save settings:', error)
+  } finally {
+    isSaving.value = false
+  }
+}
+
 </script>

package/components/VehicleManagement.vue

@@ -17,13 +17,9 @@
       <template #item.block="{ value }">
         {{ value ? `Blk ${value}` : "" }}
       </template>
-      <!-- <template #item.status="{ value }">
-        <v-chip :color="formatVehicleStatus(value).color" size="x-small" dark>
-          {{ formatVehicleStatus(value).label }}
-        </v-chip>
-
-
-      </template> -->
+      <template #item.nric="{ value }">
+       {{ maskNRIC(value) }}
+      </template>
 
       <template #item.plates="{ value, item }">
         <PlateNumberDisplay :plate-numbers="value" :default-value="item.plateNumber" />
@@ -61,7 +57,12 @@
           <v-row no-gutters class="ga-1 mb-5">
 
             <template v-for="(label, key) in formattedFields" :key="key">
-              <v-col v-if="key === 'plates'" class="d-flex flex-column ga-2">
+
+              <v-col v-if="key === 'nric' && selectedVehicleObject['nric']" cols="12">
+                <span class="d-flex ga-3 align-center"><strong>{{ label }}:</strong> {{ maskNRIC(selectedVehicleObject[key]) }}</span>
+              </v-col>
+
+              <v-col v-else-if="key === 'plates'" class="d-flex flex-column ga-2">
                 <span class="d-flex ga-3 align-center"><strong>{{ label }}:</strong></span>
                 <!-- <PlateNumberDisplay :plate-numbers="selectedVehicleObject[key]" show-all :default-value="selectedVehicleObject.plateNumber" />   -->
                 <v-col cols="12">
@@ -186,7 +187,7 @@ const plateHeaders = [
 
 
 
-const { formatCamelCaseToWords, formatDate, debounce } = useUtils();
+const { formatCamelCaseToWords, formatDate, debounce, maskNRIC } = useUtils();
 const { getVehicles, deleteVehicle, formatVehicleStatus, approveVehicle, updateVehicle, getSpecificVehicleById } = useVehicle();
 
 const items = ref<Array<Record<string, any>>>([]);

package/components/VisitorManagement.vue

@@ -340,6 +340,11 @@
                   :disabled="loading.checkingOut" @click="handleCheckout(selectedVisitorId as string)" />
               </span>
 
+              <span v-else-if="
+                key === 'nric' && selectedVisitorObject['nric']" class="d-flex align-center">
+                <strong>{{ label }}:</strong>
+                <span class="ml-2">{{ maskNRIC(selectedVisitorObject[key]) }}</span>
+              </span>
               <span v-else-if="key === 'attachments' && selectedVisitorObject?.[key]?.length > 0"
                 class="d-flex flex-column">
                 <strong class="w-full">{{ label }}:</strong>
@@ -349,7 +354,7 @@
                 </div>
               </span>
 
-              <span v-else-if="selectedVisitorObject[key]" class="d-flex ga-3 align-center"><strong>{{ label
+              <span v-else-if="selectedVisitorObject[key]" class="d-flex ga-3 align-start"><strong>{{ label
                   }}:</strong>
                 {{ formatValues(key, selectedVisitorObject[key]) }}
                 <TooltipInfo v-if="key === 'checkOut'" text="Manual Checkout" density="compact" size="x-small" />
@@ -602,6 +607,7 @@ const {
   formatDate,
   UTCToLocalTIme,
   standardFormatDate,
+  maskNRIC,
 } = useUtils();
 const { formatLocation } = useSecurityUtils();
 const { getFileUrlAnpr } = useFile();

package/composables/useANPRSettings.ts

@@ -0,0 +1,27 @@
+export default function () {
+  async function getANPRSettingBySite(data: any) {
+    return await useNuxtApp().$api<Record<string, any>>(
+      `/api/anpr-settings/get/v1`,
+      {
+        method: "POST",
+        body: data,
+      }
+    );
+  }
+  async function createUpdateANPRSettings(
+    data: any
+  ) {
+    return await useNuxtApp().$api<Record<string, any>>(
+      `/api/anpr-settings/v1`,
+      {
+        method: "POST",
+        body: data,
+      }
+    );
+  }
+
+  return {
+    getANPRSettingBySite,
+    createUpdateANPRSettings,
+  };
+}

package/composables/useDocument.ts

@@ -3,20 +3,28 @@ export default function useDocument() {
     page = 1,
     search = "",
     limit = 10,
-    status = "active",
+    type = "all",
     site = "",
     parentId = "",
+  }: {
+    page?: number;
+    search?: string;
+    limit?: number;
+    type?: string;
+    site?: string;
+    parentId?: string;
   } = {}) {
+    const query: Record<string, any> = {
+      page,
+      search,
+      limit,
+      site,
+      parentId,
+    };
+
     return useNuxtApp().$api<Record<string, any>>(`/api/documents`, {
       method: "GET",
-      query: {
-        page,
-        search,
-        limit,
-        status,
-        site,
-        parentId,
-      },
+      query,
     });
   }
 

package/composables/useLocal.ts

@@ -50,6 +50,23 @@ export default function useLocal() {
     { title: "Pool Maintenance Services", value: "pool_maintenance_services" },
   ];
 
+  const natureOfBusinessV2 = [
+    {
+      title: "Property Management Services",
+      value: "property_management_agency",
+    },
+    { title: "Security Agency", value: "security_agency" },
+    { title: "Cleaning Services", value: "cleaning_services" },
+    {
+      title: "M&E Services",
+      value: "mechanical_electrical_services",
+    },
+    { title: "Landscaping Services", value: "landscaping_services" },
+    { title: "Pest Control Services", value: "pest_control_services" },
+    { title: "Pool Maintenance Services", value: "pool_maintenance_services" },
+  ];
+
+
   const landingPage = useCookie("landing-page", cookieConfig);
 
   const subjects = [
@@ -125,6 +142,7 @@ export default function useLocal() {
     apps,
     headerSearch,
     natureOfBusiness,
+    natureOfBusinessV2,
     landingPage,
     subjects,
   };

package/composables/useMember.ts

@@ -132,6 +132,20 @@ export default function useMember() {
     )
   }
 
+  function getByUserTypeOrg(
+    user: string,
+    type: string,
+    org: string
+  ) {
+    return useNuxtApp().$api<TMember>(
+      `/api/members/user/${user}/app/${type}/org`,
+      {
+        method: "GET",
+        query: { org },
+      }
+    );
+  }
+
   return {
     members,
     member,
@@ -149,6 +163,7 @@ export default function useMember() {
     updateMemberRole,
     createMemberDirect,
     updateMemberSite,
-    getAllByUserId
+    getAllByUserId,
+    getByUserTypeOrg
   };
 }

package/composables/useUtils.ts

@@ -506,6 +506,19 @@ export default function useUtils() {
     return word[0].toUpperCase() + word.substring(1);
   }
 
+  
+function maskNRIC(value?: string) {
+  if(!value) return "";
+  if (value.length <= 4) {
+    return value;
+  }
+
+  const visiblePart = value.slice(-4);
+  const maskedPart = "*".repeat(value.length - 4);
+
+  return `${maskedPart}${visiblePart}`;
+}
+
   return {
     requiredRule,
     emailRule,
@@ -552,5 +565,6 @@ export default function useUtils() {
     getImage,
     standardFormatDate,
     getCapitalized,
+    maskNRIC
   };
 }

package/package.json

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