@7365admin1/layer-common 1.11.37 → 1.11.39

package/components/ScheduleTaskForm.vue

@@ -20,7 +20,7 @@
         </v-row>
       </v-toolbar>
 
-      <v-card-text class="pa-8 flex-grow-1" style="overflow-y: auto">
+      <v-card-text class="pa-4 flex-grow-1" style="overflow-y: auto">
         <v-form ref="formRef" v-model="valid">
           <v-row dense>
             <v-col cols="12">
@@ -52,7 +52,10 @@
                 <div class="text-caption text-medium-emphasis mb-2">
                   {{ selectedDates.length }} date(s) selected
                 </div>
-                <div v-if="selectedDates.length > 0" class="d-flex flex-wrap gap-1">
+                <div
+                  v-if="selectedDates.length > 0"
+                  class="d-flex flex-wrap ga-2"
+                >
                   <v-chip
                     v-for="date in selectedDates"
                     :key="date"
@@ -121,6 +124,108 @@
               </v-select>
             </v-col>
 
+            <v-col v-if="selectedAreas.length > 0" cols="12">
+              <InputLabel title="Units Under Selected Areas" />
+              <v-card variant="outlined" rounded class="mb-4">
+                <v-list density="compact" nav>
+                  <template
+                    v-for="(area, idx) in selectedAreas"
+                    :key="area.value || area._id"
+                  >
+                    <v-divider v-if="idx > 0" />
+
+                    <v-list-item
+                      rounded="0"
+                      class="px-3"
+                      @click="toggleArea(area.value || area._id)"
+                    >
+                      <template #prepend>
+                        <v-icon size="18" color="medium-emphasis">
+                          {{
+                            openAreas.includes(area.value || area._id)
+                              ? "mdi-chevron-down"
+                              : "mdi-chevron-right"
+                          }}
+                        </v-icon>
+                      </template>
+
+                      <v-list-item-title class="text-body-2 font-weight-medium">
+                        {{ area.name }}
+                      </v-list-item-title>
+
+                      <template #append>
+                        <v-progress-circular
+                          v-if="
+                            loadingUnits &&
+                            !(area.value || area._id in fetchedAreaUnits)
+                          "
+                          size="14"
+                          width="2"
+                          indeterminate
+                          color="primary"
+                        />
+                        <v-chip
+                          v-else
+                          size="x-small"
+                          variant="tonal"
+                          color="primary"
+                        >
+                          {{
+                            (fetchedAreaUnits[area.value || area._id] || [])
+                              .length
+                          }}
+                        </v-chip>
+                      </template>
+                    </v-list-item>
+
+                    <v-expand-transition>
+                      <div v-show="openAreas.includes(area.value || area._id)">
+                        <v-card-text class="pt-1 pb-3 px-3">
+                          <div
+                            v-if="
+                              loadingUnits &&
+                              !(area.value || area._id in fetchedAreaUnits)
+                            "
+                            class="d-flex flex-wrap ga-2"
+                          >
+                            <v-skeleton-loader
+                              v-for="n in 4"
+                              :key="n"
+                              type="chip"
+                              width="80"
+                            />
+                          </div>
+
+                          <div
+                            v-else-if="
+                              (fetchedAreaUnits[area.value || area._id] || [])
+                                .length > 0
+                            "
+                            class="d-flex flex-wrap ga-1"
+                          >
+                            <v-chip
+                              v-for="unit in fetchedAreaUnits[
+                                area.value || area._id
+                              ]"
+                              :key="unit.unit"
+                              size="small"
+                              variant="tonal"
+                            >
+                              {{ unit.name }}
+                            </v-chip>
+                          </div>
+
+                          <span v-else class="text-caption text-disabled">
+                            No units configured
+                          </span>
+                        </v-card-text>
+                      </div>
+                    </v-expand-transition>
+                  </template>
+                </v-list>
+              </v-card>
+            </v-col>
+
             <v-col cols="12">
               <InputLabel for="description" title="Task Description" />
               <v-textarea
@@ -138,18 +243,16 @@
         </v-form>
       </v-card-text>
 
-      <v-divider />
-
-      <v-card-actions class="pa-0">
-        <v-row no-gutters class="fill-width">
+      <v-toolbar class="pa-0" density="compact">
+        <v-row no-gutters>
           <v-col cols="6" class="pa-0">
             <v-btn
               block
               variant="text"
-              class="text-none rounded-0"
-              size="x-large"
+              class="text-none"
+              size="large"
               @click="close"
-              height="56"
+              height="48"
               :disabled="submitting"
             >
               Cancel
@@ -161,7 +264,7 @@
               variant="flat"
               color="primary"
               class="text-none font-weight-bold rounded-0"
-              height="56"
+              height="48"
               @click="submitTask"
               :loading="submitting"
             >
@@ -169,7 +272,7 @@
             </v-btn>
           </v-col>
         </v-row>
-      </v-card-actions>
+      </v-toolbar>
     </v-card>
   </v-dialog>
 
@@ -202,7 +305,7 @@ const props = defineProps({
 const show = defineModel("show", { type: Boolean, default: false });
 const emit = defineEmits(["saved", "close", "refresh"]);
 
-const { getAreas } = useAreas();
+const { getAreas, getAreaById } = useAreas();
 const { createScheduleTask, updateScheduleTask, getScheduleTaskById } =
   useScheduleTask();
 
@@ -215,19 +318,52 @@ const subject = ref("");
 const description = ref("");
 const scheduleTime = ref("08:00");
 const pickerDates = ref<Date[]>([]);
-// Derived from pickerDates — single source of truth, always in sync
 const selectedDates = computed(() =>
   pickerDates.value.map((d) => toLocalISO(d)).sort()
 );
 
 const selectedAreas = ref<any[]>([]);
+const loadingUnits = ref(false);
+const fetchedAreaUnits = ref<Record<string, { name: string; unit: string }[]>>(
+  {}
+);
+const openAreas = ref<string[]>([]);
+
+const selectedAreaIds = computed(() =>
+  selectedAreas.value.map((a: any) => a.value || a._id)
+);
+
+watch(selectedAreaIds, async (ids, prevIds) => {
+  openAreas.value = ids.slice();
+
+  const toFetch = ids.filter(
+    (id) => !prevIds?.includes(id) && !(id in fetchedAreaUnits.value)
+  );
+
+  if (!toFetch.length) return;
+
+  loadingUnits.value = true;
+  try {
+    await Promise.all(
+      toFetch.map(async (id) => {
+        try {
+          const result = await getAreaById(id);
+          fetchedAreaUnits.value[id] = result?.units || [];
+        } catch {
+          fetchedAreaUnits.value[id] = [];
+        }
+      })
+    );
+  } finally {
+    loadingUnits.value = false;
+  }
+});
 
 const message = ref("");
 const messageSnackbar = ref(false);
 const messageColor = ref("success");
 const areasList = ref<any[]>([]);
 
-// Helper function to generate all dates between start and end
 const generateDateRange = (start: Date, end: Date): Date[] => {
   const dates: Date[] = [];
   const current = new Date(start);
@@ -240,7 +376,6 @@ const generateDateRange = (start: Date, end: Date): Date[] => {
   return dates;
 };
 
-// Helper: convert a Date to a local YYYY-MM-DD string (avoids UTC-shift issues)
 const toLocalISO = (d: Date): string => {
   const y = d.getFullYear();
   const m = String(d.getMonth() + 1).padStart(2, "0");
@@ -248,7 +383,6 @@ const toLocalISO = (d: Date): string => {
   return `${y}-${m}-${day}`;
 };
 
-// Remove a single date from the selection via chip close
 const removeDate = (dateISO: string) => {
   pickerDates.value = pickerDates.value.filter(
     (d) => toLocalISO(d) !== dateISO
@@ -261,12 +395,23 @@ const showMessage = (text: string, color: string = "success") => {
   messageSnackbar.value = true;
 };
 
+const toggleArea = (id: string) => {
+  const idx = openAreas.value.indexOf(id);
+  if (idx === -1) {
+    openAreas.value.push(id);
+  } else {
+    openAreas.value.splice(idx, 1);
+  }
+};
+
 const resetForm = () => {
   subject.value = "";
   description.value = "";
   scheduleTime.value = "08:00";
   pickerDates.value = [];
   selectedAreas.value = [];
+  fetchedAreaUnits.value = {};
+  openAreas.value = [];
 };
 
 const setFormFromTask = (task: any) => {
@@ -310,7 +455,8 @@ const setFormFromTask = (task: any) => {
 
 const { data: getAreasReq, pending: loadingAreas } = await useLazyAsyncData(
   `get-areas-${props.site}`,
-  () => getAreas({ site: props.site, limit: 1000, serviceType: props.serviceType }),
+  () =>
+    getAreas({ site: props.site, limit: 1000, serviceType: props.serviceType }),
   {
     watch: [show, () => props.site],
     immediate: false,
@@ -377,7 +523,11 @@ const submitTask = async () => {
         (props.taskData as any)?._id || (props.taskData as any)?.id;
       response = await updateScheduleTask(taskId, payload);
     } else {
-      response = await createScheduleTask({ ...payload, site: props.site, serviceType: props.serviceType });
+      response = await createScheduleTask({
+        ...payload,
+        site: props.site,
+        serviceType: props.serviceType,
+      });
     }
 
     showMessage(

package/components/ScheduleTaskMain.vue

@@ -156,6 +156,73 @@
                   </v-col>
                 </v-row>
 
+                <v-row
+                  v-if="selectedTask.areas && selectedTask.areas.length > 0"
+                  no-gutters
+                  class="mb-2"
+                >
+                  <v-col cols="12">
+                    <div class="text-subtitle-2 font-weight-bold mb-2">Units Under Selected Areas:</div>
+                    <v-card variant="outlined" rounded>
+                      <v-list density="compact" nav>
+                        <template
+                          v-for="(area, idx) in selectedTask.areas"
+                          :key="area.value || area._id"
+                        >
+                          <v-divider v-if="Number(idx) > 0" />
+                          <v-list-item
+                            :title="area.name"
+                            class="font-weight-medium"
+                            @click="toggleViewArea(area.value || area._id)"
+                          >
+                            <template #prepend>
+                              <v-icon size="16">
+                                {{
+                                  openViewAreas.includes(area.value || area._id)
+                                    ? 'mdi-chevron-down'
+                                    : 'mdi-chevron-right'
+                                }}
+                              </v-icon>
+                            </template>
+                            <template #append>
+                              <v-progress-circular
+                                v-if="loadingViewUnits && !(area.value || area._id in fetchedViewAreaUnits)"
+                                size="14"
+                                width="2"
+                                indeterminate
+                                color="primary"
+                              />
+                              <v-chip v-else size="x-small" variant="tonal" color="primary">
+                                {{ (fetchedViewAreaUnits[area.value || area._id] || []).length }}
+                              </v-chip>
+                            </template>
+                          </v-list-item>
+                          <v-expand-transition>
+                            <div v-show="openViewAreas.includes(area.value || area._id)">
+                              <v-card-text class="px-3 py-2">
+                                <div
+                                  v-if="(fetchedViewAreaUnits[area.value || area._id] || []).length > 0"
+                                  class="d-flex flex-wrap ga-3"
+                                >
+                                  <v-chip
+                                    v-for="unit in fetchedViewAreaUnits[area.value || area._id]"
+                                    :key="unit.unit"
+                                    size="small"
+                                    variant="tonal"
+                                  >
+                                    {{ unit.name }}
+                                  </v-chip>
+                                </div>
+                                <span v-else class="text-caption text-disabled">No units configured</span>
+                              </v-card-text>
+                            </div>
+                          </v-expand-transition>
+                        </template>
+                      </v-list>
+                    </v-card>
+                  </v-col>
+                </v-row>
+
                 <v-row v-if="selectedTask.description" no-gutters class="mb-2">
                   <v-col cols="5" class="text-subtitle-2 font-weight-bold">
                     Description:
@@ -205,12 +272,14 @@
           <v-toolbar>
             <v-row no-gutters class="fill-height px-6" align="center">
               <span class="font-weight-bold text-h6 text-capitalize">
-                Delete {{ selectedTask?.title || 'Schedule Task' }}
+                Delete {{ selectedTask?.title || "Schedule Task" }}
               </span>
             </v-row>
           </v-toolbar>
           <v-card-text>
-            <span class="text-subtitle-2">Are you sure you want to delete this schedule task?</span>
+            <span class="text-subtitle-2"
+              >Are you sure you want to delete this schedule task?</span
+            >
           </v-card-text>
 
           <v-toolbar class="pa-0" density="compact">
@@ -257,6 +326,8 @@
 
 <script lang="ts" setup>
 import useScheduleTask from "../composables/useScheduleTask";
+import useUtils from "../composables/useUtils";
+import useAreas from "../composables/useAreas";
 
 const props = defineProps({
   orgId: { type: String, required: true },
@@ -271,13 +342,17 @@ const props = defineProps({
 });
 
 const { formatDate, debounce } = useUtils();
-const { getScheduleTasks, getScheduleTaskById, deleteScheduleTask } = useScheduleTask();
+const { getScheduleTasks, getScheduleTaskById, deleteScheduleTask } =
+  useScheduleTask();
+const { getAreaById } = useAreas();
 
 const canViewScheduleTasks = computed(() => props.canViewScheduleTasks);
 const canCreateScheduleTask = computed(() => props.canCreateScheduleTask);
 const canUpdateScheduleTask = computed(() => props.canUpdateScheduleTask);
 const canDeleteScheduleTask = computed(() => props.canDeleteScheduleTask);
-const canViewScheduleTaskDetails = computed(() => props.canViewScheduleTaskDetails);
+const canViewScheduleTaskDetails = computed(
+  () => props.canViewScheduleTaskDetails
+);
 
 const page = ref(1);
 const pages = ref(0);
@@ -295,6 +370,42 @@ const message = ref("");
 const messageSnackbar = ref(false);
 const messageColor = ref("success");
 
+const loadingViewUnits = ref(false);
+const fetchedViewAreaUnits = ref<Record<string, { name: string; unit: string }[]>>({});
+const openViewAreas = ref<string[]>([]);
+
+const toggleViewArea = (id: string) => {
+  const idx = openViewAreas.value.indexOf(id);
+  if (idx === -1) openViewAreas.value.push(id);
+  else openViewAreas.value.splice(idx, 1);
+};
+
+watch(dialogShowMoreActions, async (isOpen) => {
+  if (!isOpen) return;
+  const areas = (selectedTask.value?.areas || []) as any[];
+  if (areas.length === 0) return;
+  openViewAreas.value = areas.map((a) => a.value || a._id);
+  const toFetch = areas
+    .map((a) => a.value || a._id)
+    .filter((id) => id && !(id in fetchedViewAreaUnits.value));
+  if (toFetch.length === 0) return;
+  loadingViewUnits.value = true;
+  try {
+    await Promise.all(
+      toFetch.map(async (id: string) => {
+        try {
+          const result = await getAreaById(id);
+          fetchedViewAreaUnits.value[id] = result?.units || [];
+        } catch {
+          fetchedViewAreaUnits.value[id] = [];
+        }
+      })
+    );
+  } finally {
+    loadingViewUnits.value = false;
+  }
+});
+
 const items = ref<any[]>([]);
 
 const headers = [

package/components/VehicleForm.vue

@@ -775,7 +775,12 @@ onMounted(() => {
       vehicle.seasonPassType = prop.vehicleData.seasonPassType || '';
       vehicle.end = prop.vehicleData.end || '';
       vehicle.start = prop.vehicleData.start || '';
-      vehicle.plateNumber = prop.vehicleData.plates?.find((p) => p._id === prop.plateNumberId)?.plateNumber || '';
+      vehicle.plateNumber = prop.vehicleData.plateNumber
+      vehicle.peopleId = prop.vehicleData.peopleId || '';
+
+      if(prop.type === "seasonpass"){
+        showSubscriptionDateOptions.value = true;
+      }
     }
   }, 300);
 })

package/components/VehicleManagement.vue

@@ -37,13 +37,15 @@
     </v-dialog>
 
     <v-dialog v-model="dialog.createVehicle" v-if="vehicleType" width="450" persistent>
-      <VehicleForm :type="vehicleType" :mode="mode" :vehicle-data="selectedVehicleObject" :plate-number-id="selectedPlateNumberId" @back="handleBackToSelection"
-        @done="handleAddVehicleComplete" :org="org" :site="props.site" @close:all="handleCloseAll" />
+      <VehicleForm :type="vehicleType" :mode="mode" :vehicle-data="selectedVehicleObject"
+        :plate-number-id="selectedPlateNumberId" @back="handleBackToSelection" @done="handleAddVehicleComplete"
+        :org="org" :site="props.site" @close:all="handleCloseAll" />
     </v-dialog>
 
     <v-dialog v-model="dialog.updateVehicle" v-if="vehicleType" width="450" persistent>
-      <VehicleForm :type="vehicleType" :mode="mode" :vehicle-data="selectedPlateNumberObject" :plate-number-id="selectedPlateNumberId" @back="handleBackToSelection"
-        @done="handleAddVehicleComplete" :org="org" :site="props.site" @close:all="handleCloseAll" @close="handleCloseAll" />
+      <VehicleForm :type="vehicleType" :mode="mode" :vehicle-data="selectedPlateNumberObject"
+        :plate-number-id="selectedPlateNumberId" @back="handleBackToSelection" @done="handleAddVehicleComplete"
+        :org="org" :site="props.site" @close:all="handleCloseAll" @close="handleCloseAll" />
     </v-dialog>
 
     <!-- <v-dialog v-model="dialog.updateVehicle" v-if="vehicleType" width="450" persistent>
@@ -77,7 +79,8 @@
                           </template>
                           <v-list density="compact">
                             <v-list-item v-if="(plateNumberItem as TPlateNumber)?.status == 'active'"
-                              title="Edit Vehicle" prepend-icon="mdi-pencil" @click="handleEditVehicleAction(plateNumberItem as TPlateNumber)" />
+                              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'"
                               title="Approve" prepend-icon="mdi-check-circle" base-color="success"
@@ -110,7 +113,7 @@
               <v-col v-else-if="selectedVehicleObject[key]" cols="12">
                 <span class="d-flex ga-3 align-center"><strong>{{ label }}:</strong> {{ formatValues(key,
                   selectedVehicleObject[key])
-                }}</span>
+                  }}</span>
               </v-col>
             </template>
           </v-row>
@@ -184,7 +187,7 @@ const plateHeaders = [
 
 
 const { formatCamelCaseToWords, formatDate, debounce } = useUtils();
-const { getVehicles, deleteVehicle, formatVehicleStatus, approveVehicle, updateVehicle, getVehicleById } = useVehicle();
+const { getVehicles, deleteVehicle, formatVehicleStatus, approveVehicle, updateVehicle, getSpecificVehicleById } = useVehicle();
 
 const items = ref<Array<Record<string, any>>>([]);
 const page = ref(1);
@@ -322,23 +325,30 @@ async function handleEditVehicleAction(item: TPlateNumber) {
 
   try {
     loadingPlateNumberDetails.value = true;
-    const res = await getVehicleById(selectedPlateNumberId.value as string)
-      if(res?.seasonPassType){
+    const res = await getSpecificVehicleById(selectedPlateNumberId.value as string)
+
+    if (res.type === 'blocklist') {
+      vehicleType.value = "blocklist";
+    } else {
+      if (res?.seasonPassType) {
         vehicleType.value = "seasonpass";
       } else {
-        vehicleType.value = item?.type || null;
+        vehicleType.value = "whitelist";
       }
-      selectedPlateNumberObject.value = res || null;
-      dialog.showMoreActions = false;
-      mode.value = "edit";
-      dialog.updateVehicle = true;
-    
+    }
+
+
+    selectedPlateNumberObject.value = res || null;
+    dialog.showMoreActions = false;
+    mode.value = "edit";
+    dialog.updateVehicle = true;
+
   } catch (error) {
     console.error("Error fetching vehicle details:", error);
   } finally {
     loadingPlateNumberDetails.value = false;
-  } 
-  
+  }
+
 }
 
 function handleDeleteVehicleAction(item: TPlateNumber) {

package/components/VisitorManagement.vue

@@ -1331,10 +1331,10 @@ const {
       params.status = activeTab.value;
     }
 
-    if (activeTab.value !== "registered") {
-      delete params.type;
-      delete params.checkedOut;
-    }
+    // if (activeTab.value !== "registered") {
+    //   delete params.type;
+    //   delete params.checkedOut;
+    // }
 
     return await getVisitors(params);
   },

package/composables/useMember.ts

@@ -93,6 +93,21 @@ export default function useMember() {
       }
     );
   }
+
+function createMemberDirect(payload: {
+  userId: string;
+  orgId: string;
+  roleId: string;
+  app: string;
+  siteId?: string;
+  siteName?:string;
+}) {
+  return useNuxtApp().$api<TMember>('/api/members/direct', {
+    method: 'POST',
+    body: payload,
+  })
+}
+
   return {
     members,
     member,
@@ -107,5 +122,6 @@ export default function useMember() {
     getByUserIdType,
     updateMemberStatus,
     updateMemberRole,
+    createMemberDirect
   };
 }

package/composables/useSiteSettings.ts

@@ -66,6 +66,7 @@ export default function () {
         | "password"
         | "username"
         | "direction"
+        | "status"
       >
     >
   ) {

package/composables/useVehicle.ts

@@ -131,6 +131,18 @@ export default function useVehicle() {
     return { label, color }
 }
 
+// fetch specific plateNumber Vehicle data
+
+function getSpecificVehicleById(id: string){
+  return useNuxtApp().$api<Record<string, any>>(
+    `/api/vehicles/specific/${id}`,
+    {
+      method: "GET",
+    }
+  );
+}
+
+
   return {
     getVehicles,
     addVehicle,
@@ -141,6 +153,7 @@ export default function useVehicle() {
     getVehicleByNRIC,
     formatVehicleStatus,
     approveVehicle,
-    searchMultipleVehiclesByUnitId
+    searchMultipleVehiclesByUnitId,
+    getSpecificVehicleById
   };
 }

package/composables/useWorkOrder.ts

@@ -137,15 +137,21 @@ export default function useWorkOrder() {
   }
 
   function deleteWorkOrder(id: string) {
-    return useNuxtApp().$api<Record<string, any>>(
-      `/api/work-orders/deleted/work-order/${id}`,
-      {
-        method: "PUT",
-        // query: { id },
-      }
-    );
+    return useNuxtApp().$api<Record<string, any>>(`/api/work-orders/${id}`, {
+      method: "DELETE",
+    });
   }
 
+  // function deleteWorkOrder(id: string) {
+  //   return useNuxtApp().$api<Record<string, any>>(
+  //     `/api/work-orders/deleted/work-order/${id}`,
+  //     {
+  //       method: "PUT",
+  //       // query: { id },
+  //     }
+  //   );
+  // }
+
   function getWorkOrderSettings(_workOrderSettings: Record<string, any>) {
     return useNuxtApp().$api<Record<string, any>>(
       "/api/work-order-settings/get-by-site",

package/package.json

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