Adding more constraints for setting workday.

Author: renemadsen

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

@@ -34,6 +34,7 @@
         <input
           matInput
           [ngxTimepicker]="plannedPause1Picker"
+          [disabled]="plannedStartOfShift1 === '00:00' || plannedEndOfShift1 === '00:00'"
           [format]="24"
           [(ngModel)]="plannedBreakOfShift1"
           readonly
@@ -49,6 +50,7 @@
         <input
           matInput
           [ngxTimepicker]="plannedPicker2"
+          [disabled]="plannedStartOfShift1 === '00:00'"
           [format]="24"
           [(ngModel)]="plannedEndOfShift1"
           readonly
@@ -67,6 +69,7 @@
         <input
           matInput
           [ngxTimepicker]="plannedPicker3"
+          [disabled]="plannedEndOfShift1 === '00:00'"
           readonly
           [format]="24"
           [(ngModel)]="plannedStartOfShift2"
@@ -82,6 +85,7 @@
         <mat-label>{{'Pause' | translate}}</mat-label>
         <input
           matInput
+          [disabled]="plannedStartOfShift2 === '00:00' || plannedEndOfShift2 === '00:00'"
           [ngxTimepicker]="plannedPause2Picker"
           [format]="24"
           [(ngModel)]="plannedBreakOfShift2"
@@ -138,7 +142,7 @@
         <mat-label>{{'Pause' | translate}}</mat-label>
         <input
           matInput
-          [disabled]="isInTheFuture"
+          [disabled]="isInTheFuture || start1StartedAt === null && stop1StoppedAt === null"
           [ngxTimepicker]="pause1IdPicker"
           [format]="24"
           [(ngModel)]="pause1Id"
@@ -156,7 +160,7 @@
         <input
           matInput
           readonly
-          [disabled]="isInTheFuture"
+          [disabled]="isInTheFuture || start1StartedAt === null"
           [ngxTimepicker]="picker2"
           [format]="24"
           [(ngModel)]="stop1StoppedAt"
@@ -175,7 +179,7 @@
         <input
           matInput
           readonly
-          [disabled]="isInTheFuture"
+          [disabled]="isInTheFuture || stop1StoppedAt === null"
           [ngxTimepicker]="picker3"
           [format]="24"
           [(ngModel)]="start2StartedAt"
@@ -191,11 +195,12 @@
         <mat-label>{{'Pause' | translate}}</mat-label>
         <input
           matInput
-          [disabled]="isInTheFuture"
+          [disabled]="isInTheFuture || start2StartedAt === null && stop1StoppedAt === null"
           [ngxTimepicker]="pause2IdPicker"
           [format]="24"
           [(ngModel)]="pause2Id"
           readonly
+          [min]="date"
           [value]="pause2Id"
         >
         <ngx-material-timepicker #pause2IdPicker
@@ -209,7 +214,7 @@
         <input
           matInput
           readonly
-          [disabled]="isInTheFuture"
+          [disabled]="isInTheFuture || start2StartedAt === null"
           [ngxTimepicker]="picker4"
           [format]="24"
           [(ngModel)]="stop2StoppedAt"

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

@@ -66,6 +66,7 @@ export class WorkdayEntityDialogComponent implements OnInit {
   stop2StoppedAt: string;
   pause2Id: string;
   isInTheFuture: boolean = false;
+  date: any;
   @ViewChild('plannedColumnTemplate', { static: true }) plannedColumnTemplate!: TemplateRef<any>;
   @ViewChild('actualColumnTemplate', { static: true }) actualColumnTemplate!: TemplateRef<any>;
   constructor(
@@ -94,6 +95,7 @@ export class WorkdayEntityDialogComponent implements OnInit {
     this.stop2StoppedAt = this.datePipe.transform(this.data.stop2StoppedAt, 'HH:mm', 'UTC');
     this.pause2Id = this.convertMinutesToTime(this.data.pause2Id * 5);
     this.isInTheFuture = Date.parse(this.data.date) > Date.now();
+    this.date = Date.parse(this.data.date);
     //this.tableHeaders = [];
 
     this.tableHeaders = [

eform-client/src/app/plugins/modules/time-planning-pn/i18n/da.ts

@@ -90,7 +90,7 @@ export const da = {
   '4th shift': '4. skift',
   '5th shift': '5. skift',
   'Flex balance to date': 'Flex saldo til dato',
-  TimeOff: 'Fritid',
+  TimeOff: 'Ferie fridag',
   Shift: 'Skift',
   Registered: 'Registreret',
 };