Merge branch 'stable'

Author: renemadsen

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

@@ -928,6 +928,7 @@ await dbContext.PlanRegistrations.AsNoTracking()
             var planningModel = new TimePlanningPlanningPrDayModel
             {
                 Id = planRegistration.Id,
+                PlanChangedByAdmin = planRegistration.PlanChangedByAdmin,
                 SiteName = site.Name,
                 Date = midnight,
                 PlanText = planRegistration.PlanText,

eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Infrastructure/Models/Planning/TimePlanningPlanningPrDayModel.cs

@@ -175,4 +175,5 @@ public class TimePlanningPlanningPrDayModel
     public DateTime? Pause5StoppedAt { get; set; }
     public double NettoHoursOverride { get; set; }
     public bool NettoHoursOverrideActive { get; set; }
+    public bool PlanChangedByAdmin { get; set; }
 }

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

@@ -296,6 +296,9 @@
           <small>
             (id: {{ row.planningPrDayModels[col.field]?.id }})
           </small>
+          <mat-icon class="neutral-icon" *ngIf="row.planningPrDayModels[col.field]?.planChangedByAdmin">
+            lock
+          </mat-icon>
         </div>
       </div>
     </div>

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

@@ -180,7 +180,7 @@ export class TimePlanningsTableComponent implements OnInit, OnChanges {
         return isInOlderThanToday ? 'red-text' : 'black-text';
       }
     } else {
-      return workDayStarted ? workDayEnded ? 'black-text' : 'white-text' : plannedStarted ? message || workerComment ? 'black-text' : 'white-text' : message || workerComment ? 'black-text' : 'white-text';
+      return workDayStarted ? workDayEnded ? 'black-text' : 'black-text' : plannedStarted ? message || workerComment ? 'black-text' : 'black-text' : message || workerComment ? 'black-text' : 'black-text';
       // if (workDayStarted) {
       //   return 'black-text';
       // }

eform-client/src/app/plugins/modules/time-planning-pn/models/plannings/planning-pr-day.model.ts

@@ -1,5 +1,6 @@
 export class PlanningPrDayModel {
   id: number;
+  planChangedByAdmin: boolean;
   siteName: string;
   siteId: number;
   weekDay: number;