@7365admin1/layer-common 1.11.36 → 1.11.38

package/components/VehicleManagement.vue

@@ -37,10 +37,15 @@
     </v-dialog>
 
     <v-dialog v-model="dialog.createVehicle" v-if="vehicleType" width="450" persistent>
-      <VehicleForm :type="vehicleType" mode="add" :vehicle-data="selectedVehicleObject" @back="handleBackToSelection"
+      <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" />
+    </v-dialog>
+
     <!-- <v-dialog v-model="dialog.updateVehicle" v-if="vehicleType" width="450" persistent>
       <VehicleForm :type="vehicleType" mode="edit" :vehicle-data="selectedVehicleObject"
         @back="dialog.updateVehicle = false" @close="dialog.updateVehicle = false" @done="handleUpdateVehicleComplete"
@@ -58,7 +63,7 @@
                 <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">
-                  <v-card flat outlined class="pa-2" border="sm black">
+                  <v-card flat outlined class="pa-2" border="sm black" :loading="loadingPlateNumberDetails">
                     <v-data-table :items="selectedVehicleObject[key]" :headers="plateHeaders" hide-default-footer>
                       <template #item.status="{ value }">
                         <v-chip :color="formatVehicleStatus(value).color" size="x-small" dark>
@@ -66,22 +71,33 @@
                         </v-chip>
                       </template>
                       <template #item.action="{ item: plateNumberItem, value }">
-                        <v-btn v-if="canDeleteVehicle && (plateNumberItem as TPlateNumber)?.status == 'active'"
-                          text="Delete" color="error" flat size="x-small"
-                          @click="handleDeleteVehicleAction(plateNumberItem as TPlateNumber)" />
-                        <v-btn
-                          v-if="props.app === 'property_management_agency' && (plateNumberItem as TPlateNumber)?.status == 'pending'"
-                          text="Approve" color="success" flat size="x-small"
-                          @click="handleApproveVehicle(plateNumberItem as TPlateNumber)" />
-                        <v-btn v-if="(plateNumberItem as TPlateNumber)?.status == 'deleted'" text="Restore"
-                          color="orange" flat size="x-small"
-                          @click="handleRestoreVehicle(plateNumberItem as TPlateNumber)" />
-                        <v-btn
-                          v-if="((plateNumberItem as TPlateNumber)?.type === 'whitelist' || (plateNumberItem as TPlateNumber)?.type === 'blocklist') && plateNumberItem?.status == 'active'"
-                          variant="outlined"
-                          :text="(plateNumberItem as TPlateNumber)?.type === 'blocklist' ? 'Whitelist' : 'Blocklist'"
-                          :color="(plateNumberItem as TPlateNumber)?.type === 'blocklist' ? 'primary' : 'red'" flat
-                          size="x-small" class="ml-1" @click="handleUpdateType(plateNumberItem as TPlateNumber)" />
+                        <v-menu>
+                          <template #activator="{ props: menuProps }">
+                            <v-btn icon="mdi-dots-vertical" v-bind="menuProps" flat size="x-small" />
+                          </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)" />
+                            <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"
+                              @click="handleApproveVehicle(plateNumberItem as TPlateNumber)" />
+                            <v-list-item v-if="(plateNumberItem as TPlateNumber)?.status == 'deleted'" title="Restore"
+                              prepend-icon="mdi-restore" base-color="orange"
+                              @click="handleRestoreVehicle(plateNumberItem as TPlateNumber)" />
+                            <v-list-item
+                              v-if="((plateNumberItem as TPlateNumber)?.type === 'whitelist' || (plateNumberItem as TPlateNumber)?.type === 'blocklist') && plateNumberItem?.status == 'active'"
+                              :title="(plateNumberItem as TPlateNumber)?.type === 'blocklist' ? 'Whitelist' : 'Blocklist'"
+                              prepend-icon="mdi-swap-horizontal"
+                              :base-color="(plateNumberItem as TPlateNumber)?.type === 'blocklist' ? 'primary' : 'red'"
+                              @click="handleUpdateType(plateNumberItem as TPlateNumber)" />
+
+                            <v-list-item
+                              v-if="canDeleteVehicle && (plateNumberItem as TPlateNumber)?.status == 'active'"
+                              title="Delete" prepend-icon="mdi-delete" base-color="error"
+                              @click="handleDeleteVehicleAction(plateNumberItem as TPlateNumber)" />
+                          </v-list>
+                        </v-menu>
                       </template>
                     </v-data-table>
                     <v-btn text="Add Vehicle Number" class="mt-6 text-capitalize" prepend-icon="mdi-plus"
@@ -94,7 +110,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>
@@ -168,26 +184,30 @@ const plateHeaders = [
 
 
 const { formatCamelCaseToWords, formatDate, debounce } = useUtils();
-const { getVehicles, deleteVehicle, formatVehicleStatus, approveVehicle, updateVehicle } = useVehicle();
+const { getVehicles, deleteVehicle, formatVehicleStatus, approveVehicle, updateVehicle, getVehicleById } = useVehicle();
 
 const items = ref<Array<Record<string, any>>>([]);
 const page = ref(1);
 const pages = ref(0);
 const pageRange = ref("-- - -- of --");
 
+const mode = ref<"add" | "edit">("add");
+
 const searchInput = ref("")
 
 const loading = ref(false);
+const loadingPlateNumberDetails = ref(false);
 const deletingVehicle = ref(false);
 const approvingVehicle = ref(false);
 const restoringVehicle = ref(false);
 const updatingType = ref(false);
 
 const selectedVehicleId = ref<string | null>(null)
-const vehicleType = ref<TVehicleType | null>(null);
+const vehicleType = ref<TVehicleType | 'seasonpass' | null>(null);
 const vehicleTypeFilter = ref<TVehicleType | null>(null);
 
 const selectedPlateNumberObject = ref<TPlateNumber | null>(null);
+const selectedPlateNumberId = ref<string | null>(null); // individual plate number
 
 const message = ref("");
 const messageColor = ref("");
@@ -255,6 +275,8 @@ const handleCloseAll = () => {
   dialog.createVehicle = false;
   dialog.updateVehicle = false;
   dialog.showSelection = false;
+  dialog.updateVehicleType = false;
+  mode.value = "add";
   vehicleType.value = null;
 }
 
@@ -294,12 +316,29 @@ function addNewPlateNumbers() {
   dialog.showSelection = true;
 }
 
-function handleEditVehicleAction() {
-  vehicleType.value = selectedVehicleObject.value?.type || null;
-  console.log("Selected Vehicle Object: ", selectedVehicleObject.value);
-  dialog.showSelection = false;
-  dialog.updateVehicle = false;
-  dialog.updateVehicle = true;
+async function handleEditVehicleAction(item: TPlateNumber) {
+
+  selectedPlateNumberId.value = item?._id as string;
+
+  try {
+    loadingPlateNumberDetails.value = true;
+    const res = await getVehicleById(selectedPlateNumberId.value as string)
+      if(res?.seasonPassType){
+        vehicleType.value = "seasonpass";
+      } else {
+        vehicleType.value = item?.type || null;
+      }
+      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) {
@@ -354,6 +393,7 @@ function handleUpdatePage(newPageNum: number) {
 }
 
 function handleAddVehicleClick() {
+  mode.value = "add";
   dialog.showSelection = true;
   selectedVehicleId.value = null;
 }

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/useCustomerSite.ts

@@ -15,6 +15,7 @@ export default function useCustomerSite() {
     );
   }
 
+
   async function getAll({
     page = 1,
     search = "",
@@ -47,10 +48,20 @@ export default function useCustomerSite() {
     );
   }
 
+  function getCustomerSites (org: string) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/customer-sites?page=1&search=&limit=10&sort=&order=asc&status=active&org=${org}`,
+      {
+        method: 'GET'
+      }
+    )
+  }
+
   return {
     add,
     getAll,
     addViaInvite,
     getBySiteAsServiceProvider,
+    getCustomerSites
   };
 }

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/useUser.ts

@@ -14,6 +14,30 @@ export default function useUser() {
     });
   }
 
+  function inviteUserClient({
+    email = '',
+    app = '',
+    role = '',
+    name = '',
+    org = '',
+    site = '',
+    siteName = ''
+  } = {}) {
+    return useNuxtApp().$api<Record<string, any>>('/api/auth/invite/user', {
+      method: 'POST',
+      body: {
+        email,
+        app,
+        role,
+        name,
+        org,
+        ...(site && { siteId: site }),
+        ...(siteName && { siteName })
+      }
+    })
+  }
+
+
   function updateName(name = "") {
     return useNuxtApp().$api<Record<string, any>>("/api/users/name", {
       method: "PUT",
@@ -127,6 +151,7 @@ export default function useUser() {
     createUserByInvite,
     getById,
     createUserByVerification,
-    getUserByEmail
+    getUserByEmail,
+    inviteUserClient
   };
 }

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.36",
+  "version": "1.11.38",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {

package/types/org.d.ts

@@ -5,6 +5,7 @@ declare type TOrg = {
   contact: string;
   busInst: string;
   type: string;
+  defaultSite?: string;
   createdAt?: string;
   updatedAt?: string;
   status?: string;