diff --git a/src/components/admin/unit/damageReport/DamageReportListItem.vue b/src/components/admin/unit/damageReport/DamageReportListItem.vue index 0ece8cb..574c584 100644 --- a/src/components/admin/unit/damageReport/DamageReportListItem.vue +++ b/src/components/admin/unit/damageReport/DamageReportListItem.vue @@ -5,6 +5,7 @@ >

+ {{ damageReport.title }} - {{ damageReport?.related?.name ?? "Ohne Zuordnung" }} ({{ damageReport.related.code }})

diff --git a/src/components/public/damageReport/CheckEntry.vue b/src/components/public/damageReport/CheckEntry.vue index 280f43c..a187a32 100644 --- a/src/components/public/damageReport/CheckEntry.vue +++ b/src/components/public/damageReport/CheckEntry.vue @@ -9,6 +9,10 @@

Typ: {{ check.gear.type }}

+
+ + +
@@ -59,6 +63,7 @@ export default defineComponent({ check: { type: Object as PropType<{ gear: undefined | MinifiedEquipmentViewModel | MinifiedVehicleViewModel | MinifiedWearableViewModel; + title: string; description: string; location: string; note: string; @@ -98,6 +103,7 @@ export default defineComponent({ this.message = ""; const formData = new FormData(); if (this.check.gear) formData.append("related", JSON.stringify(this.check.gear)); + formData.append("title", this.check.title); formData.append("description", this.check.description); formData.append("location", this.check.location); formData.append("note", this.check.note); diff --git a/src/components/public/damageReport/InputData.vue b/src/components/public/damageReport/InputData.vue index eb01d9a..20a35ee 100644 --- a/src/components/public/damageReport/InputData.vue +++ b/src/components/public/damageReport/InputData.vue @@ -2,6 +2,10 @@

zurück

+
+ + +
@@ -45,6 +49,7 @@ export default defineComponent({ data: { type: Object as PropType<{ gear: undefined | MinifiedEquipmentViewModel | MinifiedVehicleViewModel | MinifiedWearableViewModel; + title: string; description: string; location: string; note: string; @@ -57,7 +62,14 @@ export default defineComponent({ emits: { nextStep: (s: string) => true, stepBack: () => true, - data: (d: { description: string; location: string; note: string; reportedBy: string; image?: File }) => true, + data: (d: { + title: string; + description: string; + location: string; + note: string; + reportedBy: string; + image?: File; + }) => true, }, mounted() { if (this.data.image) { @@ -68,6 +80,7 @@ export default defineComponent({ setup(e: any) { let formData = e.target.elements; this.$emit("data", { + title: formData.title.value, description: formData.description.value, location: formData.location.value, note: formData.note.value, diff --git a/src/viewmodels/admin/unit/damageReport.models.ts b/src/viewmodels/admin/unit/damageReport.models.ts index 2c39fe6..5544d00 100644 --- a/src/viewmodels/admin/unit/damageReport.models.ts +++ b/src/viewmodels/admin/unit/damageReport.models.ts @@ -22,6 +22,7 @@ export type DamageReportAssigned = { export type DamageReportViewModel = { id: string; + title: string; reportedAt: Date; status: string; done: boolean; @@ -35,6 +36,7 @@ export type DamageReportViewModel = { } & Optional; export interface CreateDamageReportViewModel { + title: string; description: string; reportedBy: string; affectedId: string; diff --git a/src/views/admin/unit/equipment/DamageReport.vue b/src/views/admin/unit/equipment/DamageReport.vue index 513277d..1f04e66 100644 --- a/src/views/admin/unit/equipment/DamageReport.vue +++ b/src/views/admin/unit/equipment/DamageReport.vue @@ -14,7 +14,7 @@ >
-

{{ new Date(row.reportedAt).toLocaleString("de") }} - {{ row.status }}

+

{{ row.title }} - {{ new Date(row.reportedAt).toLocaleString("de") }} - {{ row.status }}

diff --git a/src/views/admin/unit/vehicle/DamageReport.vue b/src/views/admin/unit/vehicle/DamageReport.vue index 25938da..69f41de 100644 --- a/src/views/admin/unit/vehicle/DamageReport.vue +++ b/src/views/admin/unit/vehicle/DamageReport.vue @@ -14,7 +14,7 @@ >
-

{{ new Date(row.reportedAt).toLocaleString("de") }} - {{ row.status }}

+

{{ row.title }} - {{ new Date(row.reportedAt).toLocaleString("de") }} - {{ row.status }}

diff --git a/src/views/admin/unit/wearable/DamageReport.vue b/src/views/admin/unit/wearable/DamageReport.vue index 3b40512..59379ab 100644 --- a/src/views/admin/unit/wearable/DamageReport.vue +++ b/src/views/admin/unit/wearable/DamageReport.vue @@ -14,7 +14,7 @@ >
-

{{ new Date(row.reportedAt).toLocaleString("de") }} - {{ row.status }}

+

{{ row.title }} - {{ new Date(row.reportedAt).toLocaleString("de") }} - {{ row.status }}

diff --git a/src/views/public/damageReport/Report.vue b/src/views/public/damageReport/Report.vue index c36a7be..4fa0026 100644 --- a/src/views/public/damageReport/Report.vue +++ b/src/views/public/damageReport/Report.vue @@ -56,6 +56,7 @@ export default defineComponent({ usingBarcode: false, content: { gear: undefined, + title: "", description: "", location: "", note: "", @@ -63,6 +64,7 @@ export default defineComponent({ image: undefined, } as { gear: undefined | MinifiedEquipmentViewModel | MinifiedVehicleViewModel | MinifiedWearableViewModel; + title: string; description: string; location: string; note: string; @@ -83,7 +85,15 @@ export default defineComponent({ this.step = index; this.successfull = index - 1; }, - updateContent(d: { description: string; location: string; note: string; reportedBy: string; image?: File }) { + updateContent(d: { + title: string; + description: string; + location: string; + note: string; + reportedBy: string; + image?: File; + }) { + this.content.title = d.title; this.content.description = d.description; this.content.location = d.location; this.content.note = d.note; @@ -102,6 +112,7 @@ export default defineComponent({ this.usingBarcode = false; this.content = { gear: undefined, + title: "", description: "", location: "", note: "",