Skip to content

Commit 9a5def7

Browse files
committed
Fixed incorrect exposure start_time and ppe assignment
1 parent 6536ab4 commit 9a5def7

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

src/models/EquipmentExposure.ts

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export class EquipmentExposure extends BaseModel implements Partial<JsonApiMappi
5050

5151
constructor(data?: any) {
5252
super(data);
53-
this.start_time = data?.attributes?.start_time?.id ?? data?.start_time ?? '';
53+
this.start_time = data?.attributes?.start_time ?? data?.start_time ?? '';
5454
this.end_time = data?.attributes?.end_time ?? data?.end_time ?? '';
5555

5656
if (data?.attributes?.location) {
@@ -74,18 +74,10 @@ export class EquipmentExposure extends BaseModel implements Partial<JsonApiMappi
7474
const ppeData = data.attributes?.ppe;
7575

7676
this.ppe = {
77-
mask: ppeData.ppe?.mask ?? false,
78-
ear_defenders: ppeData.ppe?.ear_defenders ?? false
77+
mask: ppeData?.mask ?? false,
78+
ear_defenders: ppeData?.ear_defenders ?? false
7979
}
8080
}
8181

82-
if (data?.ppe) {
83-
const ppeData = data.ppe;
84-
85-
this.ppe = {
86-
mask: ppeData.mask ?? false,
87-
ear_defenders: ppeData.ear_defenders ?? false
88-
}
89-
}
9082
}
9183
}

0 commit comments

Comments
 (0)