Skip to content

Commit 7cb8f30

Browse files
committed
Minor changes to representation of "VacationDayOff"
1 parent 2ea3c8e commit 7cb8f30

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

eform-client/src/app/plugins/modules/time-planning-pn/components/plannings/time-planning-actions/workday-entity/workday-entity-dialog.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,8 +1093,8 @@ export class WorkdayEntityDialogComponent implements OnInit, OnDestroy {
10931093
if (changedKey !== 'DayOff') {
10941094
if (changedKey === 'VacationDayOff') {
10951095
this.data.planningPrDayModels.nettoHoursOverrideActive = true;
1096-
this.data.planningPrDayModels.nettoHoursOverride = (0 - this.data.planningPrDayModels.planHours);
1097-
this.workdayForm.get('nettoHoursOverride')?.setValue(0 - this.data.planningPrDayModels.planHours);
1096+
this.data.planningPrDayModels.nettoHoursOverride = 0;
1097+
this.workdayForm.get('nettoHoursOverride')?.setValue(0);
10981098
} else {
10991099
this.data.planningPrDayModels.nettoHoursOverrideActive = true;
11001100
this.data.planningPrDayModels.nettoHoursOverride = this.data.planningPrDayModels.planHours;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,13 +321,14 @@
321321

322322
<!-- Right Icons -->
323323
<div class="plan-icons">
324-
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 2 || row.planningPrDayModels[col.field]?.message === 11" class="blue-text neutral-icon" [matTooltip]="enumKeys[row.planningPrDayModels[col.field]?.message - 1] | translate">flight</mat-icon>
324+
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 2" class="blue-text neutral-icon" [matTooltip]="enumKeys[row.planningPrDayModels[col.field]?.message - 1] | translate">flight</mat-icon>
325325
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 10" class="blue-text neutral-icon" [matTooltip]="enumKeys[row.planningPrDayModels[col.field]?.message - 1] | translate">pregnant_woman</mat-icon>
326326
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 3 || row.planningPrDayModels[col.field]?.message === 7 || row.planningPrDayModels[col.field]?.message === 8" class="red-text neutral-icon" [matTooltip]="enumKeys[row.planningPrDayModels[col.field]?.message - 1] | translate">sick</mat-icon>
327327
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 1" class="blue-text neutral-icon" [matTooltip]="enumKeys[row.planningPrDayModels[col.field]?.message - 1] | translate">event_busy</mat-icon>
328328
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 4" class="blue-text neutral-icon" [matTooltip]="enumKeys[row.planningPrDayModels[col.field]?.message - 1] | translate">school</mat-icon>
329329
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 5" class="blue-text neutral-icon" [matTooltip]="enumKeys[row.planningPrDayModels[col.field]?.message - 1] | translate">event_busy</mat-icon>
330330
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 9" class="blue-text neutral-icon" [matTooltip]="enumKeys[row.planningPrDayModels[col.field]?.message - 1] | translate">outdoor_grill</mat-icon>
331+
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 11" class="blue-text neutral-icon" [matTooltip]="enumKeys[row.planningPrDayModels[col.field]?.message - 1] | translate">clock_arrow_down</mat-icon>
331332
<mat-icon *ngIf="row.planningPrDayModels[col.field]?.message === 12" class="blue-text neutral-icon" [matTooltip]="enumKeys[row.planningPrDayModels[col.field]?.message - 1] | translate">luggage</mat-icon>
332333
</div>
333334
</div>

0 commit comments

Comments
 (0)