Improving the desing, so we don't have information shown, when we look at the future and it has no relervance.

Author: renemadsen

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

@@ -185,7 +185,7 @@
   </ng-template>
 
   <ng-template #actualColumnTemplate let-row let-col="colDef">
-    <ng-container *ngIf="row['shiftId'] === '1'">
+    <ng-container *ngIf="row['shiftId'] === '1' && !isInTheFuture">
       <div class="flex-row">
       <mat-form-field>
         <mat-label>{{'Start' | translate}}</mat-label>
@@ -267,7 +267,7 @@
         </button>
       </div>
     </ng-container>
-    <ng-container *ngIf="row['shiftId'] === '2'">
+    <ng-container *ngIf="row['shiftId'] === '2' && !isInTheFuture">
       <div class="flex-row">
       <mat-form-field>
         <mat-label>{{'Start' | translate}}</mat-label>
@@ -350,7 +350,7 @@
   </ng-template>
 
   <br>
-  <mat-form-field class="pr-2">
+  <mat-form-field class="pr-2" *ngIf="!isInTheFuture">
     <mat-label>{{ 'Flex balance at start of day' | translate }}</mat-label>
     <input
       type="text"
@@ -359,7 +359,7 @@
       name="flexToDate"
       readonly="readonly"
       disabled
-      [value]="data.planningPrDayModels.sumFlexStart.toFixed(2)"
+      [value]="convertHoursToTime(data.planningPrDayModels.sumFlexStart)"
     >
   </mat-form-field>
   <br><mat-form-field class="pr-2">
@@ -375,7 +375,7 @@
   >
 </mat-form-field>
   <br>
-  <mat-form-field class="pr-2">
+  <mat-form-field class="pr-2" *ngIf="!isInTheFuture">
     <mat-label>{{ 'NettoHours' | translate }}</mat-label>
     <input
       type="text"
@@ -388,7 +388,7 @@
     >
   </mat-form-field>
   <br>
-  <mat-form-field class="pr-2">
+  <mat-form-field class="pr-2" *ngIf="!isInTheFuture">
     <mat-label>{{ 'Flex' | translate }}</mat-label>
     <input
       type="text"
@@ -401,7 +401,7 @@
     >
   </mat-form-field>
   <br>
-  <mat-form-field class="pr-2">
+  <mat-form-field class="pr-2" *ngIf="!isInTheFuture">
     <mat-label>{{ 'PaidOutFlex' | translate }}</mat-label>
     <input
       type="number"
@@ -413,7 +413,7 @@
     >
   </mat-form-field>
   <br>
-  <mat-form-field class="pr-2">
+  <mat-form-field class="pr-2" *ngIf="!isInTheFuture">
     <mat-label>{{ 'SumFlex' | translate }}</mat-label>
     <input
       type="text"
@@ -422,7 +422,7 @@
       name="flexIncludingToday"
       readonly="readonly"
       disabled
-      [value]="data.planningPrDayModels.sumFlexEnd.toFixed(2)"
+      [value]="convertHoursToTime(data.planningPrDayModels.sumFlexEnd)"
     >
   </mat-form-field>
   <br>

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

@@ -114,7 +114,18 @@ export class WorkdayEntityDialogComponent implements OnInit {
         field: 'actualStart',
         sortable: false,
       },
-    ]: [
+    ]: this.isInTheFuture ? [
+      {
+        header: this.translateService.stream('Shift'), field: 'shift',
+        pinned: 'left'
+      },
+      {
+        cellTemplate: this.plannedColumnTemplate,
+        header: this.translateService.stream('Planned'),
+        field: 'plannedStart',
+        sortable: false,
+      },
+    ] : [
       {
         header: this.translateService.stream('Shift'), field: 'shift',
         pinned: 'left'
@@ -308,7 +319,7 @@ export class WorkdayEntityDialogComponent implements OnInit {
     if (hours < 0) {
       hours = Math.abs(hours);
     }
-    const totalMinutes = Math.floor(hours * 60)
+    const totalMinutes = Math.round(hours * 60)
     const hrs = Math.floor(totalMinutes / 60);
     let mins = totalMinutes % 60;
     if (isNegative) {