Ehrenamt/ff-admin-server
2
0
Fork 0
Code Issues 17 Pull requests Projects Releases 38 Packages Wiki Activity Actions

unit/#107-damage-reports #125

Merged
jkeffects merged 6 commits from unit/#107-damage-reports into milestone/ff-admin-unit 2025-07-17 08:50:18 +00:00
Conversation 0 Commits 6 Files changed 22 +13 -3
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 0fdb77d7ca - Show all commits

12
src/factory/admin/unit/damageReport.ts
View file

@ -25,12 +25,18 @@ export default abstract class DamageReportFactory {
assigned: "vehicle", assigned: "vehicle",
related: VehicleFactory.mapToSingle(record.vehicle), related: VehicleFactory.mapToSingle(record.vehicle),
}; };
} else { } else if (record?.wearableId) {
assigned = { assigned = {
relatedId: record.wearableId, relatedId: record.wearableId,
assigned: "wearable", assigned: "wearable",
related: WearableFactory.mapToSingle(record.wearable), related: WearableFactory.mapToSingle(record.wearable),
}; };
} else {
assigned = {
relatedId: undefined,
assigned: undefined,
related: undefined,
};
} }
return { return {
@ -39,7 +45,9 @@ export default abstract class DamageReportFactory {
status: record.status, status: record.status,
done: record.done, done: record.done,
description: record.description, description: record.description,
image: record.images, location: record.location,
note: record.note,
images: record.images.filter((i) => !!i),
reportedBy: record?.reportedBy, reportedBy: record?.reportedBy,
...assigned, ...assigned,
maintenance: record.maintenance ? MaintenanceFactory.mapToSingle(record.maintenance) : null, maintenance: record.maintenance ? MaintenanceFactory.mapToSingle(record.maintenance) : null,

4
src/viewmodel/admin/unit/damageReport.models.ts
View file

@ -26,7 +26,9 @@ export type DamageReportViewModel = {
status: string; status: string;
done: boolean; done: boolean;
description: string; description: string;
image: string[]; location: string;
note: string;
images: string[];
reportedBy: string; reportedBy: string;
maintenance?: MaintenanceViewModel; maintenance?: MaintenanceViewModel;
} & DamageReportAssigned; } & DamageReportAssigned;