Allowing the user to set planhours if there is no start of first shift.

Optimizing the loading of changes potentially done to the registrations.

Author: renemadsen

eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Infrastructure/Helpers/PlanRegistrationHelper.cs

@@ -30,7 +30,7 @@ public static async Task<TimePlanningPlanningModel> UpdatePlanRegistrationsInPer
     {
         foreach (var plan in planningsInPeriod)
         {
-            var planRegistration = await dbContext.PlanRegistrations.FirstAsync(x => x.Id == plan.Id);
+            var planRegistration = await dbContext.PlanRegistrations.AsTracking().FirstAsync(x => x.Id == plan.Id);
             var midnight = new DateTime(planRegistration.Date.Year, planRegistration.Date.Month, planRegistration.Date.Day, 0, 0, 0);
 
             try

eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Services/TimePlanningPlanningService/TimePlanningPlanningService.cs

@@ -594,7 +594,7 @@ public async Task<OperationResult> Update(int id, TimePlanningPlanningPrDayModel
                 }
                 if (planning.MessageId == null)
                 {
-                    planning.PlanHours = minutesPlanned != 0 ? minutesPlanned / 60 : 0;
+                    planning.PlanHours = minutesPlanned != 0 ? minutesPlanned / 60 : model.PlanHours;
                 }
                 else
                 {

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

@@ -369,7 +369,7 @@
     matInput
     id="planHours"
     name="planHours"
-    [disabled]="data.planningPrDayModels.message === null && data.assignedSiteModel.useOnlyPlanHours !== true"
+    [disabled]="(data.planningPrDayModels.message === null && data.assignedSiteModel.useOnlyPlanHours !== true) && plannedStartOfShift1 !== '00:00'"
     [(ngModel)]="data.planningPrDayModels.planHours"
     (change)="calculatePlanHours()"
   >

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

@@ -346,7 +346,9 @@ export class WorkdayEntityDialogComponent implements OnInit {
       plannedTimeInMinutes += timeInMinutes2NdShift;
     }
     if (this.data.planningPrDayModels.message === null) {
-      this.data.planningPrDayModels.planHours = plannedTimeInMinutes / 60;
+      if (plannedTimeInMinutes !== 0) {
+        this.data.planningPrDayModels.planHours = plannedTimeInMinutes / 60;
+      }
     }
 
     this.data.planningPrDayModels.start1Id = this.convertTimeToMinutes(this.start1StartedAt, true);

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

@@ -192,9 +192,7 @@ export class TimePlanningsTableComponent implements OnInit, OnChanges {
           minWidth: '50%',
         })
           .afterClosed().subscribe((data) => {
-          if (data) {
             this.assignedSiteChanged.emit(data);
-          }
         });
       }
     });
@@ -208,9 +206,7 @@ export class TimePlanningsTableComponent implements OnInit, OnChanges {
         this.dialog.open(WorkdayEntityDialogComponent, {
           data: {planningPrDayModels: cellData, assignedSiteModel: result.model},
         }).afterClosed().subscribe((data) => {
-          if (data) {
-            this.timePlanningChanged.emit(data);
-          }
+          this.timePlanningChanged.emit(data);
         });
       }
     });