From 05555425ce0e89ab52ebb7a943ca648b4fc173e0 Mon Sep 17 00:00:00 2001 From: Julian Krauser Date: Tue, 13 May 2025 10:11:26 +0200 Subject: [PATCH] change models --- .../unit/damageReport/damageReport.models.ts | 1 + .../admin/unit/equipment/equipment.models.ts | 2 ++ .../unit/equipmentType/equipmentType.models.ts | 4 +++- .../inspectionPlan/inspectionPlan.models.ts | 17 +++++++++++++++++ .../unit/vehicleType/vehicleType.models.ts | 3 +++ .../inspectionPlan/CreateInspectionPlan.vue | 2 +- .../admin/unit/inspectionPlan/Overview.vue | 15 ++++++++++++--- 7 files changed, 39 insertions(+), 5 deletions(-) diff --git a/src/viewmodels/admin/unit/damageReport/damageReport.models.ts b/src/viewmodels/admin/unit/damageReport/damageReport.models.ts index ccc6038..94a90ed 100644 --- a/src/viewmodels/admin/unit/damageReport/damageReport.models.ts +++ b/src/viewmodels/admin/unit/damageReport/damageReport.models.ts @@ -6,6 +6,7 @@ export interface DamageReportViewModel { status: string; done: boolean; description: string; + providedImage: string; affectedEquipmentId: string; affectedEquipment: EquipmentViewModel; } diff --git a/src/viewmodels/admin/unit/equipment/equipment.models.ts b/src/viewmodels/admin/unit/equipment/equipment.models.ts index 655f78c..0ec8e01 100644 --- a/src/viewmodels/admin/unit/equipment/equipment.models.ts +++ b/src/viewmodels/admin/unit/equipment/equipment.models.ts @@ -1,4 +1,5 @@ import type { EquipmentTypeViewModel } from "../equipmentType/equipmentType.models"; +import type { InspectionViewMoel } from "../inspectionPlan/inspectionPlan.models"; export interface EquipmentViewModel { id: string; @@ -7,6 +8,7 @@ export interface EquipmentViewModel { location: string; equipmentTypeId: string; equipmentType: EquipmentTypeViewModel; + inspections: Array; } export interface CreateEquipmentViewModel { diff --git a/src/viewmodels/admin/unit/equipmentType/equipmentType.models.ts b/src/viewmodels/admin/unit/equipmentType/equipmentType.models.ts index 7524494..e3116c9 100644 --- a/src/viewmodels/admin/unit/equipmentType/equipmentType.models.ts +++ b/src/viewmodels/admin/unit/equipmentType/equipmentType.models.ts @@ -1,8 +1,10 @@ +import type { InspectionPlanViewModel } from "../inspectionPlan/inspectionPlan.models"; + export interface EquipmentTypeViewModel { id: string; type: string; description: string; - // attached inspection plans + inspectionPlans: Array; } export interface CreateEquipmentTypeViewModel { diff --git a/src/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models.ts b/src/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models.ts index 596eba8..0de95a3 100644 --- a/src/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models.ts +++ b/src/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models.ts @@ -1,3 +1,4 @@ +import type InspectionPlan from "../../../../views/admin/unit/inspectionPlan/InspectionPlan.vue"; import type { EquipmentTypeViewModel } from "../equipmentType/equipmentType.models"; export interface InspectionPlanViewModel { @@ -31,3 +32,19 @@ export interface InspectionPointViewModel { description: string; type: "iO-niO" | "text" | "number"; } + +export interface InspectionViewMoel { + id: string; + inspectionPlanId: string; + date: Date; + status: "open" | "finished"; + results: Array; +} + +export interface InspectionPointResultViewMoel { + id: string; + inspectionId: string; + inspectionPlanId: string; + inspectionPointId: string; + value: string; +} diff --git a/src/viewmodels/admin/unit/vehicleType/vehicleType.models.ts b/src/viewmodels/admin/unit/vehicleType/vehicleType.models.ts index ea6c7cf..2de497f 100644 --- a/src/viewmodels/admin/unit/vehicleType/vehicleType.models.ts +++ b/src/viewmodels/admin/unit/vehicleType/vehicleType.models.ts @@ -1,7 +1,10 @@ +import type { InspectionPlanViewModel } from "../inspectionPlan/inspectionPlan.models"; + export interface VehicleTypeViewModel { id: string; type: string; description: string; + inspectionPlans: Array; } export interface CreateVehicleTypeViewModel { diff --git a/src/views/admin/unit/inspectionPlan/CreateInspectionPlan.vue b/src/views/admin/unit/inspectionPlan/CreateInspectionPlan.vue index dcf2262..86f74df 100644 --- a/src/views/admin/unit/inspectionPlan/CreateInspectionPlan.vue +++ b/src/views/admin/unit/inspectionPlan/CreateInspectionPlan.vue @@ -2,7 +2,7 @@