diff --git a/src/components/admin/unit/damageReport/DamageReportListItem.vue b/src/components/admin/unit/damageReport/DamageReportListItem.vue index 4cf1371..6606064 100644 --- a/src/components/admin/unit/damageReport/DamageReportListItem.vue +++ b/src/components/admin/unit/damageReport/DamageReportListItem.vue @@ -9,21 +9,23 @@ ({{ damageReport.related.code }})

-
+
-
+
-
+
-
+
+

gemeldet: {{ damageReport.reportedAt }}

+

Status: {{ damageReport.status }}

Beschreibung: {{ damageReport.description }}

diff --git a/src/stores/admin/unit/damageReport/damageReport.ts b/src/stores/admin/unit/damageReport/damageReport.ts index ed5b106..827086a 100644 --- a/src/stores/admin/unit/damageReport/damageReport.ts +++ b/src/stores/admin/unit/damageReport/damageReport.ts @@ -96,7 +96,9 @@ export const useDamageReportStore = defineStore("damageReport", { }, async updateDamageReport(damageReport: UpdateDamageReportViewModel): Promise> { const result = await http.patch(`/admin/damageReport/${damageReport.id}`, { - // TODO: data + status: damageReport.status, + noteByWorker: damageReport.noteByWorker, + done: damageReport.done, }); return result; }, diff --git a/src/stores/admin/unit/equipment/damageReport.ts b/src/stores/admin/unit/equipment/damageReport.ts index eabf261..9460582 100644 --- a/src/stores/admin/unit/equipment/damageReport.ts +++ b/src/stores/admin/unit/equipment/damageReport.ts @@ -22,7 +22,7 @@ export const useEquipmentDamageReportStore = defineStore("equipmentDamageReport" ) .then((result) => { this.totalCount = result.data.total; - result.data.reports + result.data.damageReports .filter((elem: DamageReportViewModel) => this.damageReports.findIndex((m) => m.id == elem.id) == -1) .map((elem: DamageReportViewModel, index: number): DamageReportViewModel & { tab_pos: number } => { return { diff --git a/src/stores/admin/unit/vehicle/damageReport.ts b/src/stores/admin/unit/vehicle/damageReport.ts index 29a470d..b4df77f 100644 --- a/src/stores/admin/unit/vehicle/damageReport.ts +++ b/src/stores/admin/unit/vehicle/damageReport.ts @@ -22,7 +22,7 @@ export const useVehicleDamageReportStore = defineStore("vehicleDamageReport", { ) .then((result) => { this.totalCount = result.data.total; - result.data.reports + result.data.damageReports .filter((elem: DamageReportViewModel) => this.damageReports.findIndex((m) => m.id == elem.id) == -1) .map((elem: DamageReportViewModel, index: number): DamageReportViewModel & { tab_pos: number } => { return { diff --git a/src/stores/admin/unit/wearable/damageReport.ts b/src/stores/admin/unit/wearable/damageReport.ts index 4cb2420..e54a912 100644 --- a/src/stores/admin/unit/wearable/damageReport.ts +++ b/src/stores/admin/unit/wearable/damageReport.ts @@ -22,7 +22,7 @@ export const useWearableDamageReportStore = defineStore("wearableDamageReport", ) .then((result) => { this.totalCount = result.data.total; - result.data.reports + result.data.damageReports .filter((elem: DamageReportViewModel) => this.damageReports.findIndex((m) => m.id == elem.id) == -1) .map((elem: DamageReportViewModel, index: number): DamageReportViewModel & { tab_pos: number } => { return { diff --git a/src/viewmodels/admin/unit/damageReport.models.ts b/src/viewmodels/admin/unit/damageReport.models.ts index 70b8e1d..d05debe 100644 --- a/src/viewmodels/admin/unit/damageReport.models.ts +++ b/src/viewmodels/admin/unit/damageReport.models.ts @@ -27,7 +27,8 @@ export type DamageReportViewModel = { done: boolean; description: string; location: string; - note: string; + noteByReporter: string; + noteByWorker: string; images: string[]; reportedBy: string; maintenance?: MaintenanceViewModel; @@ -43,5 +44,6 @@ export interface CreateDamageReportViewModel { export interface UpdateDamageReportViewModel { id: string; status: string; + noteByWorker: string; done: boolean; } diff --git a/src/views/admin/unit/damageReport/Overview.vue b/src/views/admin/unit/damageReport/Overview.vue index dc0eb4f..85c05eb 100644 --- a/src/views/admin/unit/damageReport/Overview.vue +++ b/src/views/admin/unit/damageReport/Overview.vue @@ -3,7 +3,29 @@
- + +
+
+ + +
+ +
+ +

@@ -12,19 +34,26 @@
- +
- - + +
- +
-
+
+ Keine Bilder hochgeladen +
@@ -32,9 +61,10 @@ diff --git a/src/views/admin/unit/equipment/DamageReport.vue b/src/views/admin/unit/equipment/DamageReport.vue index aa2df0a..230bab5 100644 --- a/src/views/admin/unit/equipment/DamageReport.vue +++ b/src/views/admin/unit/equipment/DamageReport.vue @@ -3,22 +3,37 @@
@@ -31,7 +46,7 @@ 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.models"; -import { PhotoIcon, PencilSquareIcon } from "@heroicons/vue/24/outline"; +import { PhotoIcon, PencilSquareIcon, MapPinIcon, WrenchScrewdriverIcon, UserIcon } from "@heroicons/vue/24/outline"; diff --git a/src/views/admin/unit/vehicle/DamageReport.vue b/src/views/admin/unit/vehicle/DamageReport.vue index ebac088..9cb01ad 100644 --- a/src/views/admin/unit/vehicle/DamageReport.vue +++ b/src/views/admin/unit/vehicle/DamageReport.vue @@ -4,21 +4,36 @@ :items="damageReports" :totalCount="totalCount" :indicateLoading="false" - @load-data="(offset, count, search) => {}" - @search="(search) => {}" + @load-data="(offset, count, search) => fetchDamageReportForVehicle(offset, count, search)" + @search="(search) => fetchDamageReportForVehicle(0, 25, search, true)" >
@@ -31,7 +46,7 @@ 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.models"; -import { PhotoIcon, PencilSquareIcon } from "@heroicons/vue/24/outline"; +import { PhotoIcon, PencilSquareIcon, MapPinIcon, WrenchScrewdriverIcon, UserIcon } from "@heroicons/vue/24/outline"; diff --git a/src/views/admin/unit/wearable/DamageReport.vue b/src/views/admin/unit/wearable/DamageReport.vue index 8f2600d..508ff3b 100644 --- a/src/views/admin/unit/wearable/DamageReport.vue +++ b/src/views/admin/unit/wearable/DamageReport.vue @@ -4,21 +4,36 @@ :items="damageReports" :totalCount="totalCount" :indicateLoading="false" - @load-data="(offset, count, search) => {}" - @search="(search) => {}" + @load-data="(offset, count, search) => fetchDamageReportForWearable(offset, count, search)" + @search="(search) => fetchDamageReportForWearable(0, 25, search, true)" > @@ -31,7 +46,7 @@ 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.models"; -import { PhotoIcon, PencilSquareIcon } from "@heroicons/vue/24/outline"; +import { PhotoIcon, PencilSquareIcon, MapPinIcon, WrenchScrewdriverIcon, UserIcon } from "@heroicons/vue/24/outline";