Skip to content

Commit e1844b4

Browse files
committed
Simplifying the edit of a workday.
1 parent 7cb8f30 commit e1844b4

2 files changed

Lines changed: 8 additions & 12 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: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1090,18 +1090,14 @@ export class WorkdayEntityDialogComponent implements OnInit, OnDestroy {
10901090
this.data.planningPrDayModels.message = TimePlanningMessagesEnum[changedKey as keyof typeof TimePlanningMessagesEnum];
10911091

10921092
// Your original “DayOff” logic preserved
1093-
if (changedKey !== 'DayOff') {
1094-
if (changedKey === 'VacationDayOff') {
1095-
this.data.planningPrDayModels.nettoHoursOverrideActive = true;
1096-
this.data.planningPrDayModels.nettoHoursOverride = 0;
1097-
this.workdayForm.get('nettoHoursOverride')?.setValue(0);
1098-
} else {
1099-
this.data.planningPrDayModels.nettoHoursOverrideActive = true;
1100-
this.data.planningPrDayModels.nettoHoursOverride = this.data.planningPrDayModels.planHours;
1101-
this.workdayForm.get('nettoHoursOverride')?.setValue(this.data.planningPrDayModels.planHours);
1102-
}
1093+
if (changedKey === 'DayOff' || changedKey === 'VacationDayOff') {
1094+
this.data.planningPrDayModels.nettoHoursOverrideActive = true;
1095+
this.data.planningPrDayModels.nettoHoursOverride = 0;
1096+
this.workdayForm.get('nettoHoursOverride')?.setValue(0);
11031097
} else {
1104-
this.data.planningPrDayModels.nettoHoursOverrideActive = false;
1098+
this.data.planningPrDayModels.nettoHoursOverrideActive = true;
1099+
this.data.planningPrDayModels.nettoHoursOverride = this.data.planningPrDayModels.planHours;
1100+
this.workdayForm.get('nettoHoursOverride')?.setValue(this.data.planningPrDayModels.planHours);
11051101
}
11061102
} else {
11071103
// If user unticks the active one, clear message/override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@
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>
331+
<mat-icon fontSet="material-symbols-outlined" *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>
332332
<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>
333333
</div>
334334
</div>

0 commit comments

Comments
 (0)