From 0fdb77d7cae993195a137077cca546e56c066823 Mon Sep 17 00:00:00 2001 From: Julian Krauser Date: Wed, 16 Jul 2025 12:42:54 +0200 Subject: [PATCH] pass reports to admin ui --- src/factory/admin/unit/damageReport.ts | 12 ++++++++++-- src/viewmodel/admin/unit/damageReport.models.ts | 4 +++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/factory/admin/unit/damageReport.ts b/src/factory/admin/unit/damageReport.ts index 9c7cdb4..8bf72d9 100644 --- a/src/factory/admin/unit/damageReport.ts +++ b/src/factory/admin/unit/damageReport.ts @@ -25,12 +25,18 @@ export default abstract class DamageReportFactory { assigned: "vehicle", related: VehicleFactory.mapToSingle(record.vehicle), }; - } else { + } else if (record?.wearableId) { assigned = { relatedId: record.wearableId, assigned: "wearable", related: WearableFactory.mapToSingle(record.wearable), }; + } else { + assigned = { + relatedId: undefined, + assigned: undefined, + related: undefined, + }; } return { @@ -39,7 +45,9 @@ export default abstract class DamageReportFactory { status: record.status, done: record.done, description: record.description, - image: record.images, + location: record.location, + note: record.note, + images: record.images.filter((i) => !!i), reportedBy: record?.reportedBy, ...assigned, maintenance: record.maintenance ? MaintenanceFactory.mapToSingle(record.maintenance) : null, diff --git a/src/viewmodel/admin/unit/damageReport.models.ts b/src/viewmodel/admin/unit/damageReport.models.ts index 7871d06..25692b2 100644 --- a/src/viewmodel/admin/unit/damageReport.models.ts +++ b/src/viewmodel/admin/unit/damageReport.models.ts @@ -26,7 +26,9 @@ export type DamageReportViewModel = { status: string; done: boolean; description: string; - image: string[]; + location: string; + note: string; + images: string[]; reportedBy: string; maintenance?: MaintenanceViewModel; } & DamageReportAssigned;