From 0ea9601ea371f8770b284cbfdcee00b8547192ea Mon Sep 17 00:00:00 2001 From: Julian Krauser Date: Tue, 13 May 2025 12:30:57 +0200 Subject: [PATCH] vehicle update and code --- .../admin/unit/vehicle/CreateVehicleModal.vue | 105 --------------- src/demodata/vehicle.ts | 2 + src/router/index.ts | 2 +- .../admin/unit/equipment/equipment.models.ts | 6 +- .../admin/unit/vehicle/vehicle.models.ts | 3 + .../admin/unit/wearable/wearable.models.ts | 6 +- .../admin/unit/vehicle/CreateVehicle.vue | 3 + .../admin/unit/vehicle/UpdateVehicle.vue | 120 ++++++++++++++++++ 8 files changed, 135 insertions(+), 112 deletions(-) delete mode 100644 src/components/admin/unit/vehicle/CreateVehicleModal.vue create mode 100644 src/views/admin/unit/vehicle/UpdateVehicle.vue diff --git a/src/components/admin/unit/vehicle/CreateVehicleModal.vue b/src/components/admin/unit/vehicle/CreateVehicleModal.vue deleted file mode 100644 index 54fa73e..0000000 --- a/src/components/admin/unit/vehicle/CreateVehicleModal.vue +++ /dev/null @@ -1,105 +0,0 @@ - - - - - diff --git a/src/demodata/vehicle.ts b/src/demodata/vehicle.ts index 6503137..8af503a 100644 --- a/src/demodata/vehicle.ts +++ b/src/demodata/vehicle.ts @@ -4,6 +4,7 @@ import { vehicleTypeDemoData } from "./vehicleType"; export const vehicleDemoData: Array = [ { id: "kjhb", + code: "", name: "HLF", location: "Tor 1", vehicleTypeId: "xyz", @@ -12,6 +13,7 @@ export const vehicleDemoData: Array = [ }, { id: "kjhb", + code: "", name: "LF", location: "Tor 2", vehicleTypeId: "abc", diff --git a/src/router/index.ts b/src/router/index.ts index da36567..53aac88 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -442,7 +442,7 @@ const router = createRouter({ { path: "edit", name: "admin-unit-vehicle-edit", - component: () => import("@/views/admin/ViewSelect.vue"), + component: () => import("@/views/admin/unit/vehicle/UpdateVehicle.vue"), meta: { type: "update", section: "unit", module: "vehicle" }, beforeEnter: [abilityAndNavUpdate], props: true, diff --git a/src/viewmodels/admin/unit/equipment/equipment.models.ts b/src/viewmodels/admin/unit/equipment/equipment.models.ts index 0ec8e01..613709a 100644 --- a/src/viewmodels/admin/unit/equipment/equipment.models.ts +++ b/src/viewmodels/admin/unit/equipment/equipment.models.ts @@ -3,7 +3,7 @@ import type { InspectionViewMoel } from "../inspectionPlan/inspectionPlan.models export interface EquipmentViewModel { id: string; - code: string; + code?: string; name: string; location: string; equipmentTypeId: string; @@ -12,7 +12,7 @@ export interface EquipmentViewModel { } export interface CreateEquipmentViewModel { - code: string; + code?: string; name: string; location: string; equipmentTypeId: string; @@ -20,7 +20,7 @@ export interface CreateEquipmentViewModel { export interface UpdateEquipmentViewModel { id: string; - code: string; + code?: string; name: string; location: string; } diff --git a/src/viewmodels/admin/unit/vehicle/vehicle.models.ts b/src/viewmodels/admin/unit/vehicle/vehicle.models.ts index dd5008d..2aeb5a5 100644 --- a/src/viewmodels/admin/unit/vehicle/vehicle.models.ts +++ b/src/viewmodels/admin/unit/vehicle/vehicle.models.ts @@ -3,6 +3,7 @@ import type { VehicleTypeViewModel } from "../vehicleType/vehicleType.models"; export interface VehicleViewModel { id: string; + code?: string; name: string; location: string; vehicleTypeId: string; @@ -11,6 +12,7 @@ export interface VehicleViewModel { } export interface CreateVehicleViewModel { + code?: string; name: string; location: string; vehicleTypeId: string; @@ -18,6 +20,7 @@ export interface CreateVehicleViewModel { export interface UpdateVehicleViewModel { id: string; + code?: string; name: string; location: string; } diff --git a/src/viewmodels/admin/unit/wearable/wearable.models.ts b/src/viewmodels/admin/unit/wearable/wearable.models.ts index b0fcb20..f3c2e3b 100644 --- a/src/viewmodels/admin/unit/wearable/wearable.models.ts +++ b/src/viewmodels/admin/unit/wearable/wearable.models.ts @@ -3,7 +3,7 @@ import type { WearableTypeViewModel } from "../wearableType/wearableType.models" export interface WearableViewModel { id: string; - code: string; + code?: string; name: string; location?: string; wearerId?: string; @@ -13,7 +13,7 @@ export interface WearableViewModel { } export interface CreateWearableViewModel { - code: string; + code?: string; name: string; wearerId?: string; location?: string; @@ -22,7 +22,7 @@ export interface CreateWearableViewModel { export interface UpdateWearableViewModel { id: string; - code: string; + code?: string; name: string; location?: string; wearerId?: string; diff --git a/src/views/admin/unit/vehicle/CreateVehicle.vue b/src/views/admin/unit/vehicle/CreateVehicle.vue index ce228c8..6d1add0 100644 --- a/src/views/admin/unit/vehicle/CreateVehicle.vue +++ b/src/views/admin/unit/vehicle/CreateVehicle.vue @@ -13,6 +13,7 @@ +
@@ -49,6 +50,7 @@ import SuccessCheckmark from "@/components/SuccessCheckmark.vue"; import FailureXMark from "@/components/FailureXMark.vue"; import { useVehicleTypeStore } from "@/stores/admin/unit/vehicleType/vehicleType"; import VehicleTypeSearchSelect from "@/components/search/VehicleTypeSearchSelect.vue"; +import ScanInput from "@/components/ScanInput.vue"; + +