From bd1fdaa23416752be9924569f3fc0b7f236de596 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Thu, 29 May 2025 10:57:24 +0200
Subject: [PATCH 01/16] update models to backend changes

---
 src/enums/inspectionEnum.ts                   |  5 +++
 .../{damageReport => }/damageReport.models.ts | 27 +++++++-----
 .../admin/unit/equipment/equipment.models.ts  |  4 +-
 .../equipmentType.models.ts                   |  3 --
 .../unit/inspection/inspection.models.ts      |  4 +-
 .../inspectionPlan.models.ts                  | 13 +++---
 .../admin/unit/maintenance.models.ts          | 43 +++++++++++++++++++
 .../respiratoryGear.models.ts                 |  0
 .../respiratoryMission.models.ts              |  0
 .../respiratoryWearer.models.ts               |  0
 .../admin/unit/vehicle/vehicle.models.ts      |  4 +-
 .../vehicleType.models.ts                     |  3 --
 .../admin/unit/wearable/wearable.models.ts    |  2 +-
 .../wearableType.models.ts                    |  0
 14 files changed, 79 insertions(+), 29 deletions(-)
 create mode 100644 src/enums/inspectionEnum.ts
 rename src/viewmodels/admin/unit/{damageReport => }/damageReport.models.ts (56%)
 rename src/viewmodels/admin/unit/{equipmentType => equipment}/equipmentType.models.ts (67%)
 rename src/viewmodels/admin/unit/{inspectionPlan => inspection}/inspectionPlan.models.ts (76%)
 create mode 100644 src/viewmodels/admin/unit/maintenance.models.ts
 rename src/viewmodels/admin/unit/{respiratoryGear => respiratory}/respiratoryGear.models.ts (100%)
 rename src/viewmodels/admin/unit/{respiratoryMission => respiratory}/respiratoryMission.models.ts (100%)
 rename src/viewmodels/admin/unit/{respiratoryWearer => respiratory}/respiratoryWearer.models.ts (100%)
 rename src/viewmodels/admin/unit/{vehicleType => vehicle}/vehicleType.models.ts (67%)
 rename src/viewmodels/admin/unit/{wearableType => wearable}/wearableType.models.ts (100%)

diff --git a/src/enums/inspectionEnum.ts b/src/enums/inspectionEnum.ts
new file mode 100644
index 0000000..5c87e55
--- /dev/null
+++ b/src/enums/inspectionEnum.ts
@@ -0,0 +1,5 @@
+export enum InspectionPointEnum {
+  oknok = "oknok",
+  text = "text",
+  number = "number",
+}
diff --git a/src/viewmodels/admin/unit/damageReport/damageReport.models.ts b/src/viewmodels/admin/unit/damageReport.models.ts
similarity index 56%
rename from src/viewmodels/admin/unit/damageReport/damageReport.models.ts
rename to src/viewmodels/admin/unit/damageReport.models.ts
index e1d7075..44bf661 100644
--- a/src/viewmodels/admin/unit/damageReport/damageReport.models.ts
+++ b/src/viewmodels/admin/unit/damageReport.models.ts
@@ -1,14 +1,9 @@
-import type { EquipmentViewModel } from "../equipment/equipment.models";
-import type { VehicleViewModel } from "../vehicle/vehicle.models";
-import type { WearableViewModel } from "../wearable/wearable.models";
+import type { EquipmentViewModel } from "./equipment/equipment.models";
+import type { MaintenanceViewModel } from "./maintenance.models";
+import type { VehicleViewModel } from "./vehicle/vehicle.models";
+import type { WearableViewModel } from "./wearable/wearable.models";
 
-export type DamageReportViewModel = {
-  id: string;
-  reported: Date;
-  status: string;
-  done: boolean;
-  description: string;
-  providedImage: Array<string>;
+export type DamageReportAssigned = {
   relatedId: string;
 } & (
   | {
@@ -25,8 +20,20 @@ export type DamageReportViewModel = {
     }
 );
 
+export type DamageReportViewModel = {
+  id: string;
+  reportedAt: Date;
+  status: string;
+  done: boolean;
+  description: string;
+  imageCount: number;
+  reportedBy: string;
+  maintenance?: MaintenanceViewModel;
+} & DamageReportAssigned;
+
 export interface CreateDamageReportViewModel {
   description: string;
+  reportedBy: string;
   affectedId: string;
   affected: "equipment" | "vehicle" | "wearable";
 }
diff --git a/src/viewmodels/admin/unit/equipment/equipment.models.ts b/src/viewmodels/admin/unit/equipment/equipment.models.ts
index dcd4cea..abbdee7 100644
--- a/src/viewmodels/admin/unit/equipment/equipment.models.ts
+++ b/src/viewmodels/admin/unit/equipment/equipment.models.ts
@@ -1,5 +1,4 @@
-import type { EquipmentTypeViewModel } from "../equipmentType/equipmentType.models";
-import type { InspectionViewModel } from "../inspection/inspection.models";
+import type { EquipmentTypeViewModel } from "./equipmentType.models";
 
 export interface EquipmentViewModel {
   id: string;
@@ -10,7 +9,6 @@ export interface EquipmentViewModel {
   decommissioned?: Date;
   equipmentTypeId: string;
   equipmentType: EquipmentTypeViewModel;
-  inspections: Array<InspectionViewModel>;
 }
 
 export interface CreateEquipmentViewModel {
diff --git a/src/viewmodels/admin/unit/equipmentType/equipmentType.models.ts b/src/viewmodels/admin/unit/equipment/equipmentType.models.ts
similarity index 67%
rename from src/viewmodels/admin/unit/equipmentType/equipmentType.models.ts
rename to src/viewmodels/admin/unit/equipment/equipmentType.models.ts
index e3116c9..fcf47ee 100644
--- a/src/viewmodels/admin/unit/equipmentType/equipmentType.models.ts
+++ b/src/viewmodels/admin/unit/equipment/equipmentType.models.ts
@@ -1,10 +1,7 @@
-import type { InspectionPlanViewModel } from "../inspectionPlan/inspectionPlan.models";
-
 export interface EquipmentTypeViewModel {
   id: string;
   type: string;
   description: string;
-  inspectionPlans: Array<InspectionPlanViewModel>;
 }
 
 export interface CreateEquipmentTypeViewModel {
diff --git a/src/viewmodels/admin/unit/inspection/inspection.models.ts b/src/viewmodels/admin/unit/inspection/inspection.models.ts
index 8cd2e5f..6565377 100644
--- a/src/viewmodels/admin/unit/inspection/inspection.models.ts
+++ b/src/viewmodels/admin/unit/inspection/inspection.models.ts
@@ -1,8 +1,9 @@
 import type { EquipmentViewModel } from "../equipment/equipment.models";
 import type {
   InspectionPlanViewModel,
+  InspectionPointViewModel,
   InspectionVersionedPlanViewModel,
-} from "../inspectionPlan/inspectionPlan.models";
+} from "./inspectionPlan.models";
 import type { VehicleViewModel } from "../vehicle/vehicle.models";
 
 export type InspectionViewModel = {
@@ -33,5 +34,6 @@ export interface InspectionPointResultViewModel {
   inspectionId: string;
   inspectionVersionedPlanId: string;
   inspectionPointId: string;
+  inspectionPoint: InspectionPointViewModel;
   value: string;
 }
diff --git a/src/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models.ts b/src/viewmodels/admin/unit/inspection/inspectionPlan.models.ts
similarity index 76%
rename from src/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models.ts
rename to src/viewmodels/admin/unit/inspection/inspectionPlan.models.ts
index 5f2df34..c5b1043 100644
--- a/src/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models.ts
+++ b/src/viewmodels/admin/unit/inspection/inspectionPlan.models.ts
@@ -1,5 +1,6 @@
-import type { EquipmentTypeViewModel } from "../equipmentType/equipmentType.models";
-import type { VehicleTypeViewModel } from "../vehicleType/vehicleType.models";
+import type { InspectionPointEnum } from "@/enums/inspectionEnum";
+import type { EquipmentViewModel } from "../equipment/equipment.models";
+import type { VehicleViewModel } from "../vehicle/vehicle.models";
 
 export type PlanTimeDefinition = `${number}-${"d" | "m" | "y"}` | `${number}/${number | "*"}`;
 
@@ -15,11 +16,11 @@ export type InspectionPlanViewModel = {
 } & (
   | {
       assigned: "equipment";
-      related: EquipmentTypeViewModel;
+      related: EquipmentViewModel;
     }
   | {
       assigned: "vehicle";
-      related: VehicleTypeViewModel;
+      related: VehicleViewModel;
     }
 );
 
@@ -34,8 +35,10 @@ export interface InspectionPointViewModel {
   id: string;
   title: string;
   description: string;
-  type: "iO-niO" | "text" | "number";
+  type: InspectionPointEnum;
   min?: number;
+  max?: number;
+  sort: number;
 }
 
 export interface CreateInspectionPlanViewModel {
diff --git a/src/viewmodels/admin/unit/maintenance.models.ts b/src/viewmodels/admin/unit/maintenance.models.ts
new file mode 100644
index 0000000..7ccd66e
--- /dev/null
+++ b/src/viewmodels/admin/unit/maintenance.models.ts
@@ -0,0 +1,43 @@
+import type { DamageReportViewModel } from "./damageReport.models";
+import type { EquipmentViewModel } from "./equipment/equipment.models";
+import type { VehicleViewModel } from "./vehicle/vehicle.models";
+import type { WearableViewModel } from "./wearable/wearable.models";
+
+export type MaintenanceAssigned = {
+  relatedId: string;
+} & (
+  | {
+      assigned: "equipment";
+      related: EquipmentViewModel;
+    }
+  | {
+      assigned: "vehicle";
+      related: VehicleViewModel;
+    }
+  | {
+      assigned: "wearable";
+      related: WearableViewModel;
+    }
+);
+
+export type MaintenanceViewModel = {
+  id: string;
+  createdAt: Date;
+  status: string;
+  done: boolean;
+  description: string;
+  reports: DamageReportViewModel[];
+} & MaintenanceAssigned;
+
+export interface CreateMaintenanceViewModel {
+  description: string;
+  reportedBy: string;
+  affectedId: string;
+  affected: "equipment" | "vehicle" | "wearable";
+}
+
+export interface UpdateMaintenanceViewModel {
+  id: string;
+  status: string;
+  done: boolean;
+}
diff --git a/src/viewmodels/admin/unit/respiratoryGear/respiratoryGear.models.ts b/src/viewmodels/admin/unit/respiratory/respiratoryGear.models.ts
similarity index 100%
rename from src/viewmodels/admin/unit/respiratoryGear/respiratoryGear.models.ts
rename to src/viewmodels/admin/unit/respiratory/respiratoryGear.models.ts
diff --git a/src/viewmodels/admin/unit/respiratoryMission/respiratoryMission.models.ts b/src/viewmodels/admin/unit/respiratory/respiratoryMission.models.ts
similarity index 100%
rename from src/viewmodels/admin/unit/respiratoryMission/respiratoryMission.models.ts
rename to src/viewmodels/admin/unit/respiratory/respiratoryMission.models.ts
diff --git a/src/viewmodels/admin/unit/respiratoryWearer/respiratoryWearer.models.ts b/src/viewmodels/admin/unit/respiratory/respiratoryWearer.models.ts
similarity index 100%
rename from src/viewmodels/admin/unit/respiratoryWearer/respiratoryWearer.models.ts
rename to src/viewmodels/admin/unit/respiratory/respiratoryWearer.models.ts
diff --git a/src/viewmodels/admin/unit/vehicle/vehicle.models.ts b/src/viewmodels/admin/unit/vehicle/vehicle.models.ts
index 0bfccb6..4e273f6 100644
--- a/src/viewmodels/admin/unit/vehicle/vehicle.models.ts
+++ b/src/viewmodels/admin/unit/vehicle/vehicle.models.ts
@@ -1,5 +1,4 @@
-import type { InspectionViewModel } from "../inspection/inspection.models";
-import type { VehicleTypeViewModel } from "../vehicleType/vehicleType.models";
+import type { VehicleTypeViewModel } from "./vehicleType.models";
 
 export interface VehicleViewModel {
   id: string;
@@ -10,7 +9,6 @@ export interface VehicleViewModel {
   decommissioned?: Date;
   vehicleTypeId: string;
   vehicleType: VehicleTypeViewModel;
-  inspections: Array<InspectionViewModel>;
 }
 
 export interface CreateVehicleViewModel {
diff --git a/src/viewmodels/admin/unit/vehicleType/vehicleType.models.ts b/src/viewmodels/admin/unit/vehicle/vehicleType.models.ts
similarity index 67%
rename from src/viewmodels/admin/unit/vehicleType/vehicleType.models.ts
rename to src/viewmodels/admin/unit/vehicle/vehicleType.models.ts
index 2de497f..ea6c7cf 100644
--- a/src/viewmodels/admin/unit/vehicleType/vehicleType.models.ts
+++ b/src/viewmodels/admin/unit/vehicle/vehicleType.models.ts
@@ -1,10 +1,7 @@
-import type { InspectionPlanViewModel } from "../inspectionPlan/inspectionPlan.models";
-
 export interface VehicleTypeViewModel {
   id: string;
   type: string;
   description: string;
-  inspectionPlans: Array<InspectionPlanViewModel>;
 }
 
 export interface CreateVehicleTypeViewModel {
diff --git a/src/viewmodels/admin/unit/wearable/wearable.models.ts b/src/viewmodels/admin/unit/wearable/wearable.models.ts
index cec2ece..aef67ae 100644
--- a/src/viewmodels/admin/unit/wearable/wearable.models.ts
+++ b/src/viewmodels/admin/unit/wearable/wearable.models.ts
@@ -1,5 +1,5 @@
 import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.models";
-import type { WearableTypeViewModel } from "../wearableType/wearableType.models";
+import type { WearableTypeViewModel } from "./wearableType.models";
 
 export interface WearableViewModel {
   id: string;
diff --git a/src/viewmodels/admin/unit/wearableType/wearableType.models.ts b/src/viewmodels/admin/unit/wearable/wearableType.models.ts
similarity index 100%
rename from src/viewmodels/admin/unit/wearableType/wearableType.models.ts
rename to src/viewmodels/admin/unit/wearable/wearableType.models.ts
-- 
2.47.3


From b280654f9215953f9f8ccfd7007977a398b93149 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Mon, 2 Jun 2025 13:14:24 +0200
Subject: [PATCH 02/16] change icon sizing

---
 src/views/admin/unit/equipment/DamageReport.vue | 2 +-
 src/views/admin/unit/vehicle/DamageReport.vue   | 2 +-
 src/views/admin/unit/wearable/DamageReport.vue  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/admin/unit/equipment/DamageReport.vue b/src/views/admin/unit/equipment/DamageReport.vue
index 5e5d887..3a1f043 100644
--- a/src/views/admin/unit/equipment/DamageReport.vue
+++ b/src/views/admin/unit/equipment/DamageReport.vue
@@ -11,7 +11,7 @@
         <div class="flex flex-col h-fit w-full border border-primary rounded-md">
           <div class="bg-primary p-2 text-white flex flex-row gap-2 items-center">
             <PencilSquareIcon v-if="!row.done" class="w-5 h-5" />
-            <PhotoIcon v-if="row.providedImage" />
+            <PhotoIcon v-if="row.providedImage" class="w-5 h-5" />
             <p>{{ row.reported }} - {{ row.status }}</p>
           </div>
           <div class="p-2">
diff --git a/src/views/admin/unit/vehicle/DamageReport.vue b/src/views/admin/unit/vehicle/DamageReport.vue
index 09196c6..dd05bf6 100644
--- a/src/views/admin/unit/vehicle/DamageReport.vue
+++ b/src/views/admin/unit/vehicle/DamageReport.vue
@@ -11,7 +11,7 @@
         <div class="flex flex-col h-fit w-full border border-primary rounded-md">
           <div class="bg-primary p-2 text-white flex flex-row gap-2 items-center">
             <PencilSquareIcon v-if="!row.done" class="w-5 h-5" />
-            <PhotoIcon v-if="row.providedImage" />
+            <PhotoIcon v-if="row.providedImage" class="w-5 h-5" />
             <p>{{ row.reported }} - {{ row.status }}</p>
           </div>
           <div class="p-2">
diff --git a/src/views/admin/unit/wearable/DamageReport.vue b/src/views/admin/unit/wearable/DamageReport.vue
index eb35ef2..78f1b3e 100644
--- a/src/views/admin/unit/wearable/DamageReport.vue
+++ b/src/views/admin/unit/wearable/DamageReport.vue
@@ -11,7 +11,7 @@
         <div class="flex flex-col h-fit w-full border border-primary rounded-md">
           <div class="bg-primary p-2 text-white flex flex-row gap-2 items-center">
             <PencilSquareIcon v-if="!row.done" class="w-5 h-5" />
-            <PhotoIcon v-if="row.providedImage" />
+            <PhotoIcon v-if="row.providedImage" class="w-5 h-5" />
             <p>{{ row.reported }} - {{ row.status }}</p>
           </div>
           <div class="p-2">
-- 
2.47.3


From 6c8d57a7e5a443c1684fd3e4f4f1ebd1db3c251d Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Wed, 4 Jun 2025 12:49:42 +0200
Subject: [PATCH 03/16] update imports

---
 .../damageReport/DamageReportListItem.vue     |   2 +-
 .../CreateEquipmentTypeModal.vue              |   2 +-
 .../DeleteEquipmentTypeModal.vue              |   2 +-
 .../equipmentType/EquipmentTypeListItem.vue   |   2 +-
 .../admin/unit/inspection/OkNotOk.vue         |   2 +-
 .../admin/unit/inspection/ResultInput.vue     |   2 +-
 .../inspectionPlan/InspectionPlanListItem.vue |   2 +-
 .../TypeInspectionPlanListItem.vue            |   2 +-
 .../RespiratoryGearListItem.vue               |   2 +-
 .../RespiratoryMissionListItem.vue            |   2 +-
 .../RespiratoryWearerListItem.vue             |   2 +-
 .../vehicleType/CreateVehicleTypeModal.vue    |   2 +-
 .../unit/vehicleType/VehicleTypeListItem.vue  |   2 +-
 .../wearableType/CreateWearableTypeModal.vue  |   2 +-
 .../wearableType/DeleteWearableTypeModal.vue  |   2 +-
 .../wearableType/WearableTypeListItem.vue     |   6 +-
 .../search/EquipmentTypeSearchSelect.vue      |   2 +-
 .../search/InspectionPlanSearchSelect.vue     |   2 +-
 .../search/VehicleTypeSearchSelect.vue        |   2 +-
 .../search/WearableTypeSearchSelect.vue       |   2 +-
 src/demodata/damageReport.ts                  |  30 ----
 src/demodata/equipment.ts                     |  17 --
 src/demodata/equipmentType.ts                 |  11 --
 src/demodata/inspectionPlan.ts                | 156 ------------------
 src/demodata/respiratoryGear.ts               |  10 --
 src/demodata/respiratoryMission.ts            |  11 --
 src/demodata/respiratoryWearer.ts             |  17 --
 src/demodata/vehicle.ts                       |  27 ---
 src/demodata/vehicleType.ts                   |  16 --
 src/demodata/wearable.ts                      |  25 ---
 src/demodata/wearableType.ts                  |   9 -
 .../admin/unit/damageReport/damageReport.ts   |   4 +-
 .../admin/unit/equipment/damageReport.ts      |   3 +-
 .../admin/unit/damageReport/DamageReport.vue  |   2 +-
 .../admin/unit/equipment/DamageReport.vue     |   2 +-
 .../unit/equipmentType/EquipmentType.vue      |   2 +-
 .../equipmentType/UpdateEquipmentType.vue     |   2 +-
 .../unit/inspection/InspectionExecute.vue     |   1 +
 .../inspectionPlan/CreateInspectionPlan.vue   |   4 +-
 .../unit/inspectionPlan/InspectionPlan.vue    |   2 +-
 .../inspectionPlan/UpdateInspectionPlan.vue   |   2 +-
 .../respiratoryGear/CreateRespiratoryGear.vue |   2 +-
 .../unit/respiratoryGear/RespiratoryGear.vue  |   2 +-
 .../CreateRespiratoryMission.vue              |   2 +-
 .../respiratoryMission/RespiratoryMission.vue |   2 +-
 .../CreateRespiratoryWearer.vue               |   2 +-
 .../respiratoryWearer/RespiratoryWearer.vue   |   2 +-
 src/views/admin/unit/vehicle/DamageReport.vue |   2 +-
 .../unit/vehicleType/UpdateVehicleType.vue    |   2 +-
 .../admin/unit/vehicleType/VehicleType.vue    |   2 +-
 .../admin/unit/wearable/DamageReport.vue      |   2 +-
 .../unit/wearableType/UpdateWearableType.vue  |   2 +-
 .../admin/unit/wearableType/WearableType.vue  |   2 +-
 53 files changed, 46 insertions(+), 375 deletions(-)
 delete mode 100644 src/demodata/damageReport.ts
 delete mode 100644 src/demodata/equipment.ts
 delete mode 100644 src/demodata/equipmentType.ts
 delete mode 100644 src/demodata/inspectionPlan.ts
 delete mode 100644 src/demodata/respiratoryGear.ts
 delete mode 100644 src/demodata/respiratoryMission.ts
 delete mode 100644 src/demodata/respiratoryWearer.ts
 delete mode 100644 src/demodata/vehicle.ts
 delete mode 100644 src/demodata/vehicleType.ts
 delete mode 100644 src/demodata/wearable.ts
 delete mode 100644 src/demodata/wearableType.ts

diff --git a/src/components/admin/unit/damageReport/DamageReportListItem.vue b/src/components/admin/unit/damageReport/DamageReportListItem.vue
index 82fd74b..a838973 100644
--- a/src/components/admin/unit/damageReport/DamageReportListItem.vue
+++ b/src/components/admin/unit/damageReport/DamageReportListItem.vue
@@ -16,7 +16,7 @@
 import { defineComponent, type PropType } from "vue";
 import { mapState, mapActions } from "pinia";
 import { useAbilityStore } from "@/stores/ability";
-import type { DamageReportViewModel } from "@/viewmodels/admin/unit/damageReport/damageReport.models";
+import type { DamageReportViewModel } from "@/viewmodels/admin/unit/damageReport.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/equipmentType/CreateEquipmentTypeModal.vue b/src/components/admin/unit/equipmentType/CreateEquipmentTypeModal.vue
index bbe3a80..e0f50b5 100644
--- a/src/components/admin/unit/equipmentType/CreateEquipmentTypeModal.vue
+++ b/src/components/admin/unit/equipmentType/CreateEquipmentTypeModal.vue
@@ -40,7 +40,7 @@ import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { useEquipmentTypeStore } from "@/stores/admin/unit/equipmentType/equipmentType";
-import type { CreateEquipmentTypeViewModel } from "@/viewmodels/admin/unit/equipmentType/equipmentType.models";
+import type { CreateEquipmentTypeViewModel } from "@/viewmodels/admin/unit/equipment/equipmentType.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/equipmentType/DeleteEquipmentTypeModal.vue b/src/components/admin/unit/equipmentType/DeleteEquipmentTypeModal.vue
index 5324d74..355117d 100644
--- a/src/components/admin/unit/equipmentType/DeleteEquipmentTypeModal.vue
+++ b/src/components/admin/unit/equipmentType/DeleteEquipmentTypeModal.vue
@@ -39,7 +39,7 @@ import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { useEquipmentTypeStore } from "@/stores/admin/unit/equipmentType/equipmentType";
-import type { CreateEquipmentTypeViewModel } from "@/viewmodels/admin/unit/equipmentType/equipmentType.models";
+import type { CreateEquipmentTypeViewModel } from "@/viewmodels/admin/unit/equipment/equipmentType.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/equipmentType/EquipmentTypeListItem.vue b/src/components/admin/unit/equipmentType/EquipmentTypeListItem.vue
index c8cb5ea..f3f50a1 100644
--- a/src/components/admin/unit/equipmentType/EquipmentTypeListItem.vue
+++ b/src/components/admin/unit/equipmentType/EquipmentTypeListItem.vue
@@ -15,7 +15,7 @@
 import { defineComponent, type PropType } from "vue";
 import { mapState, mapActions } from "pinia";
 import { useAbilityStore } from "@/stores/ability";
-import type { EquipmentTypeViewModel } from "@/viewmodels/admin/unit/equipmentType/equipmentType.models";
+import type { EquipmentTypeViewModel } from "@/viewmodels/admin/unit/equipment/equipmentType.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/inspection/OkNotOk.vue b/src/components/admin/unit/inspection/OkNotOk.vue
index 460c3df..861e6fa 100644
--- a/src/components/admin/unit/inspection/OkNotOk.vue
+++ b/src/components/admin/unit/inspection/OkNotOk.vue
@@ -25,7 +25,7 @@
 <script setup lang="ts">
 import { defineComponent, type PropType } from "vue";
 import { RadioGroup, RadioGroupOption } from "@headlessui/vue";
-import type { InspectionPointViewModel } from "@/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models";
+import type { InspectionPointViewModel } from "@/viewmodels/admin/unit/inspection/inspectionPlan.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/inspection/ResultInput.vue b/src/components/admin/unit/inspection/ResultInput.vue
index 2e68a1b..7ac023b 100644
--- a/src/components/admin/unit/inspection/ResultInput.vue
+++ b/src/components/admin/unit/inspection/ResultInput.vue
@@ -22,7 +22,7 @@
 
 <script setup lang="ts">
 import { defineComponent, type PropType } from "vue";
-import type { InspectionPointViewModel } from "@/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models";
+import type { InspectionPointViewModel } from "@/viewmodels/admin/unit/inspection/inspectionPlan.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/inspectionPlan/InspectionPlanListItem.vue b/src/components/admin/unit/inspectionPlan/InspectionPlanListItem.vue
index ab2a6fa..f80f564 100644
--- a/src/components/admin/unit/inspectionPlan/InspectionPlanListItem.vue
+++ b/src/components/admin/unit/inspectionPlan/InspectionPlanListItem.vue
@@ -16,7 +16,7 @@
 import { defineComponent, type PropType } from "vue";
 import { mapState, mapActions } from "pinia";
 import { useAbilityStore } from "@/stores/ability";
-import type { InspectionPlanViewModel } from "@/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models";
+import type { InspectionPlanViewModel } from "@/viewmodels/admin/unit/inspection/inspectionPlan.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/inspectionPlan/TypeInspectionPlanListItem.vue b/src/components/admin/unit/inspectionPlan/TypeInspectionPlanListItem.vue
index b8316d3..ac477cf 100644
--- a/src/components/admin/unit/inspectionPlan/TypeInspectionPlanListItem.vue
+++ b/src/components/admin/unit/inspectionPlan/TypeInspectionPlanListItem.vue
@@ -11,7 +11,7 @@
 
 <script setup lang="ts">
 import { defineComponent, type PropType } from "vue";
-import type { InspectionPlanViewModel } from "@/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models";
+import type { InspectionPlanViewModel } from "@/viewmodels/admin/unit/inspection/inspectionPlan.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/respiratoryGear/RespiratoryGearListItem.vue b/src/components/admin/unit/respiratoryGear/RespiratoryGearListItem.vue
index dd0a616..7b55acf 100644
--- a/src/components/admin/unit/respiratoryGear/RespiratoryGearListItem.vue
+++ b/src/components/admin/unit/respiratoryGear/RespiratoryGearListItem.vue
@@ -18,7 +18,7 @@
 import { defineComponent, type PropType } from "vue";
 import { mapState, mapActions } from "pinia";
 import { useAbilityStore } from "@/stores/ability";
-import type { RespiratoryGearViewModel } from "@/viewmodels/admin/unit/respiratoryGear/respiratoryGear.models";
+import type { RespiratoryGearViewModel } from "@/viewmodels/admin/unit/respiratory/respiratoryGear.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/respiratoryMission/RespiratoryMissionListItem.vue b/src/components/admin/unit/respiratoryMission/RespiratoryMissionListItem.vue
index d51eaaa..913b132 100644
--- a/src/components/admin/unit/respiratoryMission/RespiratoryMissionListItem.vue
+++ b/src/components/admin/unit/respiratoryMission/RespiratoryMissionListItem.vue
@@ -16,7 +16,7 @@
 import { defineComponent, type PropType } from "vue";
 import { mapState, mapActions } from "pinia";
 import { useAbilityStore } from "@/stores/ability";
-import type { RespiratoryMissionViewModel } from "@/viewmodels/admin/unit/respiratoryMission/respiratoryMission.models";
+import type { RespiratoryMissionViewModel } from "@/viewmodels/admin/unit/respiratory/respiratoryMission.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/respiratoryWearer/RespiratoryWearerListItem.vue b/src/components/admin/unit/respiratoryWearer/RespiratoryWearerListItem.vue
index f642990..291237e 100644
--- a/src/components/admin/unit/respiratoryWearer/RespiratoryWearerListItem.vue
+++ b/src/components/admin/unit/respiratoryWearer/RespiratoryWearerListItem.vue
@@ -19,7 +19,7 @@
 import { defineComponent, type PropType } from "vue";
 import { mapState, mapActions } from "pinia";
 import { useAbilityStore } from "@/stores/ability";
-import type { RespiratoryWearerViewModel } from "@/viewmodels/admin/unit/respiratoryWearer/respiratoryWearer.models";
+import type { RespiratoryWearerViewModel } from "@/viewmodels/admin/unit/respiratory/respiratoryWearer.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/vehicleType/CreateVehicleTypeModal.vue b/src/components/admin/unit/vehicleType/CreateVehicleTypeModal.vue
index 79dfd38..b7a570e 100644
--- a/src/components/admin/unit/vehicleType/CreateVehicleTypeModal.vue
+++ b/src/components/admin/unit/vehicleType/CreateVehicleTypeModal.vue
@@ -40,7 +40,7 @@ import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { useVehicleTypeStore } from "@/stores/admin/unit/vehicleType/vehicleType";
-import type { CreateVehicleTypeViewModel } from "@/viewmodels/admin/unit/vehicleType/vehicleType.models";
+import type { CreateVehicleTypeViewModel } from "@/viewmodels/admin/unit/vehicle/vehicleType.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/vehicleType/VehicleTypeListItem.vue b/src/components/admin/unit/vehicleType/VehicleTypeListItem.vue
index 4ade7a4..b18a059 100644
--- a/src/components/admin/unit/vehicleType/VehicleTypeListItem.vue
+++ b/src/components/admin/unit/vehicleType/VehicleTypeListItem.vue
@@ -15,7 +15,7 @@
 import { defineComponent, type PropType } from "vue";
 import { mapState, mapActions } from "pinia";
 import { useAbilityStore } from "@/stores/ability";
-import type { VehicleTypeViewModel } from "@/viewmodels/admin/unit/vehicleType/vehicleType.models";
+import type { VehicleTypeViewModel } from "@/viewmodels/admin/unit/vehicle/vehicleType.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/wearableType/CreateWearableTypeModal.vue b/src/components/admin/unit/wearableType/CreateWearableTypeModal.vue
index 8a97cfb..b7df9d0 100644
--- a/src/components/admin/unit/wearableType/CreateWearableTypeModal.vue
+++ b/src/components/admin/unit/wearableType/CreateWearableTypeModal.vue
@@ -40,7 +40,7 @@ import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { useWearableTypeStore } from "@/stores/admin/unit/wearableType/wearableType";
-import type { CreateWearableTypeViewModel } from "@/viewmodels/admin/unit/wearableType/wearableType.models";
+import type { CreateWearableTypeViewModel } from "@/viewmodels/admin/unit/wearable/wearableType.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/wearableType/DeleteWearableTypeModal.vue b/src/components/admin/unit/wearableType/DeleteWearableTypeModal.vue
index 1fc1576..d54d099 100644
--- a/src/components/admin/unit/wearableType/DeleteWearableTypeModal.vue
+++ b/src/components/admin/unit/wearableType/DeleteWearableTypeModal.vue
@@ -39,7 +39,7 @@ import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { useWearableTypeStore } from "@/stores/admin/unit/wearableType/wearableType";
-import type { CreateWearableTypeViewModel } from "@/viewmodels/admin/unit/wearableType/wearableType.models";
+import type { CreateWearableTypeViewModel } from "@/viewmodels/admin/unit/wearable/wearableType.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/wearableType/WearableTypeListItem.vue b/src/components/admin/unit/wearableType/WearableTypeListItem.vue
index 8f959ad..ce86f5b 100644
--- a/src/components/admin/unit/wearableType/WearableTypeListItem.vue
+++ b/src/components/admin/unit/wearableType/WearableTypeListItem.vue
@@ -9,10 +9,12 @@
 </template>
 
 <script setup lang="ts">
-import { defineComponent, type PropType } from "vue";
+import { defineAsyncComponent, defineComponent, markRaw, type PropType } from "vue";
 import { mapState, mapActions } from "pinia";
+import { PencilIcon, TrashIcon } from "@heroicons/vue/24/outline";
 import { useAbilityStore } from "@/stores/ability";
-import type { WearableTypeViewModel } from "@/viewmodels/admin/unit/wearableType/wearableType.models";
+import type { WearableTypeViewModel } from "@/viewmodels/admin/unit/wearable/wearableType.models";
+import { useModalStore } from "@/stores/modal";
 </script>
 
 <script lang="ts">
diff --git a/src/components/search/EquipmentTypeSearchSelect.vue b/src/components/search/EquipmentTypeSearchSelect.vue
index 77fa8b6..809b444 100644
--- a/src/components/search/EquipmentTypeSearchSelect.vue
+++ b/src/components/search/EquipmentTypeSearchSelect.vue
@@ -86,7 +86,7 @@ import {
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
 import Spinner from "../Spinner.vue";
 import { useEquipmentTypeStore } from "@/stores/admin/unit/equipmentType/equipmentType";
-import type { EquipmentTypeViewModel } from "@/viewmodels/admin/unit/equipmentType/equipmentType.models";
+import type { EquipmentTypeViewModel } from "@/viewmodels/admin/unit/equipment/equipmentType.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/search/InspectionPlanSearchSelect.vue b/src/components/search/InspectionPlanSearchSelect.vue
index 58a514b..4580bd5 100644
--- a/src/components/search/InspectionPlanSearchSelect.vue
+++ b/src/components/search/InspectionPlanSearchSelect.vue
@@ -86,7 +86,7 @@ import {
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
 import Spinner from "../Spinner.vue";
 import { useInspectionPlanStore } from "@/stores/admin/unit/inspectionPlan/inspectionPlan";
-import type { InspectionPlanViewModel } from "@/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models";
+import type { InspectionPlanViewModel } from "@/viewmodels/admin/unit/inspection/inspectionPlan.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/search/VehicleTypeSearchSelect.vue b/src/components/search/VehicleTypeSearchSelect.vue
index 09490cb..31d7752 100644
--- a/src/components/search/VehicleTypeSearchSelect.vue
+++ b/src/components/search/VehicleTypeSearchSelect.vue
@@ -86,7 +86,7 @@ import {
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
 import Spinner from "../Spinner.vue";
 import { useVehicleTypeStore } from "@/stores/admin/unit/vehicleType/vehicleType";
-import type { VehicleTypeViewModel } from "@/viewmodels/admin/unit/vehicleType/vehicleType.models";
+import type { VehicleTypeViewModel } from "@/viewmodels/admin/unit/vehicle/vehicleType.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/search/WearableTypeSearchSelect.vue b/src/components/search/WearableTypeSearchSelect.vue
index 33c42b4..5267904 100644
--- a/src/components/search/WearableTypeSearchSelect.vue
+++ b/src/components/search/WearableTypeSearchSelect.vue
@@ -86,7 +86,7 @@ import {
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
 import Spinner from "../Spinner.vue";
 import { useWearableTypeStore } from "@/stores/admin/unit/wearableType/wearableType";
-import type { WearableTypeViewModel } from "@/viewmodels/admin/unit/wearableType/wearableType.models";
+import type { WearableTypeViewModel } from "@/viewmodels/admin/unit/wearable/wearableType.models";
 </script>
 
 <script lang="ts">
diff --git a/src/demodata/damageReport.ts b/src/demodata/damageReport.ts
deleted file mode 100644
index d65e381..0000000
--- a/src/demodata/damageReport.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import type { DamageReportViewModel } from "@/viewmodels/admin/unit/damageReport/damageReport.models";
-import { equipmentDemoData } from "./equipment";
-
-export const damageReportDemoData: Array<DamageReportViewModel> = [
-  {
-    id: "sdfgh",
-    reported: new Date(),
-    status: "in Arbeit",
-    done: false,
-    description: "knjgljna g",
-    providedImage: [],
-    relatedId: "abc",
-    related: {
-      id: "abc",
-      code: "0456984224498",
-      name: "B-Schlauch",
-      location: "HLF",
-      commissioned: new Date(),
-      equipmentTypeId: "xyz",
-      equipmentType: {
-        id: "xyz",
-        type: "B-Schlauch",
-        description: "Shläuche vom Typ B",
-        inspectionPlans: [],
-      },
-      inspections: [],
-    },
-    assigned: "equipment",
-  },
-];
diff --git a/src/demodata/equipment.ts b/src/demodata/equipment.ts
deleted file mode 100644
index 06563b5..0000000
--- a/src/demodata/equipment.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import type { EquipmentViewModel } from "@/viewmodels/admin/unit/equipment/equipment.models";
-import { equipmentTypeDemoData } from "./equipmentType";
-import { inspectionDemoData } from "./inspectionPlan";
-
-export const equipmentDemoData: Array<EquipmentViewModel> = [
-  {
-    id: "abc",
-    code: "0456984224498",
-    name: "B-Schlauch",
-    location: "HLF",
-    commissioned: new Date(),
-    decommissioned: undefined,
-    equipmentTypeId: equipmentTypeDemoData[0].id,
-    equipmentType: equipmentTypeDemoData[0],
-    inspections: [inspectionDemoData[0]],
-  },
-];
diff --git a/src/demodata/equipmentType.ts b/src/demodata/equipmentType.ts
deleted file mode 100644
index df604cd..0000000
--- a/src/demodata/equipmentType.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { EquipmentTypeViewModel } from "@/viewmodels/admin/unit/equipmentType/equipmentType.models";
-import { inspectionPlanDemoData } from "./inspectionPlan";
-
-export const equipmentTypeDemoData: Array<EquipmentTypeViewModel> = [
-  {
-    id: "xyz",
-    type: "B-Schlauch",
-    description: "Shläuche vom Typ B",
-    inspectionPlans: [inspectionPlanDemoData[0], inspectionPlanDemoData[1]],
-  },
-];
diff --git a/src/demodata/inspectionPlan.ts b/src/demodata/inspectionPlan.ts
deleted file mode 100644
index 9482312..0000000
--- a/src/demodata/inspectionPlan.ts
+++ /dev/null
@@ -1,156 +0,0 @@
-import type {
-  InspectionPlanViewModel,
-  InspectionPointViewModel,
-} from "@/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models";
-import type {
-  InspectionPointResultViewModel,
-  InspectionViewModel,
-} from "@/viewmodels/admin/unit/inspection/inspection.models";
-
-export const inspectionPointDemoData: Array<InspectionPointViewModel> = [
-  {
-    id: "edf",
-    title: "vorhandene Spritzstellen ausgebessert",
-    description: "",
-    type: "number",
-  },
-  {
-    id: "ghi",
-    title: "Einband der Kupplung sitzt fest",
-    description: "",
-    type: "iO-niO",
-  },
-  {
-    id: "lmn",
-    title: "Das überstehende Drahtende des Knaggenteiles sitzt versenkt",
-    description: "",
-    type: "iO-niO",
-  },
-  {
-    id: "jgj",
-    title: "Gebrauchsprüfdruck 12bar",
-    description: "",
-    type: "iO-niO",
-  },
-];
-
-export const inspectionPlanDemoData: Array<InspectionPlanViewModel> = [
-  {
-    id: "abc",
-    title: "Sichtprüfung",
-    version: 1,
-    inspectionInterval: "1-m",
-    remindTime: "1-m",
-    created: new Date(),
-    inspectionPoints: [inspectionPointDemoData[0], inspectionPointDemoData[1], inspectionPointDemoData[2]],
-    relatedId: "xyz",
-    related: {
-      id: "xyz",
-      type: "B-Schlauch",
-      description: "Shläuche vom Typ B",
-      inspectionPlans: [],
-    },
-    assigned: "equipment",
-  },
-  {
-    id: "cba",
-    title: "Druckprüfung",
-    version: 1,
-    inspectionInterval: "1-m",
-    remindTime: "22/10",
-    created: new Date(),
-    inspectionPoints: [inspectionPointDemoData[3]],
-    relatedId: "xyz",
-    related: {
-      id: "xyz",
-      type: "B-Schlauch",
-      description: "Shläuche vom Typ B",
-      inspectionPlans: [],
-    },
-    assigned: "equipment",
-  },
-];
-
-export const inspectionPointResultDemoData: Array<InspectionPointResultViewModel> = [
-  {
-    inspectionId: "jkvshdfg",
-    inspectionVersionedPlanId: inspectionPlanDemoData[0].id,
-    inspectionPointId: inspectionPointDemoData[0].id,
-    value: "5",
-  },
-  {
-    inspectionId: "jkvshdfg",
-    inspectionVersionedPlanId: inspectionPlanDemoData[0].id,
-    inspectionPointId: inspectionPointDemoData[1].id,
-    value: "",
-  },
-  {
-    inspectionId: "jkvshdfg",
-    inspectionVersionedPlanId: inspectionPlanDemoData[0].id,
-    inspectionPointId: inspectionPointDemoData[1].id,
-    value: "",
-  },
-];
-
-export const inspectionDemoData: Array<InspectionViewModel> = [
-  {
-    id: "jkvshdfg",
-    inspectionPlanId: inspectionPlanDemoData[0].id,
-    inspectionPlan: inspectionPlanDemoData[0],
-    inspectionVersionedPlanId: inspectionPlanDemoData[0].id,
-    inspectionVersionedPlan: inspectionPlanDemoData[0],
-    context: "",
-    created: new Date(),
-    finished: undefined,
-    nextInspection: undefined,
-    isOpen: true,
-    checks: [inspectionPointResultDemoData[0], inspectionPointResultDemoData[1], inspectionPointResultDemoData[2]],
-    relatedId: "abc",
-    related: {
-      id: "abc",
-      code: "0456984224498",
-      name: "B-Schlauch",
-      location: "HLF",
-      commissioned: new Date(),
-      equipmentTypeId: "xyz",
-      equipmentType: {
-        id: "xyz",
-        type: "B-Schlauch",
-        description: "Shläuche vom Typ B",
-        inspectionPlans: [],
-      },
-      inspections: [],
-    },
-    assigned: "equipment",
-  },
-  {
-    id: "jkvshdfg",
-    inspectionPlanId: inspectionPlanDemoData[0].id,
-    inspectionPlan: inspectionPlanDemoData[0],
-    inspectionVersionedPlanId: inspectionPlanDemoData[0].id,
-    inspectionVersionedPlan: inspectionPlanDemoData[0],
-    context: "sohgfpb",
-    created: new Date(),
-    finished: new Date(),
-    nextInspection: new Date(),
-    isOpen: false,
-    checks: [inspectionPointResultDemoData[0], inspectionPointResultDemoData[1], inspectionPointResultDemoData[2]],
-    relatedId: "abc",
-    related: {
-      id: "abc",
-      code: "0456984224498",
-      name: "B-Schlauch",
-      location: "HLF",
-      commissioned: new Date(),
-      equipmentTypeId: "xyz",
-      equipmentType: {
-        id: "xyz",
-        type: "B-Schlauch",
-        description: "Shläuche vom Typ B",
-        inspectionPlans: [],
-      },
-      inspections: [],
-    },
-    assigned: "equipment",
-  },
-];
diff --git a/src/demodata/respiratoryGear.ts b/src/demodata/respiratoryGear.ts
deleted file mode 100644
index caf4de0..0000000
--- a/src/demodata/respiratoryGear.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { RespiratoryGearViewModel } from "@/viewmodels/admin/unit/respiratoryGear/respiratoryGear.models";
-import { equipmentDemoData } from "./equipment";
-
-export const respiratoryGearDemoData: Array<RespiratoryGearViewModel> = [
-  {
-    id: "adfsg",
-    equipmentId: equipmentDemoData[0].id,
-    equipment: equipmentDemoData[0],
-  },
-];
diff --git a/src/demodata/respiratoryMission.ts b/src/demodata/respiratoryMission.ts
deleted file mode 100644
index e32c39e..0000000
--- a/src/demodata/respiratoryMission.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { RespiratoryMissionViewModel } from "@/viewmodels/admin/unit/respiratoryMission/respiratoryMission.models";
-import { equipmentDemoData } from "./equipment";
-
-export const respiratoryMissionDemoData: Array<RespiratoryMissionViewModel> = [
-  {
-    id: "adfsg",
-    date: new Date(),
-    title: "B5",
-    description: "B5 Einsatz",
-  },
-];
diff --git a/src/demodata/respiratoryWearer.ts b/src/demodata/respiratoryWearer.ts
deleted file mode 100644
index 01019a0..0000000
--- a/src/demodata/respiratoryWearer.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import type { RespiratoryWearerViewModel } from "@/viewmodels/admin/unit/respiratoryWearer/respiratoryWearer.models";
-
-export const respiratoryWearerDemoData: Array<RespiratoryWearerViewModel> = [
-  {
-    id: "dfghj",
-    memberId: "9469991d-fa22-4899-82ce-b1ba5de990dc",
-    member: {
-      id: "9469991d-fa22-4899-82ce-b1ba5de990dc",
-      salutation: { id: 3, salutation: "Herr" },
-      firstname: "Julian",
-      lastname: "Krauser",
-      nameaffix: "",
-      birthdate: new Date("2003-09-20"),
-      internalId: "1312",
-    },
-  },
-];
diff --git a/src/demodata/vehicle.ts b/src/demodata/vehicle.ts
deleted file mode 100644
index b307abb..0000000
--- a/src/demodata/vehicle.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { VehicleViewModel } from "@/viewmodels/admin/unit/vehicle/vehicle.models";
-import { vehicleTypeDemoData } from "./vehicleType";
-
-export const vehicleDemoData: Array<VehicleViewModel> = [
-  {
-    id: "kjhb",
-    code: "",
-    name: "HLF",
-    location: "Tor 1",
-    commissioned: new Date(),
-    decommissioned: undefined,
-    vehicleTypeId: vehicleTypeDemoData[0].id,
-    vehicleType: vehicleTypeDemoData[0],
-    inspections: [],
-  },
-  {
-    id: "kjhdfgb",
-    code: "",
-    name: "LF",
-    location: "Tor 2",
-    commissioned: new Date(),
-    decommissioned: undefined,
-    vehicleTypeId: vehicleTypeDemoData[1].id,
-    vehicleType: vehicleTypeDemoData[1],
-    inspections: [],
-  },
-];
diff --git a/src/demodata/vehicleType.ts b/src/demodata/vehicleType.ts
deleted file mode 100644
index bf25718..0000000
--- a/src/demodata/vehicleType.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import type { VehicleTypeViewModel } from "@/viewmodels/admin/unit/vehicleType/vehicleType.models";
-
-export const vehicleTypeDemoData: Array<VehicleTypeViewModel> = [
-  {
-    id: "xyfgdghfz",
-    type: "HLF 20/10",
-    description: "HLF",
-    inspectionPlans: [],
-  },
-  {
-    id: "abc",
-    type: "LF 8/6",
-    description: "LF",
-    inspectionPlans: [],
-  },
-];
diff --git a/src/demodata/wearable.ts b/src/demodata/wearable.ts
deleted file mode 100644
index 973de4a..0000000
--- a/src/demodata/wearable.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import type { WearableViewModel } from "@/viewmodels/admin/unit/wearable/wearable.models";
-import { wearableTypeDemoData } from "./wearableType";
-
-export const wearableDemoData: Array<WearableViewModel> = [
-  {
-    id: "absdfgc",
-    code: "0456984224498",
-    name: "Jacke",
-    location: "Spint",
-    commissioned: new Date(),
-    decommissioned: undefined,
-    wearerId: "9469991d-fa22-4899-82ce-b1ba5de990dc",
-    wearer: {
-      id: "9469991d-fa22-4899-82ce-b1ba5de990dc",
-      salutation: { id: 3, salutation: "Herr" },
-      firstname: "Julian",
-      lastname: "Krauser",
-      nameaffix: "",
-      birthdate: new Date("2003-09-20"),
-      internalId: "1312",
-    },
-    wearableTypeId: wearableTypeDemoData[0].id,
-    wearableType: wearableTypeDemoData[0],
-  },
-];
diff --git a/src/demodata/wearableType.ts b/src/demodata/wearableType.ts
deleted file mode 100644
index b5aef7f..0000000
--- a/src/demodata/wearableType.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type { WearableTypeViewModel } from "@/viewmodels/admin/unit/wearableType/wearableType.models";
-
-export const wearableTypeDemoData: Array<WearableTypeViewModel> = [
-  {
-    id: "xyz",
-    type: "Jacke",
-    description: "Bayern 2000",
-  },
-];
diff --git a/src/stores/admin/unit/damageReport/damageReport.ts b/src/stores/admin/unit/damageReport/damageReport.ts
index 04c6b7c..aeb998e 100644
--- a/src/stores/admin/unit/damageReport/damageReport.ts
+++ b/src/stores/admin/unit/damageReport/damageReport.ts
@@ -3,11 +3,9 @@ import type {
   DamageReportViewModel,
   CreateDamageReportViewModel,
   UpdateDamageReportViewModel,
-} from "@/viewmodels/admin/unit/damageReport/damageReport.models";
+} from "@/viewmodels/admin/unit/damageReport.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import type { VehicleViewModel } from "@/viewmodels/admin/unit/vehicle/vehicle.models";
-import { damageReportDemoData } from "@/demodata/damageReport";
 
 export const useDamageReportStore = defineStore("damageReport", {
   state: () => {
diff --git a/src/stores/admin/unit/equipment/damageReport.ts b/src/stores/admin/unit/equipment/damageReport.ts
index 5b757d3..afda1e8 100644
--- a/src/stores/admin/unit/equipment/damageReport.ts
+++ b/src/stores/admin/unit/equipment/damageReport.ts
@@ -1,8 +1,7 @@
 import { defineStore } from "pinia";
 import { http } from "@/serverCom";
 import { useEquipmentStore } from "./equipment";
-import type { DamageReportViewModel } from "@/viewmodels/admin/unit/damageReport/damageReport.models";
-import { damageReportDemoData } from "@/demodata/damageReport";
+import type { DamageReportViewModel } from "@/viewmodels/admin/unit/damageReport.models";
 
 export const useEquipmentDamageReportStore = defineStore("equipmentDamageReport", {
   state: () => {
diff --git a/src/views/admin/unit/damageReport/DamageReport.vue b/src/views/admin/unit/damageReport/DamageReport.vue
index 78133df..cc4dd22 100644
--- a/src/views/admin/unit/damageReport/DamageReport.vue
+++ b/src/views/admin/unit/damageReport/DamageReport.vue
@@ -20,7 +20,7 @@ import { mapActions, mapState } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
 import { useAbilityStore } from "@/stores/ability";
 import { useDamageReportStore } from "@/stores/admin/unit/damageReport/damageReport";
-import type { DamageReportViewModel } from "@/viewmodels/admin/unit/damageReport/damageReport.models";
+import type { DamageReportViewModel } from "@/viewmodels/admin/unit/damageReport.models";
 import Pagination from "@/components/Pagination.vue";
 import DamageReportListItem from "@/components/admin/unit/damageReport/DamageReportListItem.vue";
 </script>
diff --git a/src/views/admin/unit/equipment/DamageReport.vue b/src/views/admin/unit/equipment/DamageReport.vue
index 3a1f043..fbe0f8d 100644
--- a/src/views/admin/unit/equipment/DamageReport.vue
+++ b/src/views/admin/unit/equipment/DamageReport.vue
@@ -29,7 +29,7 @@ import { mapActions, mapState } from "pinia";
 import { useAbilityStore } from "@/stores/ability";
 import { useEquipmentDamageReportStore } from "@/stores/admin/unit/equipment/damageReport";
 import Pagination from "@/components/Pagination.vue";
-import type { DamageReportViewModel } from "@/viewmodels/admin/unit/damageReport/damageReport.models";
+import type { DamageReportViewModel } from "@/viewmodels/admin/unit/damageReport.models";
 import { PhotoIcon, PencilSquareIcon } from "@heroicons/vue/24/outline";
 </script>
 
diff --git a/src/views/admin/unit/equipmentType/EquipmentType.vue b/src/views/admin/unit/equipmentType/EquipmentType.vue
index 8403461..f7f3d6b 100644
--- a/src/views/admin/unit/equipmentType/EquipmentType.vue
+++ b/src/views/admin/unit/equipmentType/EquipmentType.vue
@@ -33,7 +33,7 @@ import { useEquipmentTypeStore } from "@/stores/admin/unit/equipmentType/equipme
 import { useModalStore } from "@/stores/modal";
 import Pagination from "@/components/Pagination.vue";
 import { useAbilityStore } from "@/stores/ability";
-import type { EquipmentTypeViewModel } from "@/viewmodels/admin/unit/equipmentType/equipmentType.models";
+import type { EquipmentTypeViewModel } from "@/viewmodels/admin/unit/equipment/equipmentType.models";
 import EquipmentTypeListItem from "@/components/admin/unit/equipmentType/EquipmentTypeListItem.vue";
 </script>
 
diff --git a/src/views/admin/unit/equipmentType/UpdateEquipmentType.vue b/src/views/admin/unit/equipmentType/UpdateEquipmentType.vue
index eb372e7..5d1af44 100644
--- a/src/views/admin/unit/equipmentType/UpdateEquipmentType.vue
+++ b/src/views/admin/unit/equipmentType/UpdateEquipmentType.vue
@@ -37,7 +37,7 @@ import type {
   CreateEquipmentTypeViewModel,
   EquipmentTypeViewModel,
   UpdateEquipmentTypeViewModel,
-} from "@/viewmodels/admin/unit/equipmentType/equipmentType.models";
+} from "@/viewmodels/admin/unit/equipment/equipmentType.models";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
diff --git a/src/views/admin/unit/inspection/InspectionExecute.vue b/src/views/admin/unit/inspection/InspectionExecute.vue
index 1c8bc08..322091f 100644
--- a/src/views/admin/unit/inspection/InspectionExecute.vue
+++ b/src/views/admin/unit/inspection/InspectionExecute.vue
@@ -56,6 +56,7 @@ import ResultInput from "@/components/admin/unit/inspection/ResultInput.vue";
 import type { InspectionPointResultViewModel } from "@/viewmodels/admin/unit/inspection/inspection.models";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
+import { InspectionPointEnum } from "@/enums/inspectionEnum";
 </script>
 
 <script lang="ts">
diff --git a/src/views/admin/unit/inspectionPlan/CreateInspectionPlan.vue b/src/views/admin/unit/inspectionPlan/CreateInspectionPlan.vue
index c1a3c4a..4b4f9e3 100644
--- a/src/views/admin/unit/inspectionPlan/CreateInspectionPlan.vue
+++ b/src/views/admin/unit/inspectionPlan/CreateInspectionPlan.vue
@@ -94,9 +94,9 @@ import {
 } from "@headlessui/vue";
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
 import { useInspectionPlanStore } from "@/stores/admin/unit/inspectionPlan/inspectionPlan";
-import type { CreateInspectionPlanViewModel } from "@/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models";
+import type { CreateInspectionPlanViewModel } from "@/viewmodels/admin/unit/inspection/inspectionPlan.models";
 import ScanInput from "@/components/ScanInput.vue";
-import type { EquipmentTypeViewModel } from "@/viewmodels/admin/unit/equipmentType/equipmentType.models";
+import type { EquipmentTypeViewModel } from "@/viewmodels/admin/unit/equipment/equipmentType.models";
 import { useEquipmentTypeStore } from "@/stores/admin/unit/equipmentType/equipmentType";
 import EquipmentTypeSearchSelect from "@/components/search/EquipmentTypeSearchSelect.vue";
 import VehicleTypeSearchSelect from "@/components/search/VehicleTypeSearchSelect.vue";
diff --git a/src/views/admin/unit/inspectionPlan/InspectionPlan.vue b/src/views/admin/unit/inspectionPlan/InspectionPlan.vue
index fdee7b4..07ba271 100644
--- a/src/views/admin/unit/inspectionPlan/InspectionPlan.vue
+++ b/src/views/admin/unit/inspectionPlan/InspectionPlan.vue
@@ -39,7 +39,7 @@ import MainTemplate from "@/templates/Main.vue";
 import { useInspectionPlanStore } from "@/stores/admin/unit/inspectionPlan/inspectionPlan";
 import Pagination from "@/components/Pagination.vue";
 import { useAbilityStore } from "@/stores/ability";
-import type { InspectionPlanViewModel } from "@/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models";
+import type { InspectionPlanViewModel } from "@/viewmodels/admin/unit/inspection/inspectionPlan.models";
 import InspectionPlanListItem from "@/components/admin/unit/inspectionPlan/InspectionPlanListItem.vue";
 </script>
 
diff --git a/src/views/admin/unit/inspectionPlan/UpdateInspectionPlan.vue b/src/views/admin/unit/inspectionPlan/UpdateInspectionPlan.vue
index eaad622..4525b7c 100644
--- a/src/views/admin/unit/inspectionPlan/UpdateInspectionPlan.vue
+++ b/src/views/admin/unit/inspectionPlan/UpdateInspectionPlan.vue
@@ -37,7 +37,7 @@ import type {
   CreateInspectionPlanViewModel,
   InspectionPlanViewModel,
   UpdateInspectionPlanViewModel,
-} from "@/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models";
+} from "@/viewmodels/admin/unit/inspection/inspectionPlan.models";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
diff --git a/src/views/admin/unit/respiratoryGear/CreateRespiratoryGear.vue b/src/views/admin/unit/respiratoryGear/CreateRespiratoryGear.vue
index 3d84221..71f98f0 100644
--- a/src/views/admin/unit/respiratoryGear/CreateRespiratoryGear.vue
+++ b/src/views/admin/unit/respiratoryGear/CreateRespiratoryGear.vue
@@ -30,7 +30,7 @@ import { defineComponent } from "vue";
 import { mapActions, mapState } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
 import { useRespiratoryGearStore } from "@/stores/admin/unit/respiratoryGear/respiratoryGear";
-import type { CreateRespiratoryGearViewModel } from "@/viewmodels/admin/unit/respiratoryGear/respiratoryGear.models";
+import type { CreateRespiratoryGearViewModel } from "@/viewmodels/admin/unit/respiratory/respiratoryGear.models";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
diff --git a/src/views/admin/unit/respiratoryGear/RespiratoryGear.vue b/src/views/admin/unit/respiratoryGear/RespiratoryGear.vue
index c4f3a2c..211bd36 100644
--- a/src/views/admin/unit/respiratoryGear/RespiratoryGear.vue
+++ b/src/views/admin/unit/respiratoryGear/RespiratoryGear.vue
@@ -39,7 +39,7 @@ import { useRespiratoryGearStore } from "@/stores/admin/unit/respiratoryGear/res
 import { useModalStore } from "@/stores/modal";
 import Pagination from "@/components/Pagination.vue";
 import { useAbilityStore } from "@/stores/ability";
-import type { RespiratoryGearViewModel } from "@/viewmodels/admin/unit/respiratoryGear/respiratoryGear.models";
+import type { RespiratoryGearViewModel } from "@/viewmodels/admin/unit/respiratory/respiratoryGear.models";
 import RespiratoryGearListItem from "@/components/admin/unit/respiratoryGear/RespiratoryGearListItem.vue";
 </script>
 
diff --git a/src/views/admin/unit/respiratoryMission/CreateRespiratoryMission.vue b/src/views/admin/unit/respiratoryMission/CreateRespiratoryMission.vue
index 6a422fd..3687b54 100644
--- a/src/views/admin/unit/respiratoryMission/CreateRespiratoryMission.vue
+++ b/src/views/admin/unit/respiratoryMission/CreateRespiratoryMission.vue
@@ -41,7 +41,7 @@ import { defineComponent } from "vue";
 import { mapActions, mapState } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
 import { useRespiratoryMissionStore } from "@/stores/admin/unit/respiratoryMission/respiratoryMission";
-import type { CreateRespiratoryMissionViewModel } from "@/viewmodels/admin/unit/respiratoryMission/respiratoryMission.models";
+import type { CreateRespiratoryMissionViewModel } from "@/viewmodels/admin/unit/respiratory/respiratoryMission.models";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
diff --git a/src/views/admin/unit/respiratoryMission/RespiratoryMission.vue b/src/views/admin/unit/respiratoryMission/RespiratoryMission.vue
index d7ecb22..c3f4834 100644
--- a/src/views/admin/unit/respiratoryMission/RespiratoryMission.vue
+++ b/src/views/admin/unit/respiratoryMission/RespiratoryMission.vue
@@ -39,7 +39,7 @@ import { useRespiratoryMissionStore } from "@/stores/admin/unit/respiratoryMissi
 import { useModalStore } from "@/stores/modal";
 import Pagination from "@/components/Pagination.vue";
 import { useAbilityStore } from "@/stores/ability";
-import type { RespiratoryMissionViewModel } from "@/viewmodels/admin/unit/respiratoryMission/respiratoryMission.models";
+import type { RespiratoryMissionViewModel } from "@/viewmodels/admin/unit/respiratory/respiratoryMission.models";
 import RespiratoryMissionListItem from "@/components/admin/unit/respiratoryMission/RespiratoryMissionListItem.vue";
 </script>
 
diff --git a/src/views/admin/unit/respiratoryWearer/CreateRespiratoryWearer.vue b/src/views/admin/unit/respiratoryWearer/CreateRespiratoryWearer.vue
index 4c20abf..7334432 100644
--- a/src/views/admin/unit/respiratoryWearer/CreateRespiratoryWearer.vue
+++ b/src/views/admin/unit/respiratoryWearer/CreateRespiratoryWearer.vue
@@ -30,7 +30,7 @@ import { defineComponent } from "vue";
 import { mapActions, mapState } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
 import { useRespiratoryWearerStore } from "@/stores/admin/unit/respiratoryWearer/respiratoryWearer";
-import type { CreateRespiratoryWearerViewModel } from "@/viewmodels/admin/unit/respiratoryWearer/respiratoryWearer.models";
+import type { CreateRespiratoryWearerViewModel } from "@/viewmodels/admin/unit/respiratory/respiratoryWearer.models";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
diff --git a/src/views/admin/unit/respiratoryWearer/RespiratoryWearer.vue b/src/views/admin/unit/respiratoryWearer/RespiratoryWearer.vue
index 07c1ba0..58f664a 100644
--- a/src/views/admin/unit/respiratoryWearer/RespiratoryWearer.vue
+++ b/src/views/admin/unit/respiratoryWearer/RespiratoryWearer.vue
@@ -39,7 +39,7 @@ import { useRespiratoryWearerStore } from "@/stores/admin/unit/respiratoryWearer
 import { useModalStore } from "@/stores/modal";
 import Pagination from "@/components/Pagination.vue";
 import { useAbilityStore } from "@/stores/ability";
-import type { RespiratoryWearerViewModel } from "@/viewmodels/admin/unit/respiratoryWearer/respiratoryWearer.models";
+import type { RespiratoryWearerViewModel } from "@/viewmodels/admin/unit/respiratory/respiratoryWearer.models";
 import RespiratoryWearerListItem from "@/components/admin/unit/respiratoryWearer/RespiratoryWearerListItem.vue";
 </script>
 
diff --git a/src/views/admin/unit/vehicle/DamageReport.vue b/src/views/admin/unit/vehicle/DamageReport.vue
index dd05bf6..04097f8 100644
--- a/src/views/admin/unit/vehicle/DamageReport.vue
+++ b/src/views/admin/unit/vehicle/DamageReport.vue
@@ -29,7 +29,7 @@ import { mapActions, mapState } from "pinia";
 import { useAbilityStore } from "@/stores/ability";
 import { useVehicleDamageReportStore } from "@/stores/admin/unit/vehicle/damageReport";
 import Pagination from "@/components/Pagination.vue";
-import type { DamageReportViewModel } from "@/viewmodels/admin/unit/damageReport/damageReport.models";
+import type { DamageReportViewModel } from "@/viewmodels/admin/unit/damageReport.models";
 import { PhotoIcon, PencilSquareIcon } from "@heroicons/vue/24/outline";
 </script>
 
diff --git a/src/views/admin/unit/vehicleType/UpdateVehicleType.vue b/src/views/admin/unit/vehicleType/UpdateVehicleType.vue
index 2262d00..57e1db1 100644
--- a/src/views/admin/unit/vehicleType/UpdateVehicleType.vue
+++ b/src/views/admin/unit/vehicleType/UpdateVehicleType.vue
@@ -37,7 +37,7 @@ import type {
   CreateVehicleTypeViewModel,
   VehicleTypeViewModel,
   UpdateVehicleTypeViewModel,
-} from "@/viewmodels/admin/unit/vehicleType/vehicleType.models";
+} from "@/viewmodels/admin/unit/vehicle/vehicleType.models";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
diff --git a/src/views/admin/unit/vehicleType/VehicleType.vue b/src/views/admin/unit/vehicleType/VehicleType.vue
index a74082e..5dcb552 100644
--- a/src/views/admin/unit/vehicleType/VehicleType.vue
+++ b/src/views/admin/unit/vehicleType/VehicleType.vue
@@ -33,7 +33,7 @@ import { useVehicleTypeStore } from "@/stores/admin/unit/vehicleType/vehicleType
 import { useModalStore } from "@/stores/modal";
 import Pagination from "@/components/Pagination.vue";
 import { useAbilityStore } from "@/stores/ability";
-import type { VehicleTypeViewModel } from "@/viewmodels/admin/unit/vehicleType/vehicleType.models";
+import type { VehicleTypeViewModel } from "@/viewmodels/admin/unit/vehicle/vehicleType.models";
 import VehicleTypeListItem from "@/components/admin/unit/vehicleType/VehicleTypeListItem.vue";
 </script>
 
diff --git a/src/views/admin/unit/wearable/DamageReport.vue b/src/views/admin/unit/wearable/DamageReport.vue
index 78f1b3e..555a273 100644
--- a/src/views/admin/unit/wearable/DamageReport.vue
+++ b/src/views/admin/unit/wearable/DamageReport.vue
@@ -29,7 +29,7 @@ import { mapActions, mapState } from "pinia";
 import { useAbilityStore } from "@/stores/ability";
 import { useWearableDamageReportStore } from "@/stores/admin/unit/wearable/damageReport";
 import Pagination from "@/components/Pagination.vue";
-import type { DamageReportViewModel } from "@/viewmodels/admin/unit/damageReport/damageReport.models";
+import type { DamageReportViewModel } from "@/viewmodels/admin/unit/damageReport.models";
 import { PhotoIcon, PencilSquareIcon } from "@heroicons/vue/24/outline";
 </script>
 
diff --git a/src/views/admin/unit/wearableType/UpdateWearableType.vue b/src/views/admin/unit/wearableType/UpdateWearableType.vue
index 62cd35a..4bc7344 100644
--- a/src/views/admin/unit/wearableType/UpdateWearableType.vue
+++ b/src/views/admin/unit/wearableType/UpdateWearableType.vue
@@ -37,7 +37,7 @@ import type {
   CreateWearableTypeViewModel,
   WearableTypeViewModel,
   UpdateWearableTypeViewModel,
-} from "@/viewmodels/admin/unit/wearableType/wearableType.models";
+} from "@/viewmodels/admin/unit/wearable/wearableType.models";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
diff --git a/src/views/admin/unit/wearableType/WearableType.vue b/src/views/admin/unit/wearableType/WearableType.vue
index 33c18f0..0c1c45c 100644
--- a/src/views/admin/unit/wearableType/WearableType.vue
+++ b/src/views/admin/unit/wearableType/WearableType.vue
@@ -33,7 +33,7 @@ import { useWearableTypeStore } from "@/stores/admin/unit/wearableType/wearableT
 import { useModalStore } from "@/stores/modal";
 import Pagination from "@/components/Pagination.vue";
 import { useAbilityStore } from "@/stores/ability";
-import type { WearableTypeViewModel } from "@/viewmodels/admin/unit/wearableType/wearableType.models";
+import type { WearableTypeViewModel } from "@/viewmodels/admin/unit/wearable/wearableType.models";
 import WearableTypeListItem from "@/components/admin/unit/wearableType/WearableTypeListItem.vue";
 </script>
 
-- 
2.47.3


From ddeac1aa26423c716726c111c1148e9fed0a97f5 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Wed, 4 Jun 2025 14:30:41 +0200
Subject: [PATCH 04/16] connect to backend

---
 .../equipmentType/EquipmentTypeListItem.vue   |  6 ++
 .../unit/vehicleType/VehicleTypeListItem.vue  |  6 ++
 .../wearableType/WearableTypeListItem.vue     | 26 ++++++++
 .../search/EquipmentSearchSelect.vue          |  2 +-
 .../search/MemberSearchSelectSingle.vue       |  4 +-
 src/components/search/VehicleSearchSelect.vue |  2 +-
 .../admin/unit/damageReport/damageReport.ts   | 17 +----
 .../admin/unit/equipment/damageReport.ts      |  8 +--
 src/stores/admin/unit/equipment/equipment.ts  | 20 +++---
 src/stores/admin/unit/equipment/inspection.ts | 13 +---
 .../admin/unit/equipmentType/equipmentType.ts | 24 +++----
 .../unit/equipmentType/inspectionPlan.ts      | 15 +----
 .../admin/unit/inspection/inspection.ts       | 12 ++--
 .../unit/inspectionPlan/inspectionPlan.ts     | 31 +++------
 .../unit/respiratoryGear/respiratoryGear.ts   | 12 +---
 .../respiratoryMission/respiratoryMission.ts  | 12 +---
 .../respiratoryWearer/respiratoryWearer.ts    | 12 +---
 src/stores/admin/unit/vehicle/damageReport.ts | 11 +---
 src/stores/admin/unit/vehicle/inspection.ts   |  9 +--
 src/stores/admin/unit/vehicle/vehicle.ts      | 20 +++---
 .../admin/unit/vehicleType/inspectionPlan.ts  | 15 +----
 .../admin/unit/vehicleType/vehicleType.ts     | 24 +++----
 .../admin/unit/wearable/damageReport.ts       | 11 +---
 src/stores/admin/unit/wearable/wearable.ts    | 22 ++++---
 .../admin/unit/wearableType/wearableType.ts   | 19 +++---
 .../unit/inspection/inspection.models.ts      |  2 +-
 .../unit/inspection/inspectionPlan.models.ts  |  6 +-
 .../unit/damageReport/DamageReportRouting.vue |  7 --
 .../admin/unit/equipment/DamageReport.vue     |  5 +-
 .../equipmentType/UpdateEquipmentType.vue     |  8 +--
 .../unit/inspection/InspectionExecute.vue     |  2 +-
 .../inspectionPlan/CreateInspectionPlan.vue   |  4 +-
 .../admin/unit/inspectionPlan/Overview.vue    |  3 +-
 .../inspectionPlan/UpdateInspectionPlan.vue   | 25 +++++++-
 src/views/admin/unit/vehicle/DamageReport.vue |  5 +-
 .../unit/vehicleType/UpdateVehicleType.vue    |  8 +--
 .../admin/unit/vehicleType/VehicleType.vue    |  2 +-
 .../admin/unit/wearable/DamageReport.vue      |  5 +-
 .../admin/unit/wearable/UpdateWearable.vue    | 11 ++--
 .../unit/wearableType/UpdateWearableType.vue  | 64 ++++++++++---------
 .../admin/unit/wearableType/WearableType.vue  |  2 +-
 41 files changed, 221 insertions(+), 291 deletions(-)

diff --git a/src/components/admin/unit/equipmentType/EquipmentTypeListItem.vue b/src/components/admin/unit/equipmentType/EquipmentTypeListItem.vue
index f3f50a1..7859fe1 100644
--- a/src/components/admin/unit/equipmentType/EquipmentTypeListItem.vue
+++ b/src/components/admin/unit/equipmentType/EquipmentTypeListItem.vue
@@ -8,6 +8,12 @@
         {{ equipmentType.type }}
       </p>
     </div>
+    <div class="flex flex-col p-2">
+      <div class="flex flex-row gap-2">
+        <p class="min-w-16">Beschreibung:</p>
+        <p class="grow overflow-hidden">{{ equipmentType.description }}</p>
+      </div>
+    </div>
   </RouterLink>
 </template>
 
diff --git a/src/components/admin/unit/vehicleType/VehicleTypeListItem.vue b/src/components/admin/unit/vehicleType/VehicleTypeListItem.vue
index b18a059..6b621ef 100644
--- a/src/components/admin/unit/vehicleType/VehicleTypeListItem.vue
+++ b/src/components/admin/unit/vehicleType/VehicleTypeListItem.vue
@@ -8,6 +8,12 @@
         {{ vehicleType.type }}
       </p>
     </div>
+    <div class="flex flex-col p-2">
+      <div class="flex flex-row gap-2">
+        <p class="min-w-16">Beschreibung:</p>
+        <p class="grow overflow-hidden">{{ vehicleType.description }}</p>
+      </div>
+    </div>
   </RouterLink>
 </template>
 
diff --git a/src/components/admin/unit/wearableType/WearableTypeListItem.vue b/src/components/admin/unit/wearableType/WearableTypeListItem.vue
index ce86f5b..a6cb6b9 100644
--- a/src/components/admin/unit/wearableType/WearableTypeListItem.vue
+++ b/src/components/admin/unit/wearableType/WearableTypeListItem.vue
@@ -4,6 +4,23 @@
       <p>
         {{ wearableType.type }}
       </p>
+      <div class="flex flex-row">
+        <RouterLink
+          v-if="can('update', 'unit', 'wearable_type')"
+          :to="{ name: 'admin-unit-wearable_type-edit', params: { wearableTypeId: wearableType.id } }"
+        >
+          <PencilIcon class="w-5 h-5 p-1 box-content cursor-pointer" />
+        </RouterLink>
+        <div v-if="can('delete', 'unit', 'wearable_type')" @click="openDeleteModal">
+          <TrashIcon class="w-5 h-5 p-1 box-content cursor-pointer" />
+        </div>
+      </div>
+    </div>
+    <div class="flex flex-col p-2">
+      <div class="flex flex-row gap-2">
+        <p class="min-w-16">Beschreibung:</p>
+        <p class="grow overflow-hidden">{{ wearableType.description }}</p>
+      </div>
     </div>
   </div>
 </template>
@@ -25,5 +42,14 @@ export default defineComponent({
   computed: {
     ...mapState(useAbilityStore, ["can"]),
   },
+  methods: {
+    ...mapActions(useModalStore, ["openModal"]),
+    openDeleteModal() {
+      this.openModal(
+        markRaw(defineAsyncComponent(() => import("@/components/admin/unit/wearableType/DeleteWearableTypeModal.vue"))),
+        this.wearableType.id
+      );
+    },
+  },
 });
 </script>
diff --git a/src/components/search/EquipmentSearchSelect.vue b/src/components/search/EquipmentSearchSelect.vue
index 2f60486..6bd5683 100644
--- a/src/components/search/EquipmentSearchSelect.vue
+++ b/src/components/search/EquipmentSearchSelect.vue
@@ -59,7 +59,7 @@
                 }"
               >
                 <span class="block truncate" :class="{ 'font-medium': selected, 'font-normal': !selected }">
-                  {{ equipment.name }}
+                  {{ equipment.name }}<span v-if="equipment.code"> - Code: {{ equipment.code }}</span>
                 </span>
                 <span
                   v-if="selected"
diff --git a/src/components/search/MemberSearchSelectSingle.vue b/src/components/search/MemberSearchSelectSingle.vue
index aca85a9..54be6d9 100644
--- a/src/components/search/MemberSearchSelectSingle.vue
+++ b/src/components/search/MemberSearchSelectSingle.vue
@@ -105,7 +105,7 @@ export default defineComponent({
   emits: ["update:model-value"],
   watch: {
     modelValue() {
-      if (this.initialLoaded) return;
+      //if (this.initialLoaded) return;
       this.initialLoaded = true;
       this.loadMemberInitial();
     },
@@ -162,7 +162,7 @@ export default defineComponent({
       return this.filtered.find((f) => f.id == id);
     },
     loadMemberInitial() {
-      if (this.modelValue == "") return;
+      if (this.modelValue == "" || this.modelValue == null) return;
       this.fetchMemberById(this.modelValue)
         .then((res) => {
           this.chosen = res.data;
diff --git a/src/components/search/VehicleSearchSelect.vue b/src/components/search/VehicleSearchSelect.vue
index 5f19211..21de173 100644
--- a/src/components/search/VehicleSearchSelect.vue
+++ b/src/components/search/VehicleSearchSelect.vue
@@ -59,7 +59,7 @@
                 }"
               >
                 <span class="block truncate" :class="{ 'font-medium': selected, 'font-normal': !selected }">
-                  {{ vehicle.name }}
+                  {{ vehicle.name }}<span v-if="vehicle.code"> - Code: {{ vehicle.code }}</span>
                 </span>
                 <span
                   v-if="selected"
diff --git a/src/stores/admin/unit/damageReport/damageReport.ts b/src/stores/admin/unit/damageReport/damageReport.ts
index aeb998e..d9ce5d0 100644
--- a/src/stores/admin/unit/damageReport/damageReport.ts
+++ b/src/stores/admin/unit/damageReport/damageReport.ts
@@ -17,12 +17,9 @@ export const useDamageReportStore = defineStore("damageReport", {
   },
   actions: {
     fetchDamageReports(offset = 0, count = 25, search = "", clear = false) {
-      this.damageReports = damageReportDemoData.map((e, i) => ({ ...e, tab_pos: i }));
-      this.totalCount = this.damageReports.length;
-      this.loading = "fetched";
-      return;
       if (clear) this.damageReports = [];
       this.loading = "loading";
+      //TODO enable fetch of done reports
       http
         .get(`/admin/damageReport?offset=${offset}&count=${count}${search != "" ? "&search=" + search : ""}`)
         .then((result) => {
@@ -66,13 +63,6 @@ export const useDamageReportStore = defineStore("damageReport", {
     fetchDamageReportById(id: string) {
       return http.get(`/admin/damageReport/${id}`);
     },
-    async createDamageReport(damageReport: CreateDamageReportViewModel): Promise<AxiosResponse<any, any>> {
-      const result = await http.post(`/admin/damageReport`, {
-        // TODO: data
-      });
-      this.fetchDamageReports();
-      return result;
-    },
     async updateDamageReport(damageReport: UpdateDamageReportViewModel): Promise<AxiosResponse<any, any>> {
       const result = await http.patch(`/admin/damageReport/${damageReport.id}`, {
         // TODO: data
@@ -80,10 +70,5 @@ export const useDamageReportStore = defineStore("damageReport", {
       this.fetchDamageReports();
       return result;
     },
-    async deleteDamageReport(damageReport: number): Promise<AxiosResponse<any, any>> {
-      const result = await http.delete(`/admin/damageReport/${damageReport}`);
-      this.fetchDamageReports();
-      return result;
-    },
   },
 });
diff --git a/src/stores/admin/unit/equipment/damageReport.ts b/src/stores/admin/unit/equipment/damageReport.ts
index afda1e8..eabf261 100644
--- a/src/stores/admin/unit/equipment/damageReport.ts
+++ b/src/stores/admin/unit/equipment/damageReport.ts
@@ -14,17 +14,11 @@ export const useEquipmentDamageReportStore = defineStore("equipmentDamageReport"
   actions: {
     fetchDamageReportForEquipment(offset = 0, count = 25, search = "", clear = false) {
       const equipmentId = useEquipmentStore().activeEquipment;
-      this.damageReports = damageReportDemoData
-        .filter((drdd) => drdd.relatedId == equipmentId)
-        .map((e, i) => ({ ...e, tab_pos: i }));
-      this.totalCount = this.damageReports.length;
-      this.loading = "fetched";
-      return;
       if (clear) this.damageReports = [];
       this.loading = "loading";
       http
         .get(
-          `/admin/equipment/${equipmentId}/damageReport?offset=${offset}&count=${count}${search != "" ? "&search=" + search : ""}`
+          `/admin/damagereport/equipment/${equipmentId}?offset=${offset}&count=${count}${search != "" ? "&search=" + search : ""}`
         )
         .then((result) => {
           this.totalCount = result.data.total;
diff --git a/src/stores/admin/unit/equipment/equipment.ts b/src/stores/admin/unit/equipment/equipment.ts
index 7550a23..67e92c0 100644
--- a/src/stores/admin/unit/equipment/equipment.ts
+++ b/src/stores/admin/unit/equipment/equipment.ts
@@ -6,7 +6,6 @@ import type {
 } from "@/viewmodels/admin/unit/equipment/equipment.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import { equipmentDemoData } from "@/demodata/equipment";
 
 export const useEquipmentStore = defineStore("equipment", {
   state: () => {
@@ -21,10 +20,6 @@ export const useEquipmentStore = defineStore("equipment", {
   },
   actions: {
     fetchEquipments(offset = 0, count = 25, search = "", clear = false) {
-      this.equipments = equipmentDemoData.map((e, i) => ({ ...e, tab_pos: i }));
-      this.totalCount = this.equipments.length;
-      this.loading = "fetched";
-      return;
       if (clear) this.equipments = [];
       this.loading = "loading";
       http
@@ -68,9 +63,6 @@ export const useEquipmentStore = defineStore("equipment", {
       });
     },
     fetchEquipmentByActiveId() {
-      this.activeEquipmentObj = equipmentDemoData.find((e) => e.id == this.activeEquipment) as EquipmentViewModel;
-      this.loadingActive = "fetched";
-      return;
       this.loadingActive = "loading";
       http
         .get(`/admin/equipment/${this.activeEquipment}`)
@@ -87,14 +79,22 @@ export const useEquipmentStore = defineStore("equipment", {
     },
     async createEquipment(equipment: CreateEquipmentViewModel): Promise<AxiosResponse<any, any>> {
       const result = await http.post(`/admin/equipment`, {
-        // TODO: data
+        equipmentTypeId: equipment.equipmentTypeId,
+        name: equipment.name,
+        code: equipment.code,
+        location: equipment.location,
+        commissioned: equipment.commissioned,
       });
       this.fetchEquipments();
       return result;
     },
     async updateActiveEquipment(equipment: UpdateEquipmentViewModel): Promise<AxiosResponse<any, any>> {
       const result = await http.patch(`/admin/equipment/${equipment.id}`, {
-        // TODO: data
+        name: equipment.name,
+        code: equipment.code,
+        location: equipment.location,
+        commissioned: equipment.commissioned,
+        decommissioned: equipment.decommissioned,
       });
       this.fetchEquipments();
       return result;
diff --git a/src/stores/admin/unit/equipment/inspection.ts b/src/stores/admin/unit/equipment/inspection.ts
index 3a3e715..adbe911 100644
--- a/src/stores/admin/unit/equipment/inspection.ts
+++ b/src/stores/admin/unit/equipment/inspection.ts
@@ -1,7 +1,6 @@
 import { defineStore } from "pinia";
 import { http } from "@/serverCom";
 import type { InspectionViewModel } from "@/viewmodels/admin/unit/inspection/inspection.models";
-import { inspectionDemoData } from "@/demodata/inspectionPlan";
 import { useEquipmentStore } from "./equipment";
 
 export const useEquipmentInspectionStore = defineStore("equipmentInspection", {
@@ -13,20 +12,12 @@ export const useEquipmentInspectionStore = defineStore("equipmentInspection", {
     };
   },
   actions: {
-    fetchInspectionForEquipment(offset = 0, count = 25, search = "", clear = false) {
+    fetchInspectionForEquipment(offset = 0, count = 25, clear = false) {
       const equipmentId = useEquipmentStore().activeEquipment;
-      this.inspections = inspectionDemoData
-        .filter((idd) => idd.relatedId == equipmentId)
-        .map((e, i) => ({ ...e, tab_pos: i }));
-      this.totalCount = this.inspections.length;
-      this.loading = "fetched";
-      return;
       if (clear) this.inspections = [];
       this.loading = "loading";
       http
-        .get(
-          `/admin/equipment/${equipmentId}/inspection?offset=${offset}&count=${count}${search != "" ? "&search=" + search : ""}`
-        )
+        .get(`/admin/inspection/equipment/${equipmentId}?offset=${offset}&count=${count}`)
         .then((result) => {
           this.totalCount = result.data.total;
           result.data.inspections
diff --git a/src/stores/admin/unit/equipmentType/equipmentType.ts b/src/stores/admin/unit/equipmentType/equipmentType.ts
index c35b859..694e635 100644
--- a/src/stores/admin/unit/equipmentType/equipmentType.ts
+++ b/src/stores/admin/unit/equipmentType/equipmentType.ts
@@ -3,10 +3,9 @@ import type {
   EquipmentTypeViewModel,
   CreateEquipmentTypeViewModel,
   UpdateEquipmentTypeViewModel,
-} from "@/viewmodels/admin/unit/equipmentType/equipmentType.models";
+} from "@/viewmodels/admin/unit/equipment/equipmentType.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import { equipmentTypeDemoData } from "@/demodata/equipmentType";
 
 export const useEquipmentTypeStore = defineStore("equipmentType", {
   state: () => {
@@ -21,17 +20,13 @@ export const useEquipmentTypeStore = defineStore("equipmentType", {
   },
   actions: {
     fetchEquipmentTypes(offset = 0, count = 25, search = "", clear = false) {
-      this.equipmentTypes = equipmentTypeDemoData.map((e, i) => ({ ...e, tab_pos: i }));
-      this.totalCount = this.equipmentTypes.length;
-      this.loading = "fetched";
-      return;
       if (clear) this.equipmentTypes = [];
       this.loading = "loading";
       http
         .get(`/admin/equipmentType?offset=${offset}&count=${count}${search != "" ? "&search=" + search : ""}`)
         .then((result) => {
           this.totalCount = result.data.total;
-          result.data.equipments
+          result.data.equipmentTypes
             .filter((elem: EquipmentTypeViewModel) => this.equipmentTypes.findIndex((m) => m.id == elem.id) == -1)
             .map((elem: EquipmentTypeViewModel, index: number): EquipmentTypeViewModel & { tab_pos: number } => {
               return {
@@ -50,20 +45,15 @@ export const useEquipmentTypeStore = defineStore("equipmentType", {
     },
     async getAllEquipmentTypes(): Promise<AxiosResponse<any, any>> {
       return await http.get(`/admin/equipmentType?noLimit=true`).then((res) => {
-        return { ...res, data: res.data.equipments };
+        return { ...res, data: res.data.equipmentTypes };
       });
     },
     async searchEquipmentTypes(search: string): Promise<AxiosResponse<any, any>> {
       return await http.get(`/admin/equipmentType?search=${search}&noLimit=true`).then((res) => {
-        return { ...res, data: res.data.equipments };
+        return { ...res, data: res.data.equipmentTypes };
       });
     },
     fetchEquipmentTypeByActiveId() {
-      this.activeEquipmentTypeObj = equipmentTypeDemoData.find(
-        (e) => e.id == this.activeEquipmentType
-      ) as EquipmentTypeViewModel;
-      this.loadingActive = "fetched";
-      return;
       this.loadingActive = "loading";
       http
         .get(`/admin/equipmentType/${this.activeEquipmentType}`)
@@ -80,14 +70,16 @@ export const useEquipmentTypeStore = defineStore("equipmentType", {
     },
     async createEquipmentType(equipmentType: CreateEquipmentTypeViewModel): Promise<AxiosResponse<any, any>> {
       const result = await http.post(`/admin/equipmentType`, {
-        // TODO: data
+        type: equipmentType.type,
+        description: equipmentType.description,
       });
       this.fetchEquipmentTypes();
       return result;
     },
     async updateActiveEquipmentType(equipmentType: UpdateEquipmentTypeViewModel): Promise<AxiosResponse<any, any>> {
       const result = await http.patch(`/admin/equipmentType/${equipmentType.id}`, {
-        // TODO: data
+        type: equipmentType.type,
+        description: equipmentType.description,
       });
       this.fetchEquipmentTypes();
       return result;
diff --git a/src/stores/admin/unit/equipmentType/inspectionPlan.ts b/src/stores/admin/unit/equipmentType/inspectionPlan.ts
index c412056..dc3b31f 100644
--- a/src/stores/admin/unit/equipmentType/inspectionPlan.ts
+++ b/src/stores/admin/unit/equipmentType/inspectionPlan.ts
@@ -1,14 +1,6 @@
 import { defineStore } from "pinia";
-import type {
-  EquipmentTypeViewModel,
-  CreateEquipmentTypeViewModel,
-  UpdateEquipmentTypeViewModel,
-} from "@/viewmodels/admin/unit/equipmentType/equipmentType.models";
 import { http } from "@/serverCom";
-import type { AxiosResponse } from "axios";
-import { equipmentTypeDemoData } from "@/demodata/equipmentType";
-import type { InspectionPlanViewModel } from "@/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models";
-import { inspectionPlanDemoData } from "@/demodata/inspectionPlan";
+import type { InspectionPlanViewModel } from "@/viewmodels/admin/unit/inspection/inspectionPlan.models";
 import { useEquipmentTypeStore } from "./equipmentType";
 
 export const useEquipmentTypeInspectionPlanStore = defineStore("equipmentTypeInspectionPlan", {
@@ -21,12 +13,9 @@ export const useEquipmentTypeInspectionPlanStore = defineStore("equipmentTypeIns
   actions: {
     fetchInspectionPlanForEquipmentType() {
       const equipmentTypeId = useEquipmentTypeStore().activeEquipmentType;
-      this.inspectionPlans = inspectionPlanDemoData.filter((ipdd) => ipdd.relatedId == equipmentTypeId);
-      this.loading = "fetched";
-      return;
       this.loading = "loading";
       http
-        .get(`/admin/equipmentType/${equipmentTypeId}/inspectionPlan`)
+        .get(`/admin/inspectionPlan/equipmentType/${equipmentTypeId}`)
         .then((result) => {
           this.inspectionPlans = result.data;
           this.loading = "fetched";
diff --git a/src/stores/admin/unit/inspection/inspection.ts b/src/stores/admin/unit/inspection/inspection.ts
index 30b7b8b..abe1877 100644
--- a/src/stores/admin/unit/inspection/inspection.ts
+++ b/src/stores/admin/unit/inspection/inspection.ts
@@ -1,7 +1,6 @@
 import { defineStore } from "pinia";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import { inspectionDemoData } from "@/demodata/inspectionPlan";
 import type { InspectionViewModel } from "@/viewmodels/admin/unit/inspection/inspection.models";
 
 export const useInspectionStore = defineStore("inspection", {
@@ -14,10 +13,6 @@ export const useInspectionStore = defineStore("inspection", {
   },
   actions: {
     fetchInspectionByActiveId() {
-      this.loadingActive = "loading";
-      this.activeInspectionObj = inspectionDemoData.find((e) => e.id == this.activeInspection) as InspectionViewModel;
-      this.loadingActive = "fetched";
-      return;
       this.loadingActive = "loading";
       http
         .get(`/admin/inspection/${this.activeInspection}`)
@@ -34,14 +29,17 @@ export const useInspectionStore = defineStore("inspection", {
     },
     async createInspection(inspection: any): Promise<AxiosResponse<any, any>> {
       const result = await http.post(`/admin/inspection`, {
-        // TODO: data
+        context: "",
+        inspectionPlanId: "",
+        relatedId: "",
+        assigned: "equipment|vehicle",
       });
       this.fetchInspectionByActiveId();
       return result;
     },
     async updateActiveInspection(inspection: any): Promise<AxiosResponse<any, any>> {
       const result = await http.patch(`/admin/inspection/${inspection.id}`, {
-        // TODO: data
+        context: "",
       });
       this.fetchInspectionByActiveId();
       return result;
diff --git a/src/stores/admin/unit/inspectionPlan/inspectionPlan.ts b/src/stores/admin/unit/inspectionPlan/inspectionPlan.ts
index 02ab39d..78f4d73 100644
--- a/src/stores/admin/unit/inspectionPlan/inspectionPlan.ts
+++ b/src/stores/admin/unit/inspectionPlan/inspectionPlan.ts
@@ -3,10 +3,9 @@ import type {
   InspectionPlanViewModel,
   CreateInspectionPlanViewModel,
   UpdateInspectionPlanViewModel,
-} from "@/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models";
+} from "@/viewmodels/admin/unit/inspection/inspectionPlan.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import { inspectionPlanDemoData } from "@/demodata/inspectionPlan";
 
 export const useInspectionPlanStore = defineStore("inspectionPlan", {
   state: () => {
@@ -21,10 +20,6 @@ export const useInspectionPlanStore = defineStore("inspectionPlan", {
   },
   actions: {
     fetchInspectionPlans(offset = 0, count = 25, search = "", clear = false) {
-      this.inspectionPlans = inspectionPlanDemoData.map((e, i) => ({ ...e, tab_pos: i }));
-      this.totalCount = this.inspectionPlans.length;
-      this.loading = "fetched";
-      return;
       if (clear) this.inspectionPlans = [];
       this.loading = "loading";
       http
@@ -53,26 +48,12 @@ export const useInspectionPlanStore = defineStore("inspectionPlan", {
         return { ...res, data: res.data.inspectionPlans };
       });
     },
-    async getInspectionPlansByIds(ids: Array<string>): Promise<AxiosResponse<any, any>> {
-      return await http
-        .post(`/admin/inspectionPlan/ids`, {
-          ids,
-        })
-        .then((res) => {
-          return { ...res, data: res.data.inspectionPlans };
-        });
-    },
     async searchInspectionPlans(search: string): Promise<AxiosResponse<any, any>> {
       return await http.get(`/admin/inspectionPlan?search=${search}&noLimit=true`).then((res) => {
         return { ...res, data: res.data.inspectionPlans };
       });
     },
     fetchInspectionPlanByActiveId() {
-      this.activeInspectionPlanObj = inspectionPlanDemoData.find(
-        (e) => e.id == this.activeInspectionPlan
-      ) as InspectionPlanViewModel;
-      this.loadingActive = "fetched";
-      return;
       this.loadingActive = "loading";
       http
         .get(`/admin/inspectionPlan/${this.activeInspectionPlan}`)
@@ -89,14 +70,20 @@ export const useInspectionPlanStore = defineStore("inspectionPlan", {
     },
     async createInspectionPlan(inspectionPlan: CreateInspectionPlanViewModel): Promise<AxiosResponse<any, any>> {
       const result = await http.post(`/admin/inspectionPlan`, {
-        // TODO: data
+        title: inspectionPlan.title,
+        inspectionInterval: inspectionPlan.inspectionInterval,
+        remindTime: inspectionPlan.remindTime,
+        relatedId: inspectionPlan.relatedId,
+        assigned: inspectionPlan.assigned,
       });
       this.fetchInspectionPlans();
       return result;
     },
     async updateActiveInspectionPlan(inspectionPlan: UpdateInspectionPlanViewModel): Promise<AxiosResponse<any, any>> {
       const result = await http.patch(`/admin/inspectionPlan/${inspectionPlan.id}`, {
-        // TODO: data
+        title: inspectionPlan.title,
+        inspectionInterval: inspectionPlan.inspectionInterval,
+        remindTime: inspectionPlan.remindTime,
       });
       this.fetchInspectionPlans();
       return result;
diff --git a/src/stores/admin/unit/respiratoryGear/respiratoryGear.ts b/src/stores/admin/unit/respiratoryGear/respiratoryGear.ts
index 2b2e548..a49110c 100644
--- a/src/stores/admin/unit/respiratoryGear/respiratoryGear.ts
+++ b/src/stores/admin/unit/respiratoryGear/respiratoryGear.ts
@@ -3,10 +3,9 @@ import type {
   RespiratoryGearViewModel,
   CreateRespiratoryGearViewModel,
   UpdateRespiratoryGearViewModel,
-} from "@/viewmodels/admin/unit/respiratoryGear/respiratoryGear.models";
+} from "@/viewmodels/admin/unit/respiratory/respiratoryGear.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import { respiratoryGearDemoData } from "@/demodata/respiratoryGear";
 
 export const useRespiratoryGearStore = defineStore("respiratoryGear", {
   state: () => {
@@ -21,10 +20,6 @@ export const useRespiratoryGearStore = defineStore("respiratoryGear", {
   },
   actions: {
     fetchRespiratoryGears(offset = 0, count = 25, search = "", clear = false) {
-      this.respiratoryGears = respiratoryGearDemoData.map((e, i) => ({ ...e, tab_pos: i }));
-      this.totalCount = this.respiratoryGears.length;
-      this.loading = "fetched";
-      return;
       if (clear) this.respiratoryGears = [];
       this.loading = "loading";
       http
@@ -59,11 +54,6 @@ export const useRespiratoryGearStore = defineStore("respiratoryGear", {
       });
     },
     fetchRespiratoryGearByActiveId() {
-      this.activeRespiratoryGearObj = respiratoryGearDemoData.find(
-        (e) => e.id == this.activeRespiratoryGear
-      ) as RespiratoryGearViewModel;
-      this.loading = "fetched";
-      return;
       this.loadingActive = "loading";
       http
         .get(`/admin/respiratoryGear/${this.activeRespiratoryGear}`)
diff --git a/src/stores/admin/unit/respiratoryMission/respiratoryMission.ts b/src/stores/admin/unit/respiratoryMission/respiratoryMission.ts
index cc890ed..3b511fd 100644
--- a/src/stores/admin/unit/respiratoryMission/respiratoryMission.ts
+++ b/src/stores/admin/unit/respiratoryMission/respiratoryMission.ts
@@ -3,10 +3,9 @@ import type {
   RespiratoryMissionViewModel,
   CreateRespiratoryMissionViewModel,
   UpdateRespiratoryMissionViewModel,
-} from "@/viewmodels/admin/unit/respiratoryMission/respiratoryMission.models";
+} from "@/viewmodels/admin/unit/respiratory/respiratoryMission.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import { respiratoryMissionDemoData } from "@/demodata/respiratoryMission";
 
 export const useRespiratoryMissionStore = defineStore("respiratoryMission", {
   state: () => {
@@ -21,10 +20,6 @@ export const useRespiratoryMissionStore = defineStore("respiratoryMission", {
   },
   actions: {
     fetchRespiratoryMissions(offset = 0, count = 25, search = "", clear = false) {
-      this.respiratoryMissions = respiratoryMissionDemoData.map((e, i) => ({ ...e, tab_pos: i }));
-      this.totalCount = this.respiratoryMissions.length;
-      this.loading = "fetched";
-      return;
       if (clear) this.respiratoryMissions = [];
       this.loading = "loading";
       http
@@ -63,11 +58,6 @@ export const useRespiratoryMissionStore = defineStore("respiratoryMission", {
       });
     },
     fetchRespiratoryMissionByActiveId() {
-      this.activeRespiratoryMissionObj = this.respiratoryMissions.find(
-        (e) => e.id == this.activeRespiratoryMission
-      ) as RespiratoryMissionViewModel;
-      this.loading = "fetched";
-      return;
       this.loadingActive = "loading";
       http
         .get(`/admin/respiratoryMission/${this.activeRespiratoryMission}`)
diff --git a/src/stores/admin/unit/respiratoryWearer/respiratoryWearer.ts b/src/stores/admin/unit/respiratoryWearer/respiratoryWearer.ts
index 6f17e98..cdf1181 100644
--- a/src/stores/admin/unit/respiratoryWearer/respiratoryWearer.ts
+++ b/src/stores/admin/unit/respiratoryWearer/respiratoryWearer.ts
@@ -3,10 +3,9 @@ import type {
   RespiratoryWearerViewModel,
   CreateRespiratoryWearerViewModel,
   UpdateRespiratoryWearerViewModel,
-} from "@/viewmodels/admin/unit/respiratoryWearer/respiratoryWearer.models";
+} from "@/viewmodels/admin/unit/respiratory/respiratoryWearer.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import { respiratoryWearerDemoData } from "@/demodata/respiratoryWearer";
 
 export const useRespiratoryWearerStore = defineStore("respiratoryWearer", {
   state: () => {
@@ -21,10 +20,6 @@ export const useRespiratoryWearerStore = defineStore("respiratoryWearer", {
   },
   actions: {
     fetchRespiratoryWearers(offset = 0, count = 25, search = "", clear = false) {
-      this.respiratoryWearers = respiratoryWearerDemoData.map((e, i) => ({ ...e, tab_pos: i }));
-      this.totalCount = this.respiratoryWearers.length;
-      this.loading = "fetched";
-      return;
       if (clear) this.respiratoryWearers = [];
       this.loading = "loading";
       http
@@ -63,11 +58,6 @@ export const useRespiratoryWearerStore = defineStore("respiratoryWearer", {
       });
     },
     fetchRespiratoryWearerByActiveId() {
-      this.activeRespiratoryWearerObj = respiratoryWearerDemoData.find(
-        (e) => e.id == this.activeRespiratoryWearer
-      ) as RespiratoryWearerViewModel;
-      this.loading = "fetched";
-      return;
       this.loadingActive = "loading";
       http
         .get(`/admin/respiratoryWearer/${this.activeRespiratoryWearer}`)
diff --git a/src/stores/admin/unit/vehicle/damageReport.ts b/src/stores/admin/unit/vehicle/damageReport.ts
index 7774732..29a470d 100644
--- a/src/stores/admin/unit/vehicle/damageReport.ts
+++ b/src/stores/admin/unit/vehicle/damageReport.ts
@@ -1,8 +1,7 @@
 import { defineStore } from "pinia";
 import { http } from "@/serverCom";
 import { useVehicleStore } from "./vehicle";
-import type { DamageReportViewModel } from "@/viewmodels/admin/unit/damageReport/damageReport.models";
-import { damageReportDemoData } from "@/demodata/damageReport";
+import type { DamageReportViewModel } from "@/viewmodels/admin/unit/damageReport.models";
 
 export const useVehicleDamageReportStore = defineStore("vehicleDamageReport", {
   state: () => {
@@ -15,17 +14,11 @@ export const useVehicleDamageReportStore = defineStore("vehicleDamageReport", {
   actions: {
     fetchDamageReportForVehicle(offset = 0, count = 25, search = "", clear = false) {
       const vehicleId = useVehicleStore().activeVehicle;
-      this.damageReports = damageReportDemoData
-        .filter((drdd) => drdd.relatedId == vehicleId)
-        .map((e, i) => ({ ...e, tab_pos: i }));
-      this.totalCount = this.damageReports.length;
-      this.loading = "fetched";
-      return;
       if (clear) this.damageReports = [];
       this.loading = "loading";
       http
         .get(
-          `/admin/vehicle/${vehicleId}/damageReport?offset=${offset}&count=${count}${search != "" ? "&search=" + search : ""}`
+          `/admin/damagereport/vehicle/${vehicleId}?offset=${offset}&count=${count}${search != "" ? "&search=" + search : ""}`
         )
         .then((result) => {
           this.totalCount = result.data.total;
diff --git a/src/stores/admin/unit/vehicle/inspection.ts b/src/stores/admin/unit/vehicle/inspection.ts
index 00314f2..23885b9 100644
--- a/src/stores/admin/unit/vehicle/inspection.ts
+++ b/src/stores/admin/unit/vehicle/inspection.ts
@@ -1,7 +1,6 @@
 import { defineStore } from "pinia";
 import { http } from "@/serverCom";
 import type { InspectionViewModel } from "@/viewmodels/admin/unit/inspection/inspection.models";
-import { inspectionDemoData } from "@/demodata/inspectionPlan";
 import { useVehicleStore } from "./vehicle";
 
 export const useVehicleInspectionStore = defineStore("vehicleInspection", {
@@ -15,17 +14,11 @@ export const useVehicleInspectionStore = defineStore("vehicleInspection", {
   actions: {
     fetchInspectionForVehicle(offset = 0, count = 25, search = "", clear = false) {
       const vehicleId = useVehicleStore().activeVehicle;
-      this.inspections = inspectionDemoData
-        .filter((idd) => idd.relatedId == vehicleId)
-        .map((e, i) => ({ ...e, tab_pos: i }));
-      this.totalCount = this.inspections.length;
-      this.loading = "fetched";
-      return;
       if (clear) this.inspections = [];
       this.loading = "loading";
       http
         .get(
-          `/admin/vehicle/${vehicleId}/inspection?offset=${offset}&count=${count}${search != "" ? "&search=" + search : ""}`
+          `/admin/inspection/vehicle/${vehicleId}?offset=${offset}&count=${count}${search != "" ? "&search=" + search : ""}`
         )
         .then((result) => {
           this.totalCount = result.data.total;
diff --git a/src/stores/admin/unit/vehicle/vehicle.ts b/src/stores/admin/unit/vehicle/vehicle.ts
index 75e54f6..7138cea 100644
--- a/src/stores/admin/unit/vehicle/vehicle.ts
+++ b/src/stores/admin/unit/vehicle/vehicle.ts
@@ -6,7 +6,6 @@ import type {
 } from "@/viewmodels/admin/unit/vehicle/vehicle.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import { vehicleDemoData } from "@/demodata/vehicle";
 
 export const useVehicleStore = defineStore("vehicle", {
   state: () => {
@@ -21,10 +20,6 @@ export const useVehicleStore = defineStore("vehicle", {
   },
   actions: {
     fetchVehicles(offset = 0, count = 25, search = "", clear = false) {
-      this.vehicles = vehicleDemoData.map((e, i) => ({ ...e, tab_pos: i }));
-      this.totalCount = this.vehicles.length;
-      this.loading = "fetched";
-      return;
       if (clear) this.vehicles = [];
       this.loading = "loading";
       http
@@ -68,9 +63,6 @@ export const useVehicleStore = defineStore("vehicle", {
       });
     },
     fetchVehicleByActiveId() {
-      this.activeVehicleObj = vehicleDemoData.find((e) => e.id == this.activeVehicle) as VehicleViewModel;
-      this.loadingActive = "fetched";
-      return;
       this.loadingActive = "loading";
       http
         .get(`/admin/vehicle/${this.activeVehicle}`)
@@ -87,14 +79,22 @@ export const useVehicleStore = defineStore("vehicle", {
     },
     async createVehicle(vehicle: CreateVehicleViewModel): Promise<AxiosResponse<any, any>> {
       const result = await http.post(`/admin/vehicle`, {
-        // TODO: data
+        vehicleTypeId: vehicle.vehicleTypeId,
+        name: vehicle.name,
+        code: vehicle.code,
+        location: vehicle.location,
+        commissioned: vehicle.commissioned,
       });
       this.fetchVehicles();
       return result;
     },
     async updateActiveVehicle(vehicle: UpdateVehicleViewModel): Promise<AxiosResponse<any, any>> {
       const result = await http.patch(`/admin/vehicle/${vehicle.id}`, {
-        // TODO: data
+        name: vehicle.name,
+        code: vehicle.code,
+        location: vehicle.location,
+        commissioned: vehicle.commissioned,
+        decommissioned: vehicle.decommissioned,
       });
       this.fetchVehicles();
       return result;
diff --git a/src/stores/admin/unit/vehicleType/inspectionPlan.ts b/src/stores/admin/unit/vehicleType/inspectionPlan.ts
index 9b6aa27..6f1c1c6 100644
--- a/src/stores/admin/unit/vehicleType/inspectionPlan.ts
+++ b/src/stores/admin/unit/vehicleType/inspectionPlan.ts
@@ -1,14 +1,6 @@
 import { defineStore } from "pinia";
-import type {
-  VehicleTypeViewModel,
-  CreateVehicleTypeViewModel,
-  UpdateVehicleTypeViewModel,
-} from "@/viewmodels/admin/unit/vehicleType/vehicleType.models";
 import { http } from "@/serverCom";
-import type { AxiosResponse } from "axios";
-import { vehicleTypeDemoData } from "@/demodata/vehicleType";
-import type { InspectionPlanViewModel } from "@/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models";
-import { inspectionPlanDemoData } from "@/demodata/inspectionPlan";
+import type { InspectionPlanViewModel } from "@/viewmodels/admin/unit/inspection/inspectionPlan.models";
 import { useVehicleTypeStore } from "./vehicleType";
 
 export const useVehicleTypeInspectionPlanStore = defineStore("vehicleTypeInspectionPlan", {
@@ -22,12 +14,9 @@ export const useVehicleTypeInspectionPlanStore = defineStore("vehicleTypeInspect
   actions: {
     fetchInspectionPlanForVehicleType() {
       const vehicleTypeId = useVehicleTypeStore().activeVehicleType;
-      this.inspectionPlans = inspectionPlanDemoData.filter((ipdd) => ipdd.relatedId == vehicleTypeId);
-      this.loading = "fetched";
-      return;
       this.loading = "loading";
       http
-        .get(`/admin/vehicleType/${vehicleTypeId}/inspectionPlan`)
+        .get(`/admin/inspectionPlan/vehicleType/${vehicleTypeId}`)
         .then((result) => {
           this.inspectionPlans = result.data;
           this.loading = "fetched";
diff --git a/src/stores/admin/unit/vehicleType/vehicleType.ts b/src/stores/admin/unit/vehicleType/vehicleType.ts
index 257716f..9ec3904 100644
--- a/src/stores/admin/unit/vehicleType/vehicleType.ts
+++ b/src/stores/admin/unit/vehicleType/vehicleType.ts
@@ -3,10 +3,9 @@ import type {
   VehicleTypeViewModel,
   CreateVehicleTypeViewModel,
   UpdateVehicleTypeViewModel,
-} from "@/viewmodels/admin/unit/vehicleType/vehicleType.models";
+} from "@/viewmodels/admin/unit/vehicle/vehicleType.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import { vehicleTypeDemoData } from "@/demodata/vehicleType";
 
 export const useVehicleTypeStore = defineStore("vehicleType", {
   state: () => {
@@ -21,17 +20,13 @@ export const useVehicleTypeStore = defineStore("vehicleType", {
   },
   actions: {
     fetchVehicleTypes(offset = 0, count = 25, search = "", clear = false) {
-      this.vehicleTypes = vehicleTypeDemoData.map((e, i) => ({ ...e, tab_pos: i }));
-      this.totalCount = this.vehicleTypes.length;
-      this.loading = "fetched";
-      return;
       if (clear) this.vehicleTypes = [];
       this.loading = "loading";
       http
         .get(`/admin/vehicleType?offset=${offset}&count=${count}${search != "" ? "&search=" + search : ""}`)
         .then((result) => {
           this.totalCount = result.data.total;
-          result.data.vehicles
+          result.data.vehicleTypes
             .filter((elem: VehicleTypeViewModel) => this.vehicleTypes.findIndex((m) => m.id == elem.id) == -1)
             .map((elem: VehicleTypeViewModel, index: number): VehicleTypeViewModel & { tab_pos: number } => {
               return {
@@ -50,20 +45,15 @@ export const useVehicleTypeStore = defineStore("vehicleType", {
     },
     async getAllVehicleTypes(): Promise<AxiosResponse<any, any>> {
       return await http.get(`/admin/vehicleType?noLimit=true`).then((res) => {
-        return { ...res, data: res.data.vehicles };
+        return { ...res, data: res.data.vehicleTypes };
       });
     },
     async searchVehicleTypes(search: string): Promise<AxiosResponse<any, any>> {
       return await http.get(`/admin/vehicleType?search=${search}&noLimit=true`).then((res) => {
-        return { ...res, data: res.data.vehicles };
+        return { ...res, data: res.data.vehicleTypes };
       });
     },
     fetchVehicleTypeByActiveId() {
-      this.activeVehicleTypeObj = vehicleTypeDemoData.find(
-        (e) => e.id == this.activeVehicleType
-      ) as VehicleTypeViewModel;
-      this.loadingActive = "fetched";
-      return;
       this.loadingActive = "loading";
       http
         .get(`/admin/vehicleType/${this.activeVehicleType}`)
@@ -80,14 +70,16 @@ export const useVehicleTypeStore = defineStore("vehicleType", {
     },
     async createVehicleType(vehicleType: CreateVehicleTypeViewModel): Promise<AxiosResponse<any, any>> {
       const result = await http.post(`/admin/vehicleType`, {
-        // TODO: data
+        type: vehicleType.type,
+        description: vehicleType.description,
       });
       this.fetchVehicleTypes();
       return result;
     },
     async updateActiveVehicleType(vehicleType: UpdateVehicleTypeViewModel): Promise<AxiosResponse<any, any>> {
       const result = await http.patch(`/admin/vehicleType/${vehicleType.id}`, {
-        // TODO: data
+        type: vehicleType.type,
+        description: vehicleType.description,
       });
       this.fetchVehicleTypes();
       return result;
diff --git a/src/stores/admin/unit/wearable/damageReport.ts b/src/stores/admin/unit/wearable/damageReport.ts
index c4d067c..4cb2420 100644
--- a/src/stores/admin/unit/wearable/damageReport.ts
+++ b/src/stores/admin/unit/wearable/damageReport.ts
@@ -1,8 +1,7 @@
 import { defineStore } from "pinia";
 import { http } from "@/serverCom";
 import { useWearableStore } from "./wearable";
-import type { DamageReportViewModel } from "@/viewmodels/admin/unit/damageReport/damageReport.models";
-import { damageReportDemoData } from "@/demodata/damageReport";
+import type { DamageReportViewModel } from "@/viewmodels/admin/unit/damageReport.models";
 
 export const useWearableDamageReportStore = defineStore("wearableDamageReport", {
   state: () => {
@@ -15,17 +14,11 @@ export const useWearableDamageReportStore = defineStore("wearableDamageReport",
   actions: {
     fetchDamageReportForWearable(offset = 0, count = 25, search = "", clear = false) {
       const wearableId = useWearableStore().activeWearable;
-      this.damageReports = damageReportDemoData
-        .filter((drdd) => drdd.relatedId == wearableId)
-        .map((e, i) => ({ ...e, tab_pos: i }));
-      this.totalCount = this.damageReports.length;
-      this.loading = "fetched";
-      return;
       if (clear) this.damageReports = [];
       this.loading = "loading";
       http
         .get(
-          `/admin/wearable/${wearableId}/damageReport?offset=${offset}&count=${count}${search != "" ? "&search=" + search : ""}`
+          `/admin/damagereport/wearable/${wearableId}?offset=${offset}&count=${count}${search != "" ? "&search=" + search : ""}`
         )
         .then((result) => {
           this.totalCount = result.data.total;
diff --git a/src/stores/admin/unit/wearable/wearable.ts b/src/stores/admin/unit/wearable/wearable.ts
index 2b22f21..a25cc49 100644
--- a/src/stores/admin/unit/wearable/wearable.ts
+++ b/src/stores/admin/unit/wearable/wearable.ts
@@ -6,7 +6,6 @@ import type {
 } from "@/viewmodels/admin/unit/wearable/wearable.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import { wearableDemoData } from "@/demodata/wearable";
 
 export const useWearableStore = defineStore("wearable", {
   state: () => {
@@ -21,10 +20,6 @@ export const useWearableStore = defineStore("wearable", {
   },
   actions: {
     fetchWearables(offset = 0, count = 25, search = "", clear = false) {
-      this.wearables = wearableDemoData.map((e, i) => ({ ...e, tab_pos: i }));
-      this.totalCount = this.wearables.length;
-      this.loading = "fetched";
-      return;
       if (clear) this.wearables = [];
       this.loading = "loading";
       http
@@ -68,9 +63,6 @@ export const useWearableStore = defineStore("wearable", {
       });
     },
     fetchWearableByActiveId() {
-      this.activeWearableObj = wearableDemoData.find((e) => e.id == this.activeWearable) as WearableViewModel;
-      this.loadingActive = "fetched";
-      return;
       this.loadingActive = "loading";
       http
         .get(`/admin/wearable/${this.activeWearable}`)
@@ -87,14 +79,24 @@ export const useWearableStore = defineStore("wearable", {
     },
     async createWearable(wearable: CreateWearableViewModel): Promise<AxiosResponse<any, any>> {
       const result = await http.post(`/admin/wearable`, {
-        // TODO: data
+        wearableTypeId: wearable.wearableTypeId,
+        name: wearable.name,
+        code: wearable.code,
+        location: wearable.location,
+        commissioned: wearable.commissioned,
+        wearerId: wearable.wearerId,
       });
       this.fetchWearables();
       return result;
     },
     async updateActiveWearable(wearable: UpdateWearableViewModel): Promise<AxiosResponse<any, any>> {
       const result = await http.patch(`/admin/wearable/${wearable.id}`, {
-        // TODO: data
+        name: wearable.name,
+        code: wearable.code,
+        location: wearable.location,
+        commissioned: wearable.commissioned,
+        decommissioned: wearable.decommissioned,
+        wearerId: wearable.wearerId,
       });
       this.fetchWearables();
       return result;
diff --git a/src/stores/admin/unit/wearableType/wearableType.ts b/src/stores/admin/unit/wearableType/wearableType.ts
index 884f532..06b73a1 100644
--- a/src/stores/admin/unit/wearableType/wearableType.ts
+++ b/src/stores/admin/unit/wearableType/wearableType.ts
@@ -3,10 +3,9 @@ import type {
   WearableTypeViewModel,
   CreateWearableTypeViewModel,
   UpdateWearableTypeViewModel,
-} from "@/viewmodels/admin/unit/wearableType/wearableType.models";
+} from "@/viewmodels/admin/unit/wearable/wearableType.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import { wearableTypeDemoData } from "@/demodata/wearableType";
 
 export const useWearableTypeStore = defineStore("wearableType", {
   state: () => {
@@ -18,17 +17,13 @@ export const useWearableTypeStore = defineStore("wearableType", {
   },
   actions: {
     fetchWearableTypes(offset = 0, count = 25, search = "", clear = false) {
-      this.wearableTypes = wearableTypeDemoData.map((e, i) => ({ ...e, tab_pos: i }));
-      this.totalCount = this.wearableTypes.length;
-      this.loading = "fetched";
-      return;
       if (clear) this.wearableTypes = [];
       this.loading = "loading";
       http
         .get(`/admin/wearableType?offset=${offset}&count=${count}${search != "" ? "&search=" + search : ""}`)
         .then((result) => {
           this.totalCount = result.data.total;
-          result.data.wearables
+          result.data.wearableTypes
             .filter((elem: WearableTypeViewModel) => this.wearableTypes.findIndex((m) => m.id == elem.id) == -1)
             .map((elem: WearableTypeViewModel, index: number): WearableTypeViewModel & { tab_pos: number } => {
               return {
@@ -47,12 +42,12 @@ export const useWearableTypeStore = defineStore("wearableType", {
     },
     async getAllWearableTypes(): Promise<AxiosResponse<any, any>> {
       return await http.get(`/admin/wearableType?noLimit=true`).then((res) => {
-        return { ...res, data: res.data.wearables };
+        return { ...res, data: res.data.wearableTypes };
       });
     },
     async searchWearableTypes(search: string): Promise<AxiosResponse<any, any>> {
       return await http.get(`/admin/wearableType?search=${search}&noLimit=true`).then((res) => {
-        return { ...res, data: res.data.wearables };
+        return { ...res, data: res.data.wearableTypes };
       });
     },
     fetchWearableTypeById(id: string) {
@@ -60,14 +55,16 @@ export const useWearableTypeStore = defineStore("wearableType", {
     },
     async createWearableType(wearableType: CreateWearableTypeViewModel): Promise<AxiosResponse<any, any>> {
       const result = await http.post(`/admin/wearableType`, {
-        // TODO: data
+        type: wearableType.type,
+        description: wearableType.description,
       });
       this.fetchWearableTypes();
       return result;
     },
     async updateWearableType(wearableType: UpdateWearableTypeViewModel): Promise<AxiosResponse<any, any>> {
       const result = await http.patch(`/admin/wearableType/${wearableType.id}`, {
-        // TODO: data
+        type: wearableType.type,
+        description: wearableType.description,
       });
       this.fetchWearableTypes();
       return result;
diff --git a/src/viewmodels/admin/unit/inspection/inspection.models.ts b/src/viewmodels/admin/unit/inspection/inspection.models.ts
index 6565377..3f65cad 100644
--- a/src/viewmodels/admin/unit/inspection/inspection.models.ts
+++ b/src/viewmodels/admin/unit/inspection/inspection.models.ts
@@ -34,6 +34,6 @@ export interface InspectionPointResultViewModel {
   inspectionId: string;
   inspectionVersionedPlanId: string;
   inspectionPointId: string;
-  inspectionPoint: InspectionPointViewModel;
+  inspectionPoint?: InspectionPointViewModel;
   value: string;
 }
diff --git a/src/viewmodels/admin/unit/inspection/inspectionPlan.models.ts b/src/viewmodels/admin/unit/inspection/inspectionPlan.models.ts
index c5b1043..4d7b9a9 100644
--- a/src/viewmodels/admin/unit/inspection/inspectionPlan.models.ts
+++ b/src/viewmodels/admin/unit/inspection/inspectionPlan.models.ts
@@ -1,6 +1,8 @@
 import type { InspectionPointEnum } from "@/enums/inspectionEnum";
 import type { EquipmentViewModel } from "../equipment/equipment.models";
 import type { VehicleViewModel } from "../vehicle/vehicle.models";
+import type { EquipmentTypeViewModel } from "../equipment/equipmentType.models";
+import type { VehicleTypeViewModel } from "../vehicle/vehicleType.models";
 
 export type PlanTimeDefinition = `${number}-${"d" | "m" | "y"}` | `${number}/${number | "*"}`;
 
@@ -16,11 +18,11 @@ export type InspectionPlanViewModel = {
 } & (
   | {
       assigned: "equipment";
-      related: EquipmentViewModel;
+      related: EquipmentTypeViewModel;
     }
   | {
       assigned: "vehicle";
-      related: VehicleViewModel;
+      related: VehicleTypeViewModel;
     }
 );
 
diff --git a/src/views/admin/unit/damageReport/DamageReportRouting.vue b/src/views/admin/unit/damageReport/DamageReportRouting.vue
index 356e095..fdb9a49 100644
--- a/src/views/admin/unit/damageReport/DamageReportRouting.vue
+++ b/src/views/admin/unit/damageReport/DamageReportRouting.vue
@@ -51,14 +51,7 @@ export default defineComponent({
     };
   },
   computed: {
-    ...mapState(useEquipmentStore, ["activeEquipmentObj"]),
     ...mapState(useAbilityStore, ["can"]),
   },
-  mounted() {
-    this.fetchEquipmentByActiveId();
-  },
-  methods: {
-    ...mapActions(useEquipmentStore, ["fetchEquipmentByActiveId"]),
-  },
 });
 </script>
diff --git a/src/views/admin/unit/equipment/DamageReport.vue b/src/views/admin/unit/equipment/DamageReport.vue
index fbe0f8d..aa2df0a 100644
--- a/src/views/admin/unit/equipment/DamageReport.vue
+++ b/src/views/admin/unit/equipment/DamageReport.vue
@@ -11,10 +11,11 @@
         <div class="flex flex-col h-fit w-full border border-primary rounded-md">
           <div class="bg-primary p-2 text-white flex flex-row gap-2 items-center">
             <PencilSquareIcon v-if="!row.done" class="w-5 h-5" />
-            <PhotoIcon v-if="row.providedImage" class="w-5 h-5" />
-            <p>{{ row.reported }} - {{ row.status }}</p>
+            <PhotoIcon v-if="row.imageCount != 0" class="w-5 h-5" />
+            <p>{{ row.reportedAt }} - {{ row.status }}</p>
           </div>
           <div class="p-2">
+            <p v-if="row.reportedBy">gemeldet von: {{ row.reportedBy }}</p>
             <p>Beschreibung: {{ row.description }}</p>
           </div>
         </div>
diff --git a/src/views/admin/unit/equipmentType/UpdateEquipmentType.vue b/src/views/admin/unit/equipmentType/UpdateEquipmentType.vue
index 5d1af44..997e0be 100644
--- a/src/views/admin/unit/equipmentType/UpdateEquipmentType.vue
+++ b/src/views/admin/unit/equipmentType/UpdateEquipmentType.vue
@@ -9,12 +9,12 @@
     >
       <p class="mx-auto">Geräte-Typ bearbeiten</p>
       <div>
-        <label for="name">Typ</label>
-        <input type="text" id="name" required v-model="equipmentType.type" />
+        <label for="type">Typ</label>
+        <input type="text" id="type" required v-model="equipmentType.type" />
       </div>
       <div>
-        <label for="location">Beschreibung</label>
-        <input type="text" id="location" v-model="equipmentType.description" />
+        <label for="description">Beschreibung</label>
+        <input type="text" id="description" v-model="equipmentType.description" />
       </div>
       <div class="flex flex-row justify-end gap-2">
         <button primary-outline type="reset" class="w-fit!" :disabled="canSaveOrReset" @click="resetForm">
diff --git a/src/views/admin/unit/inspection/InspectionExecute.vue b/src/views/admin/unit/inspection/InspectionExecute.vue
index 322091f..a9f565d 100644
--- a/src/views/admin/unit/inspection/InspectionExecute.vue
+++ b/src/views/admin/unit/inspection/InspectionExecute.vue
@@ -15,7 +15,7 @@
       >
         <div v-for="point in points" :key="point.title">
           <OkNotOk
-            v-if="point.type == 'iO-niO'"
+            v-if="point.type == InspectionPointEnum.oknok"
             :inspectionPoint="point"
             :modelValue="boolPointResult(point.id)"
             @update:model-value="(val) => updateCheckResult(point.id, val)"
diff --git a/src/views/admin/unit/inspectionPlan/CreateInspectionPlan.vue b/src/views/admin/unit/inspectionPlan/CreateInspectionPlan.vue
index 4b4f9e3..c4f57a3 100644
--- a/src/views/admin/unit/inspectionPlan/CreateInspectionPlan.vue
+++ b/src/views/admin/unit/inspectionPlan/CreateInspectionPlan.vue
@@ -147,8 +147,8 @@ export default defineComponent({
       let formData = e.target.elements;
       let createInspectionPlan: CreateInspectionPlanViewModel = {
         title: formData.name.value,
-        inspectionInterval: formData.name.value,
-        remindTime: formData.name.value,
+        inspectionInterval: formData.interval.value,
+        remindTime: formData.remind.value,
         relatedId: this.selectedType,
         assigned: this.active,
       };
diff --git a/src/views/admin/unit/inspectionPlan/Overview.vue b/src/views/admin/unit/inspectionPlan/Overview.vue
index 361a11c..7d3a33a 100644
--- a/src/views/admin/unit/inspectionPlan/Overview.vue
+++ b/src/views/admin/unit/inspectionPlan/Overview.vue
@@ -10,8 +10,9 @@
         <input type="text" id="interval" :value="activeInspectionPlanObj.inspectionInterval" reaonly />
       </div>
     </div>
-    <p>Prüfungspunkte</p>
+    <p>Prüfungspunkte:</p>
     <div v-if="activeInspectionPlanObj?.inspectionPoints" class="flex flex-col gap-2 grow overflow-y-scroll">
+      <small v-if="activeInspectionPlanObj?.inspectionPoints.length == 0">keine Prüfpunkte enthalten</small>
       <div
         v-for="point in activeInspectionPlanObj?.inspectionPoints"
         class="flex flex-col h-fit w-full border border-primary rounded-md"
diff --git a/src/views/admin/unit/inspectionPlan/UpdateInspectionPlan.vue b/src/views/admin/unit/inspectionPlan/UpdateInspectionPlan.vue
index 4525b7c..ed9d36e 100644
--- a/src/views/admin/unit/inspectionPlan/UpdateInspectionPlan.vue
+++ b/src/views/admin/unit/inspectionPlan/UpdateInspectionPlan.vue
@@ -13,8 +13,26 @@
         <input type="text" id="name" required v-model="inspectionPlan.title" />
       </div>
       <div>
-        <label for="interval">Intervall (optional)</label>
-        <input type="text" id="interval" placeholder="<number>-(d|m|y) oder DD/MM" />
+        <label for="interval">Intervall</label>
+        <input
+          type="text"
+          id="interval"
+          placeholder="<zahl>-(d|m|y) oder DD/MM oder DD/*"
+          required
+          pattern="^\d+-(d|m|y)$|^\d{2}/\d{2}$|^\d{2}/\*$"
+          title="Eingabe muss im Format <zahl>-(d|m|y), DD/MM oder DD/* sein"
+        />
+      </div>
+      <div>
+        <label for="remind">Erinnerung vor Fälligkeit</label>
+        <input
+          type="text"
+          id="remind"
+          placeholder="<zahl>-(d|m|y) oder DD/MM oder DD/*"
+          required
+          pattern="^\d+-(d|m|y)$|^\d{2}/\d{2}$|^\d{2}/\*$"
+          title="Eingabe muss im Format <zahl>-(d|m|y), DD/MM oder DD/* sein"
+        />
       </div>
       <div class="flex flex-row justify-end gap-2">
         <button primary-outline type="reset" class="w-fit!" :disabled="canSaveOrReset" @click="resetForm">
@@ -95,7 +113,8 @@ export default defineComponent({
       let updateInspectionPlan: UpdateInspectionPlanViewModel = {
         id: this.inspectionPlan.id,
         title: formData.name.value,
-        inspectionInterval: formData.location.value || null,
+        inspectionInterval: formData.interval.value,
+        remindTime: formData.remind.value,
       };
       this.status = "loading";
       this.updateActiveInspectionPlan(updateInspectionPlan)
diff --git a/src/views/admin/unit/vehicle/DamageReport.vue b/src/views/admin/unit/vehicle/DamageReport.vue
index 04097f8..ebac088 100644
--- a/src/views/admin/unit/vehicle/DamageReport.vue
+++ b/src/views/admin/unit/vehicle/DamageReport.vue
@@ -11,10 +11,11 @@
         <div class="flex flex-col h-fit w-full border border-primary rounded-md">
           <div class="bg-primary p-2 text-white flex flex-row gap-2 items-center">
             <PencilSquareIcon v-if="!row.done" class="w-5 h-5" />
-            <PhotoIcon v-if="row.providedImage" class="w-5 h-5" />
-            <p>{{ row.reported }} - {{ row.status }}</p>
+            <PhotoIcon v-if="row.imageCount != 0" class="w-5 h-5" />
+            <p>{{ row.reportedAt }} - {{ row.status }}</p>
           </div>
           <div class="p-2">
+            <p v-if="row.reportedBy">gemeldet von: {{ row.reportedBy }}</p>
             <p>Beschreibung: {{ row.description }}</p>
           </div>
         </div>
diff --git a/src/views/admin/unit/vehicleType/UpdateVehicleType.vue b/src/views/admin/unit/vehicleType/UpdateVehicleType.vue
index 57e1db1..0878435 100644
--- a/src/views/admin/unit/vehicleType/UpdateVehicleType.vue
+++ b/src/views/admin/unit/vehicleType/UpdateVehicleType.vue
@@ -9,12 +9,12 @@
     >
       <p class="mx-auto">Fahrzeug-Typ bearbeiten</p>
       <div>
-        <label for="name">Typ</label>
-        <input type="text" id="name" required v-model="vehicleType.type" />
+        <label for="type">Typ</label>
+        <input type="text" id="type" required v-model="vehicleType.type" />
       </div>
       <div>
-        <label for="location">Beschreibung</label>
-        <input type="text" id="location" v-model="vehicleType.description" />
+        <label for="description">Beschreibung</label>
+        <input type="text" id="description" v-model="vehicleType.description" />
       </div>
       <div class="flex flex-row justify-end gap-2">
         <button primary-outline type="reset" class="w-fit!" :disabled="canSaveOrReset" @click="resetForm">
diff --git a/src/views/admin/unit/vehicleType/VehicleType.vue b/src/views/admin/unit/vehicleType/VehicleType.vue
index 5dcb552..48aca02 100644
--- a/src/views/admin/unit/vehicleType/VehicleType.vue
+++ b/src/views/admin/unit/vehicleType/VehicleType.vue
@@ -17,7 +17,7 @@
 
         <div class="flex flex-row gap-4">
           <button v-if="can('create', 'unit', 'vehicle_type')" primary class="w-fit!" @click="openCreateModal">
-            Geräte-Typ erstellen
+            Fahrzeug-Typ erstellen
           </button>
         </div>
       </div>
diff --git a/src/views/admin/unit/wearable/DamageReport.vue b/src/views/admin/unit/wearable/DamageReport.vue
index 555a273..8f2600d 100644
--- a/src/views/admin/unit/wearable/DamageReport.vue
+++ b/src/views/admin/unit/wearable/DamageReport.vue
@@ -11,10 +11,11 @@
         <div class="flex flex-col h-fit w-full border border-primary rounded-md">
           <div class="bg-primary p-2 text-white flex flex-row gap-2 items-center">
             <PencilSquareIcon v-if="!row.done" class="w-5 h-5" />
-            <PhotoIcon v-if="row.providedImage" class="w-5 h-5" />
-            <p>{{ row.reported }} - {{ row.status }}</p>
+            <PhotoIcon v-if="row.imageCount != 0" class="w-5 h-5" />
+            <p>{{ row.reportedAt }} - {{ row.status }}</p>
           </div>
           <div class="p-2">
+            <p v-if="row.reportedBy">gemeldet von: {{ row.reportedBy }}</p>
             <p>Beschreibung: {{ row.description }}</p>
           </div>
         </div>
diff --git a/src/views/admin/unit/wearable/UpdateWearable.vue b/src/views/admin/unit/wearable/UpdateWearable.vue
index 3811695..2bcccbf 100644
--- a/src/views/admin/unit/wearable/UpdateWearable.vue
+++ b/src/views/admin/unit/wearable/UpdateWearable.vue
@@ -17,7 +17,7 @@
         <label for="location">Verortung (optional)</label>
         <input type="text" id="location" v-model="wearable.location" />
       </div>
-      <MemberSearchSelectMultiple title="Träger (optional)" />
+      <MemberSearchSelectSingle title="Träger (optional)" v-model="wearable.wearerId" />
       <div>
         <label for="commissioned">In-Betrieb-Nahme</label>
         <input type="date" id="commissioned" required v-model="wearable.commissioned" />
@@ -30,7 +30,9 @@
         <button primary-outline type="reset" class="w-fit!" :disabled="canSaveOrReset" @click="resetForm">
           abbrechen
         </button>
-        <button primary type="submit" class="w-fit!" :disabled="status == 'loading'">speichern</button>
+        <button primary type="submit" class="w-fit!" :disabled="status == 'loading' || canSaveOrReset">
+          speichern
+        </button>
         <Spinner v-if="status == 'loading'" class="my-auto" />
         <SuccessCheckmark v-else-if="status?.status == 'success'" />
         <FailureXMark v-else-if="status?.status == 'failed'" />
@@ -54,7 +56,7 @@ import FailureXMark from "@/components/FailureXMark.vue";
 import ScanInput from "@/components/ScanInput.vue";
 import isEqual from "lodash.isequal";
 import cloneDeep from "lodash.clonedeep";
-import MemberSearchSelectMultiple from "@/components/search/MemberSearchSelectMultiple.vue";
+import MemberSearchSelectSingle from "@/components/search/MemberSearchSelectSingle.vue";
 </script>
 
 <script lang="ts">
@@ -109,7 +111,8 @@ export default defineComponent({
         name: formData.name.value,
         location: formData.location.value,
         commissioned: formData.commissioned.value,
-        decommissioned: formData.decommissioned.value ?? null,
+        decommissioned: formData.decommissioned.value || null,
+        wearerId: this.wearable.wearerId,
       };
       this.status = "loading";
       this.updateActiveWearable(updateWearable)
diff --git a/src/views/admin/unit/wearableType/UpdateWearableType.vue b/src/views/admin/unit/wearableType/UpdateWearableType.vue
index 4bc7344..242301a 100644
--- a/src/views/admin/unit/wearableType/UpdateWearableType.vue
+++ b/src/views/admin/unit/wearableType/UpdateWearableType.vue
@@ -1,37 +1,43 @@
 <template>
-  <div class="flex flex-col gap-2 h-full w-full overflow-y-auto">
-    <Spinner v-if="loading == 'loading'" class="mx-auto" />
-    <p v-else-if="loading == 'failed'">laden fehlgeschlagen</p>
-    <form
-      v-else-if="wearableType != null"
-      class="flex flex-col gap-4 py-2 w-full max-w-xl mx-auto"
-      @submit.prevent="triggerUpdate"
-    >
-      <p class="mx-auto">Kleidungstyp bearbeiten</p>
-      <div>
-        <label for="name">Bezeichnung</label>
-        <input type="text" id="name" required v-model="wearableType.type" />
-      </div>
-      <div>
-        <label for="description">Beschreibung (optional)</label>
-        <input type="text" id="description" v-model="wearableType.description" />
-      </div>
-      <div class="flex flex-row justify-end gap-2">
-        <button primary-outline type="reset" class="w-fit!" :disabled="canSaveOrReset" @click="resetForm">
-          abbrechen
-        </button>
-        <button primary type="submit" class="w-fit!" :disabled="status == 'loading'">speichern</button>
-        <Spinner v-if="status == 'loading'" class="my-auto" />
-        <SuccessCheckmark v-else-if="status?.status == 'success'" />
-        <FailureXMark v-else-if="status?.status == 'failed'" />
-      </div>
-    </form>
-  </div>
+  <MainTemplate :title="`Kleidungs-Typ ${origin?.type} - Daten bearbeiten`">
+    <template #headerInsert>
+      <RouterLink to="../" class="text-primary">zurück zur Liste (abbrechen)</RouterLink>
+    </template>
+    <template #main>
+      <Spinner v-if="loading == 'loading'" class="mx-auto" />
+      <p v-else-if="loading == 'failed'">laden fehlgeschlagen</p>
+      <form
+        v-else-if="wearableType != null"
+        class="flex flex-col gap-4 py-2 w-full max-w-xl mx-auto"
+        @submit.prevent="triggerUpdate"
+      >
+        <p class="mx-auto">Kleidungstyp bearbeiten</p>
+        <div>
+          <label for="type">Bezeichnung</label>
+          <input type="text" id="type" required v-model="wearableType.type" />
+        </div>
+        <div>
+          <label for="description">Beschreibung (optional)</label>
+          <input type="text" id="description" v-model="wearableType.description" />
+        </div>
+        <div class="flex flex-row justify-end gap-2">
+          <button primary-outline type="reset" class="w-fit!" :disabled="canSaveOrReset" @click="resetForm">
+            abbrechen
+          </button>
+          <button primary type="submit" class="w-fit!" :disabled="status == 'loading'">speichern</button>
+          <Spinner v-if="status == 'loading'" class="my-auto" />
+          <SuccessCheckmark v-else-if="status?.status == 'success'" />
+          <FailureXMark v-else-if="status?.status == 'failed'" />
+        </div>
+      </form>
+    </template>
+  </MainTemplate>
 </template>
 
 <script setup lang="ts">
 import { defineComponent } from "vue";
 import { mapActions, mapState } from "pinia";
+import MainTemplate from "@/templates/Main.vue";
 import { useWearableTypeStore } from "@/stores/admin/unit/wearableType/wearableType";
 import type {
   CreateWearableTypeViewModel,
@@ -93,7 +99,7 @@ export default defineComponent({
       let formData = e.target.elements;
       let updateWearableType: UpdateWearableTypeViewModel = {
         id: this.wearableType.id,
-        type: formData.name.value,
+        type: formData.type.value,
         description: formData.description.value,
       };
       this.status = "loading";
diff --git a/src/views/admin/unit/wearableType/WearableType.vue b/src/views/admin/unit/wearableType/WearableType.vue
index 0c1c45c..fcf5958 100644
--- a/src/views/admin/unit/wearableType/WearableType.vue
+++ b/src/views/admin/unit/wearableType/WearableType.vue
@@ -17,7 +17,7 @@
 
         <div class="flex flex-row gap-4">
           <button v-if="can('create', 'unit', 'wearable_type')" primary class="w-fit!" @click="openCreateModal">
-            Geräte-Typ erstellen
+            Kleidungs-Typ erstellen
           </button>
         </div>
       </div>
-- 
2.47.3


From 65759488410439cdefd563f4c69179b2dd855a07 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Fri, 13 Jun 2025 12:45:43 +0200
Subject: [PATCH 05/16] maintainance view and wearable inspection integration

---
 .../unit/maintenance/MaintenanceListItem.vue  |  31 +++
 .../wearableType/WearableTypeListItem.vue     |  18 +-
 .../search/WearableSearchSelect.vue           | 196 ++++++++++++++++++
 src/router/index.ts                           |  57 ++++-
 src/router/unit/wearableType.ts               |  21 ++
 src/stores/admin/navigation.ts                |   3 +
 .../admin/unit/maintenance/maintenance.ts     |  74 +++++++
 src/stores/admin/unit/wearable/inspection.ts  |  43 ++++
 .../admin/unit/wearableType/inspectionPlan.ts |  29 +++
 .../admin/unit/wearableType/wearableType.ts   |  15 ++
 src/types/permissionTypes.ts                  |   3 +
 .../unit/inspection/inspection.models.ts      |   5 +
 .../unit/inspection/inspectionPlan.models.ts  |   7 +-
 .../club/newsletter/NewsletterRecipients.vue  |   2 -
 .../unit/damageReport/DamageReportRouting.vue |   3 -
 .../equipmentType/EquipmentTypeRouting.vue    |   2 +-
 .../admin/unit/inspection/InspectionPlan.vue  |  16 +-
 .../admin/unit/maintenance/Maintenance.vue    |  46 ++++
 .../unit/maintenance/MaintenanceRouting.vue   |  54 +++++
 .../unit/vehicleType/VehicleTypeRouting.vue   |   2 +-
 src/views/admin/unit/wearable/Inspection.vue  |  69 ++++++
 .../admin/unit/wearable/WearableRouting.vue   |   3 +-
 .../unit/wearableType/InspectionPlans.vue     |  51 +++++
 .../admin/unit/wearableType/Overview.vue      |  43 ++++
 .../unit/wearableType/UpdateWearableType.vue  |  62 +++---
 .../unit/wearableType/WearableTypeRouting.vue |  88 ++++++++
 26 files changed, 877 insertions(+), 66 deletions(-)
 create mode 100644 src/components/admin/unit/maintenance/MaintenanceListItem.vue
 create mode 100644 src/components/search/WearableSearchSelect.vue
 create mode 100644 src/router/unit/wearableType.ts
 create mode 100644 src/stores/admin/unit/maintenance/maintenance.ts
 create mode 100644 src/stores/admin/unit/wearable/inspection.ts
 create mode 100644 src/stores/admin/unit/wearableType/inspectionPlan.ts
 create mode 100644 src/views/admin/unit/maintenance/Maintenance.vue
 create mode 100644 src/views/admin/unit/maintenance/MaintenanceRouting.vue
 create mode 100644 src/views/admin/unit/wearable/Inspection.vue
 create mode 100644 src/views/admin/unit/wearableType/InspectionPlans.vue
 create mode 100644 src/views/admin/unit/wearableType/Overview.vue
 create mode 100644 src/views/admin/unit/wearableType/WearableTypeRouting.vue

diff --git a/src/components/admin/unit/maintenance/MaintenanceListItem.vue b/src/components/admin/unit/maintenance/MaintenanceListItem.vue
new file mode 100644
index 0000000..a838973
--- /dev/null
+++ b/src/components/admin/unit/maintenance/MaintenanceListItem.vue
@@ -0,0 +1,31 @@
+<template>
+  <div class="flex flex-col h-fit w-full border border-primary rounded-md">
+    <div class="bg-primary p-2 text-white flex flex-row justify-between items-center">
+      <p>
+        {{ damageReport.related.name }}
+      </p>
+    </div>
+    <div class="p-2">
+      <p v-if="damageReport.related">Code: {{ damageReport.related.code }}</p>
+      <p v-if="damageReport.description">Beschreibung: {{ damageReport.description }}</p>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent, type PropType } from "vue";
+import { mapState, mapActions } from "pinia";
+import { useAbilityStore } from "@/stores/ability";
+import type { DamageReportViewModel } from "@/viewmodels/admin/unit/damageReport.models";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  props: {
+    damageReport: { type: Object as PropType<DamageReportViewModel>, default: {} },
+  },
+  computed: {
+    ...mapState(useAbilityStore, ["can"]),
+  },
+});
+</script>
diff --git a/src/components/admin/unit/wearableType/WearableTypeListItem.vue b/src/components/admin/unit/wearableType/WearableTypeListItem.vue
index a6cb6b9..09bdf96 100644
--- a/src/components/admin/unit/wearableType/WearableTypeListItem.vue
+++ b/src/components/admin/unit/wearableType/WearableTypeListItem.vue
@@ -1,20 +1,12 @@
 <template>
-  <div class="flex flex-col h-fit w-full border border-primary rounded-md">
+  <RouterLink
+    :to="{ name: 'admin-unit-wearable_type-overview', params: { wearableTypeId: wearableType.id } }"
+    class="flex flex-col h-fit w-full border border-primary rounded-md"
+  >
     <div class="bg-primary p-2 text-white flex flex-row justify-between items-center">
       <p>
         {{ wearableType.type }}
       </p>
-      <div class="flex flex-row">
-        <RouterLink
-          v-if="can('update', 'unit', 'wearable_type')"
-          :to="{ name: 'admin-unit-wearable_type-edit', params: { wearableTypeId: wearableType.id } }"
-        >
-          <PencilIcon class="w-5 h-5 p-1 box-content cursor-pointer" />
-        </RouterLink>
-        <div v-if="can('delete', 'unit', 'wearable_type')" @click="openDeleteModal">
-          <TrashIcon class="w-5 h-5 p-1 box-content cursor-pointer" />
-        </div>
-      </div>
     </div>
     <div class="flex flex-col p-2">
       <div class="flex flex-row gap-2">
@@ -22,7 +14,7 @@
         <p class="grow overflow-hidden">{{ wearableType.description }}</p>
       </div>
     </div>
-  </div>
+  </RouterLink>
 </template>
 
 <script setup lang="ts">
diff --git a/src/components/search/WearableSearchSelect.vue b/src/components/search/WearableSearchSelect.vue
new file mode 100644
index 0000000..3248277
--- /dev/null
+++ b/src/components/search/WearableSearchSelect.vue
@@ -0,0 +1,196 @@
+<template>
+  <div class="w-full">
+    <Combobox v-model="selected" :disabled="disabled">
+      <ComboboxLabel>{{ title }}</ComboboxLabel>
+      <div class="relative mt-1">
+        <ComboboxInput
+          class="rounded-md shadow-xs relative block w-full px-3 py-2 border border-gray-300 focus:border-primary placeholder-gray-500 text-gray-900 rounded-b-md focus:outline-hidden focus:ring-0 focus:z-10 sm:text-sm resize-none"
+          :class="useScanner ? 'pl-9!' : ''"
+          :displayValue="() => chosen?.name ?? ''"
+          @input="query = $event.target.value"
+        />
+        <QrCodeIcon
+          v-if="useScanner"
+          class="absolute h-6 stroke-1 left-2 top-1/2 -translate-y-1/2 cursor-pointer z-10"
+          @click="scanCode"
+        />
+        <ComboboxButton class="absolute inset-y-0 right-0 flex items-center pr-2">
+          <ChevronUpDownIcon class="h-5 w-5 text-gray-400" aria-hidden="true" />
+        </ComboboxButton>
+        <TransitionRoot
+          leave="transition ease-in duration-100"
+          leaveFrom="opacity-100"
+          leaveTo="opacity-0"
+          @after-leave="query = ''"
+        >
+          <ComboboxOptions
+            class="absolute mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-base shadow-md ring-1 ring-black/5 focus:outline-hidden sm:text-sm z-20"
+          >
+            <ComboboxOption v-if="loading || deferingSearch" as="template" disabled>
+              <li class="flex flex-row gap-2 text-text relative cursor-default select-none py-2 pl-3 pr-4">
+                <Spinner />
+                <span class="font-normal block truncate">suche</span>
+              </li>
+            </ComboboxOption>
+            <ComboboxOption v-else-if="filtered.length === 0 && query == ''" as="template" disabled>
+              <li class="text-text relative cursor-default select-none py-2 pl-3 pr-4">
+                <span class="font-normal block truncate">tippe, um zu suchen...</span>
+              </li>
+            </ComboboxOption>
+            <ComboboxOption v-else-if="filtered.length === 0" as="template" disabled>
+              <li class="text-text relative cursor-default select-none py-2 pl-3 pr-4">
+                <span class="font-normal block truncate">Keine Auswahl gefunden.</span>
+              </li>
+            </ComboboxOption>
+
+            <ComboboxOption
+              v-if="!(loading || deferingSearch)"
+              v-for="wearable in filtered"
+              as="template"
+              :key="wearable.id"
+              :value="wearable.id"
+              v-slot="{ selected, active }"
+            >
+              <li
+                class="relative cursor-default select-none py-2 pl-10 pr-4"
+                :class="{
+                  'bg-primary text-white': active,
+                  'text-gray-900': !active,
+                }"
+              >
+                <span class="block truncate" :class="{ 'font-medium': selected, 'font-normal': !selected }">
+                  {{ wearable.name }}<span v-if="wearable.code"> - Code: {{ wearable.code }}</span>
+                </span>
+                <span
+                  v-if="selected"
+                  class="absolute inset-y-0 left-0 flex items-center pl-3"
+                  :class="{ 'text-white': active, 'text-primary': !active }"
+                >
+                  <CheckIcon class="h-5 w-5" aria-hidden="true" />
+                </span>
+              </li>
+            </ComboboxOption>
+          </ComboboxOptions>
+        </TransitionRoot>
+      </div>
+    </Combobox>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineAsyncComponent, defineComponent, markRaw, type Prop } from "vue";
+import { mapState, mapActions } from "pinia";
+import {
+  Combobox,
+  ComboboxLabel,
+  ComboboxInput,
+  ComboboxButton,
+  ComboboxOptions,
+  ComboboxOption,
+  TransitionRoot,
+} from "@headlessui/vue";
+import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
+import Spinner from "../Spinner.vue";
+import { useWearableStore } from "@/stores/admin/unit/wearable/wearable";
+import type { WearableViewModel } from "@/viewmodels/admin/unit/wearable/wearable.models";
+import { QrCodeIcon } from "@heroicons/vue/24/outline";
+import { useModalStore } from "@/stores/modal";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  props: {
+    modelValue: {
+      type: String,
+      default: "",
+    },
+    title: String,
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    useScanner: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  emits: ["update:model-value"],
+  watch: {
+    modelValue() {
+      if (this.initialLoaded) return;
+      this.initialLoaded = true;
+      this.loadWearableInitial();
+    },
+    query() {
+      this.deferingSearch = true;
+      clearTimeout(this.timer);
+      this.timer = setTimeout(() => {
+        this.deferingSearch = false;
+        this.search();
+      }, 600);
+    },
+  },
+  data() {
+    return {
+      initialLoaded: false as boolean,
+      loading: false as boolean,
+      deferingSearch: false as boolean,
+      timer: undefined as any,
+      query: "" as string,
+      filtered: [] as Array<WearableViewModel>,
+      chosen: undefined as undefined | WearableViewModel,
+    };
+  },
+  computed: {
+    selected: {
+      get() {
+        return this.modelValue;
+      },
+      set(val: string) {
+        this.chosen = this.getWearableFromSearch(val);
+        this.$emit("update:model-value", val);
+      },
+    },
+  },
+  mounted() {
+    this.loadWearableInitial();
+  },
+  methods: {
+    ...mapActions(useWearableStore, ["searchWearables", "fetchWearableById"]),
+    ...mapActions(useModalStore, ["openModal"]),
+    search() {
+      this.filtered = [];
+      if (this.query == "") return;
+      this.loading = true;
+      this.searchWearables(this.query)
+        .then((res) => {
+          this.filtered = res.data;
+        })
+        .catch((err) => {})
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    getWearableFromSearch(id: string) {
+      return this.filtered.find((f) => f.id == id);
+    },
+    loadWearableInitial() {
+      if (this.modelValue == "") return;
+      this.fetchWearableById(this.modelValue)
+        .then((res) => {
+          this.chosen = res.data;
+        })
+        .catch(() => {});
+    },
+    scanCode() {
+      this.openModal(
+        markRaw(defineAsyncComponent(() => import("@/components/CodeDetector.vue"))),
+        "codeScanInput",
+        (result: string) => {
+          this.getWearableFromSearch(result);
+        }
+      );
+    },
+  },
+});
+</script>
diff --git a/src/router/index.ts b/src/router/index.ts
index 40c5159..5f58c0a 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -19,6 +19,7 @@ import { resetWearableStores, setWearableId } from "./unit/wearable";
 import { resetInspectionPlanStores, setInspectionPlanId } from "./unit/inspectionPlan";
 import { setVehicleTypeId } from "./unit/vehicleType";
 import { resetInspectionStores, setInspectionId } from "./unit/inspection";
+import { setWearableTypeId } from "./unit/wearableType";
 
 const router = createRouter({
   history: createWebHistory(import.meta.env.BASE_URL),
@@ -498,6 +499,12 @@ const router = createRouter({
                       component: () => import("@/views/admin/ViewSelect.vue"),
                       props: true,
                     },
+                    {
+                      path: "inspection",
+                      name: "admin-unit-wearable-inspection",
+                      component: () => import("@/views/admin/unit/wearable/Inspection.vue"),
+                      props: true,
+                    },
                     {
                       path: "report",
                       name: "admin-unit-wearable-damage_report",
@@ -706,6 +713,25 @@ const router = createRouter({
                 },
               ],
             },
+            {
+              path: "maintenance",
+              name: "admin-unit-maintenance-route",
+              component: () => import("@/views/admin/unit/maintenance/MaintenanceRouting.vue"),
+              meta: { type: "read", section: "unit", module: "maintenance" },
+              beforeEnter: [abilityAndNavUpdate],
+              children: [
+                {
+                  path: "",
+                  name: "admin-unit-maintenance",
+                  component: () => import("@/views/admin/unit/maintenance/Maintenance.vue"),
+                },
+                {
+                  path: "done",
+                  name: "admin-unit-maintenance-done",
+                  component: () => import("@/views/admin/unit/maintenance/Maintenance.vue"),
+                },
+              ],
+            },
             {
               path: "equipment-type",
               name: "admin-unit-equipment_type-route",
@@ -806,12 +832,33 @@ const router = createRouter({
                   component: () => import("@/views/admin/unit/wearableType/WearableType.vue"),
                 },
                 {
-                  path: ":wearableTypeId/edit",
-                  name: "admin-unit-wearable_type-edit",
-                  component: () => import("@/views/admin/unit/wearableType/UpdateWearableType.vue"),
-                  meta: { type: "update", section: "unit", module: "wearable_type" },
-                  beforeEnter: [abilityAndNavUpdate],
+                  path: ":wearableTypeId",
+                  name: "admin-unit-wearable_type-routing",
+                  component: () => import("@/views/admin/unit/wearableType/WearableTypeRouting.vue"),
+                  beforeEnter: [setWearableTypeId],
                   props: true,
+                  children: [
+                    {
+                      path: "overview",
+                      name: "admin-unit-wearable_type-overview",
+                      component: () => import("@/views/admin/unit/wearableType/Overview.vue"),
+                      props: true,
+                    },
+                    {
+                      path: "inspection-plan",
+                      name: "admin-unit-wearable_type-inspection_plan",
+                      component: () => import("@/views/admin/unit/wearableType/InspectionPlans.vue"),
+                      props: true,
+                    },
+                    {
+                      path: "edit",
+                      name: "admin-unit-wearable_type-edit",
+                      component: () => import("@/views/admin/unit/wearableType/UpdateWearableType.vue"),
+                      meta: { type: "update", section: "unit", module: "wearable_type" },
+                      beforeEnter: [abilityAndNavUpdate],
+                      props: true,
+                    },
+                  ],
                 },
               ],
             },
diff --git a/src/router/unit/wearableType.ts b/src/router/unit/wearableType.ts
new file mode 100644
index 0000000..3b439ff
--- /dev/null
+++ b/src/router/unit/wearableType.ts
@@ -0,0 +1,21 @@
+import { useWearableTypeStore } from "@/stores/admin/unit/wearableType/wearableType";
+import { useWearableTypeInspectionPlanStore } from "@/stores/admin/unit/wearableType/inspectionPlan";
+
+export async function setWearableTypeId(to: any, from: any, next: any) {
+  const wearableTypeStore = useWearableTypeStore();
+  wearableTypeStore.activeWearableType = to.params?.wearableTypeId ?? null;
+
+  useWearableTypeInspectionPlanStore().$reset();
+
+  next();
+}
+
+export async function resetWearableTypeStores(to: any, from: any, next: any) {
+  const wearableTypeStore = useWearableTypeStore();
+  wearableTypeStore.activeWearableType = null;
+  wearableTypeStore.activeWearableTypeObj = null;
+
+  useWearableTypeInspectionPlanStore().$reset();
+
+  next();
+}
diff --git a/src/stores/admin/navigation.ts b/src/stores/admin/navigation.ts
index 59991b3..b5d1301 100644
--- a/src/stores/admin/navigation.ts
+++ b/src/stores/admin/navigation.ts
@@ -123,6 +123,9 @@ export const useNavigationStore = defineStore("navigation", {
             ...(abilityStore.can("read", "unit", "damage_report")
               ? [{ key: "damage_report", title: "Schadensmeldungen" }]
               : []),
+            ...(abilityStore.can("read", "unit", "maintenance")
+              ? [{ key: "maintenance", title: "Wartungen / Reparaturen" }]
+              : []),
             { key: "divider1", title: "Basisdaten" },
             ...(abilityStore.can("read", "unit", "equipment_type")
               ? [{ key: "equipment_type", title: "Geräte-Typen" }]
diff --git a/src/stores/admin/unit/maintenance/maintenance.ts b/src/stores/admin/unit/maintenance/maintenance.ts
new file mode 100644
index 0000000..fd9fb79
--- /dev/null
+++ b/src/stores/admin/unit/maintenance/maintenance.ts
@@ -0,0 +1,74 @@
+import { defineStore } from "pinia";
+import type {
+  MaintenanceViewModel,
+  CreateMaintenanceViewModel,
+  UpdateMaintenanceViewModel,
+} from "@/viewmodels/admin/unit/maintenance.models";
+import { http } from "@/serverCom";
+import type { AxiosResponse } from "axios";
+
+export const useMaintenanceStore = defineStore("maintenance", {
+  state: () => {
+    return {
+      maintenances: [] as Array<MaintenanceViewModel & { tab_pos: number }>,
+      totalCount: 0 as number,
+      loading: "loading" as "loading" | "fetched" | "failed",
+    };
+  },
+  actions: {
+    fetchMaintenances(offset = 0, count = 25, search = "", clear = false) {
+      if (clear) this.maintenances = [];
+      this.loading = "loading";
+      //TODO enable fetch of done reports
+      http
+        .get(`/admin/maintenance?offset=${offset}&count=${count}${search != "" ? "&search=" + search : ""}`)
+        .then((result) => {
+          this.totalCount = result.data.total;
+          result.data.maintenances
+            .filter((elem: MaintenanceViewModel) => this.maintenances.findIndex((m) => m.id == elem.id) == -1)
+            .map((elem: MaintenanceViewModel, index: number): MaintenanceViewModel & { tab_pos: number } => {
+              return {
+                ...elem,
+                tab_pos: index + offset,
+              };
+            })
+            .forEach((elem: MaintenanceViewModel & { tab_pos: number }) => {
+              this.maintenances.push(elem);
+            });
+          this.loading = "fetched";
+        })
+        .catch((err) => {
+          this.loading = "failed";
+        });
+    },
+    async getAllMaintenances(): Promise<AxiosResponse<any, any>> {
+      return await http.get(`/admin/maintenance?noLimit=true`).then((res) => {
+        return { ...res, data: res.data.maintenances };
+      });
+    },
+    async getMaintenancesByIds(ids: Array<string>): Promise<AxiosResponse<any, any>> {
+      return await http
+        .post(`/admin/maintenance/ids`, {
+          ids,
+        })
+        .then((res) => {
+          return { ...res, data: res.data.maintenances };
+        });
+    },
+    async searchMaintenances(search: string): Promise<AxiosResponse<any, any>> {
+      return await http.get(`/admin/maintenance?search=${search}&noLimit=true`).then((res) => {
+        return { ...res, data: res.data.maintenances };
+      });
+    },
+    fetchMaintenanceById(id: string) {
+      return http.get(`/admin/maintenance/${id}`);
+    },
+    async updateMaintenance(maintenance: UpdateMaintenanceViewModel): Promise<AxiosResponse<any, any>> {
+      const result = await http.patch(`/admin/maintenance/${maintenance.id}`, {
+        // TODO: data
+      });
+      this.fetchMaintenances();
+      return result;
+    },
+  },
+});
diff --git a/src/stores/admin/unit/wearable/inspection.ts b/src/stores/admin/unit/wearable/inspection.ts
new file mode 100644
index 0000000..1596da6
--- /dev/null
+++ b/src/stores/admin/unit/wearable/inspection.ts
@@ -0,0 +1,43 @@
+import { defineStore } from "pinia";
+import { http } from "@/serverCom";
+import type { InspectionViewModel } from "@/viewmodels/admin/unit/inspection/inspection.models";
+import { useWearableStore } from "./wearable";
+
+export const useWearableInspectionStore = defineStore("wearableInspection", {
+  state: () => {
+    return {
+      inspections: [] as Array<InspectionViewModel & { tab_pos: number }>,
+      totalCount: 0 as number,
+      loading: "loading" as "loading" | "fetched" | "failed",
+    };
+  },
+  actions: {
+    fetchInspectionForWearable(offset = 0, count = 25, search = "", clear = false) {
+      const wearableId = useWearableStore().activeWearable;
+      if (clear) this.inspections = [];
+      this.loading = "loading";
+      http
+        .get(
+          `/admin/inspection/wearable/${wearableId}?offset=${offset}&count=${count}${search != "" ? "&search=" + search : ""}`
+        )
+        .then((result) => {
+          this.totalCount = result.data.total;
+          result.data.inspections
+            .filter((elem: InspectionViewModel) => this.inspections.findIndex((m) => m.id == elem.id) == -1)
+            .map((elem: InspectionViewModel, index: number): InspectionViewModel & { tab_pos: number } => {
+              return {
+                ...elem,
+                tab_pos: index + offset,
+              };
+            })
+            .forEach((elem: InspectionViewModel & { tab_pos: number }) => {
+              this.inspections.push(elem);
+            });
+          this.loading = "fetched";
+        })
+        .catch((err) => {
+          this.loading = "failed";
+        });
+    },
+  },
+});
diff --git a/src/stores/admin/unit/wearableType/inspectionPlan.ts b/src/stores/admin/unit/wearableType/inspectionPlan.ts
new file mode 100644
index 0000000..dbe2254
--- /dev/null
+++ b/src/stores/admin/unit/wearableType/inspectionPlan.ts
@@ -0,0 +1,29 @@
+import { defineStore } from "pinia";
+import { http } from "@/serverCom";
+import type { InspectionPlanViewModel } from "@/viewmodels/admin/unit/inspection/inspectionPlan.models";
+import { useWearableTypeStore } from "./wearableType";
+
+export const useWearableTypeInspectionPlanStore = defineStore("wearableTypeInspectionPlan", {
+  state: () => {
+    return {
+      inspectionPlans: [] as Array<InspectionPlanViewModel>,
+      totalCount: 0 as number,
+      loading: "loading" as "loading" | "fetched" | "failed",
+    };
+  },
+  actions: {
+    fetchInspectionPlanForWearableType() {
+      const wearableTypeId = useWearableTypeStore().activeWearableType;
+      this.loading = "loading";
+      http
+        .get(`/admin/inspectionPlan/wearableType/${wearableTypeId}`)
+        .then((result) => {
+          this.inspectionPlans = result.data;
+          this.loading = "fetched";
+        })
+        .catch((err) => {
+          this.loading = "failed";
+        });
+    },
+  },
+});
diff --git a/src/stores/admin/unit/wearableType/wearableType.ts b/src/stores/admin/unit/wearableType/wearableType.ts
index 06b73a1..bba5113 100644
--- a/src/stores/admin/unit/wearableType/wearableType.ts
+++ b/src/stores/admin/unit/wearableType/wearableType.ts
@@ -13,6 +13,9 @@ export const useWearableTypeStore = defineStore("wearableType", {
       wearableTypes: [] as Array<WearableTypeViewModel & { tab_pos: number }>,
       totalCount: 0 as number,
       loading: "loading" as "loading" | "fetched" | "failed",
+      activeWearableType: null as string | null,
+      activeWearableTypeObj: null as WearableTypeViewModel | null,
+      loadingActive: "loading" as "loading" | "fetched" | "failed",
     };
   },
   actions: {
@@ -50,6 +53,18 @@ export const useWearableTypeStore = defineStore("wearableType", {
         return { ...res, data: res.data.wearableTypes };
       });
     },
+    fetchWearableTypeByActiveId() {
+      this.loadingActive = "loading";
+      http
+        .get(`/admin/wearableType/${this.activeWearableType}`)
+        .then((res) => {
+          this.activeWearableTypeObj = res.data;
+          this.loadingActive = "fetched";
+        })
+        .catch((err) => {
+          this.loadingActive = "failed";
+        });
+    },
     fetchWearableTypeById(id: string) {
       return http.get(`/admin/wearableType/${id}`);
     },
diff --git a/src/types/permissionTypes.ts b/src/types/permissionTypes.ts
index f85a54f..2442d9f 100644
--- a/src/types/permissionTypes.ts
+++ b/src/types/permissionTypes.ts
@@ -21,6 +21,7 @@ export type PermissionModule =
   | "respiratory_wearer"
   | "respiratory_mission"
   | "damage_report"
+  | "maintenance"
   // configuration
   | "qualification"
   | "award"
@@ -95,6 +96,7 @@ export const permissionModules: Array<PermissionModule> = [
   "respiratory_wearer",
   "respiratory_mission",
   "damage_report",
+  "maintenance",
   // configuration
   "qualification",
   "award",
@@ -131,6 +133,7 @@ export const sectionsAndModules: SectionsAndModulesObject = {
     "respiratory_wearer",
     "respiratory_mission",
     "damage_report",
+    "maintenance",
   ],
   configuration: [
     "qualification",
diff --git a/src/viewmodels/admin/unit/inspection/inspection.models.ts b/src/viewmodels/admin/unit/inspection/inspection.models.ts
index 3f65cad..4f72a13 100644
--- a/src/viewmodels/admin/unit/inspection/inspection.models.ts
+++ b/src/viewmodels/admin/unit/inspection/inspection.models.ts
@@ -5,6 +5,7 @@ import type {
   InspectionVersionedPlanViewModel,
 } from "./inspectionPlan.models";
 import type { VehicleViewModel } from "../vehicle/vehicle.models";
+import type { WearableViewModel } from "../wearable/wearable.models";
 
 export type InspectionViewModel = {
   id: string;
@@ -28,6 +29,10 @@ export type InspectionViewModel = {
       assigned: "vehicle";
       related: VehicleViewModel;
     }
+  | {
+      assigned: "wearable";
+      related: WearableViewModel;
+    }
 );
 
 export interface InspectionPointResultViewModel {
diff --git a/src/viewmodels/admin/unit/inspection/inspectionPlan.models.ts b/src/viewmodels/admin/unit/inspection/inspectionPlan.models.ts
index 4d7b9a9..262f25e 100644
--- a/src/viewmodels/admin/unit/inspection/inspectionPlan.models.ts
+++ b/src/viewmodels/admin/unit/inspection/inspectionPlan.models.ts
@@ -3,6 +3,7 @@ import type { EquipmentViewModel } from "../equipment/equipment.models";
 import type { VehicleViewModel } from "../vehicle/vehicle.models";
 import type { EquipmentTypeViewModel } from "../equipment/equipmentType.models";
 import type { VehicleTypeViewModel } from "../vehicle/vehicleType.models";
+import type { WearableTypeViewModel } from "../wearable/wearableType.models";
 
 export type PlanTimeDefinition = `${number}-${"d" | "m" | "y"}` | `${number}/${number | "*"}`;
 
@@ -24,6 +25,10 @@ export type InspectionPlanViewModel = {
       assigned: "vehicle";
       related: VehicleTypeViewModel;
     }
+  | {
+      assigned: "wearable";
+      related: WearableTypeViewModel;
+    }
 );
 
 export interface InspectionVersionedPlanViewModel {
@@ -48,7 +53,7 @@ export interface CreateInspectionPlanViewModel {
   inspectionInterval: PlanTimeDefinition;
   remindTime: PlanTimeDefinition;
   relatedId: string;
-  assigned: "vehicle" | "equipment";
+  assigned: "vehicle" | "equipment" | "wearable";
 }
 
 export interface UpdateInspectionPlanViewModel {
diff --git a/src/views/admin/club/newsletter/NewsletterRecipients.vue b/src/views/admin/club/newsletter/NewsletterRecipients.vue
index cad08c2..6fcdec5 100644
--- a/src/views/admin/club/newsletter/NewsletterRecipients.vue
+++ b/src/views/admin/club/newsletter/NewsletterRecipients.vue
@@ -74,9 +74,7 @@ import { useNewsletterRecipientsStore } from "@/stores/admin/club/newsletter/new
 import { useAbilityStore } from "@/stores/ability";
 import { useQueryStoreStore } from "@/stores/admin/configuration/queryStore";
 import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
-import cloneDeep from "lodash.clonedeep";
 import MemberSearchSelectMultiple from "@/components/search/MemberSearchSelectMultiple.vue";
-import MemberSearchSelect from "@/components/search/MemberSearchSelect.vue";
 import type { FieldType } from "@/types/dynamicQueries";
 import DoubleConfirmClick from "@/components/DoubleConfirmClick.vue";
 </script>
diff --git a/src/views/admin/unit/damageReport/DamageReportRouting.vue b/src/views/admin/unit/damageReport/DamageReportRouting.vue
index fdb9a49..48d8b0f 100644
--- a/src/views/admin/unit/damageReport/DamageReportRouting.vue
+++ b/src/views/admin/unit/damageReport/DamageReportRouting.vue
@@ -39,9 +39,6 @@ import { useEquipmentStore } from "@/stores/admin/unit/equipment/equipment";
 
 <script lang="ts">
 export default defineComponent({
-  props: {
-    equipmentId: String,
-  },
   data() {
     return {
       tabs: [
diff --git a/src/views/admin/unit/equipmentType/EquipmentTypeRouting.vue b/src/views/admin/unit/equipmentType/EquipmentTypeRouting.vue
index 765cd81..f23b22d 100644
--- a/src/views/admin/unit/equipmentType/EquipmentTypeRouting.vue
+++ b/src/views/admin/unit/equipmentType/EquipmentTypeRouting.vue
@@ -80,7 +80,7 @@ export default defineComponent({
     openDeleteModal() {
       this.openModal(
         markRaw(
-          defineAsyncComponent(() => import("@/components/admin/unit/equipmentType/CreateEquipmentTypeModal.vue"))
+          defineAsyncComponent(() => import("@/components/admin/unit/equipmentType/DeleteEquipmentTypeModal.vue"))
         ),
         this.equipmentTypeId ?? ""
       );
diff --git a/src/views/admin/unit/inspection/InspectionPlan.vue b/src/views/admin/unit/inspection/InspectionPlan.vue
index c1cafc1..5e9fc32 100644
--- a/src/views/admin/unit/inspection/InspectionPlan.vue
+++ b/src/views/admin/unit/inspection/InspectionPlan.vue
@@ -27,7 +27,8 @@
         </div>
 
         <EquipmentSearchSelect v-if="active == 'equipment'" title="Gerät" useScanner v-model="related" />
-        <VehicleSearchSelect v-else title="Fahrzeug" useScanner v-model="related" />
+        <VehicleSearchSelect v-else-if="active == 'vehicle'" title="Fahrzeug" useScanner v-model="related" />
+        <WearableSearchSelect v-else title="Kleidung" useScanner v-model="related" />
 
         <InspectionPlanSearchSelect title="Prüfplan" :type="active" v-model="inspectionPlan" />
 
@@ -67,13 +68,14 @@ import ScanInput from "@/components/ScanInput.vue";
 import InspectionPlanSearchSelect from "@/components/search/InspectionPlanSearchSelect.vue";
 import EquipmentSearchSelect from "@/components/search/EquipmentSearchSelect.vue";
 import VehicleSearchSelect from "@/components/search/VehicleSearchSelect.vue";
+import WearableSearchSelect from "../../../../components/search/wearableSearchSelect.vue";
 </script>
 
 <script lang="ts">
 export default defineComponent({
   props: {
     type: {
-      type: String as PropType<"vehicle" | "equipment">,
+      type: String as PropType<"vehicle" | "equipment" | "wearable">,
       default: "equipment",
     },
     relatedId: String,
@@ -85,7 +87,7 @@ export default defineComponent({
       timeout: null as any,
       related: "",
       inspectionPlan: "",
-      active: "equipment" as "equipment" | "vehicle",
+      active: "equipment" as "equipment" | "vehicle" | "wearable",
       tabs: [
         {
           key: "equipment",
@@ -95,11 +97,15 @@ export default defineComponent({
           key: "vehicle",
           title: "Fahrzeug",
         },
-      ] as Array<{ key: "equipment" | "vehicle"; title: string }>,
+        {
+          key: "wearable",
+          title: "Kleidung",
+        },
+      ] as Array<{ key: "equipment" | "vehicle" | "wearable"; title: string }>,
     };
   },
   mounted() {
-    if (["vehicle", "equipment"].includes(this.type)) {
+    if (["vehicle", "equipment", "wearable"].includes(this.type)) {
       this.active = this.type;
       this.inspectionPlan = this.inspectionPlanId ?? "";
       this.related = this.relatedId ?? "";
diff --git a/src/views/admin/unit/maintenance/Maintenance.vue b/src/views/admin/unit/maintenance/Maintenance.vue
new file mode 100644
index 0000000..fec6c0f
--- /dev/null
+++ b/src/views/admin/unit/maintenance/Maintenance.vue
@@ -0,0 +1,46 @@
+<template>
+  <div class="flex flex-col w-full h-full gap-2 justify-center px-7">
+    <Pagination
+      :items="maintenances"
+      :totalCount="totalCount"
+      :indicateLoading="loading == 'loading'"
+      @load-data="(offset, count, search) => fetchMaintenances(offset, count, search)"
+      @search="(search) => fetchMaintenances(0, maxEntriesPerPage, search, true)"
+    >
+      <template #pageRow="{ row }: { row: MaintenanceViewModel }">
+        <MaintenanceListItem :maintenance="row" />
+      </template>
+    </Pagination>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+import { mapActions, mapState } from "pinia";
+import MainTemplate from "@/templates/Main.vue";
+import { useAbilityStore } from "@/stores/ability";
+import { useMaintenanceStore } from "@/stores/admin/unit/maintenance/maintenance";
+import type { MaintenanceViewModel } from "@/viewmodels/admin/unit/maintenance.models";
+import Pagination from "@/components/Pagination.vue";
+import MaintenanceListItem from "@/components/admin/unit/maintenance/MaintenanceListItem.vue";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  data() {
+    return {
+      maxEntriesPerPage: 25,
+    };
+  },
+  computed: {
+    ...mapState(useMaintenanceStore, ["maintenances", "totalCount", "loading"]),
+    ...mapState(useAbilityStore, ["can"]),
+  },
+  mounted() {
+    this.fetchMaintenances(0, this.maxEntriesPerPage, "", true);
+  },
+  methods: {
+    ...mapActions(useMaintenanceStore, ["fetchMaintenances"]),
+  },
+});
+</script>
diff --git a/src/views/admin/unit/maintenance/MaintenanceRouting.vue b/src/views/admin/unit/maintenance/MaintenanceRouting.vue
new file mode 100644
index 0000000..679740c
--- /dev/null
+++ b/src/views/admin/unit/maintenance/MaintenanceRouting.vue
@@ -0,0 +1,54 @@
+<template>
+  <MainTemplate title="Wartungen / Reparaturen">
+    <template #diffMain>
+      <div class="flex flex-col gap-2 grow px-7 overflow-hidden">
+        <div class="flex flex-col grow gap-2 overflow-hidden">
+          <div class="w-full flex flex-row max-lg:flex-wrap justify-center">
+            <RouterLink
+              v-for="tab in tabs"
+              :key="tab.route"
+              v-slot="{ isExactActive }"
+              :to="{ name: tab.route }"
+              class="w-1/2 md:w-1/3 lg:w-full p-0.5 first:pl-0 last:pr-0"
+            >
+              <p
+                :class="[
+                  'w-full rounded-lg py-2.5 text-sm text-center font-medium leading-5 focus:ring-0 outline-hidden',
+                  isExactActive ? 'bg-red-200 shadow-sm border-b-2 border-primary rounded-b-none' : ' hover:bg-red-200',
+                ]"
+              >
+                {{ tab.title }}
+              </p>
+            </RouterLink>
+          </div>
+          <RouterView />
+        </div>
+      </div>
+    </template>
+  </MainTemplate>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+import { mapActions, mapState } from "pinia";
+import MainTemplate from "@/templates/Main.vue";
+import { RouterLink, RouterView } from "vue-router";
+import { useAbilityStore } from "@/stores/ability";
+import { useEquipmentStore } from "@/stores/admin/unit/equipment/equipment";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  data() {
+    return {
+      tabs: [
+        { route: "admin-unit-maintenance", title: "offen" },
+        { route: "admin-unit-maintenance-done", title: "bearbeitet" },
+      ],
+    };
+  },
+  computed: {
+    ...mapState(useAbilityStore, ["can"]),
+  },
+});
+</script>
diff --git a/src/views/admin/unit/vehicleType/VehicleTypeRouting.vue b/src/views/admin/unit/vehicleType/VehicleTypeRouting.vue
index 46c3338..3c9a3d4 100644
--- a/src/views/admin/unit/vehicleType/VehicleTypeRouting.vue
+++ b/src/views/admin/unit/vehicleType/VehicleTypeRouting.vue
@@ -79,7 +79,7 @@ export default defineComponent({
     ...mapActions(useModalStore, ["openModal"]),
     openDeleteModal() {
       this.openModal(
-        markRaw(defineAsyncComponent(() => import("@/components/admin/unit/vehicleType/CreateVehicleTypeModal.vue"))),
+        markRaw(defineAsyncComponent(() => import("@/components/admin/unit/vehicleType/DeleteVehicleTypeModal.vue"))),
         this.vehicleTypeId ?? ""
       );
     },
diff --git a/src/views/admin/unit/wearable/Inspection.vue b/src/views/admin/unit/wearable/Inspection.vue
new file mode 100644
index 0000000..bf71eff
--- /dev/null
+++ b/src/views/admin/unit/wearable/Inspection.vue
@@ -0,0 +1,69 @@
+<template>
+  <div class="flex flex-col gap-2 h-full w-full">
+    <Pagination
+      :items="inspections"
+      :totalCount="totalCount"
+      :indicateLoading="false"
+      @load-data="(offset, count, search) => {}"
+      @search="(search) => {}"
+    >
+      <template #pageRow="{ row }: { row: InspectionViewModel }">
+        <RouterLink
+          :to="{ name: 'admin-unit-inspection-execute', params: { inspectionId: row.id } }"
+          class="flex flex-col h-fit w-full border border-primary rounded-md"
+        >
+          <div class="bg-primary p-2 text-white flex flex-row gap-2 items-center">
+            <PencilSquareIcon v-if="row.isOpen" class="w-5 h-5" />
+            <p>{{ row.inspectionPlan.title }} - {{ row.finished }}</p>
+          </div>
+          <div class="p-2">
+            <p v-if="row.context">Kontext: {{ row.context }}</p>
+            <p v-if="row.nextInspection">nächste Inspektion: {{ row.nextInspection }}</p>
+          </div>
+        </RouterLink>
+      </template>
+    </Pagination>
+    <div class="flex flex-row gap-4">
+      <RouterLink
+        v-if="can('create', 'unit', 'wearable')"
+        :to="{ name: 'admin-unit-inspection-plan', params: { type: 'wearable', relatedId: wearableId } }"
+        button
+        primary
+        class="w-fit!"
+        @click=""
+        >Prüfung durchführen</RouterLink
+      >
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+import { mapActions, mapState } from "pinia";
+import { useAbilityStore } from "@/stores/ability";
+import { useWearableInspectionStore } from "@/stores/admin/unit/wearable/inspection";
+import { PencilSquareIcon } from "@heroicons/vue/24/outline";
+import Pagination from "@/components/Pagination.vue";
+import type { InspectionViewModel } from "@/viewmodels/admin/unit/inspection/inspection.models";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  props: {
+    wearableId: String,
+  },
+  computed: {
+    ...mapState(useAbilityStore, ["can"]),
+    ...mapState(useWearableInspectionStore, ["inspections", "loading", "totalCount"]),
+  },
+  mounted() {
+    this.fetchItem();
+  },
+  methods: {
+    ...mapActions(useWearableInspectionStore, ["fetchInspectionForWearable"]),
+    fetchItem() {
+      this.fetchInspectionForWearable();
+    },
+  },
+});
+</script>
diff --git a/src/views/admin/unit/wearable/WearableRouting.vue b/src/views/admin/unit/wearable/WearableRouting.vue
index 1b35c5f..e1f9f88 100644
--- a/src/views/admin/unit/wearable/WearableRouting.vue
+++ b/src/views/admin/unit/wearable/WearableRouting.vue
@@ -55,7 +55,8 @@ export default defineComponent({
     return {
       tabs: [
         { route: "admin-unit-wearable-overview", title: "Übersicht" },
-        { route: "admin-unit-wearable-maintenance", title: "Reparaturen" },
+        { route: "admin-unit-wearable-maintenance", title: "Wartungen/Reparaturen" },
+        { route: "admin-unit-wearable-inspection", title: "Prüfungen" },
         { route: "admin-unit-wearable-damage_report", title: "Schadensmeldungen" },
       ],
     };
diff --git a/src/views/admin/unit/wearableType/InspectionPlans.vue b/src/views/admin/unit/wearableType/InspectionPlans.vue
new file mode 100644
index 0000000..5cc5c46
--- /dev/null
+++ b/src/views/admin/unit/wearableType/InspectionPlans.vue
@@ -0,0 +1,51 @@
+<template>
+  <div class="flex flex-col gap-2 h-full w-full overflow-y-auto">
+    <div v-if="inspectionPlans != null" class="flex flex-col gap-2 w-full">
+      <TypeInspectionPlanListItem v-for="plan in inspectionPlans" :inspection-plan="plan" />
+    </div>
+    <Spinner v-if="loading == 'loading'" class="mx-auto" />
+    <p v-else-if="loading == 'failed'" @click="fetchItem" class="cursor-pointer">&#8634; laden fehlgeschlagen</p>
+  </div>
+
+  <div class="flex flex-row gap-4">
+    <RouterLink
+      v-if="can('create', 'unit', 'vehicle_type')"
+      :to="{ name: 'admin-unit-inspection_plan-create', query: { type: 'vehicle', id: vehicleTypeId } }"
+      button
+      primary
+      class="w-fit!"
+    >
+      Prüfplan erstellen
+    </RouterLink>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+import { mapActions, mapState } from "pinia";
+import { useAbilityStore } from "@/stores/ability";
+import { useVehicleTypeInspectionPlanStore } from "@/stores/admin/unit/vehicleType/inspectionPlan";
+import TypeInspectionPlanListItem from "@/components/admin/unit/inspectionPlan/TypeInspectionPlanListItem.vue";
+import Spinner from "@/components/Spinner.vue";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  props: {
+    vehicleTypeId: String,
+  },
+  computed: {
+    ...mapState(useAbilityStore, ["can"]),
+    ...mapState(useVehicleTypeInspectionPlanStore, ["inspectionPlans", "loading"]),
+  },
+  mounted() {
+    this.fetchItem();
+  },
+  methods: {
+    ...mapActions(useVehicleTypeInspectionPlanStore, ["fetchInspectionPlanForVehicleType"]),
+    fetchItem() {
+      this.fetchInspectionPlanForVehicleType();
+    },
+  },
+});
+</script>
diff --git a/src/views/admin/unit/wearableType/Overview.vue b/src/views/admin/unit/wearableType/Overview.vue
new file mode 100644
index 0000000..5e0444e
--- /dev/null
+++ b/src/views/admin/unit/wearableType/Overview.vue
@@ -0,0 +1,43 @@
+<template>
+  <div class="flex flex-col gap-2 h-full w-full overflow-y-auto">
+    <div v-if="activeWearableTypeObj != null" class="flex flex-col gap-2 w-full">
+      <div>
+        <label for="type">Typ</label>
+        <input type="text" id="type" :value="activeWearableTypeObj.type" readonly />
+      </div>
+      <div>
+        <label for="description">Beschreibung</label>
+        <textarea id="description" :value="activeWearableTypeObj.description" class="h-18" readonly></textarea>
+      </div>
+    </div>
+
+    <Spinner v-if="loadingActive == 'loading'" class="mx-auto" />
+    <p v-else-if="loadingActive == 'failed'" @click="fetchWearableTypeByActiveId" class="cursor-pointer">
+      &#8634; laden fehlgeschlagen
+    </p>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+import { mapActions, mapState } from "pinia";
+import Spinner from "@/components/Spinner.vue";
+import { useWearableTypeStore } from "@/stores/admin/unit/wearableType/wearableType";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  props: {
+    wearableTypeId: String,
+  },
+  computed: {
+    ...mapState(useWearableTypeStore, ["activeWearableTypeObj", "loadingActive"]),
+  },
+  mounted() {
+    this.fetchWearableTypeByActiveId();
+  },
+  methods: {
+    ...mapActions(useWearableTypeStore, ["fetchWearableTypeByActiveId"]),
+  },
+});
+</script>
diff --git a/src/views/admin/unit/wearableType/UpdateWearableType.vue b/src/views/admin/unit/wearableType/UpdateWearableType.vue
index 242301a..cf85991 100644
--- a/src/views/admin/unit/wearableType/UpdateWearableType.vue
+++ b/src/views/admin/unit/wearableType/UpdateWearableType.vue
@@ -1,43 +1,37 @@
 <template>
-  <MainTemplate :title="`Kleidungs-Typ ${origin?.type} - Daten bearbeiten`">
-    <template #headerInsert>
-      <RouterLink to="../" class="text-primary">zurück zur Liste (abbrechen)</RouterLink>
-    </template>
-    <template #main>
-      <Spinner v-if="loading == 'loading'" class="mx-auto" />
-      <p v-else-if="loading == 'failed'">laden fehlgeschlagen</p>
-      <form
-        v-else-if="wearableType != null"
-        class="flex flex-col gap-4 py-2 w-full max-w-xl mx-auto"
-        @submit.prevent="triggerUpdate"
-      >
-        <p class="mx-auto">Kleidungstyp bearbeiten</p>
-        <div>
-          <label for="type">Bezeichnung</label>
-          <input type="text" id="type" required v-model="wearableType.type" />
-        </div>
-        <div>
-          <label for="description">Beschreibung (optional)</label>
-          <input type="text" id="description" v-model="wearableType.description" />
-        </div>
-        <div class="flex flex-row justify-end gap-2">
-          <button primary-outline type="reset" class="w-fit!" :disabled="canSaveOrReset" @click="resetForm">
-            abbrechen
-          </button>
-          <button primary type="submit" class="w-fit!" :disabled="status == 'loading'">speichern</button>
-          <Spinner v-if="status == 'loading'" class="my-auto" />
-          <SuccessCheckmark v-else-if="status?.status == 'success'" />
-          <FailureXMark v-else-if="status?.status == 'failed'" />
-        </div>
-      </form>
-    </template>
-  </MainTemplate>
+  <div class="flex flex-col gap-2 h-full w-full overflow-y-auto">
+    <Spinner v-if="loading == 'loading'" class="mx-auto" />
+    <p v-else-if="loading == 'failed'">laden fehlgeschlagen</p>
+    <form
+      v-else-if="wearableType != null"
+      class="flex flex-col gap-4 py-2 w-full max-w-xl mx-auto"
+      @submit.prevent="triggerUpdate"
+    >
+      <p class="mx-auto">Kleidungstyp bearbeiten</p>
+      <div>
+        <label for="type">Bezeichnung</label>
+        <input type="text" id="type" required v-model="wearableType.type" />
+      </div>
+      <div>
+        <label for="description">Beschreibung (optional)</label>
+        <input type="text" id="description" v-model="wearableType.description" />
+      </div>
+      <div class="flex flex-row justify-end gap-2">
+        <button primary-outline type="reset" class="w-fit!" :disabled="canSaveOrReset" @click="resetForm">
+          abbrechen
+        </button>
+        <button primary type="submit" class="w-fit!" :disabled="status == 'loading'">speichern</button>
+        <Spinner v-if="status == 'loading'" class="my-auto" />
+        <SuccessCheckmark v-else-if="status?.status == 'success'" />
+        <FailureXMark v-else-if="status?.status == 'failed'" />
+      </div>
+    </form>
+  </div>
 </template>
 
 <script setup lang="ts">
 import { defineComponent } from "vue";
 import { mapActions, mapState } from "pinia";
-import MainTemplate from "@/templates/Main.vue";
 import { useWearableTypeStore } from "@/stores/admin/unit/wearableType/wearableType";
 import type {
   CreateWearableTypeViewModel,
diff --git a/src/views/admin/unit/wearableType/WearableTypeRouting.vue b/src/views/admin/unit/wearableType/WearableTypeRouting.vue
new file mode 100644
index 0000000..45fa713
--- /dev/null
+++ b/src/views/admin/unit/wearableType/WearableTypeRouting.vue
@@ -0,0 +1,88 @@
+<template>
+  <MainTemplate :title="activeWearableTypeObj?.type">
+    <template #headerInsert>
+      <RouterLink :to="{ name: 'admin-unit-wearable_type' }" class="text-primary">zurück zur Liste</RouterLink>
+    </template>
+    <template #topBar>
+      <div class="flex flex-row gap-2">
+        <RouterLink v-if="can('update', 'unit', 'wearable_type')" :to="{ name: 'admin-unit-wearable_type-edit' }">
+          <PencilIcon class="w-5 h-5" />
+        </RouterLink>
+        <TrashIcon
+          v-if="can('delete', 'unit', 'wearable_type')"
+          class="w-5 h-5 cursor-pointer"
+          @click="openDeleteModal"
+        />
+      </div>
+    </template>
+    <template #diffMain>
+      <div class="flex flex-col gap-2 grow px-7 overflow-hidden">
+        <div class="flex flex-col grow gap-2 overflow-hidden">
+          <div class="w-full flex flex-row max-lg:flex-wrap justify-center">
+            <RouterLink
+              v-for="tab in tabs"
+              :key="tab.route"
+              v-slot="{ isActive }"
+              :to="{ name: tab.route }"
+              class="w-1/2 md:w-1/3 lg:w-full p-0.5 first:pl-0 last:pr-0"
+            >
+              <p
+                :class="[
+                  'w-full rounded-lg py-2.5 text-sm text-center font-medium leading-5 focus:ring-0 outline-hidden',
+                  isActive ? 'bg-red-200 shadow-sm border-b-2 border-primary rounded-b-none' : ' hover:bg-red-200',
+                ]"
+              >
+                {{ tab.title }}
+              </p>
+            </RouterLink>
+          </div>
+          <RouterView />
+        </div>
+      </div>
+    </template>
+  </MainTemplate>
+</template>
+
+<script setup lang="ts">
+import { defineAsyncComponent, defineComponent, markRaw } from "vue";
+import { mapActions, mapState } from "pinia";
+import MainTemplate from "@/templates/Main.vue";
+import { RouterLink, RouterView } from "vue-router";
+import { PencilIcon, TrashIcon } from "@heroicons/vue/24/outline";
+import { useModalStore } from "@/stores/modal";
+import { useAbilityStore } from "@/stores/ability";
+import { useWearableTypeStore } from "@/stores/admin/unit/wearableType/wearableType";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  props: {
+    wearableTypeId: String,
+  },
+  data() {
+    return {
+      tabs: [
+        { route: "admin-unit-wearable_type-overview", title: "Übersicht" },
+        { route: "admin-unit-wearable_type-inspection_plan", title: "Prüfpläne" },
+      ],
+    };
+  },
+  computed: {
+    ...mapState(useWearableTypeStore, ["activeWearableTypeObj"]),
+    ...mapState(useAbilityStore, ["can"]),
+  },
+  mounted() {
+    this.fetchWearableTypeByActiveId();
+  },
+  methods: {
+    ...mapActions(useWearableTypeStore, ["fetchWearableTypeByActiveId"]),
+    ...mapActions(useModalStore, ["openModal"]),
+    openDeleteModal() {
+      this.openModal(
+        markRaw(defineAsyncComponent(() => import("@/components/admin/unit/wearableType/DeleteWearableTypeModal.vue"))),
+        this.wearableTypeId ?? ""
+      );
+    },
+  },
+});
+</script>
-- 
2.47.3


From fe0f31ce6b8c7607959ec6c68f199911005cb4fe Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Sat, 14 Jun 2025 13:39:34 +0200
Subject: [PATCH 06/16] search z-index

---
 src/components/search/EquipmentSearchSelect.vue      | 2 +-
 src/components/search/EquipmentTypeSearchSelect.vue  | 2 +-
 src/components/search/InspectionPlanSearchSelect.vue | 4 ++--
 src/components/search/MemberSearchSelectMultiple.vue | 2 +-
 src/components/search/MemberSearchSelectSingle.vue   | 2 +-
 src/components/search/VehicleSearchSelect.vue        | 2 +-
 src/components/search/VehicleTypeSearchSelect.vue    | 2 +-
 src/components/search/WearableTypeSearchSelect.vue   | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/search/EquipmentSearchSelect.vue b/src/components/search/EquipmentSearchSelect.vue
index 6bd5683..a1a7c08 100644
--- a/src/components/search/EquipmentSearchSelect.vue
+++ b/src/components/search/EquipmentSearchSelect.vue
@@ -24,7 +24,7 @@
           @after-leave="query = ''"
         >
           <ComboboxOptions
-            class="absolute mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-base shadow-md ring-1 ring-black/5 focus:outline-hidden sm:text-sm z-10"
+            class="absolute mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-base shadow-md ring-1 ring-black/5 focus:outline-hidden sm:text-sm z-20"
           >
             <ComboboxOption v-if="loading || deferingSearch" as="template" disabled>
               <li class="flex flex-row gap-2 text-text relative cursor-default select-none py-2 pl-3 pr-4">
diff --git a/src/components/search/EquipmentTypeSearchSelect.vue b/src/components/search/EquipmentTypeSearchSelect.vue
index 809b444..6f5f46b 100644
--- a/src/components/search/EquipmentTypeSearchSelect.vue
+++ b/src/components/search/EquipmentTypeSearchSelect.vue
@@ -18,7 +18,7 @@
           @after-leave="query = ''"
         >
           <ComboboxOptions
-            class="absolute mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-base shadow-md ring-1 ring-black/5 focus:outline-hidden sm:text-sm z-10"
+            class="absolute mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-base shadow-md ring-1 ring-black/5 focus:outline-hidden sm:text-sm z-20"
           >
             <ComboboxOption v-if="loading || deferingSearch" as="template" disabled>
               <li class="flex flex-row gap-2 text-text relative cursor-default select-none py-2 pl-3 pr-4">
diff --git a/src/components/search/InspectionPlanSearchSelect.vue b/src/components/search/InspectionPlanSearchSelect.vue
index 4580bd5..4ff6e62 100644
--- a/src/components/search/InspectionPlanSearchSelect.vue
+++ b/src/components/search/InspectionPlanSearchSelect.vue
@@ -18,7 +18,7 @@
           @after-leave="query = ''"
         >
           <ComboboxOptions
-            class="absolute mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-base shadow-md ring-1 ring-black/5 focus:outline-hidden sm:text-sm z-10"
+            class="absolute mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-base shadow-md ring-1 ring-black/5 focus:outline-hidden sm:text-sm z-20"
           >
             <ComboboxOption v-if="loading || deferingSearch" as="template" disabled>
               <li class="flex flex-row gap-2 text-text relative cursor-default select-none py-2 pl-3 pr-4">
@@ -102,7 +102,7 @@ export default defineComponent({
       default: false,
     },
     type: {
-      type: String as PropType<"vehicle" | "equipment">,
+      type: String as PropType<"vehicle" | "equipment" | "wearable">,
       default: "equipment",
     },
   },
diff --git a/src/components/search/MemberSearchSelectMultiple.vue b/src/components/search/MemberSearchSelectMultiple.vue
index f244851..5b5c29a 100644
--- a/src/components/search/MemberSearchSelectMultiple.vue
+++ b/src/components/search/MemberSearchSelectMultiple.vue
@@ -18,7 +18,7 @@
           @after-leave="query = ''"
         >
           <ComboboxOptions
-            class="absolute mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-base shadow-md ring-1 ring-black/5 focus:outline-hidden sm:text-sm z-10"
+            class="absolute mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-base shadow-md ring-1 ring-black/5 focus:outline-hidden sm:text-sm z-20"
           >
             <ComboboxOption v-if="loading || deferingSearch" as="template" disabled>
               <li class="flex flex-row gap-2 text-text relative cursor-default select-none py-2 pl-3 pr-4">
diff --git a/src/components/search/MemberSearchSelectSingle.vue b/src/components/search/MemberSearchSelectSingle.vue
index 54be6d9..d81e2a4 100644
--- a/src/components/search/MemberSearchSelectSingle.vue
+++ b/src/components/search/MemberSearchSelectSingle.vue
@@ -18,7 +18,7 @@
           @after-leave="query = ''"
         >
           <ComboboxOptions
-            class="absolute mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-base shadow-md ring-1 ring-black/5 focus:outline-hidden sm:text-sm z-10"
+            class="absolute mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-base shadow-md ring-1 ring-black/5 focus:outline-hidden sm:text-sm z-20"
           >
             <ComboboxOption v-if="loading || deferingSearch" as="template" disabled>
               <li class="flex flex-row gap-2 text-text relative cursor-default select-none py-2 pl-3 pr-4">
diff --git a/src/components/search/VehicleSearchSelect.vue b/src/components/search/VehicleSearchSelect.vue
index 21de173..1fc9afa 100644
--- a/src/components/search/VehicleSearchSelect.vue
+++ b/src/components/search/VehicleSearchSelect.vue
@@ -24,7 +24,7 @@
           @after-leave="query = ''"
         >
           <ComboboxOptions
-            class="absolute mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-base shadow-md ring-1 ring-black/5 focus:outline-hidden sm:text-sm z-10"
+            class="absolute mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-base shadow-md ring-1 ring-black/5 focus:outline-hidden sm:text-sm z-20"
           >
             <ComboboxOption v-if="loading || deferingSearch" as="template" disabled>
               <li class="flex flex-row gap-2 text-text relative cursor-default select-none py-2 pl-3 pr-4">
diff --git a/src/components/search/VehicleTypeSearchSelect.vue b/src/components/search/VehicleTypeSearchSelect.vue
index 31d7752..53bde5f 100644
--- a/src/components/search/VehicleTypeSearchSelect.vue
+++ b/src/components/search/VehicleTypeSearchSelect.vue
@@ -18,7 +18,7 @@
           @after-leave="query = ''"
         >
           <ComboboxOptions
-            class="absolute mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-base shadow-md ring-1 ring-black/5 focus:outline-hidden sm:text-sm z-10"
+            class="absolute mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-base shadow-md ring-1 ring-black/5 focus:outline-hidden sm:text-sm z-20"
           >
             <ComboboxOption v-if="loading || deferingSearch" as="template" disabled>
               <li class="flex flex-row gap-2 text-text relative cursor-default select-none py-2 pl-3 pr-4">
diff --git a/src/components/search/WearableTypeSearchSelect.vue b/src/components/search/WearableTypeSearchSelect.vue
index 5267904..4cb96c8 100644
--- a/src/components/search/WearableTypeSearchSelect.vue
+++ b/src/components/search/WearableTypeSearchSelect.vue
@@ -18,7 +18,7 @@
           @after-leave="query = ''"
         >
           <ComboboxOptions
-            class="absolute mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-base shadow-md ring-1 ring-black/5 focus:outline-hidden sm:text-sm z-10"
+            class="absolute mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-base shadow-md ring-1 ring-black/5 focus:outline-hidden sm:text-sm z-20"
           >
             <ComboboxOption v-if="loading || deferingSearch" as="template" disabled>
               <li class="flex flex-row gap-2 text-text relative cursor-default select-none py-2 pl-3 pr-4">
-- 
2.47.3


From e7078960baaf55f5ebffab37b5d2e8c09711a72c Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Sun, 15 Jun 2025 22:04:41 +0200
Subject: [PATCH 07/16] search select component improvements

---
 .../search/EquipmentSearchSelect.vue          | 24 +++++++++++++---
 .../search/EquipmentTypeSearchSelect.vue      | 24 +++++++++++++---
 .../search/InspectionPlanSearchSelect.vue     | 28 ++++++++++++++++---
 src/components/search/VehicleSearchSelect.vue | 24 +++++++++++++---
 .../search/VehicleTypeSearchSelect.vue        | 24 +++++++++++++---
 .../search/WearableSearchSelect.vue           | 26 +++++++++++++----
 .../search/WearableTypeSearchSelect.vue       | 26 +++++++++++++----
 7 files changed, 146 insertions(+), 30 deletions(-)

diff --git a/src/components/search/EquipmentSearchSelect.vue b/src/components/search/EquipmentSearchSelect.vue
index a1a7c08..8feb26a 100644
--- a/src/components/search/EquipmentSearchSelect.vue
+++ b/src/components/search/EquipmentSearchSelect.vue
@@ -32,12 +32,12 @@
                 <span class="font-normal block truncate">suche</span>
               </li>
             </ComboboxOption>
-            <ComboboxOption v-else-if="filtered.length === 0 && query == ''" as="template" disabled>
+            <ComboboxOption v-else-if="available.length === 0" as="template" disabled>
               <li class="text-text relative cursor-default select-none py-2 pl-3 pr-4">
                 <span class="font-normal block truncate">tippe, um zu suchen...</span>
               </li>
             </ComboboxOption>
-            <ComboboxOption v-else-if="filtered.length === 0" as="template" disabled>
+            <ComboboxOption v-else-if="available.length === 0 && query != ''" as="template" disabled>
               <li class="text-text relative cursor-default select-none py-2 pl-3 pr-4">
                 <span class="font-normal block truncate">Keine Auswahl gefunden.</span>
               </li>
@@ -45,7 +45,7 @@
 
             <ComboboxOption
               v-if="!(loading || deferingSearch)"
-              v-for="equipment in filtered"
+              v-for="equipment in available"
               as="template"
               :key="equipment.id"
               :value="equipment.id"
@@ -137,11 +137,15 @@ export default defineComponent({
       deferingSearch: false as boolean,
       timer: undefined as any,
       query: "" as string,
+      all: [] as Array<EquipmentViewModel>,
       filtered: [] as Array<EquipmentViewModel>,
       chosen: undefined as undefined | EquipmentViewModel,
     };
   },
   computed: {
+    available() {
+      return this.query == "" ? this.all : this.filtered;
+    },
     selected: {
       get() {
         return this.modelValue;
@@ -154,10 +158,22 @@ export default defineComponent({
   },
   mounted() {
     this.loadEquipmentInitial();
+    this.preloadAll();
   },
   methods: {
-    ...mapActions(useEquipmentStore, ["searchEquipments", "fetchEquipmentById"]),
+    ...mapActions(useEquipmentStore, ["searchEquipments", "fetchEquipmentById", "getAllEquipments"]),
     ...mapActions(useModalStore, ["openModal"]),
+    preloadAll() {
+      this.loading = true;
+      this.getAllEquipments()
+        .then((res) => {
+          this.all = res.data;
+        })
+        .catch((err) => {})
+        .finally(() => {
+          this.loading = false;
+        });
+    },
     search() {
       this.filtered = [];
       if (this.query == "") return;
diff --git a/src/components/search/EquipmentTypeSearchSelect.vue b/src/components/search/EquipmentTypeSearchSelect.vue
index 6f5f46b..8d431cb 100644
--- a/src/components/search/EquipmentTypeSearchSelect.vue
+++ b/src/components/search/EquipmentTypeSearchSelect.vue
@@ -26,12 +26,12 @@
                 <span class="font-normal block truncate">suche</span>
               </li>
             </ComboboxOption>
-            <ComboboxOption v-else-if="filtered.length === 0 && query == ''" as="template" disabled>
+            <ComboboxOption v-else-if="available.length === 0" as="template" disabled>
               <li class="text-text relative cursor-default select-none py-2 pl-3 pr-4">
                 <span class="font-normal block truncate">tippe, um zu suchen...</span>
               </li>
             </ComboboxOption>
-            <ComboboxOption v-else-if="filtered.length === 0" as="template" disabled>
+            <ComboboxOption v-else-if="available.length === 0 && query != ''" as="template" disabled>
               <li class="text-text relative cursor-default select-none py-2 pl-3 pr-4">
                 <span class="font-normal block truncate">Keine Auswahl gefunden.</span>
               </li>
@@ -39,7 +39,7 @@
 
             <ComboboxOption
               v-if="!(loading || deferingSearch)"
-              v-for="equipmentType in filtered"
+              v-for="equipmentType in available"
               as="template"
               :key="equipmentType.id"
               :value="equipmentType.id"
@@ -125,11 +125,15 @@ export default defineComponent({
       deferingSearch: false as boolean,
       timer: undefined as any,
       query: "" as string,
+      all: [] as Array<EquipmentTypeViewModel>,
       filtered: [] as Array<EquipmentTypeViewModel>,
       chosen: undefined as undefined | EquipmentTypeViewModel,
     };
   },
   computed: {
+    available() {
+      return this.query == "" ? this.all : this.filtered;
+    },
     selected: {
       get() {
         return this.modelValue;
@@ -142,9 +146,21 @@ export default defineComponent({
   },
   mounted() {
     this.loadEquipmentTypeInitial();
+    this.preloadAll();
   },
   methods: {
-    ...mapActions(useEquipmentTypeStore, ["searchEquipmentTypes", "fetchEquipmentTypeById"]),
+    ...mapActions(useEquipmentTypeStore, ["searchEquipmentTypes", "fetchEquipmentTypeById", "getAllEquipmentTypes"]),
+    preloadAll() {
+      this.loading = true;
+      this.getAllEquipmentTypes()
+        .then((res) => {
+          this.all = res.data;
+        })
+        .catch((err) => {})
+        .finally(() => {
+          this.loading = false;
+        });
+    },
     search() {
       this.filtered = [];
       if (this.query == "") return;
diff --git a/src/components/search/InspectionPlanSearchSelect.vue b/src/components/search/InspectionPlanSearchSelect.vue
index 4ff6e62..a328fb8 100644
--- a/src/components/search/InspectionPlanSearchSelect.vue
+++ b/src/components/search/InspectionPlanSearchSelect.vue
@@ -26,12 +26,12 @@
                 <span class="font-normal block truncate">suche</span>
               </li>
             </ComboboxOption>
-            <ComboboxOption v-else-if="filtered.length === 0 && query == ''" as="template" disabled>
+            <ComboboxOption v-else-if="available.length === 0" as="template" disabled>
               <li class="text-text relative cursor-default select-none py-2 pl-3 pr-4">
                 <span class="font-normal block truncate">tippe, um zu suchen...</span>
               </li>
             </ComboboxOption>
-            <ComboboxOption v-else-if="filtered.length === 0" as="template" disabled>
+            <ComboboxOption v-else-if="available.length === 0 && query != ''" as="template" disabled>
               <li class="text-text relative cursor-default select-none py-2 pl-3 pr-4">
                 <span class="font-normal block truncate">Keine Auswahl gefunden.</span>
               </li>
@@ -39,7 +39,7 @@
 
             <ComboboxOption
               v-if="!(loading || deferingSearch)"
-              v-for="inspectionPlan in filtered"
+              v-for="inspectionPlan in available"
               as="template"
               :key="inspectionPlan.id"
               :value="inspectionPlan.id"
@@ -129,11 +129,15 @@ export default defineComponent({
       deferingSearch: false as boolean,
       timer: undefined as any,
       query: "" as string,
+      all: [] as Array<InspectionPlanViewModel>,
       filtered: [] as Array<InspectionPlanViewModel>,
       chosen: undefined as undefined | InspectionPlanViewModel,
     };
   },
   computed: {
+    available() {
+      return this.query == "" ? this.all : this.filtered;
+    },
     selected: {
       get() {
         return this.modelValue;
@@ -146,9 +150,25 @@ export default defineComponent({
   },
   mounted() {
     this.loadInspectionPlanInitial();
+    this.preloadAll();
   },
   methods: {
-    ...mapActions(useInspectionPlanStore, ["searchInspectionPlans", "fetchInspectionPlanById"]),
+    ...mapActions(useInspectionPlanStore, [
+      "searchInspectionPlans",
+      "fetchInspectionPlanById",
+      "getAllInspectionPlans",
+    ]),
+    preloadAll() {
+      this.loading = true;
+      this.getAllInspectionPlans()
+        .then((res) => {
+          this.all = res.data;
+        })
+        .catch((err) => {})
+        .finally(() => {
+          this.loading = false;
+        });
+    },
     search() {
       this.filtered = [];
       if (this.query == "") return;
diff --git a/src/components/search/VehicleSearchSelect.vue b/src/components/search/VehicleSearchSelect.vue
index 1fc9afa..c3484db 100644
--- a/src/components/search/VehicleSearchSelect.vue
+++ b/src/components/search/VehicleSearchSelect.vue
@@ -32,12 +32,12 @@
                 <span class="font-normal block truncate">suche</span>
               </li>
             </ComboboxOption>
-            <ComboboxOption v-else-if="filtered.length === 0 && query == ''" as="template" disabled>
+            <ComboboxOption v-else-if="available.length === 0" as="template" disabled>
               <li class="text-text relative cursor-default select-none py-2 pl-3 pr-4">
                 <span class="font-normal block truncate">tippe, um zu suchen...</span>
               </li>
             </ComboboxOption>
-            <ComboboxOption v-else-if="filtered.length === 0" as="template" disabled>
+            <ComboboxOption v-else-if="available.length === 0 && query != ''" as="template" disabled>
               <li class="text-text relative cursor-default select-none py-2 pl-3 pr-4">
                 <span class="font-normal block truncate">Keine Auswahl gefunden.</span>
               </li>
@@ -45,7 +45,7 @@
 
             <ComboboxOption
               v-if="!(loading || deferingSearch)"
-              v-for="vehicle in filtered"
+              v-for="vehicle in available"
               as="template"
               :key="vehicle.id"
               :value="vehicle.id"
@@ -137,11 +137,15 @@ export default defineComponent({
       deferingSearch: false as boolean,
       timer: undefined as any,
       query: "" as string,
+      all: [] as Array<VehicleViewModel>,
       filtered: [] as Array<VehicleViewModel>,
       chosen: undefined as undefined | VehicleViewModel,
     };
   },
   computed: {
+    available() {
+      return this.query == "" ? this.all : this.filtered;
+    },
     selected: {
       get() {
         return this.modelValue;
@@ -154,10 +158,22 @@ export default defineComponent({
   },
   mounted() {
     this.loadVehicleInitial();
+    this.preloadAll();
   },
   methods: {
-    ...mapActions(useVehicleStore, ["searchVehicles", "fetchVehicleById"]),
+    ...mapActions(useVehicleStore, ["searchVehicles", "fetchVehicleById", "getAllVehicles"]),
     ...mapActions(useModalStore, ["openModal"]),
+    preloadAll() {
+      this.loading = true;
+      this.getAllVehicles()
+        .then((res) => {
+          this.all = res.data;
+        })
+        .catch((err) => {})
+        .finally(() => {
+          this.loading = false;
+        });
+    },
     search() {
       this.filtered = [];
       if (this.query == "") return;
diff --git a/src/components/search/VehicleTypeSearchSelect.vue b/src/components/search/VehicleTypeSearchSelect.vue
index 53bde5f..c730dc5 100644
--- a/src/components/search/VehicleTypeSearchSelect.vue
+++ b/src/components/search/VehicleTypeSearchSelect.vue
@@ -26,12 +26,12 @@
                 <span class="font-normal block truncate">suche</span>
               </li>
             </ComboboxOption>
-            <ComboboxOption v-else-if="filtered.length === 0 && query == ''" as="template" disabled>
+            <ComboboxOption v-else-if="available.length === 0" as="template" disabled>
               <li class="text-text relative cursor-default select-none py-2 pl-3 pr-4">
                 <span class="font-normal block truncate">tippe, um zu suchen...</span>
               </li>
             </ComboboxOption>
-            <ComboboxOption v-else-if="filtered.length === 0" as="template" disabled>
+            <ComboboxOption v-else-if="available.length === 0 && query != ''" as="template" disabled>
               <li class="text-text relative cursor-default select-none py-2 pl-3 pr-4">
                 <span class="font-normal block truncate">Keine Auswahl gefunden.</span>
               </li>
@@ -39,7 +39,7 @@
 
             <ComboboxOption
               v-if="!(loading || deferingSearch)"
-              v-for="vehicleType in filtered"
+              v-for="vehicleType in available"
               as="template"
               :key="vehicleType.id"
               :value="vehicleType.id"
@@ -125,11 +125,15 @@ export default defineComponent({
       deferingSearch: false as boolean,
       timer: undefined as any,
       query: "" as string,
+      all: [] as Array<VehicleTypeViewModel>,
       filtered: [] as Array<VehicleTypeViewModel>,
       chosen: undefined as undefined | VehicleTypeViewModel,
     };
   },
   computed: {
+    available() {
+      return this.query == "" ? this.all : this.filtered;
+    },
     selected: {
       get() {
         return this.modelValue;
@@ -142,9 +146,21 @@ export default defineComponent({
   },
   mounted() {
     this.loadVehicleTypeInitial();
+    this.preloadAll();
   },
   methods: {
-    ...mapActions(useVehicleTypeStore, ["searchVehicleTypes", "fetchVehicleTypeById"]),
+    ...mapActions(useVehicleTypeStore, ["searchVehicleTypes", "fetchVehicleTypeById", "getAllVehicleTypes"]),
+    preloadAll() {
+      this.loading = true;
+      this.getAllVehicleTypes()
+        .then((res) => {
+          this.all = res.data;
+        })
+        .catch((err) => {})
+        .finally(() => {
+          this.loading = false;
+        });
+    },
     search() {
       this.filtered = [];
       if (this.query == "") return;
diff --git a/src/components/search/WearableSearchSelect.vue b/src/components/search/WearableSearchSelect.vue
index 3248277..e282e72 100644
--- a/src/components/search/WearableSearchSelect.vue
+++ b/src/components/search/WearableSearchSelect.vue
@@ -32,12 +32,12 @@
                 <span class="font-normal block truncate">suche</span>
               </li>
             </ComboboxOption>
-            <ComboboxOption v-else-if="filtered.length === 0 && query == ''" as="template" disabled>
+            <ComboboxOption v-else-if="available.length === 0 && all.length == 0" as="template" disabled>
               <li class="text-text relative cursor-default select-none py-2 pl-3 pr-4">
                 <span class="font-normal block truncate">tippe, um zu suchen...</span>
               </li>
             </ComboboxOption>
-            <ComboboxOption v-else-if="filtered.length === 0" as="template" disabled>
+            <ComboboxOption v-else-if="available.length === 0 && query != ''" as="template" disabled>
               <li class="text-text relative cursor-default select-none py-2 pl-3 pr-4">
                 <span class="font-normal block truncate">Keine Auswahl gefunden.</span>
               </li>
@@ -45,7 +45,7 @@
 
             <ComboboxOption
               v-if="!(loading || deferingSearch)"
-              v-for="wearable in filtered"
+              v-for="wearable in available"
               as="template"
               :key="wearable.id"
               :value="wearable.id"
@@ -137,11 +137,15 @@ export default defineComponent({
       deferingSearch: false as boolean,
       timer: undefined as any,
       query: "" as string,
+      all: [] as Array<WearableViewModel>,
       filtered: [] as Array<WearableViewModel>,
       chosen: undefined as undefined | WearableViewModel,
     };
   },
   computed: {
+    available() {
+      return this.query == "" ? this.all : this.filtered;
+    },
     selected: {
       get() {
         return this.modelValue;
@@ -154,10 +158,22 @@ export default defineComponent({
   },
   mounted() {
     this.loadWearableInitial();
+    this.preloadAll();
   },
   methods: {
-    ...mapActions(useWearableStore, ["searchWearables", "fetchWearableById"]),
+    ...mapActions(useWearableStore, ["searchWearables", "fetchWearableById", "getAllWearables"]),
     ...mapActions(useModalStore, ["openModal"]),
+    preloadAll() {
+      this.loading = true;
+      this.getAllWearables()
+        .then((res) => {
+          this.all = res.data;
+        })
+        .catch((err) => {})
+        .finally(() => {
+          this.loading = false;
+        });
+    },
     search() {
       this.filtered = [];
       if (this.query == "") return;
@@ -172,7 +188,7 @@ export default defineComponent({
         });
     },
     getWearableFromSearch(id: string) {
-      return this.filtered.find((f) => f.id == id);
+      return this.all.find((f) => f.id == id);
     },
     loadWearableInitial() {
       if (this.modelValue == "") return;
diff --git a/src/components/search/WearableTypeSearchSelect.vue b/src/components/search/WearableTypeSearchSelect.vue
index 4cb96c8..15deee2 100644
--- a/src/components/search/WearableTypeSearchSelect.vue
+++ b/src/components/search/WearableTypeSearchSelect.vue
@@ -26,12 +26,12 @@
                 <span class="font-normal block truncate">suche</span>
               </li>
             </ComboboxOption>
-            <ComboboxOption v-else-if="filtered.length === 0 && query == ''" as="template" disabled>
+            <ComboboxOption v-else-if="available.length === 0 && all.length == 0" as="template" disabled>
               <li class="text-text relative cursor-default select-none py-2 pl-3 pr-4">
                 <span class="font-normal block truncate">tippe, um zu suchen...</span>
               </li>
             </ComboboxOption>
-            <ComboboxOption v-else-if="filtered.length === 0" as="template" disabled>
+            <ComboboxOption v-else-if="available.length === 0 && query != ''" as="template" disabled>
               <li class="text-text relative cursor-default select-none py-2 pl-3 pr-4">
                 <span class="font-normal block truncate">Keine Auswahl gefunden.</span>
               </li>
@@ -39,7 +39,7 @@
 
             <ComboboxOption
               v-if="!(loading || deferingSearch)"
-              v-for="wearableType in filtered"
+              v-for="wearableType in available"
               as="template"
               :key="wearableType.id"
               :value="wearableType.id"
@@ -125,11 +125,15 @@ export default defineComponent({
       deferingSearch: false as boolean,
       timer: undefined as any,
       query: "" as string,
+      all: [] as Array<WearableTypeViewModel>,
       filtered: [] as Array<WearableTypeViewModel>,
       chosen: undefined as undefined | WearableTypeViewModel,
     };
   },
   computed: {
+    available() {
+      return this.query == "" ? this.all : this.filtered;
+    },
     selected: {
       get() {
         return this.modelValue;
@@ -142,9 +146,21 @@ export default defineComponent({
   },
   mounted() {
     this.loadWearableTypeInitial();
+    this.preloadAll();
   },
   methods: {
-    ...mapActions(useWearableTypeStore, ["searchWearableTypes", "fetchWearableTypeById"]),
+    ...mapActions(useWearableTypeStore, ["searchWearableTypes", "fetchWearableTypeById", "getAllWearableTypes"]),
+    preloadAll() {
+      this.loading = true;
+      this.getAllWearableTypes()
+        .then((res) => {
+          this.all = res.data;
+        })
+        .catch((err) => {})
+        .finally(() => {
+          this.loading = false;
+        });
+    },
     search() {
       this.filtered = [];
       if (this.query == "") return;
@@ -159,7 +175,7 @@ export default defineComponent({
         });
     },
     getWearableTypeFromSearch(id: string) {
-      return this.filtered.find((f) => f.id == id);
+      return this.all.find((f) => f.id == id);
     },
     loadWearableTypeInitial() {
       if (this.modelValue == "") return;
-- 
2.47.3


From eb4d33858303890b729e46b408343a8a87e1b2f4 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Wed, 9 Jul 2025 12:58:12 +0200
Subject: [PATCH 08/16] inspection Point base form

---
 .../admin/unit/inspection/ResultInput.vue     |   2 +
 .../InspectionPointListItem.vue               |  96 +++++++++
 .../admin/unit/vehicle/VehicleListItem.vue    |   3 +
 src/enums/inspectionEnum.ts                   |   1 +
 src/router/index.ts                           |  32 ++-
 src/stores/admin/navigation.ts                |   6 +-
 .../admin/unit/damageReport/DamageReport.vue  |   2 +-
 src/views/admin/unit/equipment/Inspection.vue |   2 +-
 .../unit/inspection/InspectionRouting.vue     |  54 +++++
 ...InspectionPlan.vue => InspectionStart.vue} |   7 +-
 .../admin/unit/inspection/NextInspection.vue  |  45 ++++
 .../inspectionPlan/CreateInspectionPlan.vue   |   2 +-
 .../inspectionPlan/InspectionPlanRouting.vue  |  16 +-
 .../admin/unit/inspectionPlan/Overview.vue    |   6 +-
 .../inspectionPlan/UpdateInspectionPlan.vue   |   3 +-
 .../UpdateInspectionPlanPoints.vue            | 199 ++++++++++++++++++
 .../admin/unit/maintenance/Maintenance.vue    |   2 +-
 src/views/admin/unit/vehicle/Inspection.vue   |   2 +-
 src/views/admin/unit/wearable/Inspection.vue  |   2 +-
 19 files changed, 457 insertions(+), 25 deletions(-)
 create mode 100644 src/components/admin/unit/inspectionPlan/InspectionPointListItem.vue
 create mode 100644 src/views/admin/unit/inspection/InspectionRouting.vue
 rename src/views/admin/unit/inspection/{InspectionPlan.vue => InspectionStart.vue} (94%)
 create mode 100644 src/views/admin/unit/inspection/NextInspection.vue
 create mode 100644 src/views/admin/unit/inspectionPlan/UpdateInspectionPlanPoints.vue

diff --git a/src/components/admin/unit/inspection/ResultInput.vue b/src/components/admin/unit/inspection/ResultInput.vue
index 7ac023b..e4d9ffb 100644
--- a/src/components/admin/unit/inspection/ResultInput.vue
+++ b/src/components/admin/unit/inspection/ResultInput.vue
@@ -14,6 +14,8 @@
         type="number"
         required
         v-model="value"
+        :min="inspectionPoint.min"
+        :max="inspectionPoint.max"
       />
       <textarea v-else :id="inspectionPoint.id" :name="inspectionPoint.id" required class="h-18" v-model="value" />
     </div>
diff --git a/src/components/admin/unit/inspectionPlan/InspectionPointListItem.vue b/src/components/admin/unit/inspectionPlan/InspectionPointListItem.vue
new file mode 100644
index 0000000..ad5654b
--- /dev/null
+++ b/src/components/admin/unit/inspectionPlan/InspectionPointListItem.vue
@@ -0,0 +1,96 @@
+<template>
+  <div class="flex flex-col h-fit w-full border border-primary rounded-md">
+    <div class="bg-primary p-2 text-white flex flex-row justify-between items-center gap-2">
+      <ClipboardDocumentCheckIcon v-if="modelValue.type == InspectionPointEnum.oknok" class="w-6 h-6" />
+      <CalculatorIcon v-else-if="modelValue.type == InspectionPointEnum.number" class="w-6 h-6" />
+      <BoldIcon v-else-if="modelValue.type == InspectionPointEnum.text" class="w-6 h-6" />
+      <DocumentIcon v-else-if="modelValue.type == InspectionPointEnum.file" class="w-6 h-6" />
+
+      <input type="text" placeholder="Titel" v-model="title" />
+
+      <div class="flex flex-col">
+        <ChevronUpIcon v-if="index != 0" class="text-white w-4 h-4 stroke-2 cursor-pointer" @click="$emit('up')" />
+        <ChevronDownIcon
+          v-if="index != totalCount - 1"
+          class="text-white w-4 h-4 stroke-2 cursor-pointer"
+          @click="$emit('down')"
+        />
+      </div>
+      <TrashIcon class="h-5 w-5 cursor-pointer" @click="$emit('remove')" />
+    </div>
+    <div class="p-2">
+      <textarea name="description" placeholder="Beschreibung" v-model="description"></textarea>
+      <div v-if="modelValue.type == InspectionPointEnum.number">
+        <label for="min">Mindestens</label>
+        <input type="number" v-model="min" min="0" />
+      </div>
+      <div v-if="modelValue.type == InspectionPointEnum.number">
+        <label for="max">Maximal</label>
+        <input type="number" v-model="max" min="0" />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent, type PropType } from "vue";
+import type { InspectionPointViewModel } from "@/viewmodels/admin/unit/inspection/inspectionPlan.models";
+import { InspectionPointEnum } from "@/enums/inspectionEnum";
+import {
+  BoldIcon,
+  CalculatorIcon,
+  ClipboardDocumentCheckIcon,
+  TrashIcon,
+  ChevronUpIcon,
+  ChevronDownIcon,
+  DocumentIcon,
+} from "@heroicons/vue/24/outline";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  props: {
+    index: { type: Number, default: 0 },
+    totalCount: { type: Number, default: 0 },
+    modelValue: {
+      type: Object as PropType<InspectionPointViewModel>,
+      required: true,
+    },
+  },
+  emits: ["up", "down", "remove", "update:model-value"],
+  computed: {
+    title: {
+      get() {
+        return this.modelValue.title;
+      },
+      set(val: InspectionPointViewModel) {
+        this.$emit("update:model-value", { ...this.modelValue, title: val });
+      },
+    },
+    description: {
+      get() {
+        return this.modelValue.description;
+      },
+      set(val: InspectionPointViewModel) {
+        this.$emit("update:model-value", { ...this.modelValue, description: val });
+      },
+    },
+    min: {
+      get() {
+        return this.modelValue.min;
+      },
+      set(val: InspectionPointViewModel) {
+        this.$emit("update:model-value", { ...this.modelValue, min: val });
+      },
+    },
+    max: {
+      get() {
+        return this.modelValue.max;
+      },
+      set(val: InspectionPointViewModel) {
+        this.$emit("update:model-value", { ...this.modelValue, max: val });
+      },
+    },
+  },
+});
+</script>
diff --git a/src/components/admin/unit/vehicle/VehicleListItem.vue b/src/components/admin/unit/vehicle/VehicleListItem.vue
index 0d24b45..c4a9254 100644
--- a/src/components/admin/unit/vehicle/VehicleListItem.vue
+++ b/src/components/admin/unit/vehicle/VehicleListItem.vue
@@ -6,6 +6,9 @@
     <div class="bg-primary p-2 text-white flex flex-row justify-between items-center">
       <p>{{ vehicle.name }}</p>
     </div>
+    <div class="p-2">
+      <p v-if="vehicle.code">Code: {{ vehicle.code }}</p>
+    </div>
   </RouterLink>
 </template>
 
diff --git a/src/enums/inspectionEnum.ts b/src/enums/inspectionEnum.ts
index 5c87e55..58143e6 100644
--- a/src/enums/inspectionEnum.ts
+++ b/src/enums/inspectionEnum.ts
@@ -2,4 +2,5 @@ export enum InspectionPointEnum {
   oknok = "oknok",
   text = "text",
   number = "number",
+  file = "file",
 }
diff --git a/src/router/index.ts b/src/router/index.ts
index 5f58c0a..d17640f 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -898,7 +898,15 @@ const router = createRouter({
                     {
                       path: "edit",
                       name: "admin-unit-inspection_plan-edit",
-                      component: () => import("@/views/admin/ViewSelect.vue"),
+                      component: () => import("@/views/admin/unit/inspectionPlan/UpdateInspectionPlan.vue"),
+                      meta: { type: "update", section: "unit", module: "inspection_plan" },
+                      beforeEnter: [abilityAndNavUpdate],
+                      props: true,
+                    },
+                    {
+                      path: "pointedit",
+                      name: "admin-unit-inspection_plan-pointedit",
+                      component: () => import("@/views/admin/unit/inspectionPlan/UpdateInspectionPlanPoints.vue"),
                       meta: { type: "update", section: "unit", module: "inspection_plan" },
                       beforeEnter: [abilityAndNavUpdate],
                       props: true,
@@ -916,13 +924,25 @@ const router = createRouter({
               children: [
                 {
                   path: "",
-                  name: "admin-unit-inspection",
-                  redirect: { name: "admin-unit-inspection-plan" },
+                  name: "admin-unit-inspection-routing",
+                  component: () => import("@/views/admin/unit/inspection/InspectionRouting.vue"),
+                  children: [
+                    {
+                      path: "next",
+                      name: "admin-unit-inspection",
+                      component: () => import("@/views/admin/unit/inspection/NextInspection.vue"),
+                    },
+                    {
+                      path: "running",
+                      name: "admin-unit-inspection-running",
+                      component: () => import("@/views/admin/unit/inspection/NextInspection.vue"),
+                    },
+                  ],
                 },
                 {
-                  path: "plan/:type?/:relatedId?/:inspectionPlanId?",
-                  name: "admin-unit-inspection-plan",
-                  component: () => import("@/views/admin/unit/inspection/InspectionPlan.vue"),
+                  path: "start/:type?/:relatedId?/:inspectionPlanId?",
+                  name: "admin-unit-inspection-start",
+                  component: () => import("@/views/admin/unit/inspection/InspectionStart.vue"),
                   beforeEnter: [],
                   props: true,
                 },
diff --git a/src/stores/admin/navigation.ts b/src/stores/admin/navigation.ts
index b5d1301..67aa59c 100644
--- a/src/stores/admin/navigation.ts
+++ b/src/stores/admin/navigation.ts
@@ -110,13 +110,13 @@ export const useNavigationStore = defineStore("navigation", {
             ...(abilityStore.can("read", "unit", "equipment") ? [{ key: "equipment", title: "Gerätschaften" }] : []),
             ...(abilityStore.can("read", "unit", "vehicle") ? [{ key: "vehicle", title: "Fahrzeuge" }] : []),
             ...(abilityStore.can("read", "unit", "wearable") ? [{ key: "wearable", title: "Kleidung" }] : []),
-            ...(abilityStore.can("read", "unit", "respiratory_gear")
+            ...(false && abilityStore.can("read", "unit", "respiratory_gear")
               ? [{ key: "respiratory_gear", title: "Atemschutz-Geräte" }]
               : []),
-            ...(abilityStore.can("read", "unit", "respiratory_wearer")
+            ...(false && abilityStore.can("read", "unit", "respiratory_wearer")
               ? [{ key: "respiratory_wearer", title: "Atemschutz-Träger" }]
               : []),
-            ...(abilityStore.can("read", "unit", "respiratory_mission")
+            ...(false && abilityStore.can("read", "unit", "respiratory_mission")
               ? [{ key: "respiratory_mission", title: "Atemschutz-Einsätze" }]
               : []),
             ...(abilityStore.can("create", "unit", "inspection") ? [{ key: "inspection", title: "Prüfungen" }] : []),
diff --git a/src/views/admin/unit/damageReport/DamageReport.vue b/src/views/admin/unit/damageReport/DamageReport.vue
index cc4dd22..5d76742 100644
--- a/src/views/admin/unit/damageReport/DamageReport.vue
+++ b/src/views/admin/unit/damageReport/DamageReport.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex flex-col w-full h-full gap-2 justify-center px-7">
+  <div class="flex flex-col w-full h-full gap-2 justify-center">
     <Pagination
       :items="damageReports"
       :totalCount="totalCount"
diff --git a/src/views/admin/unit/equipment/Inspection.vue b/src/views/admin/unit/equipment/Inspection.vue
index d1a3791..16ca4e0 100644
--- a/src/views/admin/unit/equipment/Inspection.vue
+++ b/src/views/admin/unit/equipment/Inspection.vue
@@ -26,7 +26,7 @@
     <div class="flex flex-row gap-4">
       <RouterLink
         v-if="can('create', 'unit', 'equipment')"
-        :to="{ name: 'admin-unit-inspection-plan', params: { type: 'equipment', relatedId: equipmentId } }"
+        :to="{ name: 'admin-unit-inspection-start', params: { type: 'equipment', relatedId: equipmentId } }"
         button
         primary
         class="w-fit!"
diff --git a/src/views/admin/unit/inspection/InspectionRouting.vue b/src/views/admin/unit/inspection/InspectionRouting.vue
new file mode 100644
index 0000000..6307df1
--- /dev/null
+++ b/src/views/admin/unit/inspection/InspectionRouting.vue
@@ -0,0 +1,54 @@
+<template>
+  <MainTemplate title="Prüfungen">
+    <template #diffMain>
+      <div class="flex flex-col gap-2 grow px-7 overflow-hidden">
+        <div class="flex flex-col grow gap-2 overflow-hidden">
+          <div class="w-full flex flex-row max-lg:flex-wrap justify-center">
+            <RouterLink
+              v-for="tab in tabs"
+              :key="tab.route"
+              v-slot="{ isExactActive }"
+              :to="{ name: tab.route }"
+              class="w-1/2 md:w-1/3 lg:w-full p-0.5 first:pl-0 last:pr-0"
+            >
+              <p
+                :class="[
+                  'w-full rounded-lg py-2.5 text-sm text-center font-medium leading-5 focus:ring-0 outline-hidden',
+                  isExactActive ? 'bg-red-200 shadow-sm border-b-2 border-primary rounded-b-none' : ' hover:bg-red-200',
+                ]"
+              >
+                {{ tab.title }}
+              </p>
+            </RouterLink>
+          </div>
+          <RouterView />
+        </div>
+      </div>
+    </template>
+  </MainTemplate>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+import { mapActions, mapState } from "pinia";
+import MainTemplate from "@/templates/Main.vue";
+import { RouterLink, RouterView } from "vue-router";
+import { useAbilityStore } from "@/stores/ability";
+import { useEquipmentStore } from "@/stores/admin/unit/equipment/equipment";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  data() {
+    return {
+      tabs: [
+        { route: "admin-unit-inspection", title: "anstehend" },
+        { route: "admin-unit-inspection-running", title: "in Arbeit" },
+      ],
+    };
+  },
+  computed: {
+    ...mapState(useAbilityStore, ["can"]),
+  },
+});
+</script>
diff --git a/src/views/admin/unit/inspection/InspectionPlan.vue b/src/views/admin/unit/inspection/InspectionStart.vue
similarity index 94%
rename from src/views/admin/unit/inspection/InspectionPlan.vue
rename to src/views/admin/unit/inspection/InspectionStart.vue
index 5e9fc32..9f86b88 100644
--- a/src/views/admin/unit/inspection/InspectionPlan.vue
+++ b/src/views/admin/unit/inspection/InspectionStart.vue
@@ -1,5 +1,5 @@
 <template>
-  <MainTemplate title="Prüfung erstellen">
+  <MainTemplate title="Prüfung starten">
     <template #main>
       <form class="flex flex-col gap-4 py-2 w-full max-w-xl mx-auto" @submit.prevent="">
         <div class="flex flex-row">
@@ -47,7 +47,7 @@
           >
             abbrechen
           </RouterLink>
-          <button primary type="submit" class="w-fit!" :disabled="status == 'loading'">speichern</button>
+          <button primary type="submit" class="w-fit!" :disabled="status == 'loading'">starten</button>
           <Spinner v-if="status == 'loading'" class="my-auto" />
           <SuccessCheckmark v-else-if="status?.status == 'success'" />
           <FailureXMark v-else-if="status?.status == 'failed'" />
@@ -64,11 +64,10 @@ import MainTemplate from "@/templates/Main.vue";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import ScanInput from "@/components/ScanInput.vue";
 import InspectionPlanSearchSelect from "@/components/search/InspectionPlanSearchSelect.vue";
 import EquipmentSearchSelect from "@/components/search/EquipmentSearchSelect.vue";
 import VehicleSearchSelect from "@/components/search/VehicleSearchSelect.vue";
-import WearableSearchSelect from "../../../../components/search/wearableSearchSelect.vue";
+import WearableSearchSelect from "@/components/search/WearableSearchSelect.vue";
 </script>
 
 <script lang="ts">
diff --git a/src/views/admin/unit/inspection/NextInspection.vue b/src/views/admin/unit/inspection/NextInspection.vue
new file mode 100644
index 0000000..e19eeb4
--- /dev/null
+++ b/src/views/admin/unit/inspection/NextInspection.vue
@@ -0,0 +1,45 @@
+<template>
+  <div class="flex flex-col w-full h-full gap-2 justify-center">
+    <Pagination
+      :items="[]"
+      :totalCount="0"
+      :indicateLoading="false"
+      @load-data="(offset, count, search) => {}"
+      @search="(search) => {}"
+    >
+      <template #pageRow="{ row }: { row: any }">
+        {{ row }}
+      </template>
+    </Pagination>
+
+    <div class="flex flex-row gap-4">
+      <RouterLink
+        v-if="can('create', 'unit', 'inspection')"
+        :to="{ name: 'admin-unit-inspection-start' }"
+        primary
+        button
+        class="w-fit!"
+      >
+        Prüfung starten
+      </RouterLink>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+import { mapActions, mapState } from "pinia";
+import Pagination from "@/components/Pagination.vue";
+import { useAbilityStore } from "@/stores/ability";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  data() {
+    return {};
+  },
+  computed: {
+    ...mapState(useAbilityStore, ["can"]),
+  },
+});
+</script>
diff --git a/src/views/admin/unit/inspectionPlan/CreateInspectionPlan.vue b/src/views/admin/unit/inspectionPlan/CreateInspectionPlan.vue
index c4f57a3..0e1a51d 100644
--- a/src/views/admin/unit/inspectionPlan/CreateInspectionPlan.vue
+++ b/src/views/admin/unit/inspectionPlan/CreateInspectionPlan.vue
@@ -159,7 +159,7 @@ export default defineComponent({
 
           this.timeout = setTimeout(() => {
             this.$router.push({
-              name: "admin-unit-inspectionPlan-overview",
+              name: "admin-unit-inspection_plan-overview",
               params: {
                 inspectionPlanId: res.data,
               },
diff --git a/src/views/admin/unit/inspectionPlan/InspectionPlanRouting.vue b/src/views/admin/unit/inspectionPlan/InspectionPlanRouting.vue
index 7c6913a..a0299ab 100644
--- a/src/views/admin/unit/inspectionPlan/InspectionPlanRouting.vue
+++ b/src/views/admin/unit/inspectionPlan/InspectionPlanRouting.vue
@@ -4,9 +4,17 @@
       <RouterLink to="./" class="text-primary">zurück zur Liste</RouterLink>
     </template>
     <template #topBar>
-      <RouterLink v-if="can('update', 'unit', 'inspection_plan')" :to="{ name: 'admin-unit-inspection_plan-edit' }">
-        <PencilIcon class="w-5 h-5" />
-      </RouterLink>
+      <div class="flex flex-row gap-2">
+        <RouterLink v-if="can('update', 'unit', 'inspection_plan')" :to="{ name: 'admin-unit-inspection_plan-edit' }">
+          <PencilIcon class="w-5 h-5" />
+        </RouterLink>
+        <RouterLink
+          v-if="can('update', 'unit', 'inspection_plan')"
+          :to="{ name: 'admin-unit-inspection_plan-pointedit' }"
+        >
+          <RectangleStackIcon class="w-5 h-5" />
+        </RouterLink>
+      </div>
     </template>
     <template #diffMain>
       <div class="flex flex-col gap-2 grow px-7 overflow-hidden">
@@ -21,7 +29,7 @@ import { defineComponent } from "vue";
 import { mapActions, mapState } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
 import { RouterLink, RouterView } from "vue-router";
-import { PencilIcon, TrashIcon } from "@heroicons/vue/24/outline";
+import { PencilIcon, RectangleStackIcon, TrashIcon } from "@heroicons/vue/24/outline";
 import { useAbilityStore } from "@/stores/ability";
 import { useInspectionPlanStore } from "@/stores/admin/unit/inspectionPlan/inspectionPlan";
 </script>
diff --git a/src/views/admin/unit/inspectionPlan/Overview.vue b/src/views/admin/unit/inspectionPlan/Overview.vue
index 7d3a33a..1d02aaf 100644
--- a/src/views/admin/unit/inspectionPlan/Overview.vue
+++ b/src/views/admin/unit/inspectionPlan/Overview.vue
@@ -7,7 +7,11 @@
       </div>
       <div>
         <label for="interval">Intervall</label>
-        <input type="text" id="interval" :value="activeInspectionPlanObj.inspectionInterval" reaonly />
+        <input type="text" id="interval" :value="activeInspectionPlanObj.inspectionInterval" readonly />
+      </div>
+      <div>
+        <label for="remind">Erinnerung vor Fälligkeit</label>
+        <input type="text" id="remind" :value="activeInspectionPlanObj.remindTime" readonly />
       </div>
     </div>
     <p>Prüfungspunkte:</p>
diff --git a/src/views/admin/unit/inspectionPlan/UpdateInspectionPlan.vue b/src/views/admin/unit/inspectionPlan/UpdateInspectionPlan.vue
index ed9d36e..bfff1c7 100644
--- a/src/views/admin/unit/inspectionPlan/UpdateInspectionPlan.vue
+++ b/src/views/admin/unit/inspectionPlan/UpdateInspectionPlan.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="flex flex-col gap-2 h-full w-full overflow-y-auto">
+    <RouterLink to="./" class="text-primary">zurück zur Übersicht</RouterLink>
     <Spinner v-if="loading == 'loading'" class="mx-auto" />
     <p v-else-if="loading == 'failed'">laden fehlgeschlagen</p>
     <form
@@ -7,7 +8,7 @@
       class="flex flex-col gap-4 py-2 w-full max-w-xl mx-auto"
       @submit.prevent="triggerUpdate"
     >
-      <p class="mx-auto">Ausrüstung bearbeiten</p>
+      <p class="mx-auto">Prüfplan bearbeiten</p>
       <div>
         <label for="name">Bezeichnung</label>
         <input type="text" id="name" required v-model="inspectionPlan.title" />
diff --git a/src/views/admin/unit/inspectionPlan/UpdateInspectionPlanPoints.vue b/src/views/admin/unit/inspectionPlan/UpdateInspectionPlanPoints.vue
new file mode 100644
index 0000000..a4fc09f
--- /dev/null
+++ b/src/views/admin/unit/inspectionPlan/UpdateInspectionPlanPoints.vue
@@ -0,0 +1,199 @@
+<template>
+  <div class="flex flex-col gap-2 h-full w-full overflow-y-auto">
+    <RouterLink to="./" class="text-primary">zurück zur Übersicht</RouterLink>
+    <Spinner v-if="loading == 'loading'" class="mx-auto" />
+    <p v-else-if="loading == 'failed'">laden fehlgeschlagen</p>
+    <div
+      v-else-if="inspectionPlan != null"
+      class="flex flex-col grow gap-4 py-2 w-full max-w-xl mx-auto overflow-hidden"
+    >
+      <p class="mx-auto">Prüfplan-Punkte bearbeiten</p>
+
+      <div class="flex flex-row justify-center gap-4">
+        <div
+          class="p-3 border border-gray-300 rounded-md shadow cursor-pointer"
+          @click="addItemToArray(InspectionPointEnum.oknok)"
+        >
+          <ClipboardDocumentCheckIcon class="w-7 h-7" />
+        </div>
+        <div
+          class="p-3 border border-gray-300 rounded-md shadow cursor-pointer pointer-events-none opacity-50"
+          @click="addItemToArray(InspectionPointEnum.file)"
+        >
+          <DocumentIcon class="w-7 h-7" />
+        </div>
+        <div
+          class="p-3 border border-gray-300 rounded-md shadow cursor-pointer"
+          @click="addItemToArray(InspectionPointEnum.number)"
+        >
+          <CalculatorIcon class="w-7 h-7" />
+        </div>
+        <div
+          class="p-3 border border-gray-300 rounded-md shadow cursor-pointer"
+          @click="addItemToArray(InspectionPointEnum.text)"
+        >
+          <BoldIcon class="w-7 h-7" />
+        </div>
+      </div>
+
+      <div class="grow flex flex-col gap-2 overflow-y-scroll">
+        <InspectionPointListItem
+          v-for="(point, index) in sortedPoints"
+          :key="index"
+          :model-value="point"
+          :index="index"
+          :total-count="inspectionPoints.length"
+          @update:model-value="updateItemFromArray"
+          @up="changeSort('up', point.id, index)"
+          @down="changeSort('down', point.id, index)"
+          @remove="removeItemFromArray(point.id)"
+        />
+      </div>
+
+      <div class="flex flex-row justify-end gap-2">
+        <button primary-outline type="reset" class="w-fit!" :disabled="canSaveOrReset" @click="resetForm">
+          abbrechen
+        </button>
+        <button primary type="submit" class="w-fit!" :disabled="status == 'loading'" @click="triggerUpdate">
+          speichern
+        </button>
+        <Spinner v-if="status == 'loading'" class="my-auto" />
+        <SuccessCheckmark v-else-if="status?.status == 'success'" />
+        <FailureXMark v-else-if="status?.status == 'failed'" />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+import { mapActions, mapState } from "pinia";
+import { useInspectionPlanStore } from "@/stores/admin/unit/inspectionPlan/inspectionPlan";
+import type {
+  CreateInspectionPlanViewModel,
+  InspectionPlanViewModel,
+  InspectionPointViewModel,
+  UpdateInspectionPlanViewModel,
+} from "@/viewmodels/admin/unit/inspection/inspectionPlan.models";
+import Spinner from "@/components/Spinner.vue";
+import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
+import FailureXMark from "@/components/FailureXMark.vue";
+import isEqual from "lodash.isequal";
+import cloneDeep from "lodash.clonedeep";
+import { BoldIcon, CalculatorIcon, ClipboardDocumentCheckIcon, DocumentIcon } from "@heroicons/vue/24/outline";
+import { InspectionPointEnum } from "@/enums/inspectionEnum";
+import { v4 as uuid } from "uuid";
+import InspectionPointListItem from "@/components/admin/unit/inspectionPlan/InspectionPointListItem.vue";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  props: {
+    inspectionPlanId: String,
+  },
+  watch: {
+    loadingActive() {
+      if (this.loading == "loading") {
+        this.loading = this.loadingActive;
+      }
+      if (this.loadingActive == "fetched") this.inspectionPlan = cloneDeep(this.activeInspectionPlanObj);
+    },
+  },
+  data() {
+    return {
+      loading: "loading" as "loading" | "fetched" | "failed",
+      status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
+      inspectionPlan: null as null | InspectionPlanViewModel,
+      timeout: null as any,
+      inspectionPoints: [] as Array<InspectionPointViewModel>,
+    };
+  },
+  computed: {
+    canSaveOrReset(): boolean {
+      return isEqual(this.activeInspectionPlanObj, this.inspectionPlan);
+    },
+    ...mapState(useInspectionPlanStore, ["activeInspectionPlanObj", "loadingActive"]),
+    sortedPoints() {
+      return this.inspectionPoints.slice().sort((a, b) => a.sort - b.sort);
+    },
+  },
+  mounted() {
+    this.fetchItem();
+  },
+  beforeUnmount() {
+    try {
+      clearTimeout(this.timeout);
+    } catch (error) {}
+  },
+  methods: {
+    ...mapActions(useInspectionPlanStore, ["updateActiveInspectionPlan", "fetchInspectionPlanByActiveId"]),
+    resetForm() {
+      this.inspectionPlan = cloneDeep(this.activeInspectionPlanObj);
+    },
+    fetchItem() {
+      this.fetchInspectionPlanByActiveId();
+    },
+    addItemToArray(type: InspectionPointEnum) {
+      this.inspectionPoints.push({
+        id: uuid(),
+        title: "",
+        description: "",
+        type,
+        sort: this.inspectionPoints.length,
+      });
+    },
+    updateItemFromArray(pkg: InspectionPointViewModel) {
+      let index = this.inspectionPoints.findIndex((ip) => ip.id == pkg.id);
+      this.inspectionPoints[index] = pkg;
+    },
+    removeItemFromArray(id: string) {
+      let index = this.inspectionPoints.findIndex((ip) => ip.id == id);
+      if (index !== -1) {
+        this.inspectionPoints.splice(index, 1);
+        this.normalizeSort();
+      }
+    },
+    changeSort(dir: "up" | "down", thisId: string, index: number) {
+      let affected = this.sortedPoints[dir == "up" ? index - 1 : index + 1];
+      if (affected) {
+        this.inspectionPoints.find((a) => a.id == thisId)!.sort = dir == "up" ? index - 1 : index + 1;
+        this.inspectionPoints.find((a) => a.id == affected.id)!.sort =
+          dir == "up" ? affected.sort + 1 : affected.sort - 1;
+      }
+      this.normalizeSort();
+    },
+    normalizeSort() {
+      let rightSort = this.sortedPoints.every((val, index) => val.sort == index);
+      if (!rightSort) {
+        this.inspectionPoints.forEach((e, index) => {
+          e.sort = this.sortedPoints.findIndex((sp) => sp.id == e.id);
+        });
+      }
+    },
+    triggerUpdate(e: any) {
+      if (this.inspectionPlan == null) return;
+      let formData = e.target.elements;
+      let updateInspectionPlan: UpdateInspectionPlanViewModel = {
+        id: this.inspectionPlan.id,
+        title: formData.name.value,
+        inspectionInterval: formData.interval.value,
+        remindTime: formData.remind.value,
+      };
+      this.status = "loading";
+      this.updateActiveInspectionPlan(updateInspectionPlan)
+        .then((res) => {
+          this.fetchItem();
+          this.status = { status: "success" };
+        })
+        .catch((err) => {
+          this.status = { status: "failed" };
+        })
+        .finally(() => {
+          this.timeout = setTimeout(() => {
+            this.status = null;
+          }, 2000);
+        });
+    },
+  },
+});
+</script>
diff --git a/src/views/admin/unit/maintenance/Maintenance.vue b/src/views/admin/unit/maintenance/Maintenance.vue
index fec6c0f..19e0e0c 100644
--- a/src/views/admin/unit/maintenance/Maintenance.vue
+++ b/src/views/admin/unit/maintenance/Maintenance.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex flex-col w-full h-full gap-2 justify-center px-7">
+  <div class="flex flex-col w-full h-full gap-2 justify-center">
     <Pagination
       :items="maintenances"
       :totalCount="totalCount"
diff --git a/src/views/admin/unit/vehicle/Inspection.vue b/src/views/admin/unit/vehicle/Inspection.vue
index 6df1894..c50789a 100644
--- a/src/views/admin/unit/vehicle/Inspection.vue
+++ b/src/views/admin/unit/vehicle/Inspection.vue
@@ -26,7 +26,7 @@
     <div class="flex flex-row gap-4">
       <RouterLink
         v-if="can('create', 'unit', 'vehicle')"
-        :to="{ name: 'admin-unit-inspection-plan', params: { type: 'vehicle', relatedId: vehicleId } }"
+        :to="{ name: 'admin-unit-inspection-start', params: { type: 'vehicle', relatedId: vehicleId } }"
         button
         primary
         class="w-fit!"
diff --git a/src/views/admin/unit/wearable/Inspection.vue b/src/views/admin/unit/wearable/Inspection.vue
index bf71eff..a5045c0 100644
--- a/src/views/admin/unit/wearable/Inspection.vue
+++ b/src/views/admin/unit/wearable/Inspection.vue
@@ -26,7 +26,7 @@
     <div class="flex flex-row gap-4">
       <RouterLink
         v-if="can('create', 'unit', 'wearable')"
-        :to="{ name: 'admin-unit-inspection-plan', params: { type: 'wearable', relatedId: wearableId } }"
+        :to="{ name: 'admin-unit-inspection-start', params: { type: 'wearable', relatedId: wearableId } }"
         button
         primary
         class="w-fit!"
-- 
2.47.3


From 23bdde5fc2cc6e87a88ff68f56b5678724a1bb19 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Wed, 9 Jul 2025 16:01:15 +0200
Subject: [PATCH 09/16] save inspectionPoints

---
 .../InspectionPointListItem.vue               |  29 ++-
 .../search/EquipmentSearchSelect.vue          |   2 +-
 .../search/EquipmentTypeSearchSelect.vue      |   2 +-
 .../search/InspectionPlanSearchSelect.vue     |   6 +-
 .../InspectionPlanSearchSelectWithRelated.vue | 215 ++++++++++++++++++
 src/components/search/VehicleSearchSelect.vue |   2 +-
 .../search/VehicleTypeSearchSelect.vue        |   2 +-
 src/router/unit/inspectionPlan.ts             |   5 +-
 .../unit/inspectionPlan/inspectionPlan.ts     |  19 ++
 .../unit/inspectionPlan/inspectionPoint.ts    |  37 +++
 .../unit/inspection/inspectionPlan.models.ts  |   1 +
 .../admin/unit/inspection/InspectionStart.vue |  72 +++++-
 .../UpdateInspectionPlanPoints.vue            |  87 +++----
 13 files changed, 407 insertions(+), 72 deletions(-)
 create mode 100644 src/components/search/InspectionPlanSearchSelectWithRelated.vue
 create mode 100644 src/stores/admin/unit/inspectionPlan/inspectionPoint.ts

diff --git a/src/components/admin/unit/inspectionPlan/InspectionPointListItem.vue b/src/components/admin/unit/inspectionPlan/InspectionPointListItem.vue
index ad5654b..a7591d6 100644
--- a/src/components/admin/unit/inspectionPlan/InspectionPointListItem.vue
+++ b/src/components/admin/unit/inspectionPlan/InspectionPointListItem.vue
@@ -6,7 +6,7 @@
       <BoldIcon v-else-if="modelValue.type == InspectionPointEnum.text" class="w-6 h-6" />
       <DocumentIcon v-else-if="modelValue.type == InspectionPointEnum.file" class="w-6 h-6" />
 
-      <input type="text" placeholder="Titel" v-model="title" />
+      <input type="text" placeholder="Titel" class="grow !w-fit" v-model="title" />
 
       <div class="flex flex-col">
         <ChevronUpIcon v-if="index != 0" class="text-white w-4 h-4 stroke-2 cursor-pointer" @click="$emit('up')" />
@@ -28,6 +28,13 @@
         <label for="max">Maximal</label>
         <input type="number" v-model="max" min="0" />
       </div>
+      <div v-if="modelValue.type == InspectionPointEnum.file">
+        <p>Dateiart</p>
+        <div class="flex flex-row gap-2">
+          <button :primary="others == 'img'" :primary-outline="others != 'img'" @click="others = 'img'">Bild</button>
+          <button :primary="others == 'pdf'" :primary-outline="others != 'pdf'" @click="others = 'pdf'">PDF</button>
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -63,7 +70,7 @@ export default defineComponent({
       get() {
         return this.modelValue.title;
       },
-      set(val: InspectionPointViewModel) {
+      set(val: string) {
         this.$emit("update:model-value", { ...this.modelValue, title: val });
       },
     },
@@ -71,7 +78,7 @@ export default defineComponent({
       get() {
         return this.modelValue.description;
       },
-      set(val: InspectionPointViewModel) {
+      set(val: string) {
         this.$emit("update:model-value", { ...this.modelValue, description: val });
       },
     },
@@ -79,16 +86,24 @@ export default defineComponent({
       get() {
         return this.modelValue.min;
       },
-      set(val: InspectionPointViewModel) {
-        this.$emit("update:model-value", { ...this.modelValue, min: val });
+      set(val: string) {
+        this.$emit("update:model-value", { ...this.modelValue, min: val == "" ? null : val });
       },
     },
     max: {
       get() {
         return this.modelValue.max;
       },
-      set(val: InspectionPointViewModel) {
-        this.$emit("update:model-value", { ...this.modelValue, max: val });
+      set(val: string) {
+        this.$emit("update:model-value", { ...this.modelValue, max: val == "" ? null : val });
+      },
+    },
+    others: {
+      get() {
+        return this.modelValue.others;
+      },
+      set(val: string) {
+        this.$emit("update:model-value", { ...this.modelValue, others: val == "" ? null : val });
       },
     },
   },
diff --git a/src/components/search/EquipmentSearchSelect.vue b/src/components/search/EquipmentSearchSelect.vue
index 8feb26a..a68cd52 100644
--- a/src/components/search/EquipmentSearchSelect.vue
+++ b/src/components/search/EquipmentSearchSelect.vue
@@ -188,7 +188,7 @@ export default defineComponent({
         });
     },
     getEquipmentFromSearch(id: string) {
-      return this.filtered.find((f) => f.id == id);
+      return this.available.find((f) => f.id == id);
     },
     loadEquipmentInitial() {
       if (this.modelValue == "") return;
diff --git a/src/components/search/EquipmentTypeSearchSelect.vue b/src/components/search/EquipmentTypeSearchSelect.vue
index 8d431cb..6dc4f4a 100644
--- a/src/components/search/EquipmentTypeSearchSelect.vue
+++ b/src/components/search/EquipmentTypeSearchSelect.vue
@@ -175,7 +175,7 @@ export default defineComponent({
         });
     },
     getEquipmentTypeFromSearch(id: string) {
-      return this.filtered.find((f) => f.id == id);
+      return this.available.find((f) => f.id == id);
     },
     loadEquipmentTypeInitial() {
       if (this.modelValue == "") return;
diff --git a/src/components/search/InspectionPlanSearchSelect.vue b/src/components/search/InspectionPlanSearchSelect.vue
index a328fb8..5c86179 100644
--- a/src/components/search/InspectionPlanSearchSelect.vue
+++ b/src/components/search/InspectionPlanSearchSelect.vue
@@ -101,10 +101,6 @@ export default defineComponent({
       type: Boolean,
       default: false,
     },
-    type: {
-      type: String as PropType<"vehicle" | "equipment" | "wearable">,
-      default: "equipment",
-    },
   },
   emits: ["update:model-value"],
   watch: {
@@ -183,7 +179,7 @@ export default defineComponent({
         });
     },
     getInspectionPlanFromSearch(id: string) {
-      return this.filtered.find((f) => f.id == id);
+      return this.available.find((f) => f.id == id);
     },
     loadInspectionPlanInitial() {
       if (this.modelValue == "") return;
diff --git a/src/components/search/InspectionPlanSearchSelectWithRelated.vue b/src/components/search/InspectionPlanSearchSelectWithRelated.vue
new file mode 100644
index 0000000..0d5d034
--- /dev/null
+++ b/src/components/search/InspectionPlanSearchSelectWithRelated.vue
@@ -0,0 +1,215 @@
+<template>
+  <div class="w-full">
+    <Combobox v-model="selected" :disabled="disabled">
+      <ComboboxLabel>{{ title }}</ComboboxLabel>
+      <div class="relative mt-1">
+        <ComboboxInput
+          class="rounded-md shadow-xs relative block w-full px-3 py-2 border border-gray-300 focus:border-primary placeholder-gray-500 text-gray-900 rounded-b-md focus:outline-hidden focus:ring-0 focus:z-10 sm:text-sm resize-none"
+          :displayValue="() => chosen?.title ?? ''"
+          @input="query = $event.target.value"
+        />
+        <ComboboxButton class="absolute inset-y-0 right-0 flex items-center pr-2">
+          <ChevronUpDownIcon class="h-5 w-5 text-gray-400" aria-hidden="true" />
+        </ComboboxButton>
+        <TransitionRoot
+          leave="transition ease-in duration-100"
+          leaveFrom="opacity-100"
+          leaveTo="opacity-0"
+          @after-leave="query = ''"
+        >
+          <ComboboxOptions
+            class="absolute mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-base shadow-md ring-1 ring-black/5 focus:outline-hidden sm:text-sm z-20"
+          >
+            <ComboboxOption v-if="loading || deferingSearch" as="template" disabled>
+              <li class="flex flex-row gap-2 text-text relative cursor-default select-none py-2 pl-3 pr-4">
+                <Spinner />
+                <span class="font-normal block truncate">suche</span>
+              </li>
+            </ComboboxOption>
+            <ComboboxOption v-else-if="available.length === 0" as="template" disabled>
+              <li class="text-text relative cursor-default select-none py-2 pl-3 pr-4">
+                <span class="font-normal block truncate">tippe, um zu suchen...</span>
+              </li>
+            </ComboboxOption>
+            <ComboboxOption v-else-if="available.length === 0 && query != ''" as="template" disabled>
+              <li class="text-text relative cursor-default select-none py-2 pl-3 pr-4">
+                <span class="font-normal block truncate">Keine Auswahl gefunden.</span>
+              </li>
+            </ComboboxOption>
+
+            <ComboboxOption
+              v-if="!(loading || deferingSearch)"
+              v-for="inspectionPlan in available"
+              as="template"
+              :key="inspectionPlan.id"
+              :value="inspectionPlan.id"
+              v-slot="{ selected, active }"
+            >
+              <li
+                class="relative cursor-default select-none py-2 pl-10 pr-4"
+                :class="{
+                  'bg-primary text-white': active,
+                  'text-gray-900': !active,
+                }"
+              >
+                <span class="block truncate" :class="{ 'font-medium': selected, 'font-normal': !selected }">
+                  {{ inspectionPlan.title }}
+                </span>
+                <span
+                  v-if="selected"
+                  class="absolute inset-y-0 left-0 flex items-center pl-3"
+                  :class="{ 'text-white': active, 'text-primary': !active }"
+                >
+                  <CheckIcon class="h-5 w-5" aria-hidden="true" />
+                </span>
+              </li>
+            </ComboboxOption>
+          </ComboboxOptions>
+        </TransitionRoot>
+      </div>
+    </Combobox>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent, type PropType } from "vue";
+import { mapState, mapActions } from "pinia";
+import {
+  Combobox,
+  ComboboxLabel,
+  ComboboxInput,
+  ComboboxButton,
+  ComboboxOptions,
+  ComboboxOption,
+  TransitionRoot,
+} from "@headlessui/vue";
+import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
+import Spinner from "../Spinner.vue";
+import { useInspectionPlanStore } from "@/stores/admin/unit/inspectionPlan/inspectionPlan";
+import type { InspectionPlanViewModel } from "@/viewmodels/admin/unit/inspection/inspectionPlan.models";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  props: {
+    modelValue: {
+      type: String,
+      default: "",
+    },
+    title: String,
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    relatedType: {
+      type: String as PropType<"vehicle" | "equipment" | "wearable">,
+      default: "equipment",
+    },
+    relatedTypeId: {
+      type: String,
+      required: true,
+    },
+  },
+  emits: ["update:model-value"],
+  watch: {
+    modelValue() {
+      if (this.initialLoaded) return;
+      this.initialLoaded = true;
+      this.loadInspectionPlanInitial();
+    },
+    relatedType() {
+      this.reload();
+    },
+    relatedTypeId() {
+      this.reload();
+    },
+    query() {
+      this.deferingSearch = true;
+      clearTimeout(this.timer);
+      this.timer = setTimeout(() => {
+        this.deferingSearch = false;
+        this.search();
+      }, 600);
+    },
+  },
+  data() {
+    return {
+      initialLoaded: false as boolean,
+      loading: false as boolean,
+      deferingSearch: false as boolean,
+      timer: undefined as any,
+      query: "" as string,
+      all: [] as Array<InspectionPlanViewModel>,
+      filtered: [] as Array<InspectionPlanViewModel>,
+      chosen: undefined as undefined | InspectionPlanViewModel,
+    };
+  },
+  computed: {
+    available() {
+      return this.query == "" ? this.all : this.filtered;
+    },
+    selected: {
+      get() {
+        return this.modelValue;
+      },
+      set(val: string) {
+        this.chosen = this.getInspectionPlanFromSearch(val);
+        this.$emit("update:model-value", val);
+      },
+    },
+  },
+  mounted() {
+    this.reload();
+  },
+  methods: {
+    ...mapActions(useInspectionPlanStore, [
+      "fetchInspectionPlanById",
+      "getAllInspectionPlansWithRelated",
+      "searchInspectionPlansWithRelated",
+    ]),
+    reload() {
+      this.chosen = undefined;
+      this.filtered = [];
+      this.preloadAll();
+      this.loadInspectionPlanInitial();
+    },
+    preloadAll() {
+      this.all = [];
+      if (this.relatedTypeId == "") return;
+      this.loading = true;
+      this.getAllInspectionPlansWithRelated(this.relatedType, this.relatedTypeId)
+        .then((res) => {
+          this.all = res.data;
+        })
+        .catch((err) => {})
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    search() {
+      this.filtered = [];
+      if (this.query == "" || this.relatedTypeId == "") return;
+      this.loading = true;
+      this.searchInspectionPlansWithRelated(this.relatedType, this.relatedTypeId, this.query)
+        .then((res) => {
+          this.filtered = res.data;
+        })
+        .catch((err) => {})
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    getInspectionPlanFromSearch(id: string) {
+      return this.available.find((f) => f.id == id);
+    },
+    loadInspectionPlanInitial() {
+      if (this.modelValue == "") return;
+      this.fetchInspectionPlanById(this.modelValue)
+        .then((res) => {
+          this.chosen = res.data;
+        })
+        .catch(() => {});
+    },
+  },
+});
+</script>
diff --git a/src/components/search/VehicleSearchSelect.vue b/src/components/search/VehicleSearchSelect.vue
index c3484db..293e739 100644
--- a/src/components/search/VehicleSearchSelect.vue
+++ b/src/components/search/VehicleSearchSelect.vue
@@ -188,7 +188,7 @@ export default defineComponent({
         });
     },
     getVehicleFromSearch(id: string) {
-      return this.filtered.find((f) => f.id == id);
+      return this.available.find((f) => f.id == id);
     },
     loadVehicleInitial() {
       if (this.modelValue == "") return;
diff --git a/src/components/search/VehicleTypeSearchSelect.vue b/src/components/search/VehicleTypeSearchSelect.vue
index c730dc5..1f3901f 100644
--- a/src/components/search/VehicleTypeSearchSelect.vue
+++ b/src/components/search/VehicleTypeSearchSelect.vue
@@ -175,7 +175,7 @@ export default defineComponent({
         });
     },
     getVehicleTypeFromSearch(id: string) {
-      return this.filtered.find((f) => f.id == id);
+      return this.available.find((f) => f.id == id);
     },
     loadVehicleTypeInitial() {
       if (this.modelValue == "") return;
diff --git a/src/router/unit/inspectionPlan.ts b/src/router/unit/inspectionPlan.ts
index 7bd43a3..91b8c8e 100644
--- a/src/router/unit/inspectionPlan.ts
+++ b/src/router/unit/inspectionPlan.ts
@@ -1,10 +1,11 @@
 import { useInspectionPlanStore } from "@/stores/admin/unit/inspectionPlan/inspectionPlan";
+import { useInspectionPointStore } from "../../stores/admin/unit/inspectionPlan/inspectionPoint";
 
 export async function setInspectionPlanId(to: any, from: any, next: any) {
   const InspectionPlanStore = useInspectionPlanStore();
   InspectionPlanStore.activeInspectionPlan = to.params?.inspectionPlanId ?? null;
 
-  //useXYStore().$reset();
+  useInspectionPointStore().$reset();
 
   next();
 }
@@ -14,7 +15,7 @@ export async function resetInspectionPlanStores(to: any, from: any, next: any) {
   InspectionPlanStore.activeInspectionPlan = null;
   InspectionPlanStore.activeInspectionPlanObj = null;
 
-  //useXYStore().$reset();
+  useInspectionPointStore().$reset();
 
   next();
 }
diff --git a/src/stores/admin/unit/inspectionPlan/inspectionPlan.ts b/src/stores/admin/unit/inspectionPlan/inspectionPlan.ts
index 78f4d73..f69d53e 100644
--- a/src/stores/admin/unit/inspectionPlan/inspectionPlan.ts
+++ b/src/stores/admin/unit/inspectionPlan/inspectionPlan.ts
@@ -53,6 +53,25 @@ export const useInspectionPlanStore = defineStore("inspectionPlan", {
         return { ...res, data: res.data.inspectionPlans };
       });
     },
+    async getAllInspectionPlansWithRelated(
+      related: "vehicle" | "equipment" | "wearable",
+      relatedId: string
+    ): Promise<AxiosResponse<any, any>> {
+      return await http.get(`/admin/inspectionPlan/${related}/${relatedId}?noLimit=true`).then((res) => {
+        return { ...res, data: res.data.inspectionPlans };
+      });
+    },
+    async searchInspectionPlansWithRelated(
+      related: "vehicle" | "equipment" | "wearable",
+      relatedId: string,
+      search: string
+    ): Promise<AxiosResponse<any, any>> {
+      return await http
+        .get(`/admin/inspectionPlan/${related}/${relatedId}?search=${search}&noLimit=true`)
+        .then((res) => {
+          return { ...res, data: res.data.inspectionPlans };
+        });
+    },
     fetchInspectionPlanByActiveId() {
       this.loadingActive = "loading";
       http
diff --git a/src/stores/admin/unit/inspectionPlan/inspectionPoint.ts b/src/stores/admin/unit/inspectionPlan/inspectionPoint.ts
new file mode 100644
index 0000000..7ce669e
--- /dev/null
+++ b/src/stores/admin/unit/inspectionPlan/inspectionPoint.ts
@@ -0,0 +1,37 @@
+import { defineStore } from "pinia";
+import type { InspectionPointViewModel } from "@/viewmodels/admin/unit/inspection/inspectionPlan.models";
+import { http } from "@/serverCom";
+import type { AxiosResponse } from "axios";
+import { useInspectionPlanStore } from "./inspectionPlan";
+
+export const useInspectionPointStore = defineStore("inspectionPoint", {
+  state: () => {
+    return {
+      inspectionPoints: [] as Array<InspectionPointViewModel>,
+      loading: "loading" as "loading" | "fetched" | "failed",
+    };
+  },
+  actions: {
+    fetchInspectionPoints() {
+      const inspectionPlanId = useInspectionPlanStore().activeInspectionPlan;
+      this.loading = "loading";
+      http
+        .get(`/admin/inspectionPlan/${inspectionPlanId}/points`)
+        .then((result) => {
+          this.inspectionPoints = result.data;
+          this.loading = "fetched";
+        })
+        .catch((err) => {
+          this.loading = "failed";
+        });
+    },
+    async updateActiveInspectionPoints(
+      inspectionPoints: Array<InspectionPointViewModel>
+    ): Promise<AxiosResponse<any, any>> {
+      const inspectionPlanId = useInspectionPlanStore().activeInspectionPlan;
+      const result = await http.patch(`/admin/inspectionPlan/${inspectionPlanId}/points`, inspectionPoints);
+      this.fetchInspectionPoints();
+      return result;
+    },
+  },
+});
diff --git a/src/viewmodels/admin/unit/inspection/inspectionPlan.models.ts b/src/viewmodels/admin/unit/inspection/inspectionPlan.models.ts
index 262f25e..ad0478c 100644
--- a/src/viewmodels/admin/unit/inspection/inspectionPlan.models.ts
+++ b/src/viewmodels/admin/unit/inspection/inspectionPlan.models.ts
@@ -45,6 +45,7 @@ export interface InspectionPointViewModel {
   type: InspectionPointEnum;
   min?: number;
   max?: number;
+  others?: string;
   sort: number;
 }
 
diff --git a/src/views/admin/unit/inspection/InspectionStart.vue b/src/views/admin/unit/inspection/InspectionStart.vue
index 9f86b88..de35f5a 100644
--- a/src/views/admin/unit/inspection/InspectionStart.vue
+++ b/src/views/admin/unit/inspection/InspectionStart.vue
@@ -30,10 +30,17 @@
         <VehicleSearchSelect v-else-if="active == 'vehicle'" title="Fahrzeug" useScanner v-model="related" />
         <WearableSearchSelect v-else title="Kleidung" useScanner v-model="related" />
 
-        <InspectionPlanSearchSelect title="Prüfplan" :type="active" v-model="inspectionPlan" />
+        <InspectionPlanSearchSelectWithRelated
+          title="Prüfplan"
+          :relatedType="active"
+          :relatedTypeId="relatedType"
+          v-model="inspectionPlan"
+        />
 
         <div>
-          <label for="nextInspection">Nächste Prüfung (optional) {{ " - Intervall: xx-x" }}</label>
+          <label for="nextInspection">
+            Nächste Prüfung (optional) - Intervall: {{ selectedInspectionPlan?.inspectionInterval }}
+          </label>
           <input id="nextInspection" type="date" />
         </div>
 
@@ -64,10 +71,15 @@ import MainTemplate from "@/templates/Main.vue";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import InspectionPlanSearchSelect from "@/components/search/InspectionPlanSearchSelect.vue";
 import EquipmentSearchSelect from "@/components/search/EquipmentSearchSelect.vue";
 import VehicleSearchSelect from "@/components/search/VehicleSearchSelect.vue";
 import WearableSearchSelect from "@/components/search/WearableSearchSelect.vue";
+import type { InspectionPlanViewModel } from "@/viewmodels/admin/unit/inspection/inspectionPlan.models";
+import { useInspectionPlanStore } from "@/stores/admin/unit/inspectionPlan/inspectionPlan";
+import InspectionPlanSearchSelectWithRelated from "@/components/search/InspectionPlanSearchSelectWithRelated.vue";
+import { useEquipmentStore } from "@/stores/admin/unit/equipment/equipment";
+import { useVehicleStore } from "@/stores/admin/unit/vehicle/vehicle";
+import { useWearableStore } from "@/stores/admin/unit/wearable/wearable";
 </script>
 
 <script lang="ts">
@@ -80,11 +92,20 @@ export default defineComponent({
     relatedId: String,
     inspectionPlanId: String,
   },
+  watch: {
+    inspectionPlan() {
+      if (this.inspectionPlan != "") this.getInspectionPlanData();
+    },
+    related() {
+      this.getTypeIdToRelated();
+    },
+  },
   data() {
     return {
       status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
       timeout: null as any,
       related: "",
+      relatedType: "",
       inspectionPlan: "",
       active: "equipment" as "equipment" | "vehicle" | "wearable",
       tabs: [
@@ -101,6 +122,7 @@ export default defineComponent({
           title: "Kleidung",
         },
       ] as Array<{ key: "equipment" | "vehicle" | "wearable"; title: string }>,
+      selectedInspectionPlan: undefined as undefined | InspectionPlanViewModel,
     };
   },
   mounted() {
@@ -110,5 +132,49 @@ export default defineComponent({
       this.related = this.relatedId ?? "";
     }
   },
+  methods: {
+    ...mapActions(useInspectionPlanStore, ["fetchInspectionPlanById"]),
+    ...mapActions(useEquipmentStore, ["fetchEquipmentById"]),
+    ...mapActions(useVehicleStore, ["fetchVehicleById"]),
+    ...mapActions(useWearableStore, ["fetchWearableById"]),
+    getInspectionPlanData() {
+      this.fetchInspectionPlanById(this.inspectionPlan)
+        .then((res) => {
+          this.selectedInspectionPlan = res.data;
+        })
+        .catch((err) => {});
+    },
+    getTypeIdToRelated() {
+      if (this.related == "") {
+        this.relatedType = "";
+        return;
+      }
+      if (this.active == "equipment") {
+        this.fetchEquipmentById(this.related)
+          .then((res) => {
+            this.relatedType = res.data.equipmentTypeId;
+          })
+          .catch(() => {
+            this.relatedType = "";
+          });
+      } else if (this.active == "vehicle") {
+        this.fetchVehicleById(this.related)
+          .then((res) => {
+            this.relatedType = res.data.vehicleTypeId;
+          })
+          .catch(() => {
+            this.relatedType = "";
+          });
+      } else if (this.active == "wearable") {
+        this.fetchWearableById(this.related)
+          .then((res) => {
+            this.relatedType = res.data.wearableTypeId;
+          })
+          .catch(() => {
+            this.relatedType = "";
+          });
+      }
+    },
+  },
 });
 </script>
diff --git a/src/views/admin/unit/inspectionPlan/UpdateInspectionPlanPoints.vue b/src/views/admin/unit/inspectionPlan/UpdateInspectionPlanPoints.vue
index a4fc09f..0b78a77 100644
--- a/src/views/admin/unit/inspectionPlan/UpdateInspectionPlanPoints.vue
+++ b/src/views/admin/unit/inspectionPlan/UpdateInspectionPlanPoints.vue
@@ -3,34 +3,35 @@
     <RouterLink to="./" class="text-primary">zurück zur Übersicht</RouterLink>
     <Spinner v-if="loading == 'loading'" class="mx-auto" />
     <p v-else-if="loading == 'failed'">laden fehlgeschlagen</p>
-    <div
-      v-else-if="inspectionPlan != null"
-      class="flex flex-col grow gap-4 py-2 w-full max-w-xl mx-auto overflow-hidden"
-    >
+    <div v-else-if="localPoints != null" class="flex flex-col grow gap-4 py-2 w-full max-w-xl mx-auto overflow-hidden">
       <p class="mx-auto">Prüfplan-Punkte bearbeiten</p>
 
       <div class="flex flex-row justify-center gap-4">
         <div
           class="p-3 border border-gray-300 rounded-md shadow cursor-pointer"
           @click="addItemToArray(InspectionPointEnum.oknok)"
+          title="OK Nicht OK"
         >
           <ClipboardDocumentCheckIcon class="w-7 h-7" />
         </div>
         <div
-          class="p-3 border border-gray-300 rounded-md shadow cursor-pointer pointer-events-none opacity-50"
+          class="p-3 border border-gray-300 rounded-md shadow cursor-pointer"
           @click="addItemToArray(InspectionPointEnum.file)"
+          title="Datei-Upload"
         >
           <DocumentIcon class="w-7 h-7" />
         </div>
         <div
           class="p-3 border border-gray-300 rounded-md shadow cursor-pointer"
           @click="addItemToArray(InspectionPointEnum.number)"
+          title="Zahl-Eingabe"
         >
           <CalculatorIcon class="w-7 h-7" />
         </div>
         <div
           class="p-3 border border-gray-300 rounded-md shadow cursor-pointer"
           @click="addItemToArray(InspectionPointEnum.text)"
+          title="Text-Eingabe"
         >
           <BoldIcon class="w-7 h-7" />
         </div>
@@ -42,7 +43,7 @@
           :key="index"
           :model-value="point"
           :index="index"
-          :total-count="inspectionPoints.length"
+          :total-count="localPoints.length"
           @update:model-value="updateItemFromArray"
           @up="changeSort('up', point.id, index)"
           @down="changeSort('down', point.id, index)"
@@ -54,7 +55,13 @@
         <button primary-outline type="reset" class="w-fit!" :disabled="canSaveOrReset" @click="resetForm">
           abbrechen
         </button>
-        <button primary type="submit" class="w-fit!" :disabled="status == 'loading'" @click="triggerUpdate">
+        <button
+          primary
+          type="submit"
+          class="w-fit!"
+          :disabled="status == 'loading' || canSaveOrReset"
+          @click="triggerUpdate"
+        >
           speichern
         </button>
         <Spinner v-if="status == 'loading'" class="my-auto" />
@@ -68,13 +75,7 @@
 <script setup lang="ts">
 import { defineComponent } from "vue";
 import { mapActions, mapState } from "pinia";
-import { useInspectionPlanStore } from "@/stores/admin/unit/inspectionPlan/inspectionPlan";
-import type {
-  CreateInspectionPlanViewModel,
-  InspectionPlanViewModel,
-  InspectionPointViewModel,
-  UpdateInspectionPlanViewModel,
-} from "@/viewmodels/admin/unit/inspection/inspectionPlan.models";
+import type { InspectionPointViewModel } from "@/viewmodels/admin/unit/inspection/inspectionPlan.models";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
@@ -84,6 +85,7 @@ import { BoldIcon, CalculatorIcon, ClipboardDocumentCheckIcon, DocumentIcon } fr
 import { InspectionPointEnum } from "@/enums/inspectionEnum";
 import { v4 as uuid } from "uuid";
 import InspectionPointListItem from "@/components/admin/unit/inspectionPlan/InspectionPointListItem.vue";
+import { useInspectionPointStore } from "@/stores/admin/unit/inspectionPlan/inspectionPoint";
 </script>
 
 <script lang="ts">
@@ -92,33 +94,28 @@ export default defineComponent({
     inspectionPlanId: String,
   },
   watch: {
-    loadingActive() {
-      if (this.loading == "loading") {
-        this.loading = this.loadingActive;
-      }
-      if (this.loadingActive == "fetched") this.inspectionPlan = cloneDeep(this.activeInspectionPlanObj);
+    loading() {
+      if (this.loading == "fetched") this.localPoints = cloneDeep(this.inspectionPoints);
     },
   },
   data() {
     return {
-      loading: "loading" as "loading" | "fetched" | "failed",
       status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
-      inspectionPlan: null as null | InspectionPlanViewModel,
       timeout: null as any,
-      inspectionPoints: [] as Array<InspectionPointViewModel>,
+      localPoints: [] as Array<InspectionPointViewModel>,
     };
   },
   computed: {
     canSaveOrReset(): boolean {
-      return isEqual(this.activeInspectionPlanObj, this.inspectionPlan);
+      return isEqual(this.inspectionPoints, this.localPoints);
     },
-    ...mapState(useInspectionPlanStore, ["activeInspectionPlanObj", "loadingActive"]),
+    ...mapState(useInspectionPointStore, ["inspectionPoints", "loading"]),
     sortedPoints() {
-      return this.inspectionPoints.slice().sort((a, b) => a.sort - b.sort);
+      return this.localPoints.slice().sort((a, b) => a.sort - b.sort);
     },
   },
   mounted() {
-    this.fetchItem();
+    this.fetchInspectionPoints();
   },
   beforeUnmount() {
     try {
@@ -126,63 +123,51 @@ export default defineComponent({
     } catch (error) {}
   },
   methods: {
-    ...mapActions(useInspectionPlanStore, ["updateActiveInspectionPlan", "fetchInspectionPlanByActiveId"]),
+    ...mapActions(useInspectionPointStore, ["fetchInspectionPoints", "updateActiveInspectionPoints"]),
     resetForm() {
-      this.inspectionPlan = cloneDeep(this.activeInspectionPlanObj);
-    },
-    fetchItem() {
-      this.fetchInspectionPlanByActiveId();
+      this.localPoints = cloneDeep(this.inspectionPoints);
     },
     addItemToArray(type: InspectionPointEnum) {
-      this.inspectionPoints.push({
+      this.localPoints.push({
         id: uuid(),
         title: "",
         description: "",
         type,
-        sort: this.inspectionPoints.length,
+        sort: this.localPoints.length,
       });
     },
     updateItemFromArray(pkg: InspectionPointViewModel) {
-      let index = this.inspectionPoints.findIndex((ip) => ip.id == pkg.id);
-      this.inspectionPoints[index] = pkg;
+      let index = this.localPoints.findIndex((ip) => ip.id == pkg.id);
+      this.localPoints[index] = pkg;
     },
     removeItemFromArray(id: string) {
-      let index = this.inspectionPoints.findIndex((ip) => ip.id == id);
+      let index = this.localPoints.findIndex((ip) => ip.id == id);
       if (index !== -1) {
-        this.inspectionPoints.splice(index, 1);
+        this.localPoints.splice(index, 1);
         this.normalizeSort();
       }
     },
     changeSort(dir: "up" | "down", thisId: string, index: number) {
       let affected = this.sortedPoints[dir == "up" ? index - 1 : index + 1];
       if (affected) {
-        this.inspectionPoints.find((a) => a.id == thisId)!.sort = dir == "up" ? index - 1 : index + 1;
-        this.inspectionPoints.find((a) => a.id == affected.id)!.sort =
-          dir == "up" ? affected.sort + 1 : affected.sort - 1;
+        this.localPoints.find((a) => a.id == thisId)!.sort = dir == "up" ? index - 1 : index + 1;
+        this.localPoints.find((a) => a.id == affected.id)!.sort = dir == "up" ? affected.sort + 1 : affected.sort - 1;
       }
       this.normalizeSort();
     },
     normalizeSort() {
       let rightSort = this.sortedPoints.every((val, index) => val.sort == index);
       if (!rightSort) {
-        this.inspectionPoints.forEach((e, index) => {
+        this.localPoints.forEach((e, index) => {
           e.sort = this.sortedPoints.findIndex((sp) => sp.id == e.id);
         });
       }
     },
     triggerUpdate(e: any) {
-      if (this.inspectionPlan == null) return;
-      let formData = e.target.elements;
-      let updateInspectionPlan: UpdateInspectionPlanViewModel = {
-        id: this.inspectionPlan.id,
-        title: formData.name.value,
-        inspectionInterval: formData.interval.value,
-        remindTime: formData.remind.value,
-      };
+      if (this.localPoints.length == 0) return;
       this.status = "loading";
-      this.updateActiveInspectionPlan(updateInspectionPlan)
+      this.updateActiveInspectionPoints(this.localPoints)
         .then((res) => {
-          this.fetchItem();
           this.status = { status: "success" };
         })
         .catch((err) => {
-- 
2.47.3


From 1409cf8045a3baa662d358957d53bef2c0628d0c Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Thu, 10 Jul 2025 10:49:44 +0200
Subject: [PATCH 10/16] fill out inspection and inspection plan

---
 .../admin/unit/inspection/FileInput.vue       |  76 ++++++++++++
 .../unit/inspection/InspectionFinishModal.vue |  39 +++++++
 .../admin/unit/inspection/NumberInput.vue     |  75 ++++++++++++
 .../admin/unit/inspection/OkNotOk.vue         |   7 +-
 .../{ResultInput.vue => TextInput.vue}        |  14 +--
 .../InspectionPointListItem.vue               |  21 +++-
 .../admin/unit/inspection/inspection.ts       |  23 ++--
 .../unit/inspection/inspection.models.ts      |  15 ++-
 .../unit/inspection/InspectionExecute.vue     | 110 +++++++++++++-----
 .../admin/unit/inspection/InspectionStart.vue |  39 ++++++-
 .../inspectionPlan/CreateInspectionPlan.vue   |  12 --
 .../UpdateInspectionPlanPoints.vue            |  20 +++-
 12 files changed, 374 insertions(+), 77 deletions(-)
 create mode 100644 src/components/admin/unit/inspection/FileInput.vue
 create mode 100644 src/components/admin/unit/inspection/InspectionFinishModal.vue
 create mode 100644 src/components/admin/unit/inspection/NumberInput.vue
 rename src/components/admin/unit/inspection/{ResultInput.vue => TextInput.vue} (75%)

diff --git a/src/components/admin/unit/inspection/FileInput.vue b/src/components/admin/unit/inspection/FileInput.vue
new file mode 100644
index 0000000..7ade43d
--- /dev/null
+++ b/src/components/admin/unit/inspection/FileInput.vue
@@ -0,0 +1,76 @@
+<template>
+  <div class="flex flex-col h-fit w-full border border-primary rounded-md">
+    <div class="bg-primary p-2 text-white flex flex-row justify-between items-center">
+      <p>{{ inspectionPoint.title }}</p>
+    </div>
+    <div class="p-2">
+      <p v-if="inspectionPoint.description" class="pb-2">Beschreibung: {{ inspectionPoint.description }}</p>
+      <hr v-if="inspectionPoint.description" />
+      <label :for="inspectionPoint.id">{{ inspectionPoint.others == "pdf" ? "PDF" : "Bild" }}-Datei</label>
+      <button
+        :primary="value != ''"
+        :primary-outline="value == ''"
+        type="button"
+        class="flex flex-row gap-2"
+        @click="($refs.fileInput as HTMLInputElement).click()"
+      >
+        <span v-if="value == ''">Datei wählen</span><span v-else>Datei gewählt</span>
+        <CheckIcon v-if="value != ''" class="h-5 w-5" />
+      </button>
+      <input
+        ref="fileInput"
+        :id="inspectionPoint.id"
+        :name="inspectionPoint.id"
+        type="file"
+        :accept="inspectionPoint.others == 'pdf' ? 'application/pdf' : 'image/*'"
+        hidden
+        @change="selectFile"
+      />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent, type PropType } from "vue";
+import type { InspectionPointViewModel } from "@/viewmodels/admin/unit/inspection/inspectionPlan.models";
+import { CheckIcon } from "@heroicons/vue/24/outline";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  props: {
+    inspectionPoint: {
+      type: Object as PropType<InspectionPointViewModel>,
+      required: true,
+    },
+    modelValue: {
+      type: String,
+      default: "",
+    },
+  },
+  emits: {
+    "update:model-value": (p: string) => {
+      return true;
+    },
+    "update:upload": (p: File | null) => {
+      return true;
+    },
+  },
+  computed: {
+    value: {
+      get() {
+        return this.modelValue;
+      },
+      set(val: string | number) {
+        this.$emit("update:model-value", val.toString());
+      },
+    },
+  },
+  methods: {
+    selectFile(e: Event) {
+      this.$emit("update:upload", (e.target as HTMLInputElement).files?.[0] ?? null);
+      this.value = "set";
+    },
+  },
+});
+</script>
diff --git a/src/components/admin/unit/inspection/InspectionFinishModal.vue b/src/components/admin/unit/inspection/InspectionFinishModal.vue
new file mode 100644
index 0000000..33c9cd0
--- /dev/null
+++ b/src/components/admin/unit/inspection/InspectionFinishModal.vue
@@ -0,0 +1,39 @@
+<template>
+  <div class="relative w-full md:max-w-md">
+    <div class="flex flex-col items-center">
+      <p class="text-xl font-medium">Prüfung abschließen</p>
+    </div>
+    <br />
+    <div class="flex flex-col gap-2">
+      <p class="flex flex-row text-sm">
+        <InformationCircleIcon class="text-gray-500 h-5 w-5" /> Nach abschluss der Prüfung können keine Änderung mehr an
+        dieser vorgenommen werden. <br />
+        Es wird ein PDF ausgedruckt und ist dann zu dieser Prüfung verfügbar.
+      </p>
+      <br />
+      <button primary>Prüfung abschließen</button>
+    </div>
+    <br />
+
+    <div class="flex flex-row justify-end">
+      <div class="flex flex-row gap-4 py-2">
+        <button primary-outline @click="closeModal">abbrechen</button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+import { mapState, mapActions } from "pinia";
+import { useModalStore } from "@/stores/modal";
+import { InformationCircleIcon } from "@heroicons/vue/24/outline";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  methods: {
+    ...mapActions(useModalStore, ["closeModal"]),
+  },
+});
+</script>
diff --git a/src/components/admin/unit/inspection/NumberInput.vue b/src/components/admin/unit/inspection/NumberInput.vue
new file mode 100644
index 0000000..eb3cc4d
--- /dev/null
+++ b/src/components/admin/unit/inspection/NumberInput.vue
@@ -0,0 +1,75 @@
+<template>
+  <div class="flex flex-col h-fit w-full border border-primary rounded-md">
+    <div class="bg-primary p-2 text-white flex flex-row justify-between items-center">
+      <p>{{ inspectionPoint.title }}</p>
+    </div>
+    <div class="p-2">
+      <p v-if="inspectionPoint.description" class="pb-2">Beschreibung: {{ inspectionPoint.description }}</p>
+      <hr v-if="inspectionPoint.description" />
+      <label :for="inspectionPoint.id">
+        Zahl <small>{{ restrictedRange }}</small>
+      </label>
+      <input
+        :id="inspectionPoint.id"
+        :name="inspectionPoint.id"
+        type="number"
+        v-model="value"
+        :min="inspectionPoint.min"
+        :max="inspectionPoint.max"
+        :class="{ 'ring-red-500! ring-1!': isInRange }"
+      />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent, type PropType } from "vue";
+import type { InspectionPointViewModel } from "@/viewmodels/admin/unit/inspection/inspectionPlan.models";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  props: {
+    inspectionPoint: {
+      type: Object as PropType<InspectionPointViewModel>,
+      required: true,
+    },
+    modelValue: {
+      type: String,
+      default: "",
+    },
+  },
+  emits: ["update:model-value"],
+  computed: {
+    value: {
+      get() {
+        return this.modelValue;
+      },
+      set(val: string | number) {
+        this.$emit("update:model-value", val.toString());
+      },
+    },
+    restrictedRange() {
+      let range = "";
+      if (this.inspectionPoint.min != null) range += `min. ${this.inspectionPoint.min}`;
+      if (this.inspectionPoint.max != null) range += ` bis max. ${this.inspectionPoint.max}`;
+      return range;
+    },
+    isInRange() {
+      if (this.inspectionPoint.min != null && this.inspectionPoint.max != null)
+        return Number(this.value) < this.inspectionPoint.min || this.inspectionPoint.max < Number(this.value);
+
+      if (this.inspectionPoint.min != null) return Number(this.value) < this.inspectionPoint.min;
+
+      if (this.inspectionPoint.max != null) return this.inspectionPoint.max < Number(this.value);
+
+      return false;
+    },
+  },
+  mounted() {
+    if (!this.value) {
+      this.value = String(this.inspectionPoint.min ?? 0);
+    }
+  },
+});
+</script>
diff --git a/src/components/admin/unit/inspection/OkNotOk.vue b/src/components/admin/unit/inspection/OkNotOk.vue
index 861e6fa..4394ba8 100644
--- a/src/components/admin/unit/inspection/OkNotOk.vue
+++ b/src/components/admin/unit/inspection/OkNotOk.vue
@@ -36,8 +36,8 @@ export default defineComponent({
       required: true,
     },
     modelValue: {
-      type: String as PropType<"true" | "false">,
-      default: "false",
+      type: String as PropType<"true" | "false" | "">,
+      default: "",
     },
   },
   emits: ["update:model-value"],
@@ -59,5 +59,8 @@ export default defineComponent({
       },
     },
   },
+  mounted() {
+    if (this.value == "") this.value = "false";
+  },
 });
 </script>
diff --git a/src/components/admin/unit/inspection/ResultInput.vue b/src/components/admin/unit/inspection/TextInput.vue
similarity index 75%
rename from src/components/admin/unit/inspection/ResultInput.vue
rename to src/components/admin/unit/inspection/TextInput.vue
index e4d9ffb..4ff65c4 100644
--- a/src/components/admin/unit/inspection/ResultInput.vue
+++ b/src/components/admin/unit/inspection/TextInput.vue
@@ -6,18 +6,14 @@
     <div class="p-2">
       <p v-if="inspectionPoint.description" class="pb-2">Beschreibung: {{ inspectionPoint.description }}</p>
       <hr v-if="inspectionPoint.description" />
-      <label :for="inspectionPoint.id">{{ inspectionPoint.type == "number" ? "Zahl" : "Freitext" }}</label>
-      <input
-        v-if="inspectionPoint.type == 'number'"
+      <label :for="inspectionPoint.id">Freitext</label>
+      <textarea
         :id="inspectionPoint.id"
         :name="inspectionPoint.id"
-        type="number"
-        required
+        class="h-18"
+        :class="{ 'ring-red-500! ring-1!': value == '' }"
         v-model="value"
-        :min="inspectionPoint.min"
-        :max="inspectionPoint.max"
-      />
-      <textarea v-else :id="inspectionPoint.id" :name="inspectionPoint.id" required class="h-18" v-model="value" />
+      ></textarea>
     </div>
   </div>
 </template>
diff --git a/src/components/admin/unit/inspectionPlan/InspectionPointListItem.vue b/src/components/admin/unit/inspectionPlan/InspectionPointListItem.vue
index a7591d6..46a359d 100644
--- a/src/components/admin/unit/inspectionPlan/InspectionPointListItem.vue
+++ b/src/components/admin/unit/inspectionPlan/InspectionPointListItem.vue
@@ -6,7 +6,7 @@
       <BoldIcon v-else-if="modelValue.type == InspectionPointEnum.text" class="w-6 h-6" />
       <DocumentIcon v-else-if="modelValue.type == InspectionPointEnum.file" class="w-6 h-6" />
 
-      <input type="text" placeholder="Titel" class="grow !w-fit" v-model="title" />
+      <input type="text" placeholder="Titel" class="grow !w-fit" v-model="title" required />
 
       <div class="flex flex-col">
         <ChevronUpIcon v-if="index != 0" class="text-white w-4 h-4 stroke-2 cursor-pointer" @click="$emit('up')" />
@@ -26,13 +26,17 @@
       </div>
       <div v-if="modelValue.type == InspectionPointEnum.number">
         <label for="max">Maximal</label>
-        <input type="number" v-model="max" min="0" />
+        <input type="number" v-model="max" :min="Number(min ?? 0) + 1" />
       </div>
       <div v-if="modelValue.type == InspectionPointEnum.file">
         <p>Dateiart</p>
         <div class="flex flex-row gap-2">
-          <button :primary="others == 'img'" :primary-outline="others != 'img'" @click="others = 'img'">Bild</button>
-          <button :primary="others == 'pdf'" :primary-outline="others != 'pdf'" @click="others = 'pdf'">PDF</button>
+          <button :primary="others == 'img'" :primary-outline="others != 'img'" type="button" @click="others = 'img'">
+            Bild
+          </button>
+          <button :primary="others == 'pdf'" :primary-outline="others != 'pdf'" type="button" @click="others = 'pdf'">
+            PDF
+          </button>
         </div>
       </div>
     </div>
@@ -87,7 +91,7 @@ export default defineComponent({
         return this.modelValue.min;
       },
       set(val: string) {
-        this.$emit("update:model-value", { ...this.modelValue, min: val == "" ? null : val });
+        this.$emit("update:model-value", { ...this.modelValue, min: String(val) == "" ? null : String(val) });
       },
     },
     max: {
@@ -95,7 +99,7 @@ export default defineComponent({
         return this.modelValue.max;
       },
       set(val: string) {
-        this.$emit("update:model-value", { ...this.modelValue, max: val == "" ? null : val });
+        this.$emit("update:model-value", { ...this.modelValue, max: String(val) == "" ? null : String(val) });
       },
     },
     others: {
@@ -107,5 +111,10 @@ export default defineComponent({
       },
     },
   },
+  mounted() {
+    if (this.modelValue.type == InspectionPointEnum.file && !this.others) {
+      this.others = "img";
+    }
+  },
 });
 </script>
diff --git a/src/stores/admin/unit/inspection/inspection.ts b/src/stores/admin/unit/inspection/inspection.ts
index abe1877..a0fcd11 100644
--- a/src/stores/admin/unit/inspection/inspection.ts
+++ b/src/stores/admin/unit/inspection/inspection.ts
@@ -1,7 +1,11 @@
 import { defineStore } from "pinia";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import type { InspectionViewModel } from "@/viewmodels/admin/unit/inspection/inspection.models";
+import type {
+  CreateInspectionViewModel,
+  InspectionViewModel,
+  UpdateInspectionViewModel,
+} from "@/viewmodels/admin/unit/inspection/inspection.models";
 
 export const useInspectionStore = defineStore("inspection", {
   state: () => {
@@ -27,19 +31,20 @@ export const useInspectionStore = defineStore("inspection", {
     fetchInspectionById(id: string) {
       return http.get(`/admin/inspection/${id}`);
     },
-    async createInspection(inspection: any): Promise<AxiosResponse<any, any>> {
+    async createInspection(inspection: CreateInspectionViewModel): Promise<AxiosResponse<any, any>> {
       const result = await http.post(`/admin/inspection`, {
-        context: "",
-        inspectionPlanId: "",
-        relatedId: "",
-        assigned: "equipment|vehicle",
+        assigned: inspection.assigned,
+        relatedId: inspection.relatedId,
+        inspectionPlanId: inspection.inspectionPlanId,
+        nextInspection: inspection.nextInspection,
+        context: inspection.context,
       });
-      this.fetchInspectionByActiveId();
       return result;
     },
-    async updateActiveInspection(inspection: any): Promise<AxiosResponse<any, any>> {
+    async updateActiveInspection(inspection: UpdateInspectionViewModel): Promise<AxiosResponse<any, any>> {
       const result = await http.patch(`/admin/inspection/${inspection.id}`, {
-        context: "",
+        nextInspection: inspection.nextInspection,
+        context: inspection.context,
       });
       this.fetchInspectionByActiveId();
       return result;
diff --git a/src/viewmodels/admin/unit/inspection/inspection.models.ts b/src/viewmodels/admin/unit/inspection/inspection.models.ts
index 4f72a13..0ffde9c 100644
--- a/src/viewmodels/admin/unit/inspection/inspection.models.ts
+++ b/src/viewmodels/admin/unit/inspection/inspection.models.ts
@@ -37,8 +37,21 @@ export type InspectionViewModel = {
 
 export interface InspectionPointResultViewModel {
   inspectionId: string;
-  inspectionVersionedPlanId: string;
   inspectionPointId: string;
   inspectionPoint?: InspectionPointViewModel;
   value: string;
 }
+
+export type CreateInspectionViewModel = {
+  assigned: "equipment" | "vehicle" | "wearable";
+  relatedId: string;
+  inspectionPlanId: string;
+  nextInspection?: Date;
+  context?: string;
+};
+
+export type UpdateInspectionViewModel = {
+  id: string;
+  nextInspection?: Date;
+  context?: string;
+};
diff --git a/src/views/admin/unit/inspection/InspectionExecute.vue b/src/views/admin/unit/inspection/InspectionExecute.vue
index a9f565d..c12dec8 100644
--- a/src/views/admin/unit/inspection/InspectionExecute.vue
+++ b/src/views/admin/unit/inspection/InspectionExecute.vue
@@ -2,49 +2,80 @@
   <MainTemplate>
     <template #topBar>
       <h1 class="font-bold text-xl min-h-8">
-        Prüfung durchführen: {{ activeInspectionObj?.related.name }} - {{ activeInspectionObj?.inspectionPlan.title }}
+        Prüfung durchführen: {{ activeInspectionObj?.related.name }}
+        <small v-if="activeInspectionObj?.related.code">({{ activeInspectionObj?.related.code }})</small> -
+        {{ activeInspectionObj?.inspectionPlan.title }}
       </h1>
     </template>
     <template #main>
       <Spinner v-if="loading == 'loading'" class="mx-auto" />
       <p v-else-if="loading == 'failed'">laden fehlgeschlagen</p>
-      <form
+      <div
         v-else-if="activeInspectionObj != null"
-        class="flex flex-col gap-4 py-2 w-full max-w-xl mx-auto"
-        @submit.prevent="triggerUpdate"
+        class="flex flex-col gap-4 py-2 grow w-full max-w-xl mx-auto overflow-hidden"
       >
-        <div v-for="point in points" :key="point.title">
-          <OkNotOk
-            v-if="point.type == InspectionPointEnum.oknok"
-            :inspectionPoint="point"
-            :modelValue="boolPointResult(point.id)"
-            @update:model-value="(val) => updateCheckResult(point.id, val)"
-          />
-          <ResultInput
-            v-else
-            :inspectionPoint="point"
-            :modelValue="pointResult(point.id)"
-            @update:model-value="(val) => updateCheckResult(point.id, val)"
-          />
+        <div class="flex flex-col gap-2 grow overflow-y-scroll">
+          <div v-for="point in points" :key="point.title" class="contents">
+            <OkNotOk
+              v-if="point.type == InspectionPointEnum.oknok"
+              :inspectionPoint="point"
+              :modelValue="boolPointResult(point.id)"
+              @update:model-value="(val) => updateCheckResult(point.id, val)"
+            />
+            <NumberInput
+              v-else-if="point.type == InspectionPointEnum.number"
+              :inspectionPoint="point"
+              :modelValue="pointResult(point.id)"
+              @update:model-value="(val) => updateCheckResult(point.id, val)"
+            />
+            <TextInput
+              v-else-if="point.type == InspectionPointEnum.text"
+              :inspectionPoint="point"
+              :modelValue="pointResult(point.id)"
+              @update:model-value="(val) => updateCheckResult(point.id, val)"
+            />
+            <FileInput
+              v-else-if="point.type == InspectionPointEnum.file"
+              :inspectionPoint="point"
+              :modelValue="pointResult(point.id)"
+              @update:model-value="(val) => updateCheckResult(point.id, val)"
+              @update:upload="(val) => (fileStore[point.id] = val)"
+            />
+          </div>
         </div>
-        <div class="flex flex-row justify-end gap-2">
+        <div class="flex flex-row justify-end flex-wrap min-h-fit gap-2">
           <button primary-outline type="reset" class="w-fit!" :disabled="canSaveOrReset" @click="resetForm">
             verwerfen
           </button>
-          <button primary type="submit" class="w-fit!" :disabled="status == 'loading' || canSaveOrReset">
-            speichern
+          <button
+            primary
+            type="submit"
+            class="w-fit!"
+            :disabled="status == 'loading' || canSaveOrReset"
+            @click="triggerUpdate"
+          >
+            zwischenspeichern
+          </button>
+          <button
+            primary
+            type="button"
+            class="w-fit!"
+            :disabled="status == 'loading' || !canSaveOrReset || !isEverythingFilled"
+            @click.prevent="finishInspection"
+          >
+            abschließen
           </button>
           <Spinner v-if="status == 'loading'" class="my-auto" />
           <SuccessCheckmark v-else-if="status?.status == 'success'" />
           <FailureXMark v-else-if="status?.status == 'failed'" />
         </div>
-      </form>
+      </div>
     </template>
   </MainTemplate>
 </template>
 
 <script setup lang="ts">
-import { defineComponent, type PropType } from "vue";
+import { defineAsyncComponent, defineComponent, markRaw, type PropType } from "vue";
 import { mapActions, mapState } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
 import Spinner from "@/components/Spinner.vue";
@@ -52,11 +83,14 @@ import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { useInspectionStore } from "@/stores/admin/unit/inspection/inspection";
 import OkNotOk from "@/components/admin/unit/inspection/OkNotOk.vue";
-import ResultInput from "@/components/admin/unit/inspection/ResultInput.vue";
 import type { InspectionPointResultViewModel } from "@/viewmodels/admin/unit/inspection/inspection.models";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
 import { InspectionPointEnum } from "@/enums/inspectionEnum";
+import { useModalStore } from "@/stores/modal";
+import NumberInput from "@/components/admin/unit/inspection/NumberInput.vue";
+import TextInput from "@/components/admin/unit/inspection/TextInput.vue";
+import FileInput from "@/components/admin/unit/inspection/FileInput.vue";
 </script>
 
 <script lang="ts">
@@ -80,6 +114,7 @@ export default defineComponent({
       status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
       timeout: null as any,
       checks: [] as Array<InspectionPointResultViewModel>,
+      fileStore: {} as { [key: string]: File | null },
     };
   },
   computed: {
@@ -99,13 +134,25 @@ export default defineComponent({
       };
     },
     boolPointResult() {
-      return (pointId: string): "true" | "false" => {
-        return this.pointResult(pointId) == "true" ? "true" : "false";
+      return (pointId: string): "true" | "false" | "" => {
+        let value = this.pointResult(pointId);
+        return ["true", "false"].includes(value) ? (value as "true" | "false") : "";
       };
     },
+    isEverythingFilled() {
+      return this.points.every((p) => {
+        if (p.type == InspectionPointEnum.file) {
+          return this.pointResult(p.id) == "set" ? !!this.fileStore[p.id] : !!this.pointResult(p.id);
+        } else if (p.type == InspectionPointEnum.oknok) {
+          return this.boolPointResult(p.id) != "";
+        } else {
+          return !!this.pointResult(p.id);
+        }
+      });
+    },
   },
   mounted() {
-    this.fetchItem();
+    this.fetchInspectionByActiveId();
   },
   beforeUnmount() {
     try {
@@ -114,12 +161,10 @@ export default defineComponent({
   },
   methods: {
     ...mapActions(useInspectionStore, ["fetchInspectionByActiveId"]),
+    ...mapActions(useModalStore, ["openModal"]),
     resetForm() {
       this.checks = cloneDeep(this.activeInspectionObj?.checks ?? []);
     },
-    fetchItem() {
-      this.fetchInspectionByActiveId();
-    },
     updateCheckResult(id: string, value: string) {
       if (this.activeInspectionObj == null) return;
 
@@ -127,7 +172,6 @@ export default defineComponent({
       if (index == -1) {
         this.checks.push({
           inspectionId: this.activeInspectionObj.id,
-          inspectionVersionedPlanId: this.activeInspectionObj.inspectionVersionedPlanId,
           inspectionPointId: id,
           value: value,
         });
@@ -142,7 +186,6 @@ export default defineComponent({
         resolve();
       })
         .then(() => {
-          this.fetchItem();
           this.status = { status: "success" };
         })
         .catch((err) => {
@@ -154,6 +197,11 @@ export default defineComponent({
           }, 2000);
         });
     },
+    finishInspection() {
+      this.openModal(
+        markRaw(defineAsyncComponent(() => import("@/components/admin/unit/inspection/InspectionFinishModal.vue")))
+      );
+    },
   },
 });
 </script>
diff --git a/src/views/admin/unit/inspection/InspectionStart.vue b/src/views/admin/unit/inspection/InspectionStart.vue
index de35f5a..fe988a5 100644
--- a/src/views/admin/unit/inspection/InspectionStart.vue
+++ b/src/views/admin/unit/inspection/InspectionStart.vue
@@ -1,7 +1,7 @@
 <template>
   <MainTemplate title="Prüfung starten">
     <template #main>
-      <form class="flex flex-col gap-4 py-2 w-full max-w-xl mx-auto" @submit.prevent="">
+      <form class="flex flex-col gap-4 py-2 w-full max-w-xl mx-auto" @submit.prevent="createNewInspection">
         <div class="flex flex-row">
           <div
             v-for="tab in tabs"
@@ -44,6 +44,11 @@
           <input id="nextInspection" type="date" />
         </div>
 
+        <div>
+          <label for="context"> Kontext </label>
+          <textarea id="context" class="h-24"></textarea>
+        </div>
+
         <div class="flex flex-row justify-end gap-2">
           <RouterLink
             :to="{ name: 'admin-unit-inspection_plan' }"
@@ -80,6 +85,8 @@ import InspectionPlanSearchSelectWithRelated from "@/components/search/Inspectio
 import { useEquipmentStore } from "@/stores/admin/unit/equipment/equipment";
 import { useVehicleStore } from "@/stores/admin/unit/vehicle/vehicle";
 import { useWearableStore } from "@/stores/admin/unit/wearable/wearable";
+import type { CreateInspectionViewModel } from "@/viewmodels/admin/unit/inspection/inspection.models";
+import { useInspectionStore } from "@/stores/admin/unit/inspection/inspection";
 </script>
 
 <script lang="ts">
@@ -94,6 +101,7 @@ export default defineComponent({
   },
   watch: {
     inspectionPlan() {
+      this.selectedInspectionPlan = undefined;
       if (this.inspectionPlan != "") this.getInspectionPlanData();
     },
     related() {
@@ -133,6 +141,7 @@ export default defineComponent({
     }
   },
   methods: {
+    ...mapActions(useInspectionStore, ["createInspection"]),
     ...mapActions(useInspectionPlanStore, ["fetchInspectionPlanById"]),
     ...mapActions(useEquipmentStore, ["fetchEquipmentById"]),
     ...mapActions(useVehicleStore, ["fetchVehicleById"]),
@@ -175,6 +184,34 @@ export default defineComponent({
           });
       }
     },
+    createNewInspection(e: any) {
+      if (this.related == "" || this.inspectionPlan == "") return;
+      let formData = e.target.elements;
+      let createInspection: CreateInspectionViewModel = {
+        assigned: this.active,
+        relatedId: this.related,
+        inspectionPlanId: this.inspectionPlan,
+        nextInspection: formData.nextInspection.value,
+        context: formData.context.value,
+      };
+      this.status = "loading";
+      this.createInspection(createInspection)
+        .then((res) => {
+          this.status = { status: "success" };
+
+          this.timeout = setTimeout(() => {
+            this.$router.push({
+              name: "admin-unit-inspection-execute",
+              params: {
+                inspectionId: res.data,
+              },
+            });
+          }, 1500);
+        })
+        .catch((err) => {
+          this.status = { status: "failed" };
+        });
+    },
   },
 });
 </script>
diff --git a/src/views/admin/unit/inspectionPlan/CreateInspectionPlan.vue b/src/views/admin/unit/inspectionPlan/CreateInspectionPlan.vue
index 0e1a51d..8b06b8e 100644
--- a/src/views/admin/unit/inspectionPlan/CreateInspectionPlan.vue
+++ b/src/views/admin/unit/inspectionPlan/CreateInspectionPlan.vue
@@ -83,20 +83,8 @@ import MainTemplate from "@/templates/Main.vue";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import {
-  Combobox,
-  ComboboxLabel,
-  ComboboxInput,
-  ComboboxButton,
-  ComboboxOptions,
-  ComboboxOption,
-  TransitionRoot,
-} from "@headlessui/vue";
-import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
 import { useInspectionPlanStore } from "@/stores/admin/unit/inspectionPlan/inspectionPlan";
 import type { CreateInspectionPlanViewModel } from "@/viewmodels/admin/unit/inspection/inspectionPlan.models";
-import ScanInput from "@/components/ScanInput.vue";
-import type { EquipmentTypeViewModel } from "@/viewmodels/admin/unit/equipment/equipmentType.models";
 import { useEquipmentTypeStore } from "@/stores/admin/unit/equipmentType/equipmentType";
 import EquipmentTypeSearchSelect from "@/components/search/EquipmentTypeSearchSelect.vue";
 import VehicleTypeSearchSelect from "@/components/search/VehicleTypeSearchSelect.vue";
diff --git a/src/views/admin/unit/inspectionPlan/UpdateInspectionPlanPoints.vue b/src/views/admin/unit/inspectionPlan/UpdateInspectionPlanPoints.vue
index 0b78a77..1cf03c2 100644
--- a/src/views/admin/unit/inspectionPlan/UpdateInspectionPlanPoints.vue
+++ b/src/views/admin/unit/inspectionPlan/UpdateInspectionPlanPoints.vue
@@ -1,9 +1,13 @@
 <template>
   <div class="flex flex-col gap-2 h-full w-full overflow-y-auto">
     <RouterLink to="./" class="text-primary">zurück zur Übersicht</RouterLink>
-    <Spinner v-if="loading == 'loading'" class="mx-auto" />
+    <Spinner v-if="loading == 'loading' && showLoading" class="mx-auto" />
     <p v-else-if="loading == 'failed'">laden fehlgeschlagen</p>
-    <div v-else-if="localPoints != null" class="flex flex-col grow gap-4 py-2 w-full max-w-xl mx-auto overflow-hidden">
+    <form
+      v-else-if="localPoints != null"
+      class="flex flex-col grow gap-4 py-2 w-full max-w-xl mx-auto overflow-hidden"
+      @submit.prevent="triggerUpdate"
+    >
       <p class="mx-auto">Prüfplan-Punkte bearbeiten</p>
 
       <div class="flex flex-row justify-center gap-4">
@@ -38,6 +42,7 @@
       </div>
 
       <div class="grow flex flex-col gap-2 overflow-y-scroll">
+        <p v-if="sortedPoints.length == 0" class="m-auto">Wähle mindestens 1 Eingabefeld</p>
         <InspectionPointListItem
           v-for="(point, index) in sortedPoints"
           :key="index"
@@ -59,8 +64,7 @@
           primary
           type="submit"
           class="w-fit!"
-          :disabled="status == 'loading' || canSaveOrReset"
-          @click="triggerUpdate"
+          :disabled="status == 'loading' || canSaveOrReset || sortedPoints.length == 0"
         >
           speichern
         </button>
@@ -68,7 +72,7 @@
         <SuccessCheckmark v-else-if="status?.status == 'success'" />
         <FailureXMark v-else-if="status?.status == 'failed'" />
       </div>
-    </div>
+    </form>
   </div>
 </template>
 
@@ -95,11 +99,15 @@ export default defineComponent({
   },
   watch: {
     loading() {
-      if (this.loading == "fetched") this.localPoints = cloneDeep(this.inspectionPoints);
+      if (this.loading == "fetched") {
+        this.localPoints = cloneDeep(this.inspectionPoints);
+        this.showLoading = false;
+      }
     },
   },
   data() {
     return {
+      showLoading: true as boolean,
       status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
       timeout: null as any,
       localPoints: [] as Array<InspectionPointViewModel>,
-- 
2.47.3


From 74b05ee97f2258b8c01b9b01564a2eb8b30e54c3 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Thu, 10 Jul 2025 13:22:38 +0200
Subject: [PATCH 11/16] next and running inspections

---
 .../admin/unit/inspection/FileInput.vue       |  5 ++
 .../admin/unit/inspection/NumberInput.vue     |  7 +-
 .../admin/unit/inspection/OkNotOk.vue         |  6 +-
 .../admin/unit/inspection/TextInput.vue       |  7 +-
 src/router/index.ts                           |  4 +-
 .../admin/unit/inspection/inspection.ts       | 58 ++++++++++++++++
 .../unit/inspection/inspection.models.ts      | 48 +++++++++----
 src/views/admin/unit/equipment/Inspection.vue |  8 +--
 .../unit/inspection/InspectionExecute.vue     | 14 +++-
 .../admin/unit/inspection/NextInspection.vue  | 45 ------------
 .../admin/unit/inspection/NextInspections.vue | 69 +++++++++++++++++++
 .../unit/inspection/RunningInspections.vue    | 68 ++++++++++++++++++
 src/views/admin/unit/vehicle/Inspection.vue   |  8 +--
 src/views/admin/unit/wearable/Inspection.vue  |  8 +--
 14 files changed, 280 insertions(+), 75 deletions(-)
 delete mode 100644 src/views/admin/unit/inspection/NextInspection.vue
 create mode 100644 src/views/admin/unit/inspection/NextInspections.vue
 create mode 100644 src/views/admin/unit/inspection/RunningInspections.vue

diff --git a/src/components/admin/unit/inspection/FileInput.vue b/src/components/admin/unit/inspection/FileInput.vue
index 7ade43d..e02c470 100644
--- a/src/components/admin/unit/inspection/FileInput.vue
+++ b/src/components/admin/unit/inspection/FileInput.vue
@@ -13,6 +13,7 @@
         type="button"
         class="flex flex-row gap-2"
         @click="($refs.fileInput as HTMLInputElement).click()"
+        :disabled="!editable"
       >
         <span v-if="value == ''">Datei wählen</span><span v-else>Datei gewählt</span>
         <CheckIcon v-if="value != ''" class="h-5 w-5" />
@@ -47,6 +48,10 @@ export default defineComponent({
       type: String,
       default: "",
     },
+    editable: {
+      type: Boolean,
+      default: true,
+    },
   },
   emits: {
     "update:model-value": (p: string) => {
diff --git a/src/components/admin/unit/inspection/NumberInput.vue b/src/components/admin/unit/inspection/NumberInput.vue
index eb3cc4d..b93b720 100644
--- a/src/components/admin/unit/inspection/NumberInput.vue
+++ b/src/components/admin/unit/inspection/NumberInput.vue
@@ -16,7 +16,8 @@
         v-model="value"
         :min="inspectionPoint.min"
         :max="inspectionPoint.max"
-        :class="{ 'ring-red-500! ring-1!': isInRange }"
+        :class="{ 'ring-red-500! ring-1!': isInRange && editable }"
+        :disabled="!editable"
       />
     </div>
   </div>
@@ -38,6 +39,10 @@ export default defineComponent({
       type: String,
       default: "",
     },
+    editable: {
+      type: Boolean,
+      default: true,
+    },
   },
   emits: ["update:model-value"],
   computed: {
diff --git a/src/components/admin/unit/inspection/OkNotOk.vue b/src/components/admin/unit/inspection/OkNotOk.vue
index 4394ba8..b32170d 100644
--- a/src/components/admin/unit/inspection/OkNotOk.vue
+++ b/src/components/admin/unit/inspection/OkNotOk.vue
@@ -6,7 +6,7 @@
     <div class="p-2">
       <p v-if="inspectionPoint.description" class="pb-2">Beschreibung: {{ inspectionPoint.description }}</p>
       <hr v-if="inspectionPoint.description" />
-      <RadioGroup v-model="value" :name="inspectionPoint.id" class="flex flex-row gap-2">
+      <RadioGroup v-model="value" :name="inspectionPoint.id" class="flex flex-row gap-2" :disabled="!editable">
         <RadioGroupOption
           v-for="option in options"
           :key="option.key"
@@ -39,6 +39,10 @@ export default defineComponent({
       type: String as PropType<"true" | "false" | "">,
       default: "",
     },
+    editable: {
+      type: Boolean,
+      default: true,
+    },
   },
   emits: ["update:model-value"],
   data() {
diff --git a/src/components/admin/unit/inspection/TextInput.vue b/src/components/admin/unit/inspection/TextInput.vue
index 4ff65c4..664c3d4 100644
--- a/src/components/admin/unit/inspection/TextInput.vue
+++ b/src/components/admin/unit/inspection/TextInput.vue
@@ -11,8 +11,9 @@
         :id="inspectionPoint.id"
         :name="inspectionPoint.id"
         class="h-18"
-        :class="{ 'ring-red-500! ring-1!': value == '' }"
+        :class="{ 'ring-red-500! ring-1!': value == '' && editable }"
         v-model="value"
+        :disabled="!editable"
       ></textarea>
     </div>
   </div>
@@ -34,6 +35,10 @@ export default defineComponent({
       type: String,
       default: "",
     },
+    editable: {
+      type: Boolean,
+      default: true,
+    },
   },
   emits: ["update:model-value"],
   computed: {
diff --git a/src/router/index.ts b/src/router/index.ts
index d17640f..9ed65d6 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -930,12 +930,12 @@ const router = createRouter({
                     {
                       path: "next",
                       name: "admin-unit-inspection",
-                      component: () => import("@/views/admin/unit/inspection/NextInspection.vue"),
+                      component: () => import("@/views/admin/unit/inspection/NextInspections.vue"),
                     },
                     {
                       path: "running",
                       name: "admin-unit-inspection-running",
-                      component: () => import("@/views/admin/unit/inspection/NextInspection.vue"),
+                      component: () => import("@/views/admin/unit/inspection/RunningInspections.vue"),
                     },
                   ],
                 },
diff --git a/src/stores/admin/unit/inspection/inspection.ts b/src/stores/admin/unit/inspection/inspection.ts
index a0fcd11..bfef211 100644
--- a/src/stores/admin/unit/inspection/inspection.ts
+++ b/src/stores/admin/unit/inspection/inspection.ts
@@ -3,19 +3,77 @@ import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
 import type {
   CreateInspectionViewModel,
+  InspectionNextViewModel,
   InspectionViewModel,
+  MinifiedInspectionViewModel,
   UpdateInspectionViewModel,
 } from "@/viewmodels/admin/unit/inspection/inspection.models";
 
 export const useInspectionStore = defineStore("inspection", {
   state: () => {
     return {
+      inspections: [] as Array<MinifiedInspectionViewModel & { tab_pos: number }>,
+      totalCount: 0 as number,
+      loading: "loading" as "loading" | "fetched" | "failed",
+      nextInspections: [] as Array<InspectionNextViewModel & { tab_pos: number }>,
+      nextTotalCount: 0 as number,
+      nextLoading: "loading" as "loading" | "fetched" | "failed",
       activeInspection: null as string | null,
       activeInspectionObj: null as InspectionViewModel | null,
       loadingActive: "loading" as "loading" | "fetched" | "failed",
     };
   },
   actions: {
+    fetchRunningInspections(offset = 0, count = 25, search = "", clear = false) {
+      if (clear) this.inspections = [];
+      this.loading = "loading";
+      http
+        .get(`/admin/inspection/running?offset=${offset}&count=${count}${search != "" ? "&search=" + search : ""}`)
+        .then((result) => {
+          this.totalCount = result.data.total;
+          result.data.inspections
+            .filter((elem: MinifiedInspectionViewModel) => this.inspections.findIndex((m) => m.id == elem.id) == -1)
+            .map(
+              (elem: MinifiedInspectionViewModel, index: number): MinifiedInspectionViewModel & { tab_pos: number } => {
+                return {
+                  ...elem,
+                  tab_pos: index + offset,
+                };
+              }
+            )
+            .forEach((elem: MinifiedInspectionViewModel & { tab_pos: number }) => {
+              this.inspections.push(elem);
+            });
+          this.loading = "fetched";
+        })
+        .catch((err) => {
+          this.loading = "failed";
+        });
+    },
+    fetchNextInspections(offset = 0, count = 25, search = "", clear = false) {
+      if (clear) this.nextInspections = [];
+      this.nextLoading = "loading";
+      http
+        .get(`/admin/inspection/next?offset=${offset}&count=${count}${search != "" ? "&search=" + search : ""}`)
+        .then((result) => {
+          this.nextTotalCount = result.data.total;
+          result.data.inspections
+            .filter((elem: InspectionNextViewModel) => this.nextInspections.findIndex((m) => m.id == elem.id) == -1)
+            .map((elem: InspectionNextViewModel, index: number): InspectionNextViewModel & { tab_pos: number } => {
+              return {
+                ...elem,
+                tab_pos: index + offset,
+              };
+            })
+            .forEach((elem: InspectionNextViewModel & { tab_pos: number }) => {
+              this.nextInspections.push(elem);
+            });
+          this.nextLoading = "fetched";
+        })
+        .catch((err) => {
+          this.nextLoading = "failed";
+        });
+    },
     fetchInspectionByActiveId() {
       this.loadingActive = "loading";
       http
diff --git a/src/viewmodels/admin/unit/inspection/inspection.models.ts b/src/viewmodels/admin/unit/inspection/inspection.models.ts
index 0ffde9c..f2a56d1 100644
--- a/src/viewmodels/admin/unit/inspection/inspection.models.ts
+++ b/src/viewmodels/admin/unit/inspection/inspection.models.ts
@@ -7,18 +7,7 @@ import type {
 import type { VehicleViewModel } from "../vehicle/vehicle.models";
 import type { WearableViewModel } from "../wearable/wearable.models";
 
-export type InspectionViewModel = {
-  id: string;
-  inspectionPlanId: string;
-  inspectionPlan: InspectionPlanViewModel;
-  inspectionVersionedPlanId: string;
-  inspectionVersionedPlan: InspectionVersionedPlanViewModel;
-  context: string;
-  created: Date;
-  finished?: Date;
-  isOpen: boolean;
-  nextInspection?: Date;
-  checks: Array<InspectionPointResultViewModel>;
+export type InspectionRelated = {
   relatedId: string;
 } & (
   | {
@@ -35,6 +24,41 @@ export type InspectionViewModel = {
     }
 );
 
+export type InspectionViewModel = {
+  id: string;
+  inspectionPlanId: string;
+  inspectionPlan: InspectionPlanViewModel;
+  inspectionVersionedPlanId: string;
+  inspectionVersionedPlan: InspectionVersionedPlanViewModel;
+  context: string;
+  created: Date;
+  finished?: Date;
+  isOpen: boolean;
+  nextInspection?: Date;
+  checks: Array<InspectionPointResultViewModel>;
+  relatedId: string;
+} & InspectionRelated;
+
+export type MinifiedInspectionViewModel = {
+  id: string;
+  inspectionPlanId: string;
+  inspectionPlan: InspectionPlanViewModel;
+  context: string;
+  created: Date;
+  finished?: Date;
+  isOpen: boolean;
+  nextInspection?: Date;
+  relatedId: string;
+} & InspectionRelated;
+
+export type InspectionNextViewModel = {
+  id: string;
+  inspectionPlanId: string;
+  inspectionPlan: InspectionPlanViewModel;
+  dueDate: Date;
+  relatedId: string;
+} & InspectionRelated;
+
 export interface InspectionPointResultViewModel {
   inspectionId: string;
   inspectionPointId: string;
diff --git a/src/views/admin/unit/equipment/Inspection.vue b/src/views/admin/unit/equipment/Inspection.vue
index 16ca4e0..40ff9e9 100644
--- a/src/views/admin/unit/equipment/Inspection.vue
+++ b/src/views/admin/unit/equipment/Inspection.vue
@@ -14,9 +14,9 @@
         >
           <div class="bg-primary p-2 text-white flex flex-row gap-2 items-center">
             <PencilSquareIcon v-if="row.isOpen" class="w-5 h-5" />
-            <p>{{ row.inspectionPlan.title }} - {{ row.finished }}</p>
+            <p>{{ row.inspectionPlan.title }} - {{ row.finished ?? "in Arbeit" }}</p>
           </div>
-          <div class="p-2">
+          <div v-if="row.context || row.nextInspection" class="p-2">
             <p v-if="row.context">Kontext: {{ row.context }}</p>
             <p v-if="row.nextInspection">nächste Inspektion: {{ row.nextInspection }}</p>
           </div>
@@ -30,9 +30,9 @@
         button
         primary
         class="w-fit!"
-        @click=""
-        >Prüfung durchführen</RouterLink
       >
+        Prüfung durchführen
+      </RouterLink>
     </div>
   </div>
 </template>
diff --git a/src/views/admin/unit/inspection/InspectionExecute.vue b/src/views/admin/unit/inspection/InspectionExecute.vue
index c12dec8..35072c2 100644
--- a/src/views/admin/unit/inspection/InspectionExecute.vue
+++ b/src/views/admin/unit/inspection/InspectionExecute.vue
@@ -14,36 +14,45 @@
         v-else-if="activeInspectionObj != null"
         class="flex flex-col gap-4 py-2 grow w-full max-w-xl mx-auto overflow-hidden"
       >
+        <div>
+          <p>Kontext:</p>
+          <textarea readonly :value="activeInspectionObj.context || '---'" class="h-18"></textarea>
+        </div>
+
         <div class="flex flex-col gap-2 grow overflow-y-scroll">
           <div v-for="point in points" :key="point.title" class="contents">
             <OkNotOk
               v-if="point.type == InspectionPointEnum.oknok"
               :inspectionPoint="point"
+              :editable="activeInspectionObj.isOpen"
               :modelValue="boolPointResult(point.id)"
               @update:model-value="(val) => updateCheckResult(point.id, val)"
             />
             <NumberInput
               v-else-if="point.type == InspectionPointEnum.number"
               :inspectionPoint="point"
+              :editable="activeInspectionObj.isOpen"
               :modelValue="pointResult(point.id)"
               @update:model-value="(val) => updateCheckResult(point.id, val)"
             />
             <TextInput
               v-else-if="point.type == InspectionPointEnum.text"
               :inspectionPoint="point"
+              :editable="activeInspectionObj.isOpen"
               :modelValue="pointResult(point.id)"
               @update:model-value="(val) => updateCheckResult(point.id, val)"
             />
             <FileInput
               v-else-if="point.type == InspectionPointEnum.file"
               :inspectionPoint="point"
+              :editable="activeInspectionObj.isOpen"
               :modelValue="pointResult(point.id)"
               @update:model-value="(val) => updateCheckResult(point.id, val)"
               @update:upload="(val) => (fileStore[point.id] = val)"
             />
           </div>
         </div>
-        <div class="flex flex-row justify-end flex-wrap min-h-fit gap-2">
+        <div v-if="activeInspectionObj.isOpen" class="flex flex-row justify-end flex-wrap min-h-fit gap-2">
           <button primary-outline type="reset" class="w-fit!" :disabled="canSaveOrReset" @click="resetForm">
             verwerfen
           </button>
@@ -69,6 +78,9 @@
           <SuccessCheckmark v-else-if="status?.status == 'success'" />
           <FailureXMark v-else-if="status?.status == 'failed'" />
         </div>
+        <div v-else>
+          <button primary type="button" @click="">Bericht anzeigen</button>
+        </div>
       </div>
     </template>
   </MainTemplate>
diff --git a/src/views/admin/unit/inspection/NextInspection.vue b/src/views/admin/unit/inspection/NextInspection.vue
deleted file mode 100644
index e19eeb4..0000000
--- a/src/views/admin/unit/inspection/NextInspection.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<template>
-  <div class="flex flex-col w-full h-full gap-2 justify-center">
-    <Pagination
-      :items="[]"
-      :totalCount="0"
-      :indicateLoading="false"
-      @load-data="(offset, count, search) => {}"
-      @search="(search) => {}"
-    >
-      <template #pageRow="{ row }: { row: any }">
-        {{ row }}
-      </template>
-    </Pagination>
-
-    <div class="flex flex-row gap-4">
-      <RouterLink
-        v-if="can('create', 'unit', 'inspection')"
-        :to="{ name: 'admin-unit-inspection-start' }"
-        primary
-        button
-        class="w-fit!"
-      >
-        Prüfung starten
-      </RouterLink>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { defineComponent } from "vue";
-import { mapActions, mapState } from "pinia";
-import Pagination from "@/components/Pagination.vue";
-import { useAbilityStore } from "@/stores/ability";
-</script>
-
-<script lang="ts">
-export default defineComponent({
-  data() {
-    return {};
-  },
-  computed: {
-    ...mapState(useAbilityStore, ["can"]),
-  },
-});
-</script>
diff --git a/src/views/admin/unit/inspection/NextInspections.vue b/src/views/admin/unit/inspection/NextInspections.vue
new file mode 100644
index 0000000..20dabb7
--- /dev/null
+++ b/src/views/admin/unit/inspection/NextInspections.vue
@@ -0,0 +1,69 @@
+<template>
+  <div class="flex flex-col w-full h-full gap-2 justify-center">
+    <Pagination
+      :items="nextInspections"
+      :totalCount="nextTotalCount"
+      :indicateLoading="nextLoading == 'loading'"
+      @load-data="(offset, count, search) => fetchNextInspections(offset, count, search)"
+      @search="(search) => fetchNextInspections(0, maxEntriesPerPage, search, true)"
+    >
+      <template #pageRow="{ row }: { row: InspectionNextViewModel }">
+        <RouterLink
+          :to="{
+            name: 'admin-unit-inspection-start',
+            params: { type: row.assigned, relatedId: row.relatedId, inspectionPlanId: row.inspectionPlanId },
+          }"
+          class="flex flex-col h-fit w-full border border-primary rounded-md"
+        >
+          <div class="bg-primary p-2 text-white flex flex-row gap-2 items-center">
+            <p>
+              {{ row.related.name }} <small v-if="row.related.code">({{ row.related.code }})</small> -
+              {{ row.inspectionPlan.title }} - {{ row.dueDate ?? "ohne Fälligkeit" }}
+            </p>
+          </div>
+        </RouterLink>
+      </template>
+    </Pagination>
+
+    <div class="flex flex-row gap-4">
+      <RouterLink
+        v-if="can('create', 'unit', 'inspection')"
+        :to="{ name: 'admin-unit-inspection-start' }"
+        primary
+        button
+        class="w-fit!"
+      >
+        Prüfung starten
+      </RouterLink>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+import { mapActions, mapState } from "pinia";
+import Pagination from "@/components/Pagination.vue";
+import { useAbilityStore } from "@/stores/ability";
+import { useInspectionStore } from "@/stores/admin/unit/inspection/inspection";
+import type { InspectionNextViewModel } from "@/viewmodels/admin/unit/inspection/inspection.models";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  data() {
+    return {
+      maxEntriesPerPage: 25,
+    };
+  },
+  computed: {
+    ...mapState(useInspectionStore, ["nextInspections", "nextTotalCount", "nextLoading"]),
+    ...mapState(useAbilityStore, ["can"]),
+  },
+  mounted() {
+    this.fetchNextInspections(0, this.maxEntriesPerPage, "", true);
+  },
+  methods: {
+    ...mapActions(useInspectionStore, ["fetchNextInspections"]),
+  },
+});
+</script>
diff --git a/src/views/admin/unit/inspection/RunningInspections.vue b/src/views/admin/unit/inspection/RunningInspections.vue
new file mode 100644
index 0000000..2a1bb58
--- /dev/null
+++ b/src/views/admin/unit/inspection/RunningInspections.vue
@@ -0,0 +1,68 @@
+<template>
+  <div class="flex flex-col w-full h-full gap-2 justify-center">
+    <Pagination
+      :items="inspections"
+      :totalCount="totalCount"
+      :indicateLoading="loading == 'loading'"
+      @load-data="(offset, count, search) => fetchRunningInspections(offset, count, search)"
+      @search="(search) => fetchRunningInspections(0, maxEntriesPerPage, search, true)"
+    >
+      <template #pageRow="{ row }: { row: MinifiedInspectionViewModel }">
+        <RouterLink
+          :to="{ name: 'admin-unit-inspection-execute', params: { inspectionId: row.id } }"
+          class="flex flex-col h-fit w-full border border-primary rounded-md"
+        >
+          <div class="bg-primary p-2 text-white flex flex-row gap-2 items-center">
+            <PencilSquareIcon v-if="row.isOpen" class="w-5 h-5" />
+            <p>{{ row.inspectionPlan.title }} - in Arbeit seit {{ row.created }}</p>
+          </div>
+          <div v-if="row.context" class="p-2">
+            <p v-if="row.context">Kontext: {{ row.context }}</p>
+          </div>
+        </RouterLink>
+      </template>
+    </Pagination>
+
+    <div class="flex flex-row gap-4">
+      <RouterLink
+        v-if="can('create', 'unit', 'inspection')"
+        :to="{ name: 'admin-unit-inspection-start' }"
+        primary
+        button
+        class="w-fit!"
+      >
+        Prüfung starten
+      </RouterLink>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+import { mapActions, mapState } from "pinia";
+import Pagination from "@/components/Pagination.vue";
+import { useAbilityStore } from "@/stores/ability";
+import type { MinifiedInspectionViewModel } from "@/viewmodels/admin/unit/inspection/inspection.models";
+import { useInspectionStore } from "@/stores/admin/unit/inspection/inspection";
+import { PencilSquareIcon } from "@heroicons/vue/24/outline";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  data() {
+    return {
+      maxEntriesPerPage: 25,
+    };
+  },
+  computed: {
+    ...mapState(useInspectionStore, ["inspections", "totalCount", "loading"]),
+    ...mapState(useAbilityStore, ["can"]),
+  },
+  mounted() {
+    this.fetchRunningInspections(0, this.maxEntriesPerPage, "", true);
+  },
+  methods: {
+    ...mapActions(useInspectionStore, ["fetchRunningInspections"]),
+  },
+});
+</script>
diff --git a/src/views/admin/unit/vehicle/Inspection.vue b/src/views/admin/unit/vehicle/Inspection.vue
index c50789a..193c62e 100644
--- a/src/views/admin/unit/vehicle/Inspection.vue
+++ b/src/views/admin/unit/vehicle/Inspection.vue
@@ -14,9 +14,9 @@
         >
           <div class="bg-primary p-2 text-white flex flex-row gap-2 items-center">
             <PencilSquareIcon v-if="row.isOpen" class="w-5 h-5" />
-            <p>{{ row.inspectionPlan.title }} - {{ row.finished }}</p>
+            <p>{{ row.inspectionPlan.title }} - {{ row.finished ?? "in Arbeit" }}</p>
           </div>
-          <div class="p-2">
+          <div v-if="row.context || row.nextInspection" class="p-2">
             <p v-if="row.context">Kontext: {{ row.context }}</p>
             <p v-if="row.nextInspection">nächste Inspektion: {{ row.nextInspection }}</p>
           </div>
@@ -30,9 +30,9 @@
         button
         primary
         class="w-fit!"
-        @click=""
-        >Prüfung durchführen</RouterLink
       >
+        Prüfung durchführen
+      </RouterLink>
     </div>
   </div>
 </template>
diff --git a/src/views/admin/unit/wearable/Inspection.vue b/src/views/admin/unit/wearable/Inspection.vue
index a5045c0..d5e54be 100644
--- a/src/views/admin/unit/wearable/Inspection.vue
+++ b/src/views/admin/unit/wearable/Inspection.vue
@@ -14,9 +14,9 @@
         >
           <div class="bg-primary p-2 text-white flex flex-row gap-2 items-center">
             <PencilSquareIcon v-if="row.isOpen" class="w-5 h-5" />
-            <p>{{ row.inspectionPlan.title }} - {{ row.finished }}</p>
+            <p>{{ row.inspectionPlan.title }} - {{ row.finished ?? "in Arbeit" }}</p>
           </div>
-          <div class="p-2">
+          <div v-if="row.context || row.nextInspection" class="p-2">
             <p v-if="row.context">Kontext: {{ row.context }}</p>
             <p v-if="row.nextInspection">nächste Inspektion: {{ row.nextInspection }}</p>
           </div>
@@ -30,9 +30,9 @@
         button
         primary
         class="w-fit!"
-        @click=""
-        >Prüfung durchführen</RouterLink
       >
+        Prüfung durchführen
+      </RouterLink>
     </div>
   </div>
 </template>
-- 
2.47.3


From adfe64d1f2e82fc6ebd1c8389ed1fc27c831cebe Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Fri, 11 Jul 2025 09:33:34 +0200
Subject: [PATCH 12/16] show instances to type

---
 .../admin/unit/equipmentType/EquipmentTypeListItem.vue        | 4 ++++
 src/components/admin/unit/vehicleType/VehicleTypeListItem.vue | 4 ++++
 .../admin/unit/wearableType/WearableTypeListItem.vue          | 4 ++++
 src/viewmodels/admin/unit/equipment/equipmentType.models.ts   | 1 +
 src/viewmodels/admin/unit/vehicle/vehicleType.models.ts       | 1 +
 src/viewmodels/admin/unit/wearable/wearableType.models.ts     | 1 +
 6 files changed, 15 insertions(+)

diff --git a/src/components/admin/unit/equipmentType/EquipmentTypeListItem.vue b/src/components/admin/unit/equipmentType/EquipmentTypeListItem.vue
index 7859fe1..91e8e9b 100644
--- a/src/components/admin/unit/equipmentType/EquipmentTypeListItem.vue
+++ b/src/components/admin/unit/equipmentType/EquipmentTypeListItem.vue
@@ -10,6 +10,10 @@
     </div>
     <div class="flex flex-col p-2">
       <div class="flex flex-row gap-2">
+        <p class="min-w-16">Anzahl angelegter Geräte:</p>
+        <p class="grow overflow-hidden">{{ equipmentType.equipmentCount }}</p>
+      </div>
+      <div v-if="equipmentType.description" class="flex flex-row gap-2">
         <p class="min-w-16">Beschreibung:</p>
         <p class="grow overflow-hidden">{{ equipmentType.description }}</p>
       </div>
diff --git a/src/components/admin/unit/vehicleType/VehicleTypeListItem.vue b/src/components/admin/unit/vehicleType/VehicleTypeListItem.vue
index 6b621ef..c3658b8 100644
--- a/src/components/admin/unit/vehicleType/VehicleTypeListItem.vue
+++ b/src/components/admin/unit/vehicleType/VehicleTypeListItem.vue
@@ -10,6 +10,10 @@
     </div>
     <div class="flex flex-col p-2">
       <div class="flex flex-row gap-2">
+        <p class="min-w-16">Anzahl angelegter Fahrzeuge:</p>
+        <p class="grow overflow-hidden">{{ vehicleType.vehicleCount }}</p>
+      </div>
+      <div v-if="vehicleType.description" class="flex flex-row gap-2">
         <p class="min-w-16">Beschreibung:</p>
         <p class="grow overflow-hidden">{{ vehicleType.description }}</p>
       </div>
diff --git a/src/components/admin/unit/wearableType/WearableTypeListItem.vue b/src/components/admin/unit/wearableType/WearableTypeListItem.vue
index 09bdf96..3b9d0ed 100644
--- a/src/components/admin/unit/wearableType/WearableTypeListItem.vue
+++ b/src/components/admin/unit/wearableType/WearableTypeListItem.vue
@@ -10,6 +10,10 @@
     </div>
     <div class="flex flex-col p-2">
       <div class="flex flex-row gap-2">
+        <p class="min-w-16">Anzahl angelegter Kleidung:</p>
+        <p class="grow overflow-hidden">{{ wearableType.wearableCount }}</p>
+      </div>
+      <div v-if="wearableType.description" class="flex flex-row gap-2">
         <p class="min-w-16">Beschreibung:</p>
         <p class="grow overflow-hidden">{{ wearableType.description }}</p>
       </div>
diff --git a/src/viewmodels/admin/unit/equipment/equipmentType.models.ts b/src/viewmodels/admin/unit/equipment/equipmentType.models.ts
index fcf47ee..d7dfad9 100644
--- a/src/viewmodels/admin/unit/equipment/equipmentType.models.ts
+++ b/src/viewmodels/admin/unit/equipment/equipmentType.models.ts
@@ -2,6 +2,7 @@ export interface EquipmentTypeViewModel {
   id: string;
   type: string;
   description: string;
+  equipmentCount: number;
 }
 
 export interface CreateEquipmentTypeViewModel {
diff --git a/src/viewmodels/admin/unit/vehicle/vehicleType.models.ts b/src/viewmodels/admin/unit/vehicle/vehicleType.models.ts
index ea6c7cf..72e1203 100644
--- a/src/viewmodels/admin/unit/vehicle/vehicleType.models.ts
+++ b/src/viewmodels/admin/unit/vehicle/vehicleType.models.ts
@@ -2,6 +2,7 @@ export interface VehicleTypeViewModel {
   id: string;
   type: string;
   description: string;
+  vehicleCount: number;
 }
 
 export interface CreateVehicleTypeViewModel {
diff --git a/src/viewmodels/admin/unit/wearable/wearableType.models.ts b/src/viewmodels/admin/unit/wearable/wearableType.models.ts
index b3f49fc..d3c9c0e 100644
--- a/src/viewmodels/admin/unit/wearable/wearableType.models.ts
+++ b/src/viewmodels/admin/unit/wearable/wearableType.models.ts
@@ -2,6 +2,7 @@ export interface WearableTypeViewModel {
   id: string;
   type: string;
   description: string;
+  wearableCount: number;
 }
 
 export interface CreateWearableTypeViewModel {
-- 
2.47.3


From d96c73d5b109ba49bfcbac502f49f285f3d2de2e Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Fri, 11 Jul 2025 09:42:07 +0200
Subject: [PATCH 13/16] correct type inspectionPlans request

---
 src/router/unit/equipment.ts                   | 18 +++++++++++-------
 src/router/unit/inspection.ts                  | 10 +++++-----
 src/router/unit/inspectionPlan.ts              | 10 +++++-----
 src/router/unit/respiratoryGear.ts             | 10 +++++-----
 src/router/unit/respiratoryMission.ts          | 10 +++++-----
 src/router/unit/respiratoryWearer.ts           | 10 +++++-----
 src/router/unit/vehicle.ts                     | 18 +++++++++++-------
 src/router/unit/wearable.ts                    | 18 +++++++++++-------
 .../admin/unit/equipmentType/inspectionPlan.ts |  4 ++--
 .../admin/unit/vehicleType/inspectionPlan.ts   |  4 ++--
 .../admin/unit/wearableType/inspectionPlan.ts  |  4 ++--
 11 files changed, 64 insertions(+), 52 deletions(-)

diff --git a/src/router/unit/equipment.ts b/src/router/unit/equipment.ts
index cdb2efa..b8a3d7d 100644
--- a/src/router/unit/equipment.ts
+++ b/src/router/unit/equipment.ts
@@ -1,20 +1,24 @@
 import { useEquipmentStore } from "@/stores/admin/unit/equipment/equipment";
+import { useEquipmentDamageReportStore } from "../../stores/admin/unit/equipment/damageReport";
+import { useEquipmentInspectionStore } from "../../stores/admin/unit/equipment/inspection";
 
 export async function setEquipmentId(to: any, from: any, next: any) {
-  const EquipmentStore = useEquipmentStore();
-  EquipmentStore.activeEquipment = to.params?.equipmentId ?? null;
+  const equipmentStore = useEquipmentStore();
+  equipmentStore.activeEquipment = to.params?.equipmentId ?? null;
 
-  //useXYStore().$reset();
+  useEquipmentDamageReportStore().$reset();
+  useEquipmentInspectionStore().$reset();
 
   next();
 }
 
 export async function resetEquipmentStores(to: any, from: any, next: any) {
-  const EquipmentStore = useEquipmentStore();
-  EquipmentStore.activeEquipment = null;
-  EquipmentStore.activeEquipmentObj = null;
+  const equipmentStore = useEquipmentStore();
+  equipmentStore.activeEquipment = null;
+  equipmentStore.activeEquipmentObj = null;
 
-  //useXYStore().$reset();
+  useEquipmentDamageReportStore().$reset();
+  useEquipmentInspectionStore().$reset();
 
   next();
 }
diff --git a/src/router/unit/inspection.ts b/src/router/unit/inspection.ts
index 1232a42..3c1a30f 100644
--- a/src/router/unit/inspection.ts
+++ b/src/router/unit/inspection.ts
@@ -1,8 +1,8 @@
 import { useInspectionStore } from "@/stores/admin/unit/inspection/inspection";
 
 export async function setInspectionId(to: any, from: any, next: any) {
-  const InspectionStore = useInspectionStore();
-  InspectionStore.activeInspection = to.params?.inspectionId ?? null;
+  const inspectionStore = useInspectionStore();
+  inspectionStore.activeInspection = to.params?.inspectionId ?? null;
 
   //useXYStore().$reset();
 
@@ -10,9 +10,9 @@ export async function setInspectionId(to: any, from: any, next: any) {
 }
 
 export async function resetInspectionStores(to: any, from: any, next: any) {
-  const InspectionStore = useInspectionStore();
-  InspectionStore.activeInspection = null;
-  InspectionStore.activeInspectionObj = null;
+  const inspectionStore = useInspectionStore();
+  inspectionStore.activeInspection = null;
+  inspectionStore.activeInspectionObj = null;
 
   //useXYStore().$reset();
 
diff --git a/src/router/unit/inspectionPlan.ts b/src/router/unit/inspectionPlan.ts
index 91b8c8e..95b9e7c 100644
--- a/src/router/unit/inspectionPlan.ts
+++ b/src/router/unit/inspectionPlan.ts
@@ -2,8 +2,8 @@ import { useInspectionPlanStore } from "@/stores/admin/unit/inspectionPlan/inspe
 import { useInspectionPointStore } from "../../stores/admin/unit/inspectionPlan/inspectionPoint";
 
 export async function setInspectionPlanId(to: any, from: any, next: any) {
-  const InspectionPlanStore = useInspectionPlanStore();
-  InspectionPlanStore.activeInspectionPlan = to.params?.inspectionPlanId ?? null;
+  const inspectionPlanStore = useInspectionPlanStore();
+  inspectionPlanStore.activeInspectionPlan = to.params?.inspectionPlanId ?? null;
 
   useInspectionPointStore().$reset();
 
@@ -11,9 +11,9 @@ export async function setInspectionPlanId(to: any, from: any, next: any) {
 }
 
 export async function resetInspectionPlanStores(to: any, from: any, next: any) {
-  const InspectionPlanStore = useInspectionPlanStore();
-  InspectionPlanStore.activeInspectionPlan = null;
-  InspectionPlanStore.activeInspectionPlanObj = null;
+  const inspectionPlanStore = useInspectionPlanStore();
+  inspectionPlanStore.activeInspectionPlan = null;
+  inspectionPlanStore.activeInspectionPlanObj = null;
 
   useInspectionPointStore().$reset();
 
diff --git a/src/router/unit/respiratoryGear.ts b/src/router/unit/respiratoryGear.ts
index 8059d2a..e681332 100644
--- a/src/router/unit/respiratoryGear.ts
+++ b/src/router/unit/respiratoryGear.ts
@@ -1,8 +1,8 @@
 import { useRespiratoryGearStore } from "@/stores/admin/unit/respiratoryGear/respiratoryGear";
 
 export async function setRespiratoryGearId(to: any, from: any, next: any) {
-  const RespiratoryGearStore = useRespiratoryGearStore();
-  RespiratoryGearStore.activeRespiratoryGear = to.params?.respiratoryGearId ?? null;
+  const respiratoryGearStore = useRespiratoryGearStore();
+  respiratoryGearStore.activeRespiratoryGear = to.params?.respiratoryGearId ?? null;
 
   //useXYStore().$reset();
 
@@ -10,9 +10,9 @@ export async function setRespiratoryGearId(to: any, from: any, next: any) {
 }
 
 export async function resetRespiratoryGearStores(to: any, from: any, next: any) {
-  const RespiratoryGearStore = useRespiratoryGearStore();
-  RespiratoryGearStore.activeRespiratoryGear = null;
-  RespiratoryGearStore.activeRespiratoryGearObj = null;
+  const respiratoryGearStore = useRespiratoryGearStore();
+  respiratoryGearStore.activeRespiratoryGear = null;
+  respiratoryGearStore.activeRespiratoryGearObj = null;
 
   //useXYStore().$reset();
 
diff --git a/src/router/unit/respiratoryMission.ts b/src/router/unit/respiratoryMission.ts
index db85a2f..25272f5 100644
--- a/src/router/unit/respiratoryMission.ts
+++ b/src/router/unit/respiratoryMission.ts
@@ -1,8 +1,8 @@
 import { useRespiratoryMissionStore } from "@/stores/admin/unit/respiratoryMission/respiratoryMission";
 
 export async function setRespiratoryMissionId(to: any, from: any, next: any) {
-  const RespiratoryMissionStore = useRespiratoryMissionStore();
-  RespiratoryMissionStore.activeRespiratoryMission = to.params?.respiratoryMissionId ?? null;
+  const respiratoryMissionStore = useRespiratoryMissionStore();
+  respiratoryMissionStore.activeRespiratoryMission = to.params?.respiratoryMissionId ?? null;
 
   //useXYStore().$reset();
 
@@ -10,9 +10,9 @@ export async function setRespiratoryMissionId(to: any, from: any, next: any) {
 }
 
 export async function resetRespiratoryMissionStores(to: any, from: any, next: any) {
-  const RespiratoryMissionStore = useRespiratoryMissionStore();
-  RespiratoryMissionStore.activeRespiratoryMission = null;
-  RespiratoryMissionStore.activeRespiratoryMissionObj = null;
+  const respiratoryMissionStore = useRespiratoryMissionStore();
+  respiratoryMissionStore.activeRespiratoryMission = null;
+  respiratoryMissionStore.activeRespiratoryMissionObj = null;
 
   //useXYStore().$reset();
 
diff --git a/src/router/unit/respiratoryWearer.ts b/src/router/unit/respiratoryWearer.ts
index 37a4499..6057ee5 100644
--- a/src/router/unit/respiratoryWearer.ts
+++ b/src/router/unit/respiratoryWearer.ts
@@ -1,8 +1,8 @@
 import { useRespiratoryWearerStore } from "@/stores/admin/unit/respiratoryWearer/respiratoryWearer";
 
 export async function setRespiratoryWearerId(to: any, from: any, next: any) {
-  const RespiratoryWearerStore = useRespiratoryWearerStore();
-  RespiratoryWearerStore.activeRespiratoryWearer = to.params?.respiratoryWearerId ?? null;
+  const respiratoryWearerStore = useRespiratoryWearerStore();
+  respiratoryWearerStore.activeRespiratoryWearer = to.params?.respiratoryWearerId ?? null;
 
   //useXYStore().$reset();
 
@@ -10,9 +10,9 @@ export async function setRespiratoryWearerId(to: any, from: any, next: any) {
 }
 
 export async function resetRespiratoryWearerStores(to: any, from: any, next: any) {
-  const RespiratoryWearerStore = useRespiratoryWearerStore();
-  RespiratoryWearerStore.activeRespiratoryWearer = null;
-  RespiratoryWearerStore.activeRespiratoryWearerObj = null;
+  const respiratoryWearerStore = useRespiratoryWearerStore();
+  respiratoryWearerStore.activeRespiratoryWearer = null;
+  respiratoryWearerStore.activeRespiratoryWearerObj = null;
 
   //useXYStore().$reset();
 
diff --git a/src/router/unit/vehicle.ts b/src/router/unit/vehicle.ts
index c27c47c..210f5c4 100644
--- a/src/router/unit/vehicle.ts
+++ b/src/router/unit/vehicle.ts
@@ -1,20 +1,24 @@
 import { useVehicleStore } from "@/stores/admin/unit/vehicle/vehicle";
+import { useVehicleDamageReportStore } from "../../stores/admin/unit/vehicle/damageReport";
+import { useVehicleInspectionStore } from "../../stores/admin/unit/vehicle/inspection";
 
 export async function setVehicleId(to: any, from: any, next: any) {
-  const VehicleStore = useVehicleStore();
-  VehicleStore.activeVehicle = to.params?.vehicleId ?? null;
+  const vehicleStore = useVehicleStore();
+  vehicleStore.activeVehicle = to.params?.vehicleId ?? null;
 
-  //useXYStore().$reset();
+  useVehicleDamageReportStore().$reset();
+  useVehicleInspectionStore().$reset();
 
   next();
 }
 
 export async function resetVehicleStores(to: any, from: any, next: any) {
-  const VehicleStore = useVehicleStore();
-  VehicleStore.activeVehicle = null;
-  VehicleStore.activeVehicleObj = null;
+  const vehicleStore = useVehicleStore();
+  vehicleStore.activeVehicle = null;
+  vehicleStore.activeVehicleObj = null;
 
-  //useXYStore().$reset();
+  useVehicleDamageReportStore().$reset();
+  useVehicleInspectionStore().$reset();
 
   next();
 }
diff --git a/src/router/unit/wearable.ts b/src/router/unit/wearable.ts
index 1a0fb91..f294bbd 100644
--- a/src/router/unit/wearable.ts
+++ b/src/router/unit/wearable.ts
@@ -1,20 +1,24 @@
 import { useWearableStore } from "@/stores/admin/unit/wearable/wearable";
+import { useWearableDamageReportStore } from "../../stores/admin/unit/wearable/damageReport";
+import { useWearableTypeInspectionPlanStore } from "../../stores/admin/unit/wearableType/inspectionPlan";
 
 export async function setWearableId(to: any, from: any, next: any) {
-  const WearableStore = useWearableStore();
-  WearableStore.activeWearable = to.params?.wearableId ?? null;
+  const wearableStore = useWearableStore();
+  wearableStore.activeWearable = to.params?.wearableId ?? null;
 
-  //useXYStore().$reset();
+  useWearableDamageReportStore().$reset();
+  useWearableTypeInspectionPlanStore().$reset();
 
   next();
 }
 
 export async function resetWearableStores(to: any, from: any, next: any) {
-  const WearableStore = useWearableStore();
-  WearableStore.activeWearable = null;
-  WearableStore.activeWearableObj = null;
+  const wearableStore = useWearableStore();
+  wearableStore.activeWearable = null;
+  wearableStore.activeWearableObj = null;
 
-  //useXYStore().$reset();
+  useWearableDamageReportStore().$reset();
+  useWearableTypeInspectionPlanStore().$reset();
 
   next();
 }
diff --git a/src/stores/admin/unit/equipmentType/inspectionPlan.ts b/src/stores/admin/unit/equipmentType/inspectionPlan.ts
index dc3b31f..0496cd3 100644
--- a/src/stores/admin/unit/equipmentType/inspectionPlan.ts
+++ b/src/stores/admin/unit/equipmentType/inspectionPlan.ts
@@ -15,9 +15,9 @@ export const useEquipmentTypeInspectionPlanStore = defineStore("equipmentTypeIns
       const equipmentTypeId = useEquipmentTypeStore().activeEquipmentType;
       this.loading = "loading";
       http
-        .get(`/admin/inspectionPlan/equipmentType/${equipmentTypeId}`)
+        .get(`/admin/inspectionPlan/equipmentType/${equipmentTypeId}?noLimit=true`)
         .then((result) => {
-          this.inspectionPlans = result.data;
+          this.inspectionPlans = result.data.inspectionPlans;
           this.loading = "fetched";
         })
         .catch((err) => {
diff --git a/src/stores/admin/unit/vehicleType/inspectionPlan.ts b/src/stores/admin/unit/vehicleType/inspectionPlan.ts
index 6f1c1c6..e7184ab 100644
--- a/src/stores/admin/unit/vehicleType/inspectionPlan.ts
+++ b/src/stores/admin/unit/vehicleType/inspectionPlan.ts
@@ -16,9 +16,9 @@ export const useVehicleTypeInspectionPlanStore = defineStore("vehicleTypeInspect
       const vehicleTypeId = useVehicleTypeStore().activeVehicleType;
       this.loading = "loading";
       http
-        .get(`/admin/inspectionPlan/vehicleType/${vehicleTypeId}`)
+        .get(`/admin/inspectionPlan/vehicleType/${vehicleTypeId}?noLimit=true`)
         .then((result) => {
-          this.inspectionPlans = result.data;
+          this.inspectionPlans = result.data.inspectionPlans;
           this.loading = "fetched";
         })
         .catch((err) => {
diff --git a/src/stores/admin/unit/wearableType/inspectionPlan.ts b/src/stores/admin/unit/wearableType/inspectionPlan.ts
index dbe2254..3622c37 100644
--- a/src/stores/admin/unit/wearableType/inspectionPlan.ts
+++ b/src/stores/admin/unit/wearableType/inspectionPlan.ts
@@ -16,9 +16,9 @@ export const useWearableTypeInspectionPlanStore = defineStore("wearableTypeInspe
       const wearableTypeId = useWearableTypeStore().activeWearableType;
       this.loading = "loading";
       http
-        .get(`/admin/inspectionPlan/wearableType/${wearableTypeId}`)
+        .get(`/admin/inspectionPlan/wearableType/${wearableTypeId}?noLimit=true`)
         .then((result) => {
-          this.inspectionPlans = result.data;
+          this.inspectionPlans = result.data.inspectionPlans;
           this.loading = "fetched";
         })
         .catch((err) => {
-- 
2.47.3


From 5d26885da3b117584b5c38efbf2dbb01f07d0bf7 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Fri, 11 Jul 2025 14:02:39 +0200
Subject: [PATCH 14/16] inspection finish and print

---
 .../unit/InspectionTimeFormatExplainIcon.vue  | 25 ++++++
 .../unit/InspectionTimeFormatExplainModal.vue | 55 ++++++++++++
 .../unit/inspection/DeleteInspectionModal.vue | 85 +++++++++++++++++++
 .../unit/inspection/InspectionFinishModal.vue | 48 ++++++++++-
 .../unit/inspection/InspectionPrintModal.vue  | 62 ++++++++++++++
 .../TypeInspectionPlanListItem.vue            |  7 +-
 .../InspectionPlanSearchSelectWithRelated.vue |  4 +-
 .../admin/unit/inspection/inspection.ts       | 36 +++++++-
 .../unit/inspectionPlan/inspectionPlan.ts     |  4 +-
 .../unit/inspection/inspection.models.ts      |  5 ++
 src/views/admin/unit/equipment/Inspection.vue |  3 +-
 .../unit/inspection/InspectionExecute.vue     | 43 +++++++---
 .../admin/unit/inspection/InspectionStart.vue |  8 +-
 .../inspectionPlan/CreateInspectionPlan.vue   | 11 ++-
 14 files changed, 367 insertions(+), 29 deletions(-)
 create mode 100644 src/components/admin/unit/InspectionTimeFormatExplainIcon.vue
 create mode 100644 src/components/admin/unit/InspectionTimeFormatExplainModal.vue
 create mode 100644 src/components/admin/unit/inspection/DeleteInspectionModal.vue
 create mode 100644 src/components/admin/unit/inspection/InspectionPrintModal.vue

diff --git a/src/components/admin/unit/InspectionTimeFormatExplainIcon.vue b/src/components/admin/unit/InspectionTimeFormatExplainIcon.vue
new file mode 100644
index 0000000..9f27541
--- /dev/null
+++ b/src/components/admin/unit/InspectionTimeFormatExplainIcon.vue
@@ -0,0 +1,25 @@
+<template>
+  <div @click="showInfo" class="cursor-pointer">
+    <InformationCircleIcon class="w-5 h-5" />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineAsyncComponent, defineComponent, markRaw } from "vue";
+import { mapState, mapActions } from "pinia";
+import { useModalStore } from "@/stores/modal";
+import { InformationCircleIcon } from "@heroicons/vue/24/outline";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  methods: {
+    ...mapActions(useModalStore, ["openModal"]),
+    showInfo() {
+      this.openModal(
+        markRaw(defineAsyncComponent(() => import("@/components/admin/unit/InspectionTimeFormatExplainModal.vue")))
+      );
+    },
+  },
+});
+</script>
diff --git a/src/components/admin/unit/InspectionTimeFormatExplainModal.vue b/src/components/admin/unit/InspectionTimeFormatExplainModal.vue
new file mode 100644
index 0000000..d0719c2
--- /dev/null
+++ b/src/components/admin/unit/InspectionTimeFormatExplainModal.vue
@@ -0,0 +1,55 @@
+<template>
+  <div class="relative w-full md:max-w-md">
+    <div class="flex flex-row gap-2 items-center justify-center">
+      <InformationCircleIcon class="text-gray-500 h-5 w-5" />
+      <p class="text-xl font-medium">Zeit Format für Erinnerung und Intervall</p>
+    </div>
+    <br />
+    <table class="min-w-full text-sm border border-gray-200 rounded">
+      <tbody>
+        <tr>
+          <td class="px-3 py-2 font-mono text-gray-700 border-b border-gray-100">&lt;zahl&gt;-(d|m|y)</td>
+          <td class="px-3 py-2 text-gray-600 border-b border-gray-100">
+            Ein Intervall, z.B. <span class="font-mono">7-d</span> für alle 7 Tage,
+            <span class="font-mono">1-m</span> für jeden Monat.
+          </td>
+        </tr>
+        <tr>
+          <td class="px-3 py-2 font-mono text-gray-700 border-b border-gray-100">DD/MM</td>
+          <td class="px-3 py-2 text-gray-600 border-b border-gray-100">
+            Ein bestimmtes Datum, z.B. <span class="font-mono">15/06</span> für den 15. Juni.
+          </td>
+        </tr>
+        <tr>
+          <td class="px-3 py-2 font-mono text-gray-700">DD/*</td>
+          <td class="px-3 py-2 text-gray-600">
+            Ein Tag jeden Monats, z.B. <span class="font-mono">01/*</span> für den ersten Tag jedes Monats.
+          </td>
+        </tr>
+      </tbody>
+    </table>
+    <p>Im Fall von Erinnerungen wird das Format als zeitliche Angabe vor einem Datum verwendet.</p>
+    <br />
+
+    <div class="flex flex-row justify-end">
+      <div class="flex flex-row gap-4 py-2">
+        <button primary-outline @click="closeModal">schließen</button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+import { mapState, mapActions } from "pinia";
+import { useModalStore } from "@/stores/modal";
+import { InformationCircleIcon } from "@heroicons/vue/24/outline";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  methods: {
+    ...mapActions(useModalStore, ["closeModal"]),
+  },
+});
+</script>
diff --git a/src/components/admin/unit/inspection/DeleteInspectionModal.vue b/src/components/admin/unit/inspection/DeleteInspectionModal.vue
new file mode 100644
index 0000000..334080c
--- /dev/null
+++ b/src/components/admin/unit/inspection/DeleteInspectionModal.vue
@@ -0,0 +1,85 @@
+<template>
+  <div class="w-full md:max-w-md">
+    <div class="flex flex-col items-center">
+      <p class="text-xl font-medium">angefangene Prüfung löschen</p>
+    </div>
+    <br />
+    <p class="text-center">
+      {{ activeInspectionObj?.inspectionPlan.title }} zu {{ activeInspectionObj?.related.name }}
+      <small v-if="activeInspectionObj?.related.code">({{ activeInspectionObj?.related.code }})</small> begonnen am
+      {{ new Date(activeInspectionObj?.created ?? "").toLocaleDateString("de-de") }} löschen?
+    </p>
+    <br />
+
+    <div class="flex flex-row gap-2">
+      <button
+        primary
+        type="submit"
+        :disabled="status == 'loading' || status?.status == 'success'"
+        @click="triggerDelete"
+      >
+        löschen
+      </button>
+      <Spinner v-if="status == 'loading'" class="my-auto" />
+      <SuccessCheckmark v-else-if="status?.status == 'success'" />
+      <FailureXMark v-else-if="status?.status == 'failed'" />
+    </div>
+
+    <div class="flex flex-row justify-end">
+      <div class="flex flex-row gap-4 py-2">
+        <button primary-outline @click="closeModal" :disabled="status == 'loading' || status?.status == 'success'">
+          abbrechen
+        </button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+import { mapState, mapActions } from "pinia";
+import { useModalStore } from "@/stores/modal";
+import Spinner from "@/components/Spinner.vue";
+import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
+import FailureXMark from "@/components/FailureXMark.vue";
+import { useInspectionStore } from "@/stores/admin/unit/inspection/inspection";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  data() {
+    return {
+      status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
+      timeout: undefined as any,
+    };
+  },
+  computed: {
+    ...mapState(useInspectionStore, ["activeInspectionObj"]),
+  },
+  beforeUnmount() {
+    try {
+      clearTimeout(this.timeout);
+    } catch (error) {}
+  },
+  methods: {
+    ...mapActions(useModalStore, ["closeModal"]),
+    ...mapActions(useInspectionStore, ["deleteInspection"]),
+    triggerDelete() {
+      if (!this.activeInspectionObj) return;
+
+      this.status = "loading";
+      this.deleteInspection(this.activeInspectionObj.id)
+        .then(() => {
+          this.status = { status: "success" };
+          this.timeout = setTimeout(() => {
+            this.$router.push({ name: "admin-unit-inspection" });
+            this.closeModal();
+          }, 1500);
+        })
+        .catch(() => {
+          this.status = { status: "failed" };
+        });
+    },
+  },
+});
+</script>
diff --git a/src/components/admin/unit/inspection/InspectionFinishModal.vue b/src/components/admin/unit/inspection/InspectionFinishModal.vue
index 33c9cd0..b2628e1 100644
--- a/src/components/admin/unit/inspection/InspectionFinishModal.vue
+++ b/src/components/admin/unit/inspection/InspectionFinishModal.vue
@@ -11,13 +11,22 @@
         Es wird ein PDF ausgedruckt und ist dann zu dieser Prüfung verfügbar.
       </p>
       <br />
-      <button primary>Prüfung abschließen</button>
+      <div class="flex flex-row gap-2">
+        <button :disabled="status == 'loading' || status?.status == 'success'" primary @click="finishInspection">
+          Prüfung abschließen
+        </button>
+        <Spinner v-if="status == 'loading'" class="my-auto" />
+        <SuccessCheckmark v-else-if="status?.status == 'success'" />
+        <FailureXMark v-else-if="status?.status == 'failed'" />
+      </div>
     </div>
     <br />
 
     <div class="flex flex-row justify-end">
       <div class="flex flex-row gap-4 py-2">
-        <button primary-outline @click="closeModal">abbrechen</button>
+        <button primary-outline @click="closeModal" :disabled="status == 'loading' || status?.status == 'success'">
+          abbrechen
+        </button>
       </div>
     </div>
   </div>
@@ -28,12 +37,47 @@ import { defineComponent } from "vue";
 import { mapState, mapActions } from "pinia";
 import { useModalStore } from "@/stores/modal";
 import { InformationCircleIcon } from "@heroicons/vue/24/outline";
+import { useInspectionStore } from "@/stores/admin/unit/inspection/inspection";
+import Spinner from "@/components/Spinner.vue";
+import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
+import FailureXMark from "@/components/FailureXMark.vue";
 </script>
 
 <script lang="ts">
 export default defineComponent({
+  data() {
+    return {
+      status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
+      timeout: null as any,
+    };
+  },
+  beforeUnmount() {
+    try {
+      clearTimeout(this.timeout);
+    } catch (error) {}
+  },
   methods: {
     ...mapActions(useModalStore, ["closeModal"]),
+    ...mapActions(useInspectionStore, ["finishActiveInspection"]),
+
+    finishInspection(e: any) {
+      this.status = "loading";
+      this.finishActiveInspection()
+        .then(() => {
+          this.status = { status: "success" };
+          this.timeout = setTimeout(() => {
+            this.closeModal();
+          }, 2100);
+        })
+        .catch((err) => {
+          this.status = { status: "failed" };
+        })
+        .finally(() => {
+          this.timeout = setTimeout(() => {
+            this.status = null;
+          }, 2000);
+        });
+    },
   },
 });
 </script>
diff --git a/src/components/admin/unit/inspection/InspectionPrintModal.vue b/src/components/admin/unit/inspection/InspectionPrintModal.vue
new file mode 100644
index 0000000..734ed64
--- /dev/null
+++ b/src/components/admin/unit/inspection/InspectionPrintModal.vue
@@ -0,0 +1,62 @@
+<template>
+  <div class="w-full h-full flex flex-col gap-2">
+    <Spinner v-if="status == 'loading'" />
+    <div class="grow">
+      <iframe ref="viewer" class="w-full h-full" />
+    </div>
+
+    <div class="flex flex-row gap-2 justify-end">
+      <a ref="download" button primary class="w-fit!">download</a>
+      <button primary-outline class="w-fit!" @click="closeModal">schließen</button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+import { mapState, mapActions } from "pinia";
+import { useModalStore } from "@/stores/modal";
+import Spinner from "@/components/Spinner.vue";
+import { useInspectionStore } from "@/stores/admin/unit/inspection/inspection";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  data() {
+    return {
+      status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
+    };
+  },
+  computed: {
+    ...mapState(useModalStore, ["data"]),
+    ...mapState(useInspectionStore, ["activeInspectionObj"]),
+  },
+  mounted() {
+    this.fetchItem();
+  },
+  methods: {
+    ...mapActions(useModalStore, ["closeModal"]),
+    ...mapActions(useInspectionStore, ["fetchInspectionPrintoutById"]),
+    fetchItem() {
+      this.status = "loading";
+      this.fetchInspectionPrintoutById()
+        .then((response) => {
+          this.status = { status: "success" };
+          const blob = new Blob([response.data], { type: "application/pdf" });
+          (this.$refs.viewer as HTMLIFrameElement).src = window.URL.createObjectURL(blob);
+
+          const fileURL = window.URL.createObjectURL(new Blob([response.data]));
+          const fileLink = this.$refs.download as HTMLAnchorElement;
+          fileLink.href = fileURL;
+          fileLink.setAttribute(
+            "download",
+            `Prüf-Ausdruck_${[this.activeInspectionObj?.related.code ?? "", this.activeInspectionObj?.related.name].join("_")}_${this.activeInspectionObj?.inspectionPlan.title}_${new Date(this.activeInspectionObj?.created ?? "").toLocaleDateString("de-de")}.pdf`
+          );
+        })
+        .catch(() => {
+          this.status = { status: "failed" };
+        });
+    },
+  },
+});
+</script>
diff --git a/src/components/admin/unit/inspectionPlan/TypeInspectionPlanListItem.vue b/src/components/admin/unit/inspectionPlan/TypeInspectionPlanListItem.vue
index ac477cf..7f677bd 100644
--- a/src/components/admin/unit/inspectionPlan/TypeInspectionPlanListItem.vue
+++ b/src/components/admin/unit/inspectionPlan/TypeInspectionPlanListItem.vue
@@ -1,12 +1,15 @@
 <template>
-  <div class="flex flex-col h-fit w-full border border-primary rounded-md">
+  <RouterLink
+    :to="{ name: 'admin-unit-inspection_plan-overview', params: { inspectionPlanId: inspectionPlan.id } }"
+    class="flex flex-col h-fit w-full border border-primary rounded-md"
+  >
     <div class="bg-primary p-2 text-white flex flex-row justify-between items-center">
       <p>{{ inspectionPlan.title }}</p>
     </div>
     <div class="p-2">
       <p>Interval: {{ inspectionPlan.inspectionInterval }}</p>
     </div>
-  </div>
+  </RouterLink>
 </template>
 
 <script setup lang="ts">
diff --git a/src/components/search/InspectionPlanSearchSelectWithRelated.vue b/src/components/search/InspectionPlanSearchSelectWithRelated.vue
index 0d5d034..e6d0c3b 100644
--- a/src/components/search/InspectionPlanSearchSelectWithRelated.vue
+++ b/src/components/search/InspectionPlanSearchSelectWithRelated.vue
@@ -102,8 +102,8 @@ export default defineComponent({
       default: false,
     },
     relatedType: {
-      type: String as PropType<"vehicle" | "equipment" | "wearable">,
-      default: "equipment",
+      type: String as PropType<"vehicleType" | "equipmentType" | "wearableType">,
+      default: "equipmentType",
     },
     relatedTypeId: {
       type: String,
diff --git a/src/stores/admin/unit/inspection/inspection.ts b/src/stores/admin/unit/inspection/inspection.ts
index bfef211..bb3a230 100644
--- a/src/stores/admin/unit/inspection/inspection.ts
+++ b/src/stores/admin/unit/inspection/inspection.ts
@@ -3,6 +3,7 @@ import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
 import type {
   CreateInspectionViewModel,
+  CreateOrUpdateInspectionPointResultCommand,
   InspectionNextViewModel,
   InspectionViewModel,
   MinifiedInspectionViewModel,
@@ -89,6 +90,11 @@ export const useInspectionStore = defineStore("inspection", {
     fetchInspectionById(id: string) {
       return http.get(`/admin/inspection/${id}`);
     },
+    fetchInspectionPrintoutById() {
+      return http.get(`/admin/inspection/${this.activeInspectionObj?.id}/printout`, {
+        responseType: "blob",
+      });
+    },
     async createInspection(inspection: CreateInspectionViewModel): Promise<AxiosResponse<any, any>> {
       const result = await http.post(`/admin/inspection`, {
         assigned: inspection.assigned,
@@ -100,17 +106,41 @@ export const useInspectionStore = defineStore("inspection", {
       return result;
     },
     async updateActiveInspection(inspection: UpdateInspectionViewModel): Promise<AxiosResponse<any, any>> {
-      const result = await http.patch(`/admin/inspection/${inspection.id}`, {
+      const result = await http.patch(`/admin/inspection/${this.activeInspection}`, {
         nextInspection: inspection.nextInspection,
         context: inspection.context,
       });
       this.fetchInspectionByActiveId();
       return result;
     },
-    async deleteInspection(inspection: number): Promise<AxiosResponse<any, any>> {
-      const result = await http.delete(`/admin/inspection/${inspection}`);
+    async updateActiveInspectionResults(
+      results: Array<CreateOrUpdateInspectionPointResultCommand>,
+      files: { [key: string]: File | null }
+    ): Promise<AxiosResponse<any, any>> {
+      const formData = new FormData();
+      formData.append("results", JSON.stringify(results));
+      Object.entries(files).forEach(([key, file]) => {
+        if (file) {
+          const extension = file.name.split(".").pop() || "";
+          formData.append(`files`, new File([file], `${key}.${extension}`, { type: file.type }));
+        }
+      });
+      const result = await http.patch(`/admin/inspection/${this.activeInspection}/results`, formData, {
+        headers: {
+          "Content-Type": "multipart/form-data",
+        },
+      });
       this.fetchInspectionByActiveId();
       return result;
     },
+    async finishActiveInspection(): Promise<AxiosResponse<any, any>> {
+      const result = await http.patch(`/admin/inspection/${this.activeInspection}/finish`);
+      this.fetchInspectionByActiveId();
+      return result;
+    },
+    async deleteInspection(inspection: string): Promise<AxiosResponse<any, any>> {
+      const result = await http.delete(`/admin/inspection/${inspection}`);
+      return result;
+    },
   },
 });
diff --git a/src/stores/admin/unit/inspectionPlan/inspectionPlan.ts b/src/stores/admin/unit/inspectionPlan/inspectionPlan.ts
index f69d53e..a30f6e3 100644
--- a/src/stores/admin/unit/inspectionPlan/inspectionPlan.ts
+++ b/src/stores/admin/unit/inspectionPlan/inspectionPlan.ts
@@ -54,7 +54,7 @@ export const useInspectionPlanStore = defineStore("inspectionPlan", {
       });
     },
     async getAllInspectionPlansWithRelated(
-      related: "vehicle" | "equipment" | "wearable",
+      related: "vehicleType" | "equipmentType" | "wearableType",
       relatedId: string
     ): Promise<AxiosResponse<any, any>> {
       return await http.get(`/admin/inspectionPlan/${related}/${relatedId}?noLimit=true`).then((res) => {
@@ -62,7 +62,7 @@ export const useInspectionPlanStore = defineStore("inspectionPlan", {
       });
     },
     async searchInspectionPlansWithRelated(
-      related: "vehicle" | "equipment" | "wearable",
+      related: "vehicleType" | "equipmentType" | "wearableType",
       relatedId: string,
       search: string
     ): Promise<AxiosResponse<any, any>> {
diff --git a/src/viewmodels/admin/unit/inspection/inspection.models.ts b/src/viewmodels/admin/unit/inspection/inspection.models.ts
index f2a56d1..dcd74b2 100644
--- a/src/viewmodels/admin/unit/inspection/inspection.models.ts
+++ b/src/viewmodels/admin/unit/inspection/inspection.models.ts
@@ -79,3 +79,8 @@ export type UpdateInspectionViewModel = {
   nextInspection?: Date;
   context?: string;
 };
+
+export interface CreateOrUpdateInspectionPointResultCommand {
+  inspectionPointId: string;
+  value: string;
+}
diff --git a/src/views/admin/unit/equipment/Inspection.vue b/src/views/admin/unit/equipment/Inspection.vue
index 40ff9e9..a193ef8 100644
--- a/src/views/admin/unit/equipment/Inspection.vue
+++ b/src/views/admin/unit/equipment/Inspection.vue
@@ -4,8 +4,7 @@
       :items="inspections"
       :totalCount="totalCount"
       :indicateLoading="false"
-      @load-data="(offset, count, search) => {}"
-      @search="(search) => {}"
+      @load-data="(offset, count, search) => fetchInspectionForEquipment(offset, count, false)"
     >
       <template #pageRow="{ row }: { row: InspectionViewModel }">
         <RouterLink
diff --git a/src/views/admin/unit/inspection/InspectionExecute.vue b/src/views/admin/unit/inspection/InspectionExecute.vue
index 35072c2..4a75e2a 100644
--- a/src/views/admin/unit/inspection/InspectionExecute.vue
+++ b/src/views/admin/unit/inspection/InspectionExecute.vue
@@ -6,6 +6,13 @@
         <small v-if="activeInspectionObj?.related.code">({{ activeInspectionObj?.related.code }})</small> -
         {{ activeInspectionObj?.inspectionPlan.title }}
       </h1>
+      <div class="flex flex-row gap-2">
+        <TrashIcon
+          v-if="activeInspectionObj?.isOpen && can('delete', 'unit', 'inspection')"
+          class="w-5 h-5 cursor-pointer"
+          @click="openDeleteModal"
+        />
+      </div>
     </template>
     <template #main>
       <Spinner v-if="loading == 'loading'" class="mx-auto" />
@@ -79,7 +86,7 @@
           <FailureXMark v-else-if="status?.status == 'failed'" />
         </div>
         <div v-else>
-          <button primary type="button" @click="">Bericht anzeigen</button>
+          <button primary type="button" @click="openPrintModal">Bericht anzeigen</button>
         </div>
       </div>
     </template>
@@ -103,6 +110,8 @@ import { useModalStore } from "@/stores/modal";
 import NumberInput from "@/components/admin/unit/inspection/NumberInput.vue";
 import TextInput from "@/components/admin/unit/inspection/TextInput.vue";
 import FileInput from "@/components/admin/unit/inspection/FileInput.vue";
+import { useAbilityStore } from "@/stores/ability";
+import { DocumentTextIcon, TrashIcon } from "@heroicons/vue/24/outline";
 </script>
 
 <script lang="ts">
@@ -137,8 +146,11 @@ export default defineComponent({
       );
     },
     ...mapState(useInspectionStore, ["activeInspectionObj", "loadingActive"]),
+    ...mapState(useAbilityStore, ["can"]),
     points() {
-      return this.activeInspectionObj?.inspectionVersionedPlan.inspectionPoints ?? [];
+      return (this.activeInspectionObj?.inspectionVersionedPlan.inspectionPoints ?? [])
+        .slice()
+        .sort((a, b) => (a.sort ?? 0) - (b.sort ?? 0));
     },
     pointResult() {
       return (pointId: string) => {
@@ -172,8 +184,24 @@ export default defineComponent({
     } catch (error) {}
   },
   methods: {
-    ...mapActions(useInspectionStore, ["fetchInspectionByActiveId"]),
+    ...mapActions(useInspectionStore, ["fetchInspectionByActiveId", "updateActiveInspectionResults"]),
     ...mapActions(useModalStore, ["openModal"]),
+    openDeleteModal() {
+      this.openModal(
+        markRaw(defineAsyncComponent(() => import("@/components/admin/unit/inspection/DeleteInspectionModal.vue"))),
+        parseInt(this.inspectionId ?? "")
+      );
+    },
+    openPrintModal() {
+      this.openModal(
+        markRaw(defineAsyncComponent(() => import("@/components/admin/unit/inspection/InspectionPrintModal.vue")))
+      );
+    },
+    finishInspection() {
+      this.openModal(
+        markRaw(defineAsyncComponent(() => import("@/components/admin/unit/inspection/InspectionFinishModal.vue")))
+      );
+    },
     resetForm() {
       this.checks = cloneDeep(this.activeInspectionObj?.checks ?? []);
     },
@@ -194,9 +222,7 @@ export default defineComponent({
     triggerUpdate(e: any) {
       if (this.activeInspectionObj == null) return;
       this.status = "loading";
-      new Promise<void>((resolve, reject) => {
-        resolve();
-      })
+      this.updateActiveInspectionResults(this.checks, this.fileStore)
         .then(() => {
           this.status = { status: "success" };
         })
@@ -209,11 +235,6 @@ export default defineComponent({
           }, 2000);
         });
     },
-    finishInspection() {
-      this.openModal(
-        markRaw(defineAsyncComponent(() => import("@/components/admin/unit/inspection/InspectionFinishModal.vue")))
-      );
-    },
   },
 });
 </script>
diff --git a/src/views/admin/unit/inspection/InspectionStart.vue b/src/views/admin/unit/inspection/InspectionStart.vue
index fe988a5..4c61b06 100644
--- a/src/views/admin/unit/inspection/InspectionStart.vue
+++ b/src/views/admin/unit/inspection/InspectionStart.vue
@@ -32,14 +32,15 @@
 
         <InspectionPlanSearchSelectWithRelated
           title="Prüfplan"
-          :relatedType="active"
+          :relatedType="`${active}Type`"
           :relatedTypeId="relatedType"
           v-model="inspectionPlan"
         />
 
         <div>
-          <label for="nextInspection">
-            Nächste Prüfung (optional) - Intervall: {{ selectedInspectionPlan?.inspectionInterval }}
+          <label for="nextInspection" class="flex flex-row justify-between">
+            Nächste Prüfung (optional) - Intervall: {{ selectedInspectionPlan?.inspectionInterval ?? "xx" }}
+            <InspectionTimeFormatExplainIcon />
           </label>
           <input id="nextInspection" type="date" />
         </div>
@@ -87,6 +88,7 @@ import { useVehicleStore } from "@/stores/admin/unit/vehicle/vehicle";
 import { useWearableStore } from "@/stores/admin/unit/wearable/wearable";
 import type { CreateInspectionViewModel } from "@/viewmodels/admin/unit/inspection/inspection.models";
 import { useInspectionStore } from "@/stores/admin/unit/inspection/inspection";
+import InspectionTimeFormatExplainIcon from "@/components/admin/unit/InspectionTimeFormatExplainIcon.vue";
 </script>
 
 <script lang="ts">
diff --git a/src/views/admin/unit/inspectionPlan/CreateInspectionPlan.vue b/src/views/admin/unit/inspectionPlan/CreateInspectionPlan.vue
index 8b06b8e..91c4d83 100644
--- a/src/views/admin/unit/inspectionPlan/CreateInspectionPlan.vue
+++ b/src/views/admin/unit/inspectionPlan/CreateInspectionPlan.vue
@@ -34,7 +34,10 @@
             <input type="text" id="name" required />
           </div>
           <div>
-            <label for="interval">Intervall</label>
+            <label for="interval" class="flex flex-row justify-between">
+              Intervall
+              <InspectionTimeFormatExplainIcon />
+            </label>
             <input
               type="text"
               id="interval"
@@ -45,7 +48,10 @@
             />
           </div>
           <div>
-            <label for="remind">Erinnerung vor Fälligkeit</label>
+            <label for="remind" class="flex flex-row justify-between">
+              Erinnerung vor Fälligkeit
+              <InspectionTimeFormatExplainIcon />
+            </label>
             <input
               type="text"
               id="remind"
@@ -88,6 +94,7 @@ import type { CreateInspectionPlanViewModel } from "@/viewmodels/admin/unit/insp
 import { useEquipmentTypeStore } from "@/stores/admin/unit/equipmentType/equipmentType";
 import EquipmentTypeSearchSelect from "@/components/search/EquipmentTypeSearchSelect.vue";
 import VehicleTypeSearchSelect from "@/components/search/VehicleTypeSearchSelect.vue";
+import InspectionTimeFormatExplainIcon from "@/components/admin/unit/InspectionTimeFormatExplainIcon.vue";
 </script>
 
 <script lang="ts">
-- 
2.47.3


From 98bf4532aa6da15f8e1747258e930d033bf67a47 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Sat, 12 Jul 2025 17:04:27 +0200
Subject: [PATCH 15/16] enable viewing of uploaded files to inspection points

---
 .../admin/unit/inspection/FileInput.vue       | 14 +++-
 .../admin/unit/inspection/OkNotOk.vue         | 13 ++--
 .../unit/inspection/UploadedFileViewModal.vue | 64 +++++++++++++++++++
 src/main.css                                  |  4 +-
 .../admin/unit/inspection/inspection.ts       |  5 ++
 5 files changed, 91 insertions(+), 9 deletions(-)
 create mode 100644 src/components/admin/unit/inspection/UploadedFileViewModal.vue

diff --git a/src/components/admin/unit/inspection/FileInput.vue b/src/components/admin/unit/inspection/FileInput.vue
index e02c470..de9d27f 100644
--- a/src/components/admin/unit/inspection/FileInput.vue
+++ b/src/components/admin/unit/inspection/FileInput.vue
@@ -2,6 +2,7 @@
   <div class="flex flex-col h-fit w-full border border-primary rounded-md">
     <div class="bg-primary p-2 text-white flex flex-row justify-between items-center">
       <p>{{ inspectionPoint.title }}</p>
+      <DocumentCheckIcon class="w-5 h-5 cursor-pointer" @click="openDetailView" />
     </div>
     <div class="p-2">
       <p v-if="inspectionPoint.description" class="pb-2">Beschreibung: {{ inspectionPoint.description }}</p>
@@ -32,9 +33,11 @@
 </template>
 
 <script setup lang="ts">
-import { defineComponent, type PropType } from "vue";
+import { defineAsyncComponent, defineComponent, markRaw, type PropType } from "vue";
 import type { InspectionPointViewModel } from "@/viewmodels/admin/unit/inspection/inspectionPlan.models";
-import { CheckIcon } from "@heroicons/vue/24/outline";
+import { CheckIcon, DocumentCheckIcon } from "@heroicons/vue/24/outline";
+import { mapActions } from "pinia";
+import { useModalStore } from "@/stores/modal";
 </script>
 
 <script lang="ts">
@@ -72,10 +75,17 @@ export default defineComponent({
     },
   },
   methods: {
+    ...mapActions(useModalStore, ["openModal"]),
     selectFile(e: Event) {
       this.$emit("update:upload", (e.target as HTMLInputElement).files?.[0] ?? null);
       this.value = "set";
     },
+    openDetailView() {
+      this.openModal(
+        markRaw(defineAsyncComponent(() => import("@/components/admin/unit/inspection/UploadedFileViewModal.vue"))),
+        this.inspectionPoint
+      );
+    },
   },
 });
 </script>
diff --git a/src/components/admin/unit/inspection/OkNotOk.vue b/src/components/admin/unit/inspection/OkNotOk.vue
index b32170d..177ed92 100644
--- a/src/components/admin/unit/inspection/OkNotOk.vue
+++ b/src/components/admin/unit/inspection/OkNotOk.vue
@@ -6,18 +6,19 @@
     <div class="p-2">
       <p v-if="inspectionPoint.description" class="pb-2">Beschreibung: {{ inspectionPoint.description }}</p>
       <hr v-if="inspectionPoint.description" />
-      <RadioGroup v-model="value" :name="inspectionPoint.id" class="flex flex-row gap-2" :disabled="!editable">
-        <RadioGroupOption
+      <div class="flex flex-row gap-2">
+        <button
           v-for="option in options"
           :key="option.key"
-          button
           :primary="value == option.key"
           :primary-outline="value != option.key"
+          :disabled="!editable"
           :value="option.key"
+          @click="value = option.key"
         >
           {{ option.title }}
-        </RadioGroupOption>
-      </RadioGroup>
+        </button>
+      </div>
     </div>
   </div>
 </template>
@@ -50,7 +51,7 @@ export default defineComponent({
       options: [
         { key: "true", title: "OK" },
         { key: "false", title: "nicht OK" },
-      ],
+      ] as Array<{ key: "true" | "false"; title: string }>,
     };
   },
   computed: {
diff --git a/src/components/admin/unit/inspection/UploadedFileViewModal.vue b/src/components/admin/unit/inspection/UploadedFileViewModal.vue
new file mode 100644
index 0000000..28d8458
--- /dev/null
+++ b/src/components/admin/unit/inspection/UploadedFileViewModal.vue
@@ -0,0 +1,64 @@
+<template>
+  <div class="w-full h-full flex flex-col gap-2">
+    <Spinner v-if="status == 'loading'" />
+    <div class="grow">
+      <iframe v-if="data.others == 'pdf'" ref="viewer" class="w-full h-full" />
+      <img v-else ref="viewer" class="w-full h-full object-contain" />
+    </div>
+
+    <div class="flex flex-row gap-2 justify-end">
+      <a ref="download" button primary class="w-fit!">download</a>
+      <button primary-outline class="w-fit!" @click="closeModal">schließen</button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+import { mapState, mapActions } from "pinia";
+import { useModalStore } from "@/stores/modal";
+import Spinner from "@/components/Spinner.vue";
+import { useInspectionStore } from "@/stores/admin/unit/inspection/inspection";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  data() {
+    return {
+      status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
+    };
+  },
+  computed: {
+    ...mapState(useModalStore, ["data"]),
+    ...mapState(useInspectionStore, ["activeInspectionObj"]),
+  },
+  mounted() {
+    this.fetchItem();
+  },
+  methods: {
+    ...mapActions(useModalStore, ["closeModal"]),
+    ...mapActions(useInspectionStore, ["fetchUploadedFileByPointId"]),
+    fetchItem() {
+      this.status = "loading";
+      this.fetchUploadedFileByPointId(this.data.id)
+        .then((response) => {
+          this.status = { status: "success" };
+          const blob = new Blob([response.data], { type: this.data.others == "pdf" ? "application/pdf" : "image/png" });
+          (this.$refs.viewer as HTMLIFrameElement).src = window.URL.createObjectURL(blob);
+
+          const fileURL = window.URL.createObjectURL(new Blob([response.data]));
+          const fileLink = this.$refs.download as HTMLAnchorElement;
+          fileLink.href = fileURL;
+          console.log(this.data);
+          fileLink.setAttribute(
+            "download",
+            this.data.others == "pdf" ? `${this.data.title}.pdf` : `${this.data.title}.png`
+          );
+        })
+        .catch(() => {
+          this.status = { status: "failed" };
+        });
+    },
+  },
+});
+</script>
diff --git a/src/main.css b/src/main.css
index b9501d6..449fd89 100644
--- a/src/main.css
+++ b/src/main.css
@@ -102,7 +102,9 @@ select[readonly] {
 }
 
 input[disabled],
-textarea[disabled],
+textarea[disabled] {
+  @apply opacity-75;
+}
 select[disabled] {
   @apply opacity-75 pointer-events-none;
 }
diff --git a/src/stores/admin/unit/inspection/inspection.ts b/src/stores/admin/unit/inspection/inspection.ts
index bb3a230..7da24c4 100644
--- a/src/stores/admin/unit/inspection/inspection.ts
+++ b/src/stores/admin/unit/inspection/inspection.ts
@@ -95,6 +95,11 @@ export const useInspectionStore = defineStore("inspection", {
         responseType: "blob",
       });
     },
+    fetchUploadedFileByPointId(id: string) {
+      return http.get(`/admin/inspection/${this.activeInspectionObj?.id}/${id}/upload`, {
+        responseType: "blob",
+      });
+    },
     async createInspection(inspection: CreateInspectionViewModel): Promise<AxiosResponse<any, any>> {
       const result = await http.post(`/admin/inspection`, {
         assigned: inspection.assigned,
-- 
2.47.3


From 6c8c0939b437200e2378189999fc5cb7da2c9d7e Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Sat, 12 Jul 2025 17:13:32 +0200
Subject: [PATCH 16/16] refactor

---
 src/components/CodeDetector.vue                       |  4 ++--
 .../admin/unit/inspection/UploadedFileViewModal.vue   |  1 -
 src/router/unit/equipment.ts                          |  4 ++--
 src/router/unit/inspectionPlan.ts                     |  2 +-
 src/router/unit/vehicle.ts                            |  4 ++--
 src/router/unit/wearable.ts                           |  4 ++--
 src/views/admin/unit/inspectionPlan/Overview.vue      | 11 +++++++++--
 .../unit/inspectionPlan/UpdateInspectionPlan.vue      | 11 +++++++++--
 8 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/components/CodeDetector.vue b/src/components/CodeDetector.vue
index 373fc9d..d8ca6b8 100644
--- a/src/components/CodeDetector.vue
+++ b/src/components/CodeDetector.vue
@@ -24,7 +24,7 @@
 <script setup lang="ts">
 import { defineComponent } from "vue";
 import { mapState, mapActions } from "pinia";
-import { useModalStore } from "../stores/modal";
+import { useModalStore } from "@/stores/modal";
 import {
   barcodeFormats,
   defaultConstraintOptions,
@@ -32,7 +32,7 @@ import {
   handleScannerError,
   trackFunctionOptions,
   type Camera,
-} from "../helpers/codeScanner";
+} from "@/helpers/codeScanner";
 import { QrcodeStream, type DetectedBarcode } from "vue-qrcode-reader";
 import { XMarkIcon } from "@heroicons/vue/24/outline";
 </script>
diff --git a/src/components/admin/unit/inspection/UploadedFileViewModal.vue b/src/components/admin/unit/inspection/UploadedFileViewModal.vue
index 28d8458..d9f1487 100644
--- a/src/components/admin/unit/inspection/UploadedFileViewModal.vue
+++ b/src/components/admin/unit/inspection/UploadedFileViewModal.vue
@@ -49,7 +49,6 @@ export default defineComponent({
           const fileURL = window.URL.createObjectURL(new Blob([response.data]));
           const fileLink = this.$refs.download as HTMLAnchorElement;
           fileLink.href = fileURL;
-          console.log(this.data);
           fileLink.setAttribute(
             "download",
             this.data.others == "pdf" ? `${this.data.title}.pdf` : `${this.data.title}.png`
diff --git a/src/router/unit/equipment.ts b/src/router/unit/equipment.ts
index b8a3d7d..29f4416 100644
--- a/src/router/unit/equipment.ts
+++ b/src/router/unit/equipment.ts
@@ -1,6 +1,6 @@
 import { useEquipmentStore } from "@/stores/admin/unit/equipment/equipment";
-import { useEquipmentDamageReportStore } from "../../stores/admin/unit/equipment/damageReport";
-import { useEquipmentInspectionStore } from "../../stores/admin/unit/equipment/inspection";
+import { useEquipmentDamageReportStore } from "@/stores/admin/unit/equipment/damageReport";
+import { useEquipmentInspectionStore } from "@/stores/admin/unit/equipment/inspection";
 
 export async function setEquipmentId(to: any, from: any, next: any) {
   const equipmentStore = useEquipmentStore();
diff --git a/src/router/unit/inspectionPlan.ts b/src/router/unit/inspectionPlan.ts
index 95b9e7c..ad950c1 100644
--- a/src/router/unit/inspectionPlan.ts
+++ b/src/router/unit/inspectionPlan.ts
@@ -1,5 +1,5 @@
 import { useInspectionPlanStore } from "@/stores/admin/unit/inspectionPlan/inspectionPlan";
-import { useInspectionPointStore } from "../../stores/admin/unit/inspectionPlan/inspectionPoint";
+import { useInspectionPointStore } from "@/stores/admin/unit/inspectionPlan/inspectionPoint";
 
 export async function setInspectionPlanId(to: any, from: any, next: any) {
   const inspectionPlanStore = useInspectionPlanStore();
diff --git a/src/router/unit/vehicle.ts b/src/router/unit/vehicle.ts
index 210f5c4..2e911d4 100644
--- a/src/router/unit/vehicle.ts
+++ b/src/router/unit/vehicle.ts
@@ -1,6 +1,6 @@
 import { useVehicleStore } from "@/stores/admin/unit/vehicle/vehicle";
-import { useVehicleDamageReportStore } from "../../stores/admin/unit/vehicle/damageReport";
-import { useVehicleInspectionStore } from "../../stores/admin/unit/vehicle/inspection";
+import { useVehicleDamageReportStore } from "@/stores/admin/unit/vehicle/damageReport";
+import { useVehicleInspectionStore } from "@/stores/admin/unit/vehicle/inspection";
 
 export async function setVehicleId(to: any, from: any, next: any) {
   const vehicleStore = useVehicleStore();
diff --git a/src/router/unit/wearable.ts b/src/router/unit/wearable.ts
index f294bbd..c73124d 100644
--- a/src/router/unit/wearable.ts
+++ b/src/router/unit/wearable.ts
@@ -1,6 +1,6 @@
 import { useWearableStore } from "@/stores/admin/unit/wearable/wearable";
-import { useWearableDamageReportStore } from "../../stores/admin/unit/wearable/damageReport";
-import { useWearableTypeInspectionPlanStore } from "../../stores/admin/unit/wearableType/inspectionPlan";
+import { useWearableDamageReportStore } from "@/stores/admin/unit/wearable/damageReport";
+import { useWearableTypeInspectionPlanStore } from "@/stores/admin/unit/wearableType/inspectionPlan";
 
 export async function setWearableId(to: any, from: any, next: any) {
   const wearableStore = useWearableStore();
diff --git a/src/views/admin/unit/inspectionPlan/Overview.vue b/src/views/admin/unit/inspectionPlan/Overview.vue
index 1d02aaf..eaae5ba 100644
--- a/src/views/admin/unit/inspectionPlan/Overview.vue
+++ b/src/views/admin/unit/inspectionPlan/Overview.vue
@@ -6,11 +6,17 @@
         <input type="text" id="type" :value="activeInspectionPlanObj.related.type" readonly />
       </div>
       <div>
-        <label for="interval">Intervall</label>
+        <label for="interval" class="flex flex-row justify-between">
+          Intervall
+          <InspectionTimeFormatExplainIcon />
+        </label>
         <input type="text" id="interval" :value="activeInspectionPlanObj.inspectionInterval" readonly />
       </div>
       <div>
-        <label for="remind">Erinnerung vor Fälligkeit</label>
+        <label for="remind" class="flex flex-row justify-between">
+          Erinnerung vor Fälligkeit
+          <InspectionTimeFormatExplainIcon />
+        </label>
         <input type="text" id="remind" :value="activeInspectionPlanObj.remindTime" readonly />
       </div>
     </div>
@@ -43,6 +49,7 @@ import { defineComponent } from "vue";
 import { mapActions, mapState } from "pinia";
 import Spinner from "@/components/Spinner.vue";
 import { useInspectionPlanStore } from "@/stores/admin/unit/inspectionPlan/inspectionPlan";
+import InspectionTimeFormatExplainIcon from "@/components/admin/unit/InspectionTimeFormatExplainIcon.vue";
 </script>
 
 <script lang="ts">
diff --git a/src/views/admin/unit/inspectionPlan/UpdateInspectionPlan.vue b/src/views/admin/unit/inspectionPlan/UpdateInspectionPlan.vue
index bfff1c7..d413aea 100644
--- a/src/views/admin/unit/inspectionPlan/UpdateInspectionPlan.vue
+++ b/src/views/admin/unit/inspectionPlan/UpdateInspectionPlan.vue
@@ -14,7 +14,10 @@
         <input type="text" id="name" required v-model="inspectionPlan.title" />
       </div>
       <div>
-        <label for="interval">Intervall</label>
+        <label for="interval" class="flex flex-row justify-between">
+          Intervall
+          <InspectionTimeFormatExplainIcon />
+        </label>
         <input
           type="text"
           id="interval"
@@ -25,7 +28,10 @@
         />
       </div>
       <div>
-        <label for="remind">Erinnerung vor Fälligkeit</label>
+        <label for="remind" class="flex flex-row justify-between">
+          Erinnerung vor Fälligkeit
+          <InspectionTimeFormatExplainIcon />
+        </label>
         <input
           type="text"
           id="remind"
@@ -63,6 +69,7 @@ import FailureXMark from "@/components/FailureXMark.vue";
 import ScanInput from "@/components/ScanInput.vue";
 import isEqual from "lodash.isequal";
 import cloneDeep from "lodash.clonedeep";
+import InspectionTimeFormatExplainIcon from "@/components/admin/unit/InspectionTimeFormatExplainIcon.vue";
 </script>
 
 <script lang="ts">
-- 
2.47.3