@7365admin1/layer-common 1.10.3 → 1.10.4

package/components/ScheduleTaskForm.vue

@@ -37,57 +37,35 @@
             </v-col>
 
             <v-col cols="12">
-              <InputLabel for="date-range" title="Date Range" required />
+              <InputLabel for="date-range" title="Select Dates" required />
               <v-sheet border rounded class="pa-4 mb-4" color="grey-lighten-5">
-                <div class="d-flex align-center gap-3 mb-3">
-                  <v-text-field
-                    v-model="startDateInput"
-                    type="date"
-                    variant="outlined"
-                    density="compact"
-                    label="Start Date"
-                    hide-details
-                    class="flex-grow-1"
-                    @update:model-value="handleStartDateChange"
-                  />
-                  <v-icon>mdi-arrow-right</v-icon>
-                  <v-text-field
-                    v-model="endDateInput"
-                    type="date"
-                    variant="outlined"
-                    density="compact"
-                    label="End Date"
-                    hide-details
-                    class="flex-grow-1"
-                    @update:model-value="handleEndDateChange"
-                  />
+                <v-date-picker
+                  v-model="pickerDates"
+                  multiple
+                  :show-current="false"
+                  color="primary"
+                  elevation="0"
+                  width="100%"
+                  class="ma-0"
+                />
+                <v-divider class="my-3" />
+                <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">
+                  <v-chip
+                    v-for="date in selectedDates"
+                    :key="date"
+                    size="small"
+                    closable
+                    @click:close="removeDate(date)"
+                  >
+                    {{ date }}
+                  </v-chip>
+                </div>
+                <div v-else class="text-caption text-disabled">
+                  No dates selected. Click on the calendar to select dates.
                 </div>
-
-                <v-expand-transition>
-                  <div v-if="showCalendar">
-                    <v-divider class="mb-3" />
-                    <v-date-picker
-                      v-model="pickerDates"
-                      multiple
-                      @update:model-value="handlePickerChange"
-                      :show-current="false"
-                      color="primary"
-                      elevation="0"
-                      width="100%"
-                      class="ma-0"
-                    />
-                  </div>
-                </v-expand-transition>
-
-                <v-btn
-                  variant="text"
-                  size="small"
-                  @click="showCalendar = !showCalendar"
-                  class="mt-2"
-                  prepend-icon="mdi-calendar"
-                >
-                  {{ showCalendar ? "Hide Calendar" : "Show Calendar" }}
-                </v-btn>
               </v-sheet>
             </v-col>
 
@@ -199,6 +177,9 @@
 </template>
 
 <script setup lang="ts">
+import useAreas from "../composables/useAreas";
+import useScheduleTask from "../composables/useScheduleTask";
+
 const props = defineProps({
   mode: {
     type: String as PropType<"add" | "edit">,
@@ -225,14 +206,16 @@ const formRef = ref<HTMLFormElement | null>(null);
 const valid = ref(false);
 const submitting = ref(false);
 const loadingTask = ref(false);
-const showCalendar = ref(false);
 
 const subject = ref("");
 const description = ref("");
 const scheduleTime = ref("08:00");
-const startDateInput = ref("");
-const endDateInput = ref("");
 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 message = ref("");
@@ -253,45 +236,19 @@ const generateDateRange = (start: Date, end: Date): Date[] => {
   return dates;
 };
 
-// Handle changes from the start date input
-const handleStartDateChange = (value: string) => {
-  if (value && endDateInput.value) {
-    const start = new Date(value);
-    const end = new Date(endDateInput.value);
-
-    if (start <= end) {
-      pickerDates.value = generateDateRange(start, end);
-    }
-  }
-};
-
-// Handle changes from the end date input
-const handleEndDateChange = (value: string) => {
-  if (startDateInput.value && value) {
-    const start = new Date(startDateInput.value);
-    const end = new Date(value);
-
-    if (start <= end) {
-      pickerDates.value = generateDateRange(start, end);
-    }
-  }
+// 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");
+  const day = String(d.getDate()).padStart(2, "0");
+  return `${y}-${m}-${day}`;
 };
 
-// Handle changes from the calendar picker
-const handlePickerChange = (dates: Date[]) => {
-  if (dates && dates.length > 0) {
-    // Sort dates to find earliest and latest
-    const sortedDates = [...dates].sort((a, b) => a.getTime() - b.getTime());
-    const start = sortedDates[0];
-    const end = sortedDates[sortedDates.length - 1];
-
-    // Update input fields
-    startDateInput.value = start.toISOString().slice(0, 10);
-    endDateInput.value = end.toISOString().slice(0, 10);
-
-    // Fill in all dates between start and end
-    pickerDates.value = generateDateRange(start, end);
-  }
+// Remove a single date from the selection via chip close
+const removeDate = (dateISO: string) => {
+  pickerDates.value = pickerDates.value.filter(
+    (d) => toLocalISO(d) !== dateISO
+  );
 };
 
 const showMessage = (text: string, color: string = "success") => {
@@ -304,11 +261,8 @@ const resetForm = () => {
   subject.value = "";
   description.value = "";
   scheduleTime.value = "08:00";
-  startDateInput.value = "";
-  endDateInput.value = "";
   pickerDates.value = [];
   selectedAreas.value = [];
-  showCalendar.value = false;
 };
 
 const setFormFromTask = (task: any) => {
@@ -329,13 +283,13 @@ const setFormFromTask = (task: any) => {
     }
   };
 
-  if (task.startDate || task.endDate) {
+  // Handle dates array from task
+  if (task.dates && Array.isArray(task.dates) && task.dates.length > 0) {
+    pickerDates.value = task.dates.map((d: string) => new Date(d));
+  } else if (task.startDate || task.endDate) {
+    // Fallback for old format (startDate/endDate)
     const start = toISODate(task.startDate || task.start);
     const end = toISODate(task.endDate || task.end);
-
-    if (start) startDateInput.value = start;
-    if (end) endDateInput.value = end;
-
     if (start && end) {
       pickerDates.value = generateDateRange(new Date(start), new Date(end));
     }
@@ -343,9 +297,9 @@ const setFormFromTask = (task: any) => {
 
   selectedAreas.value = Array.isArray(task.areas)
     ? task.areas.map((area: any) => ({
-        _id: area.value,
+        _id: area.value || area._id,
         name: area.name,
-        value: area.value,
+        value: area.value || area._id,
       }))
     : [];
 };
@@ -356,7 +310,7 @@ const { data: getAreasReq, pending: loadingAreas } = await useLazyAsyncData(
   {
     watch: [show, () => props.site],
     immediate: false,
-  },
+  }
 );
 
 watchEffect(() => {
@@ -391,7 +345,7 @@ const loadTaskData = async () => {
     if ((props.taskData as any)?.title) setFormFromTask(props.taskData);
     showMessage(
       error?.data?.message || "Failed to load schedule task",
-      "error",
+      "error"
     );
   } finally {
     loadingTask.value = false;
@@ -404,8 +358,7 @@ const submitTask = async () => {
     const payload = {
       title: subject.value,
       time: scheduleTime.value,
-      startDate: startDateInput.value,
-      endDate: endDateInput.value,
+      dates: selectedDates.value, // Array of YYYY-MM-DD strings
       description: description.value?.trim() || "",
       areas: selectedAreas.value.map((area: any) => ({
         name: area.name || area.title || "",
@@ -413,14 +366,6 @@ const submitTask = async () => {
       })),
     };
 
-    if (startDateInput.value) {
-      payload.startDate = startDateInput.value;
-    }
-
-    if (endDateInput.value) {
-      payload.endDate = endDateInput.value;
-    }
-
     let response;
 
     if (props.mode === "edit" && props.taskData) {
@@ -436,7 +381,7 @@ const submitTask = async () => {
         `Schedule task ${
           props.mode === "edit" ? "updated" : "created"
         } successfully`,
-      "success",
+      "success"
     );
 
     emit("saved");
@@ -445,7 +390,7 @@ const submitTask = async () => {
   } catch (error: any) {
     showMessage(
       error?.data?.message || "Failed to submit schedule task",
-      "error",
+      "error"
     );
   } finally {
     submitting.value = false;
@@ -466,6 +411,6 @@ watch(
       resetForm();
     }
   },
-  { immediate: false },
+  { immediate: false }
 );
 </script>

package/components/ScheduleTaskMain.vue

@@ -47,8 +47,6 @@
           </v-row>
         </template>
 
-        <!-- frequency removed: using explicit date range in details -->
-
         <template #item.areas="{ value }">
           <div v-if="value && value.length > 0">
             <v-chip
@@ -107,21 +105,21 @@
 
                 <v-row no-gutters class="mb-2">
                   <v-col cols="5" class="text-subtitle-2 font-weight-bold">
-                    Date Range:
+                    Dates:
                   </v-col>
                   <v-col cols="7" class="text-subtitle-2">
-                    <div v-if="selectedTask.startDate || selectedTask.endDate">
-                      {{
-                        selectedTask.startDate
-                          ? formatDate(selectedTask.startDate)
-                          : "N/A"
-                      }}
-                      -
-                      {{
-                        selectedTask.endDate
-                          ? formatDate(selectedTask.endDate)
-                          : "N/A"
-                      }}
+                    <div
+                      v-if="selectedTask.dates && selectedTask.dates.length > 0"
+                      class="d-flex flex-wrap gap-1"
+                    >
+                      <v-chip
+                        v-for="date in selectedTask.dates"
+                        :key="date"
+                        size="x-small"
+                        class="mr-1 mb-1"
+                      >
+                        {{ formatDateChip(date) }}
+                      </v-chip>
                     </div>
                     <div v-else>N/A</div>
                   </v-col>
@@ -258,6 +256,12 @@ const showMessage = (text: string, color: string = "success") => {
   messageSnackbar.value = true;
 };
 
+const formatDateChip = (dateStr: string) => {
+  const parts = dateStr?.split("-");
+  if (parts?.length === 3) return `${parts[2]}-${parts[1]}-${parts[0]}`;
+  return dateStr;
+};
+
 const mapShortToDay = (short: string) => {
   const mapping: Record<string, string> = {
     Mon: "Monday",

package/components/VisitorForm.vue

@@ -54,7 +54,7 @@
           <v-col v-if="shouldShowField('nric')" cols="12">
             <v-row>
               <v-col cols="12">
-                <InputLabel class="text-capitalize" title="NRIC/Passport/ID No." required />
+                <InputLabel class="text-capitalize" title="NRIC" required />
                 <InputNRICNumber v-model="visitor.nric" density="comfortable" :rules="[requiredRule]"
                   @update:model-value="handleUpdateNRIC" :loading="fetchPersonByNRICPending" />
               </v-col>

package/composables/useAccessManagement.ts

@@ -148,6 +148,13 @@ export default function useAccessManagement() {
     );
   }
 
+  function deleteCard(payload: { cardId: string }) {
+    return useNuxtApp().$api(`/api/access-management/delete-card`, {
+      method: "PATCH",
+      body: payload,
+    });
+  }
+
   return {
     getDoorAccessLevels,
     getLiftAccessLevels,
@@ -159,5 +166,6 @@ export default function useAccessManagement() {
     bulkPhysicalAccessCard,
     assignAccessCard,
     getAvailableAccessCards,
+    deleteCard,
   };
 }

package/composables/useBulletin.ts

@@ -1,11 +1,11 @@
 export default function(){
 
   const recipientList: { title: string, value: TAnnouncementRecipients }[] = [
-    { title: "Admin", value: "admin" },
-    { title: "Management Agency", value: "organization" },
-    { title: "Site Personnel", value: "site" },
-    { title: "Service Provider", value: "service-provider" },
-    { title: "Service Provider Member", value: "service-provider-member" },
+    // resident | security_agency | cleaning_services | mechanical_electrical | property_management_agency
+    { title: "Security Agency", value: "security_agency" },
+    { title: "Cleaning Services", value: "cleaning_services" },
+    { title: "Mechanical & Electrical", value: "mechanical_electrical" },
+    { title: "Property Management Agency", value: "property_management_agency" },
     { title: "Resident", value: "resident" }
 ]
 

package/composables/useCard.ts

@@ -39,10 +39,24 @@ export default function useCard() {
     });
   }
 
+  function replaceCard(payload: {
+    cardId: string;
+    issuedCardId: string;
+    unitId: string;
+    remarks: string;
+    userId: string;
+  }) {
+    return useNuxtApp().$api("/api/access-management/card-replacement", {
+      method: "POST",
+      body: payload,
+    });
+  }
+
   return {
     getAll,
     add,
     deleteById,
     updateById,
+    replaceCard,
   };
 }

package/composables/useScheduleTask.ts

@@ -31,8 +31,7 @@ export default function useScheduleTask() {
   function createScheduleTask(payload: {
     title: string;
     time: string;
-    startDate?: string;
-    endDate?: string;
+    dates: string[];
     description?: string;
     areas: { name: string; value: string }[];
     site: string;
@@ -44,8 +43,7 @@ export default function useScheduleTask() {
         body: {
           title: payload.title,
           time: payload.time,
-          startDate: payload.startDate,
-          endDate: payload.endDate,
+          dates: payload.dates,
           description: payload.description,
           areas: payload.areas,
         },
@@ -58,8 +56,7 @@ export default function useScheduleTask() {
     payload: {
       title: string;
       time: string;
-      startDate?: string;
-      endDate?: string;
+      dates: string[];
       description?: string;
       areas: { name: string; value: string }[];
     },
@@ -71,8 +68,7 @@ export default function useScheduleTask() {
         body: {
           title: payload.title,
           time: payload.time,
-          startDate: payload.startDate,
-          endDate: payload.endDate,
+          dates: payload.dates,
           description: payload.description,
           areas: payload.areas,
         },

package/package.json

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

package/types/bulletin-board.d.ts

@@ -20,7 +20,7 @@ declare interface TAnnouncementFile {
   preview: boolean;
 }
 
-declare type TAnnouncementRecipients = "admin" | "organization" | "site" | "service-provider" | "service-provider-member" | "resident";
+declare type TAnnouncementRecipients = "resident" | "security_agency" | "cleaning_services" | "mechanical_electrical" | "property_management_agency"
 
 
 

package/types/checkout-item.d.ts

@@ -22,6 +22,7 @@ declare type TCheckoutItem = {
   supply: string;
   supplyName: string;
   qty: number;
+  stockQty?: number;
   photos: string[];
   photoIds: string[];
 };

package/types/cleaner-schedule.d.ts

@@ -50,5 +50,5 @@ declare type TFlattenedUnitItem = TUnitChecklistItem & {
   set: number;
 };
 
-declare type TScheduleAreaStatus = "All" | "Ready" | "Ongoing" | "Completed";
+declare type TScheduleAreaStatus = "All" | "Open" | "Ongoing" | "Completed";
 declare type TAreaType = "all" | "common" | "toilet";

package/types/people.d.ts

@@ -15,7 +15,7 @@ declare type TPeople = {
   end?: string;
   org?: string;
   site?: string,
-  type?: TPeoplePayload;
+  type?: TPeopleType;
 };