admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in release/2024-04-19 (pull request #1414)

Browse Source 
Resolve schedule header display.
This commit is contained in:
Patrick Fic
2024-04-15 20:47:48 +00:00
parent ec7509670d 81f94eac6c
commit 1620b94a7b
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.js
View File

@@ -77,11 +77,11 @@ export function ScheduleCalendarHeaderComponent({
<OwnerNameDisplay ownerObject={j} /> <OwnerNameDisplay ownerObject={j} />
</td> </td>
<td style={{ padding: "2.5px" }}> <td style={{ padding: "2.5px" }}>
{`(${j.labhrs.aggregate.sum.mod_lb_hrs.toFixed( {`(${j.labhrs?.aggregate?.sum?.mod_lb_hrs?.toFixed(1) || 0}/${
1 j.larhrs?.aggregate?.sum?.mod_lb_hrs?.toFixed(1) || 0
)}/${j.larhrs.aggregate.sum.mod_lb_hrs.toFixed(1)}/${( }/${(
j.labhrs.aggregate.sum.mod_lb_hrs + j.labhrs.aggregate?.sum?.mod_lb_hrs +
j.larhrs.aggregate.sum.mod_lb_hrs j.larhrs.aggregate?.sum?.mod_lb_hrs
).toFixed(1)} ${t("general.labels.hours")})`} ).toFixed(1)} ${t("general.labels.hours")})`}
</td> </td>
<td style={{ padding: "2.5px" }}> <td style={{ padding: "2.5px" }}>
@@ -117,11 +117,11 @@ export function ScheduleCalendarHeaderComponent({
<OwnerNameDisplay ownerObject={j} /> <OwnerNameDisplay ownerObject={j} />
</td> </td>
<td style={{ padding: "2.5px" }}> <td style={{ padding: "2.5px" }}>
{`(${j.labhrs.aggregate.sum.mod_lb_hrs.toFixed( {`(${j.labhrs?.aggregate?.sum.mod_lb_hrs?.toFixed(1) || 0}/${
1 j.larhrs?.aggregate?.sum?.mod_lb_hrs?.toFixed(1) || 0
)}/${j.larhrs.aggregate.sum.mod_lb_hrs.toFixed(1)}/${( }/${(
j.labhrs.aggregate.sum.mod_lb_hrs + j.labhrs?.aggregate?.sum?.mod_lb_hrs +
j.larhrs.aggregate.sum.mod_lb_hrs j.larhrs?.aggregate?.sum?.mod_lb_hrs
).toFixed(1)} ${t("general.labels.hours")})`} ).toFixed(1)} ${t("general.labels.hours")})`}
</td> </td>
<td style={{ padding: "2.5px" }}> <td style={{ padding: "2.5px" }}>