Skip to content

Commit 43df3f4

Browse files
committed
Fixing saving of autocalculation of breaks.
1 parent 66cac12 commit 43df3f4

4 files changed

Lines changed: 6 additions & 3 deletions

File tree

eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Infrastructure/Models/Settings/AssignedSite.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public class AssignedSite
4242
public int SaturdayBreakMinutesPrDivider { get; set; }
4343
public int SundayBreakMinutesDivider { get; set; }
4444
public int SundayBreakMinutesPrDivider { get; set; }
45+
public bool GlobalAutoBreakCalculationActive { get; set; }
4546
public bool AutoBreakCalculationActive { get; set; }
4647
public int MondayBreakMinutesUpperLimit { get; set; }
4748
public int TuesdayBreakMinutesUpperLimit { get; set; }

eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Services/TimePlanningSettingService/TimeSettingService.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,8 +456,8 @@ planRegistrationForToday is
456456
return new OperationDataResult<Infrastructure.Models.Settings.AssignedSite>(false, "Site not found");
457457
}
458458

459-
var autoBreakCalculationActive = _options.Value.AutoBreakCalculationActive == "1";
460-
dbAssignedSite.AutoBreakCalculationActive = autoBreakCalculationActive;
459+
var globalAutoBreakCalculationActive = _options.Value.AutoBreakCalculationActive == "1";
460+
dbAssignedSite.GlobalAutoBreakCalculationActive = globalAutoBreakCalculationActive;
461461
dbAssignedSite.SiteName = site.Name;
462462

463463
return new OperationDataResult<Infrastructure.Models.Settings.AssignedSite>(true, dbAssignedSite);
@@ -509,6 +509,7 @@ public async Task<OperationResult> UpdateAssignedSite(Infrastructure.Models.Sett
509509
dbAssignedSite.UseOneMinuteIntervals = site.UseOneMinuteIntervals;
510510
dbAssignedSite.UsePunchClock = site.UsePunchClock;
511511
dbAssignedSite.UseDetailedPauseEditing = site.UseDetailedPauseEditing;
512+
dbAssignedSite.AutoBreakCalculationActive = site.AutoBreakCalculationActive;
512513

513514
dbAssignedSite.StartMonday = site.StartMonday;
514515
dbAssignedSite.StartTuesday = site.StartTuesday;

eform-client/src/app/plugins/modules/time-planning-pn/components/plannings/time-planning-actions/assigned-site/assigned-site-dialog.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<!-- {{ 'Use detailed pause editing' | translate }}-->
4141
<!-- </mat-checkbox>-->
4242
<!-- </div>-->
43-
<div class="d-flex flex-row">
43+
<div class="d-flex flex-row" *ngIf="data.globalAutoBreakCalculationActive">
4444
<!-- data.autoBreakCalculationActive -->
4545
<mat-checkbox class="p-1"
4646
[id]="'autoBreakCalculationActive'"

eform-client/src/app/plugins/modules/time-planning-pn/models/assigned-sites/assigned-site.model.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ export class AssignedSiteModel {
4040
sundayBreakMinutesDivider: number;
4141
sundayBreakMinutesPrDivider: number;
4242
autoBreakCalculationActive: boolean;
43+
globalAutoBreakCalculationActive: boolean;
4344
mondayBreakMinutesUpperLimit: number;
4445
tuesdayBreakMinutesUpperLimit: number;
4546
wednesdayBreakMinutesUpperLimit: number;

0 commit comments

Comments
 (0)