Fixing autobreak calcuation settings.

renemadsen · renemadsen · commit 576f6860ba75 · 2025-10-16T13:11:24.000+02:00
diff --git a/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Infrastructure/Helpers/PlanRegistrationHelper.cs b/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Infrastructure/Helpers/PlanRegistrationHelper.cs
@@ -859,7 +859,7 @@ await dbContext.PlanRegistrations.AsNoTracking()
                                 tainted = true;
                             }
 
-                            Console.WriteLine($"The plannedHours are now: {planRegistration.PlanHours}");
+                            // Console.WriteLine($"The plannedHours are now: {planRegistration.PlanHours}");
 
                             await planRegistration.Update(dbContext).ConfigureAwait(false);
                         }
@@ -1881,7 +1881,7 @@ await dbContext.PlanRegistrations.AsNoTracking()
                         }
                     }
 
-                    Console.WriteLine($"The plannedHours are now: {planRegistration.PlanHours}");
+                    // Console.WriteLine($"The plannedHours are now: {planRegistration.PlanHours}");
 
                     await planRegistration.Update(dbContext).ConfigureAwait(false);
                 }
diff --git a/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Infrastructure/Models/Settings/AssignedSite.cs b/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Infrastructure/Models/Settings/AssignedSite.cs
@@ -164,6 +164,7 @@ public class AssignedSite
     public bool FifthShiftActive { get; set; } = false;
     public bool DaysBackInTimeAllowedEditingEnabled { get; set; }
     public int DaysBackInTimeAllowedEditing { get; set; } = 2;
+    public AutoBreakSettings AutoBreakSettings { get; set; }
 
     // implicit conversion from Microting.TimePlanningBase.Infrastructure.Data.Entities.AssignedSite to AssignedSite
     public static implicit operator AssignedSite(
@@ -320,7 +321,4 @@ public static implicit operator AssignedSite(
             DaysBackInTimeAllowedEditing = model.DaysBackInTimeAllowedEditing,
         };
     }
-}
-
-
-
+}
diff --git a/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Infrastructure/Models/Settings/AutoBreakSettings.cs b/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Infrastructure/Models/Settings/AutoBreakSettings.cs
@@ -0,0 +1,55 @@
+namespace TimePlanning.Pn.Infrastructure.Models.Settings;
+
+public class AutoBreakSettings
+{
+    public Monday Monday { get; set; }
+    public Tuesday Tuesday { get; set; }
+    public Wednesday Wednesday { get; set; }
+    public Thursday Thursday { get; set; }
+    public Friday Friday { get; set; }
+    public Saturday Saturday { get; set; }
+    public Sunday Sunday { get; set; }
+}
+
+public class Day
+{
+    public int BreakMinutesDivider { get; set; }
+    public int BreakMinutesPrDivider { get; set; }
+    public int BreakMinutesUpperLimit { get; set; }
+
+}
+
+public class Monday : Day
+{
+
+}
+
+public class Tuesday : Day
+{
+
+}
+
+public class Wednesday : Day
+{
+
+}
+
+public class Thursday : Day
+{
+
+}
+
+public class Friday : Day
+{
+
+}
+
+public class Saturday : Day
+{
+
+}
+
+public class Sunday : Day
+{
+
+}
diff --git a/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Services/TimePlanningSettingService/TimeSettingService.cs b/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Services/TimePlanningSettingService/TimeSettingService.cs
@@ -653,27 +653,46 @@ public async Task<OperationResult> UpdateAssignedSite(Infrastructure.Models.Sett
         dbAssignedSite.BreakSunday2NdShift = site.BreakSunday2NdShift;
         if (dbAssignedSite.AutoBreakCalculationActive)
         {
-            dbAssignedSite.MondayBreakMinutesDivider = site.MondayBreakMinutesDivider;
-            dbAssignedSite.TuesdayBreakMinutesDivider = site.TuesdayBreakMinutesDivider;
-            dbAssignedSite.WednesdayBreakMinutesDivider = site.WednesdayBreakMinutesDivider;
-            dbAssignedSite.ThursdayBreakMinutesDivider = site.ThursdayBreakMinutesDivider;
-            dbAssignedSite.FridayBreakMinutesDivider = site.FridayBreakMinutesDivider;
-            dbAssignedSite.SaturdayBreakMinutesDivider = site.SaturdayBreakMinutesDivider;
-            dbAssignedSite.SundayBreakMinutesDivider = site.SundayBreakMinutesDivider;
-            dbAssignedSite.MondayBreakMinutesPrDivider = site.MondayBreakMinutesPrDivider;
-            dbAssignedSite.TuesdayBreakMinutesPrDivider = site.TuesdayBreakMinutesPrDivider;
-            dbAssignedSite.WednesdayBreakMinutesPrDivider = site.WednesdayBreakMinutesPrDivider;
-            dbAssignedSite.ThursdayBreakMinutesPrDivider = site.ThursdayBreakMinutesPrDivider;
-            dbAssignedSite.FridayBreakMinutesPrDivider = site.FridayBreakMinutesPrDivider;
-            dbAssignedSite.SaturdayBreakMinutesPrDivider = site.SaturdayBreakMinutesPrDivider;
-            dbAssignedSite.SundayBreakMinutesPrDivider = site.SundayBreakMinutesPrDivider;
-            dbAssignedSite.MondayBreakMinutesUpperLimit = site.MondayBreakMinutesUpperLimit;
-            dbAssignedSite.TuesdayBreakMinutesUpperLimit = site.TuesdayBreakMinutesUpperLimit;
-            dbAssignedSite.WednesdayBreakMinutesUpperLimit = site.WednesdayBreakMinutesUpperLimit;
-            dbAssignedSite.ThursdayBreakMinutesUpperLimit = site.ThursdayBreakMinutesUpperLimit;
-            dbAssignedSite.FridayBreakMinutesUpperLimit = site.FridayBreakMinutesUpperLimit;
-            dbAssignedSite.SaturdayBreakMinutesUpperLimit = site.SaturdayBreakMinutesUpperLimit;
-            dbAssignedSite.SundayBreakMinutesUpperLimit = site.SundayBreakMinutesUpperLimit;
+            dbAssignedSite.MondayBreakMinutesDivider = site.AutoBreakSettings.Monday.BreakMinutesDivider;
+            dbAssignedSite.MondayBreakMinutesPrDivider = site.AutoBreakSettings.Monday.BreakMinutesPrDivider;
+            dbAssignedSite.MondayBreakMinutesUpperLimit = site.AutoBreakSettings.Monday.BreakMinutesUpperLimit;
+            dbAssignedSite.TuesdayBreakMinutesDivider = site.AutoBreakSettings.Tuesday.BreakMinutesDivider;
+            dbAssignedSite.TuesdayBreakMinutesPrDivider = site.AutoBreakSettings.Tuesday.BreakMinutesPrDivider;
+            dbAssignedSite.TuesdayBreakMinutesUpperLimit = site.AutoBreakSettings.Tuesday.BreakMinutesUpperLimit;
+            dbAssignedSite.WednesdayBreakMinutesDivider = site.AutoBreakSettings.Wednesday.BreakMinutesDivider;
+            dbAssignedSite.WednesdayBreakMinutesPrDivider = site.AutoBreakSettings.Wednesday.BreakMinutesPrDivider;
+            dbAssignedSite.WednesdayBreakMinutesUpperLimit = site.AutoBreakSettings.Wednesday.BreakMinutesUpperLimit;
+            dbAssignedSite.ThursdayBreakMinutesDivider = site.AutoBreakSettings.Thursday.BreakMinutesDivider;
+            dbAssignedSite.ThursdayBreakMinutesPrDivider = site.AutoBreakSettings.Thursday.BreakMinutesPrDivider;
+            dbAssignedSite.ThursdayBreakMinutesUpperLimit = site.AutoBreakSettings.Thursday.BreakMinutesUpperLimit;
+            dbAssignedSite.FridayBreakMinutesDivider = site.AutoBreakSettings.Friday.BreakMinutesDivider;
+            dbAssignedSite.FridayBreakMinutesPrDivider = site.AutoBreakSettings.Friday.BreakMinutesPrDivider;
+            dbAssignedSite.FridayBreakMinutesUpperLimit = site.AutoBreakSettings.Friday.BreakMinutesUpperLimit;
+            dbAssignedSite.SaturdayBreakMinutesDivider = site.AutoBreakSettings.Saturday.BreakMinutesDivider;
+            dbAssignedSite.SaturdayBreakMinutesPrDivider = site.AutoBreakSettings.Saturday.BreakMinutesPrDivider;
+            dbAssignedSite.SaturdayBreakMinutesUpperLimit = site.AutoBreakSettings.Saturday.BreakMinutesUpperLimit;
+            dbAssignedSite.SundayBreakMinutesDivider = site.AutoBreakSettings.Sunday.BreakMinutesDivider;
+            dbAssignedSite.SundayBreakMinutesPrDivider = site.AutoBreakSettings.Sunday.BreakMinutesPrDivider;
+            dbAssignedSite.SundayBreakMinutesUpperLimit = site.AutoBreakSettings.Sunday.BreakMinutesUpperLimit;
+            // dbAssignedSite.WednesdayBreakMinutesDivider = site.WednesdayBreakMinutesDivider;
+            // dbAssignedSite.ThursdayBreakMinutesDivider = site.ThursdayBreakMinutesDivider;
+            // dbAssignedSite.FridayBreakMinutesDivider = site.FridayBreakMinutesDivider;
+            // dbAssignedSite.SaturdayBreakMinutesDivider = site.SaturdayBreakMinutesDivider;
+            // dbAssignedSite.SundayBreakMinutesDivider = site.SundayBreakMinutesDivider;
+            // dbAssignedSite.MondayBreakMinutesPrDivider = site.MondayBreakMinutesPrDivider;
+            // dbAssignedSite.TuesdayBreakMinutesPrDivider = site.TuesdayBreakMinutesPrDivider;
+            // dbAssignedSite.WednesdayBreakMinutesPrDivider = site.WednesdayBreakMinutesPrDivider;
+            // dbAssignedSite.ThursdayBreakMinutesPrDivider = site.ThursdayBreakMinutesPrDivider;
+            // dbAssignedSite.FridayBreakMinutesPrDivider = site.FridayBreakMinutesPrDivider;
+            // dbAssignedSite.SaturdayBreakMinutesPrDivider = site.SaturdayBreakMinutesPrDivider;
+            // dbAssignedSite.SundayBreakMinutesPrDivider = site.SundayBreakMinutesPrDivider;
+            // dbAssignedSite.MondayBreakMinutesUpperLimit = site.MondayBreakMinutesUpperLimit;
+            // dbAssignedSite.TuesdayBreakMinutesUpperLimit = site.TuesdayBreakMinutesUpperLimit;
+            // dbAssignedSite.WednesdayBreakMinutesUpperLimit = site.WednesdayBreakMinutesUpperLimit;
+            // dbAssignedSite.ThursdayBreakMinutesUpperLimit = site.ThursdayBreakMinutesUpperLimit;
+            // dbAssignedSite.FridayBreakMinutesUpperLimit = site.FridayBreakMinutesUpperLimit;
+            // dbAssignedSite.SaturdayBreakMinutesUpperLimit = site.SaturdayBreakMinutesUpperLimit;
+            // dbAssignedSite.SundayBreakMinutesUpperLimit = site.SundayBreakMinutesUpperLimit;
         }
         dbAssignedSite.MondayPlanHours = site.MondayPlanHours;
         dbAssignedSite.TuesdayPlanHours = site.TuesdayPlanHours;
diff --git a/eform-client/src/app/plugins/modules/time-planning-pn/components/plannings/time-planning-actions/assigned-site/assigned-site-dialog.component.html b/eform-client/src/app/plugins/modules/time-planning-pn/components/plannings/time-planning-actions/assigned-site/assigned-site-dialog.component.html
@@ -214,10 +214,10 @@
       </div>
     </mat-tab>
     <mat-tab  label="{{ 'Auto break calculation settings' | translate }}"
-             *ngIf="data.autoBreakCalculationActive && selectCurrentUserIsFirstUser$ | async">
+             *ngIf="data.autoBreakCalculationActive && selectCurrentUserIsAdmin$ | async">
       <div [formGroupName]="'autoBreakSettings'">
       <ng-container *ngFor="let day of ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']">
-        <div [formGroupName]="day" class="d-flex flex-row">
+        <div [formGroupName]="day.toLowerCase()" class="d-flex flex-row">
           <mat-form-field class="p-1">
             <mat-label>{{ day + ' break time divider in minutes' | translate }}</mat-label>
             <input
@@ -228,7 +228,6 @@
               [id]="day.toLowerCase() + 'BreakMinutesDivider'"
               [name]="day.toLowerCase() + 'BreakMinutesDivider'"
               formControlName="breakMinutesDivider"
-              [disabled]="!data.autoBreakCalculationActive"
               readonly
             >
             <ngx-material-timepicker
@@ -238,7 +237,7 @@
             ></ngx-material-timepicker>
           </mat-form-field>
           <mat-form-field class="p-1">
-            <mat-label>{{ day + ' break time pr divider in minutes' | translate }}</mat-label>
+            <mat-label>{{ day.toLowerCase() + ' break time pr divider in minutes' | translate }}</mat-label>
             <input
               matInput
               [ngxTimepicker]="timePickerPrDivider"
@@ -247,7 +246,6 @@
               [id]="day.toLowerCase() + 'BreakMinutesPrDivider'"
               [name]="day.toLowerCase() + 'BreakMinutesPrDivider'"
               formControlName="breakMinutesPrDivider"
-              [disabled]="!data.autoBreakCalculationActive"
               readonly>
             <ngx-material-timepicker
               #timePickerPrDivider
@@ -265,7 +263,6 @@
               [id]="day.toLowerCase() + 'BreakMinutesUpperLimit'"
               [name]="day.toLowerCase() + 'BreakMinutesUpperLimit'"
               formControlName="breakMinutesUpperLimit"
-              [disabled]="!data.autoBreakCalculationActive"
               readonly
             >
           </mat-form-field>
diff --git a/eform-client/src/app/plugins/modules/time-planning-pn/components/plannings/time-planning-actions/assigned-site/assigned-site-dialog.component.ts b/eform-client/src/app/plugins/modules/time-planning-pn/components/plannings/time-planning-actions/assigned-site/assigned-site-dialog.component.ts
@@ -65,9 +65,9 @@ export class AssignedSiteDialogComponent implements DoCheck, OnInit {
     // autoBreakSettings group
     const autoBreakGroup = days.reduce((acc, day) => {
       acc[day] = this.fb.group({
-        breakMinutesDivider: new FormControl(this.data[`${day}BreakMinutesDivider`] ?? null),
-        breakMinutesPrDivider: new FormControl(this.data[`${day}BreakMinutesPrDivider`] ?? null),
-        breakMinutesUpperLimit: new FormControl(this.data[`${day}BreakMinutesUpperLimit`] ?? null),
+        breakMinutesDivider: new FormControl(this.getConvertedValue(this.data[`${day}BreakMinutesDivider`]) ?? null),
+        breakMinutesPrDivider: new FormControl(this.getConvertedValue(this.data[`${day}BreakMinutesPrDivider`]) ?? null),
+        breakMinutesUpperLimit: new FormControl(this.getConvertedValue(this.data[`${day}BreakMinutesUpperLimit`]) ?? null),
       });
       return acc;
     }, {} as { [key: string]: FormGroup });
@@ -296,7 +296,7 @@ export class AssignedSiteDialogComponent implements DoCheck, OnInit {
     const firstShiftMinutes = this.calculateShiftMinutes(start, end, breakTime);
     const secondShiftMinutes = this.calculateShiftMinutes(start2NdShift, end2NdShift, break2NdShift);
     const totalMinutes = firstShiftMinutes + secondShiftMinutes;
-    
+
     return this.formatMinutesAsTime(totalMinutes);
   }
 
@@ -487,51 +487,51 @@ export class AssignedSiteDialogComponent implements DoCheck, OnInit {
     switch (day) {
       case 'monday':
         dayGroup.patchValue({
-          breakMinutesDivider: this.globalAutoBreakSettings.mondayBreakMinutesDivider,
-          breakMinutesPrDivider: this.globalAutoBreakSettings.mondayBreakMinutesPrDivider,
-          breakMinutesUpperLimit: this.globalAutoBreakSettings.mondayBreakMinutesUpperLimit,
+          breakMinutesDivider: this.getConvertedValue(this.globalAutoBreakSettings.mondayBreakMinutesDivider),
+          breakMinutesPrDivider: this.getConvertedValue(this.globalAutoBreakSettings.mondayBreakMinutesPrDivider),
+          breakMinutesUpperLimit: this.getConvertedValue(this.globalAutoBreakSettings.mondayBreakMinutesUpperLimit),
         });
         break;
       case 'tuesday':
         dayGroup.patchValue({
-          breakMinutesDivider: this.globalAutoBreakSettings.tuesdayBreakMinutesDivider,
-          breakMinutesPrDivider: this.globalAutoBreakSettings.tuesdayBreakMinutesPrDivider,
-          breakMinutesUpperLimit: this.globalAutoBreakSettings.tuesdayBreakMinutesUpperLimit,
+          breakMinutesDivider: this.getConvertedValue(this.globalAutoBreakSettings.tuesdayBreakMinutesDivider),
+          breakMinutesPrDivider: this.getConvertedValue(this.globalAutoBreakSettings.tuesdayBreakMinutesPrDivider),
+          breakMinutesUpperLimit: this.getConvertedValue(this.globalAutoBreakSettings.tuesdayBreakMinutesUpperLimit),
         });
         break;
       case 'wednesday':
         dayGroup.patchValue({
-          breakMinutesDivider: this.globalAutoBreakSettings.wednesdayBreakMinutesDivider,
-          breakMinutesPrDivider: this.globalAutoBreakSettings.wednesdayBreakMinutesPrDivider,
-          breakMinutesUpperLimit: this.globalAutoBreakSettings.wednesdayBreakMinutesUpperLimit,
+          breakMinutesDivider: this.getConvertedValue(this.globalAutoBreakSettings.wednesdayBreakMinutesDivider),
+          breakMinutesPrDivider: this.getConvertedValue(this.globalAutoBreakSettings.wednesdayBreakMinutesPrDivider),
+          breakMinutesUpperLimit: this.getConvertedValue(this.globalAutoBreakSettings.wednesdayBreakMinutesUpperLimit),
         });
         break;
       case 'thursday':
         dayGroup.patchValue({
-          breakMinutesDivider: this.globalAutoBreakSettings.thursdayBreakMinutesDivider,
-          breakMinutesPrDivider: this.globalAutoBreakSettings.thursdayBreakMinutesPrDivider,
-          breakMinutesUpperLimit: this.globalAutoBreakSettings.thursdayBreakMinutesUpperLimit,
+          breakMinutesDivider: this.getConvertedValue(this.globalAutoBreakSettings.thursdayBreakMinutesDivider),
+          breakMinutesPrDivider: this.getConvertedValue(this.globalAutoBreakSettings.thursdayBreakMinutesPrDivider),
+          breakMinutesUpperLimit: this.getConvertedValue(this.globalAutoBreakSettings.thursdayBreakMinutesUpperLimit),
         });
         break;
       case 'friday':
         dayGroup.patchValue({
-          breakMinutesDivider: this.globalAutoBreakSettings.fridayBreakMinutesDivider,
-          breakMinutesPrDivider: this.globalAutoBreakSettings.fridayBreakMinutesPrDivider,
-          breakMinutesUpperLimit: this.globalAutoBreakSettings.fridayBreakMinutesUpperLimit,
+          breakMinutesDivider: this.getConvertedValue(this.globalAutoBreakSettings.fridayBreakMinutesDivider),
+          breakMinutesPrDivider: this.getConvertedValue(this.globalAutoBreakSettings.fridayBreakMinutesPrDivider),
+          breakMinutesUpperLimit: this.getConvertedValue(this.globalAutoBreakSettings.fridayBreakMinutesUpperLimit),
         });
         break;
       case 'saturday':
         dayGroup.patchValue({
-          breakMinutesDivider: this.globalAutoBreakSettings.saturdayBreakMinutesDivider,
-          breakMinutesPrDivider: this.globalAutoBreakSettings.saturdayBreakMinutesPrDivider,
-          breakMinutesUpperLimit: this.globalAutoBreakSettings.saturdayBreakMinutesUpperLimit,
+          breakMinutesDivider: this.getConvertedValue(this.globalAutoBreakSettings.saturdayBreakMinutesDivider),
+          breakMinutesPrDivider: this.getConvertedValue(this.globalAutoBreakSettings.saturdayBreakMinutesPrDivider),
+          breakMinutesUpperLimit: this.getConvertedValue(this.globalAutoBreakSettings.saturdayBreakMinutesUpperLimit),
         });
         break;
       case 'sunday':
         dayGroup.patchValue({
-          breakMinutesDivider: this.globalAutoBreakSettings.sundayBreakMinutesDivider,
-          breakMinutesPrDivider: this.globalAutoBreakSettings.sundayBreakMinutesPrDivider,
-          breakMinutesUpperLimit: this.globalAutoBreakSettings.sundayBreakMinutesUpperLimit,
+          breakMinutesDivider: this.getConvertedValue(this.globalAutoBreakSettings.sundayBreakMinutesDivider),
+          breakMinutesPrDivider: this.getConvertedValue(this.globalAutoBreakSettings.sundayBreakMinutesPrDivider),
+          breakMinutesUpperLimit: this.getConvertedValue(this.globalAutoBreakSettings.sundayBreakMinutesUpperLimit),
         });
         break;
     }
diff --git a/eform-client/src/app/plugins/modules/time-planning-pn/components/plannings/time-plannings-table/time-plannings-table.component.ts b/eform-client/src/app/plugins/modules/time-planning-pn/components/plannings/time-plannings-table/time-plannings-table.component.ts

Original file line number	Diff line number	Diff line change
`@@ -859,7 +859,7 @@ await dbContext.PlanRegistrations.AsNoTracking()`
`859`	`859`	`tainted = true;`
`860`	`860`	`}`
`861`	`861`
`862`		`- Console.WriteLine($"The plannedHours are now: {planRegistration.PlanHours}");`
	`862`	`+ // Console.WriteLine($"The plannedHours are now: {planRegistration.PlanHours}");`
`863`	`863`
`864`	`864`	`await planRegistration.Update(dbContext).ConfigureAwait(false);`
`865`	`865`	`}`
`@@ -1881,7 +1881,7 @@ await dbContext.PlanRegistrations.AsNoTracking()`
`1881`	`1881`	`}`
`1882`	`1882`	`}`
`1883`	`1883`
`1884`		`- Console.WriteLine($"The plannedHours are now: {planRegistration.PlanHours}");`
	`1884`	`+ // Console.WriteLine($"The plannedHours are now: {planRegistration.PlanHours}");`
`1885`	`1885`
`1886`	`1886`	`await planRegistration.Update(dbContext).ConfigureAwait(false);`
`1887`	`1887`	`}`