From b83b22d8064df51d9e8a71bcc45acf9b27546b20 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Wed, 21 May 2025 09:10:41 +0200
Subject: [PATCH] add additional fields

---
 src/demodata/equipment.ts                              |  2 ++
 src/demodata/vehicle.ts                                |  4 ++++
 src/demodata/wearable.ts                               |  2 ++
 .../admin/unit/equipment/equipment.models.ts           |  5 +++++
 .../admin/unit/inspection/inspection.models.ts         |  1 +
 src/viewmodels/admin/unit/vehicle/vehicle.models.ts    |  5 +++++
 src/viewmodels/admin/unit/wearable/wearable.models.ts  |  7 ++++++-
 src/views/admin/unit/equipment/CreateEquipment.vue     |  5 +++++
 src/views/admin/unit/equipment/Overview.vue            |  8 ++++++++
 src/views/admin/unit/equipment/UpdateEquipment.vue     | 10 ++++++++++
 src/views/admin/unit/vehicle/CreateVehicle.vue         |  5 +++++
 src/views/admin/unit/vehicle/Overview.vue              |  8 ++++++++
 src/views/admin/unit/vehicle/UpdateVehicle.vue         | 10 ++++++++++
 src/views/admin/unit/wearable/CreateWearable.vue       | 10 ++++++++--
 src/views/admin/unit/wearable/Overview.vue             |  8 ++++++++
 src/views/admin/unit/wearable/UpdateWearable.vue       | 10 ++++++++++
 16 files changed, 97 insertions(+), 3 deletions(-)

diff --git a/src/demodata/equipment.ts b/src/demodata/equipment.ts
index 3323946..06563b5 100644
--- a/src/demodata/equipment.ts
+++ b/src/demodata/equipment.ts
@@ -8,6 +8,8 @@ export const equipmentDemoData: Array<EquipmentViewModel> = [
     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/vehicle.ts b/src/demodata/vehicle.ts
index 11ce9e8..b307abb 100644
--- a/src/demodata/vehicle.ts
+++ b/src/demodata/vehicle.ts
@@ -7,6 +7,8 @@ export const vehicleDemoData: Array<VehicleViewModel> = [
     code: "",
     name: "HLF",
     location: "Tor 1",
+    commissioned: new Date(),
+    decommissioned: undefined,
     vehicleTypeId: vehicleTypeDemoData[0].id,
     vehicleType: vehicleTypeDemoData[0],
     inspections: [],
@@ -16,6 +18,8 @@ export const vehicleDemoData: Array<VehicleViewModel> = [
     code: "",
     name: "LF",
     location: "Tor 2",
+    commissioned: new Date(),
+    decommissioned: undefined,
     vehicleTypeId: vehicleTypeDemoData[1].id,
     vehicleType: vehicleTypeDemoData[1],
     inspections: [],
diff --git a/src/demodata/wearable.ts b/src/demodata/wearable.ts
index 1f483c2..973de4a 100644
--- a/src/demodata/wearable.ts
+++ b/src/demodata/wearable.ts
@@ -7,6 +7,8 @@ export const wearableDemoData: Array<WearableViewModel> = [
     code: "0456984224498",
     name: "Jacke",
     location: "Spint",
+    commissioned: new Date(),
+    decommissioned: undefined,
     wearerId: "9469991d-fa22-4899-82ce-b1ba5de990dc",
     wearer: {
       id: "9469991d-fa22-4899-82ce-b1ba5de990dc",
diff --git a/src/viewmodels/admin/unit/equipment/equipment.models.ts b/src/viewmodels/admin/unit/equipment/equipment.models.ts
index 09cb681..dcd4cea 100644
--- a/src/viewmodels/admin/unit/equipment/equipment.models.ts
+++ b/src/viewmodels/admin/unit/equipment/equipment.models.ts
@@ -6,6 +6,8 @@ export interface EquipmentViewModel {
   code?: string;
   name: string;
   location: string;
+  commissioned: Date;
+  decommissioned?: Date;
   equipmentTypeId: string;
   equipmentType: EquipmentTypeViewModel;
   inspections: Array<InspectionViewModel>;
@@ -15,6 +17,7 @@ export interface CreateEquipmentViewModel {
   code?: string;
   name: string;
   location: string;
+  commissioned: Date;
   equipmentTypeId: string;
 }
 
@@ -23,4 +26,6 @@ export interface UpdateEquipmentViewModel {
   code?: string;
   name: string;
   location: string;
+  commissioned: Date;
+  decommissioned?: Date;
 }
diff --git a/src/viewmodels/admin/unit/inspection/inspection.models.ts b/src/viewmodels/admin/unit/inspection/inspection.models.ts
index 4843dc2..a25c279 100644
--- a/src/viewmodels/admin/unit/inspection/inspection.models.ts
+++ b/src/viewmodels/admin/unit/inspection/inspection.models.ts
@@ -26,6 +26,7 @@ export interface InspectionPointViewModel {
   title: string;
   description: string;
   type: "iO-niO" | "text" | "number";
+  min?: number;
 }
 
 export interface InspectionPointResultViewModel {
diff --git a/src/viewmodels/admin/unit/vehicle/vehicle.models.ts b/src/viewmodels/admin/unit/vehicle/vehicle.models.ts
index d459d06..0bfccb6 100644
--- a/src/viewmodels/admin/unit/vehicle/vehicle.models.ts
+++ b/src/viewmodels/admin/unit/vehicle/vehicle.models.ts
@@ -6,6 +6,8 @@ export interface VehicleViewModel {
   code?: string;
   name: string;
   location: string;
+  commissioned: Date;
+  decommissioned?: Date;
   vehicleTypeId: string;
   vehicleType: VehicleTypeViewModel;
   inspections: Array<InspectionViewModel>;
@@ -15,6 +17,7 @@ export interface CreateVehicleViewModel {
   code?: string;
   name: string;
   location: string;
+  commissioned: Date;
   vehicleTypeId: string;
 }
 
@@ -23,4 +26,6 @@ export interface UpdateVehicleViewModel {
   code?: string;
   name: string;
   location: string;
+  commissioned: Date;
+  decommissioned?: Date;
 }
diff --git a/src/viewmodels/admin/unit/wearable/wearable.models.ts b/src/viewmodels/admin/unit/wearable/wearable.models.ts
index 379c6e1..cec2ece 100644
--- a/src/viewmodels/admin/unit/wearable/wearable.models.ts
+++ b/src/viewmodels/admin/unit/wearable/wearable.models.ts
@@ -5,7 +5,9 @@ export interface WearableViewModel {
   id: string;
   code?: string;
   name: string;
-  location?: string;
+  location: string;
+  commissioned: Date;
+  decommissioned?: Date;
   wearerId?: string;
   wearer?: MemberViewModel;
   wearableTypeId: string;
@@ -17,6 +19,7 @@ export interface CreateWearableViewModel {
   name: string;
   wearerId?: string;
   location?: string;
+  commissioned: Date;
   wearableTypeId: string;
 }
 
@@ -25,5 +28,7 @@ export interface UpdateWearableViewModel {
   code?: string;
   name: string;
   location?: string;
+  commissioned: Date;
+  decommissioned?: Date;
   wearerId?: string;
 }
diff --git a/src/views/admin/unit/equipment/CreateEquipment.vue b/src/views/admin/unit/equipment/CreateEquipment.vue
index fccae85..7493874 100644
--- a/src/views/admin/unit/equipment/CreateEquipment.vue
+++ b/src/views/admin/unit/equipment/CreateEquipment.vue
@@ -14,6 +14,10 @@
             <input type="text" id="name" required />
           </div>
           <ScanInput name="code" label="Code" :required="false" />
+          <div>
+            <label for="commissioned">In-Betrieb-Nahme</label>
+            <input type="date" id="commissioned" required />
+          </div>
           <div>
             <label for="location">Verortung (optional)</label>
             <input type="text" id="location" />
@@ -81,6 +85,7 @@ export default defineComponent({
         name: formData.name.value,
         location: formData.location.value,
         equipmentTypeId: this.selectedType,
+        commissioned: formData.commissioned.value,
       };
       this.status = "loading";
       this.createEquipment(createEquipment)
diff --git a/src/views/admin/unit/equipment/Overview.vue b/src/views/admin/unit/equipment/Overview.vue
index a08e431..99304e6 100644
--- a/src/views/admin/unit/equipment/Overview.vue
+++ b/src/views/admin/unit/equipment/Overview.vue
@@ -17,6 +17,14 @@
         <label for="location">Verortung</label>
         <input type="text" id="location" :value="activeEquipmentObj.location" readonly />
       </div>
+      <div>
+        <label for="commissioned">In-Betrieb-Nahme</label>
+        <input type="date" id="commissioned" :value="activeEquipmentObj.commissioned" readonly />
+      </div>
+      <div>
+        <label for="decommissioned">Außer-Betrieb-Nahme</label>
+        <input type="date" id="decommissioned" :value="activeEquipmentObj.decommissioned" readonly />
+      </div>
     </div>
 
     <Spinner v-if="loadingActive == 'loading'" class="mx-auto" />
diff --git a/src/views/admin/unit/equipment/UpdateEquipment.vue b/src/views/admin/unit/equipment/UpdateEquipment.vue
index c52b920..60c0531 100644
--- a/src/views/admin/unit/equipment/UpdateEquipment.vue
+++ b/src/views/admin/unit/equipment/UpdateEquipment.vue
@@ -17,6 +17,14 @@
         <label for="location">Verortung (optional)</label>
         <input type="text" id="location" v-model="equipment.location" />
       </div>
+      <div>
+        <label for="commissioned">In-Betrieb-Nahme</label>
+        <input type="date" id="commissioned" required v-model="equipment.commissioned" />
+      </div>
+      <div>
+        <label for="decommissioned">Außer-Betrieb-Nahme (optional)</label>
+        <input type="date" id="decommissioned" v-model="equipment.decommissioned" />
+      </div>
       <div class="flex flex-row justify-end gap-2">
         <button primary-outline type="reset" class="w-fit!" :disabled="canSaveOrReset" @click="resetForm">
           abbrechen
@@ -98,6 +106,8 @@ export default defineComponent({
         code: formData.code.value || null,
         name: formData.name.value,
         location: formData.location.value,
+        commissioned: formData.commissioned.value,
+        decommissioned: formData.decommissioned.value ?? null,
       };
       this.status = "loading";
       this.updateActiveEquipment(updateEquipment)
diff --git a/src/views/admin/unit/vehicle/CreateVehicle.vue b/src/views/admin/unit/vehicle/CreateVehicle.vue
index 6d1add0..6ffc3db 100644
--- a/src/views/admin/unit/vehicle/CreateVehicle.vue
+++ b/src/views/admin/unit/vehicle/CreateVehicle.vue
@@ -14,6 +14,10 @@
             <input type="text" id="name" required />
           </div>
           <ScanInput name="code" label="Code" :required="false" />
+          <div>
+            <label for="commissioned">In-Betrieb-Nahme</label>
+            <input type="date" id="commissioned" required />
+          </div>
           <div>
             <label for="location">Verortung (optional)</label>
             <input type="text" id="location" />
@@ -80,6 +84,7 @@ export default defineComponent({
         code: formData.code.value || null,
         location: formData.location.value,
         vehicleTypeId: this.selectedType,
+        commissioned: formData.commissioned.value,
       };
       this.status = "loading";
       this.createVehicle(createVehicle)
diff --git a/src/views/admin/unit/vehicle/Overview.vue b/src/views/admin/unit/vehicle/Overview.vue
index 36de8b1..3dbc194 100644
--- a/src/views/admin/unit/vehicle/Overview.vue
+++ b/src/views/admin/unit/vehicle/Overview.vue
@@ -17,6 +17,14 @@
         <label for="location">Verortung</label>
         <input type="text" id="location" :value="activeVehicleObj.location" readonly />
       </div>
+      <div>
+        <label for="commissioned">In-Betrieb-Nahme</label>
+        <input type="date" id="commissioned" :value="activeVehicleObj.commissioned" readonly />
+      </div>
+      <div>
+        <label for="decommissioned">Außer-Betrieb-Nahme</label>
+        <input type="date" id="decommissioned" :value="activeVehicleObj.decommissioned" readonly />
+      </div>
     </div>
 
     <Spinner v-if="loadingActive == 'loading'" class="mx-auto" />
diff --git a/src/views/admin/unit/vehicle/UpdateVehicle.vue b/src/views/admin/unit/vehicle/UpdateVehicle.vue
index 026668a..983c84c 100644
--- a/src/views/admin/unit/vehicle/UpdateVehicle.vue
+++ b/src/views/admin/unit/vehicle/UpdateVehicle.vue
@@ -17,6 +17,14 @@
         <label for="location">Verortung (optional)</label>
         <input type="text" id="location" />
       </div>
+      <div>
+        <label for="commissioned">In-Betrieb-Nahme</label>
+        <input type="date" id="commissioned" required v-model="vehicle.commissioned" />
+      </div>
+      <div>
+        <label for="decommissioned">Außer-Betrieb-Nahme (optional)</label>
+        <input type="date" id="decommissioned" v-model="vehicle.decommissioned" />
+      </div>
       <div class="flex flex-row justify-end gap-2">
         <RouterLink
           :to="{ name: 'admin-unit-vehicle' }"
@@ -100,6 +108,8 @@ export default defineComponent({
         name: formData.name.value,
         code: formData.code.value || null,
         location: formData.location.value,
+        commissioned: formData.commissioned.value,
+        decommissioned: formData.decommissioned.value ?? null,
       };
       this.status = "loading";
       this.updateActiveVehicle(updateVehicle)
diff --git a/src/views/admin/unit/wearable/CreateWearable.vue b/src/views/admin/unit/wearable/CreateWearable.vue
index e319cba..3b4fc1e 100644
--- a/src/views/admin/unit/wearable/CreateWearable.vue
+++ b/src/views/admin/unit/wearable/CreateWearable.vue
@@ -14,11 +14,15 @@
             <input type="text" id="name" required />
           </div>
           <ScanInput name="code" label="Code" :required="false" />
+          <div>
+            <label for="commissioned">In-Betrieb-Nahme</label>
+            <input type="date" id="commissioned" required />
+          </div>
           <div>
             <label for="location">Verortung (optional)</label>
             <input type="text" id="location" />
           </div>
-          <MemberSearchSelectSingle title="Träger (optional)" />
+          <MemberSearchSelectSingle title="Träger (optional)" v-model="wearer" />
           <div class="flex flex-row justify-end gap-2">
             <RouterLink
               :to="{ name: 'admin-unit-wearable' }"
@@ -62,6 +66,7 @@ export default defineComponent({
       status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
       timeout: null as any,
       selectedType: "" as string,
+      wearer: "" as string,
     };
   },
   computed: {
@@ -82,8 +87,9 @@ export default defineComponent({
         code: formData.code.value || null,
         name: formData.name.value,
         location: formData.location.value,
-        wearerId: "",
+        wearerId: this.wearer,
         wearableTypeId: this.selectedType,
+        commissioned: formData.commissioned.value,
       };
       this.status = "loading";
       this.createWearable(createWearable)
diff --git a/src/views/admin/unit/wearable/Overview.vue b/src/views/admin/unit/wearable/Overview.vue
index 43920f6..656f456 100644
--- a/src/views/admin/unit/wearable/Overview.vue
+++ b/src/views/admin/unit/wearable/Overview.vue
@@ -17,6 +17,14 @@
         <label for="location">Verortung</label>
         <input type="text" id="location" :value="activeWearableObj.location" readonly />
       </div>
+      <div>
+        <label for="commissioned">In-Betrieb-Nahme</label>
+        <input type="date" id="commissioned" :value="activeWearableObj.commissioned" readonly />
+      </div>
+      <div>
+        <label for="decommissioned">Außer-Betrieb-Nahme</label>
+        <input type="date" id="decommissioned" :value="activeWearableObj.decommissioned" readonly />
+      </div>
       <div>
         <label for="wearer">Träger</label>
         <input
diff --git a/src/views/admin/unit/wearable/UpdateWearable.vue b/src/views/admin/unit/wearable/UpdateWearable.vue
index 105d2da..3811695 100644
--- a/src/views/admin/unit/wearable/UpdateWearable.vue
+++ b/src/views/admin/unit/wearable/UpdateWearable.vue
@@ -18,6 +18,14 @@
         <input type="text" id="location" v-model="wearable.location" />
       </div>
       <MemberSearchSelectMultiple title="Träger (optional)" />
+      <div>
+        <label for="commissioned">In-Betrieb-Nahme</label>
+        <input type="date" id="commissioned" required v-model="wearable.commissioned" />
+      </div>
+      <div>
+        <label for="decommissioned">Außer-Betrieb-Nahme (optional)</label>
+        <input type="date" id="decommissioned" v-model="wearable.decommissioned" />
+      </div>
       <div class="flex flex-row justify-end gap-2">
         <button primary-outline type="reset" class="w-fit!" :disabled="canSaveOrReset" @click="resetForm">
           abbrechen
@@ -100,6 +108,8 @@ export default defineComponent({
         code: formData.code.value || null,
         name: formData.name.value,
         location: formData.location.value,
+        commissioned: formData.commissioned.value,
+        decommissioned: formData.decommissioned.value ?? null,
       };
       this.status = "loading";
       this.updateActiveWearable(updateWearable)