Skip to content

Commit b377edb

Browse files
masudul-tikwebrenemadsen
authored andcommitted
fix the planned hours overlapped when the start hour is 0
1 parent f06c799 commit b377edb

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

eform-client/src/app/plugins/modules/time-planning-pn/components/plannings/time-plannings-table/time-plannings-table.component.html

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,23 @@
136136
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedBreakOfShift1) }}
137137
</strong>
138138
</div>
139-
<div class="plan-text" *ngIf="row.planningPrDayModels[col.field]?.plannedStartOfShift1 === 0 && row.planningPrDayModels[col.field]?.planHours !== 0">
139+
140+
<div class="plan-text" *ngIf="row.planningPrDayModels[col.field]?.plannedStartOfShift1 === 0 && row.planningPrDayModels[col.field]?.plannedEndOfShift1 !== 0 ">
141+
<strong class="{{ getCellTextColor(row, col.field) }}" id="firstShift{{index}}_{{col.field}}">
142+
<mat-icon class="neutral-icon" [matTooltip]="'Planned working hours' | translate ">calendar_month</mat-icon>
143+
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedStartOfShift1) }} -
144+
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedEndOfShift1) }} /
145+
{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.plannedBreakOfShift1) }}
146+
</strong>
147+
</div>
148+
149+
<div class="plan-text" *ngIf="row.planningPrDayModels[col.field]?.plannedStartOfShift1 === 0 && row.planningPrDayModels[col.field]?.plannedEndOfShift1 === 0 && row.planningPrDayModels[col.field]?.planHours !== 0">
140150
<strong class="{{ getCellTextColor(row, col.field) }}" id="plannedHours{{index}}_{{col.field}}">
141151
<mat-icon class="neutral-icon" [matTooltip]="'Planned working hours' | translate ">calendar_month</mat-icon>
142152
{{ convertHoursToTime(row.planningPrDayModels[col.field]?.planHours) }}
143153
</strong>
144154
</div>
155+
145156
<div class="plan-text {{ getCellTextColor(row, col.field) }}"
146157
*ngIf="row.planningPrDayModels[col.field]?.start1StartedAt !== null" id="firstShiftActual{{index}}_{{col.field}}">
147158
<mat-icon class="neutral-icon" [matTooltip]="'Worktime start' | translate ">login</mat-icon> {{ datePipe.transform(row.planningPrDayModels[col.field]?.start1StartedAt, 'HH:mm', 'UTC') }}

0 commit comments

Comments
 (0)