Fixing the site settings dialog to not allow conflicting settings.

Author: renemadsen

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

@@ -4,7 +4,7 @@
     dynamicHeight="false"
   >
     <mat-tab label="{{'General' | translate }}">
-      <div class="d-flex flex-row">
+      <div class="d-flex flex-row" *ngIf="selectCurrentUserIsAdmin$ | async">
         <!-- data.useGoogleSheetAsDefault -->
         <mat-checkbox class="p-1"
                       [id]="'useGoogleSheetAsDefault'"
@@ -13,7 +13,7 @@
           {{ 'Use Google Sheet as default' | translate }}
         </mat-checkbox>
       </div>
-      <div class="d-flex flex-row" *ngIf="!data.useGoogleSheetAsDefault">
+      <div class="d-flex flex-row" *ngIf="!data.useGoogleSheetAsDefault && selectCurrentUserIsAdmin$ | async" >
         <!-- data.useOnlyPlanHours checkbox -->
         <mat-checkbox class="p-1"
                       [id]="'useOnlyPlanHours'"
@@ -40,7 +40,7 @@
 <!--          {{ 'Use detailed pause editing' | translate }}-->
 <!--        </mat-checkbox>-->
 <!--      </div>-->
-      <div class="d-flex flex-row" *ngIf="data.globalAutoBreakCalculationActive">
+      <div class="d-flex flex-row" *ngIf="data.globalAutoBreakCalculationActive && selectCurrentUserIsAdmin$ | async">
         <!-- data.autoBreakCalculationActive -->
         <mat-checkbox class="p-1"
                       [id]="'autoBreakCalculationActive'"
@@ -49,15 +49,6 @@
           {{ 'Auto break calculation' | translate }}
         </mat-checkbox>
       </div>
-      <div class="d-flex flex-row">
-        <!-- data.allowAcceptOfPlannedHours -->
-        <mat-checkbox class="p-1"
-                      [id]="'allowAcceptOfPlannedHours'"
-                      [name]="'allowAcceptOfPlannedHours'"
-                      [(ngModel)]="data.allowAcceptOfPlannedHours">
-          {{ 'Allow accept of planned hours' | translate }}
-        </mat-checkbox>
-      </div>
       <div class="d-flex flex-row">
         <!-- data.allowEditOfRegistrations -->
         <mat-checkbox class="p-1"
@@ -76,7 +67,7 @@
           {{ 'Allow personal time registration' | translate }}
         </mat-checkbox>
       </div>
-      <div class="d-flex flex-row">
+      <div class="d-flex flex-row" *ngIf="data.allowPersonalTimeRegistration && !data.allowAcceptOfPlannedHours">
         <!-- data.allowPersonalTimeRegistration -->
         <mat-checkbox class="p-1"
                       [id]="'usePunchClock'"
@@ -85,8 +76,17 @@
           {{ 'Use punch clock' | translate }}
         </mat-checkbox>
       </div>
+      <div class="d-flex flex-row" *ngIf="data.allowPersonalTimeRegistration && !data.usePunchClock && selectCurrentUserIsAdmin$ | async">
+        <!-- data.allowAcceptOfPlannedHours -->
+        <mat-checkbox class="p-1"
+                      [id]="'allowAcceptOfPlannedHours'"
+                      [name]="'allowAcceptOfPlannedHours'"
+                      [(ngModel)]="data.allowAcceptOfPlannedHours">
+          {{ 'Allow accept of planned hours' | translate }}
+        </mat-checkbox>
+      </div>
     </mat-tab>
-    <mat-tab label="{{'Plan hours' | translate }}" *ngIf="data.useOnlyPlanHours && !data.useGoogleSheetAsDefault">
+    <mat-tab label="{{'Plan hours' | translate }}" *ngIf="data.useOnlyPlanHours && !data.useGoogleSheetAsDefault && selectCurrentUserIsAdmin$ | async">
       <div class="d-flex flex-row"
            *ngFor="let day of ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']">
         <mat-form-field class="p-1">
@@ -105,7 +105,7 @@
         </mat-form-field>
       </div>
     </mat-tab>
-    <mat-tab label="{{ 'Auto break calculation settings' | translate }}" *ngIf="data.autoBreakCalculationActive">
+    <mat-tab label="{{ 'Auto break calculation settings' | translate }}" *ngIf="data.autoBreakCalculationActive && selectCurrentUserIsAdmin$ | async">
       <ng-container *ngFor="let day of ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']">
         <div class="d-flex flex-row">
           <mat-form-field class="p-1">
@@ -175,7 +175,7 @@
         </div>
       </ng-container>
     </mat-tab>
-    <mat-tab label="{{'1st shift' | translate }}" *ngIf="!data.useOnlyPlanHours && !data.useGoogleSheetAsDefault">
+    <mat-tab label="{{'1st shift' | translate }}" *ngIf="!data.useOnlyPlanHours && !data.useGoogleSheetAsDefault && selectCurrentUserIsAdmin$ | async">
       <ng-container *ngIf="selectCurrentUserIsAdmin$ | async">
         <div class="d-flex flex-row"
              *ngFor="let day of ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']">
@@ -232,7 +232,7 @@
         </div>
       </ng-container>
     </mat-tab>
-    <mat-tab label="{{'2nd shift' | translate }}" *ngIf="!data.useOnlyPlanHours && !data.useGoogleSheetAsDefault">
+    <mat-tab label="{{'2nd shift' | translate }}" *ngIf="!data.useOnlyPlanHours && !data.useGoogleSheetAsDefault && selectCurrentUserIsAdmin$ | async">
       <ng-container *ngIf="selectCurrentUserIsAdmin$ | async">
         <div class="d-flex flex-row"
              *ngFor="let day of ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']">

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

@@ -12,7 +12,7 @@ import {FormsModule} from '@angular/forms';
 import {MatFormField, MatLabel} from '@angular/material/form-field';
 import {MatInput} from '@angular/material/input';
 import {TranslatePipe} from '@ngx-translate/core';
-import {selectCurrentUserIsAdmin} from 'src/app/state';
+import {selectAuthIsAdmin, selectCurrentUserIsAdmin} from 'src/app/state';
 import {Store} from '@ngrx/store';
 import {AsyncPipe, NgForOf, NgIf} from '@angular/common';
 import {MatTab, MatTabGroup} from '@angular/material/tabs';
@@ -50,14 +50,14 @@ import {MatIcon} from '@angular/material/icon';
   styleUrls: ['./assigned-site-dialog.component.scss']
 })
 export class AssignedSiteDialogComponent implements DoCheck, OnInit {
-  public selectCurrentUserIsAdmin$ = this.authStore.select(selectCurrentUserIsAdmin);
+  public selectCurrentUserIsAdmin$ = this.store.select(selectCurrentUserIsAdmin);
   private previousData: AssignedSiteModel;
   private globalAutoBreakSettings: GlobalAutoBreakSettingsModel;
 
   constructor(
     @Inject(MAT_DIALOG_DATA) public data: AssignedSiteModel,
     private timePlanningPnSettingsService: TimePlanningPnSettingsService,
-    private authStore: Store
+    private store: Store
   ) {
     this.previousData = {...data};
     this.calculateHours();