Merge branch 'stable'

Author: renemadsen

eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Services/TimePlanningSettingService/TimeSettingService.cs

@@ -356,10 +356,11 @@ planRegistrationForToday is
         var currentUserAsync = await userService.GetCurrentUserAsync();
         var currentUser = baseDbContext.Users
             .Single(x => x.Id == currentUserAsync.Id);
-        var fullName = currentUser.FirstName.Trim() + " " + currentUser.LastName.Trim();
-        var sdkSite = await sdkContext.Sites
+        var worker = await sdkContext.Workers
+            .Include(x => x.SiteWorkers)
+            .ThenInclude(x => x.Site)
             .Where(x => x.WorkflowState != Constants.WorkflowStates.Removed)
-            .FirstOrDefaultAsync(x => x.Name.Replace(" ", "") == fullName.Replace(" ", ""));
+            .FirstOrDefaultAsync(x => x.Email == currentUser.Email);
 
         if (sdkSite == null)
         {

eform-client/cypress/e2e/plugins/time-planning-pn/h/dashboard-edit-a.spec.cy.ts

@@ -35,12 +35,12 @@ describe('Dashboard edit values', () => {
   });
 
   it('should accepts decimal values with comma', () => {
-    cy.get('#paidOutFlex').should('have.value', '12');
-    cy.get('#paidOutFlex').clear().type('12');
+    cy.get('#paidOutFlex').should('have.value', '1.2');
+    cy.get('#paidOutFlex').clear().type('1,2');
   });
 
   it('should accepts whole numbers', () => {
-    cy.get('#paidOutFlex').should('have.value', '12');
+    cy.get('#paidOutFlex').should('have.value', '1.2');
     cy.get('#paidOutFlex').clear().type('0');
   });
 

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

@@ -1324,8 +1324,12 @@ export class WorkdayEntityDialogComponent implements OnInit {
       plannedTimeInMinutes += this.getPlannedShiftMinutes(start, end, brk);
     }
 
-    m.planHours = plannedTimeInMinutes / 60;
-    this.workdayForm.get('planHours')?.setValue(m.planHours, {emitEvent: false});
+    if (plannedTimeInMinutes !== 0) {
+      m.planHours = plannedTimeInMinutes / 60;
+      this.workdayForm.get('planHours')?.setValue(m.planHours, {emitEvent: false});
+    }
+    // m.planHours = plannedTimeInMinutes / 60;
+    // this.workdayForm.get('planHours')?.setValue(m.planHours, {emitEvent: false});
 
     // Summer actual
     let actualTimeInMinutes = 0;

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

@@ -17,7 +17,18 @@ <h4 class="mat-card-title">Google sheet information</h4>
               <input matInput placeholder="Google sheet id" [(ngModel)]="settingsModel.googleSheetId">
             </mat-form-field>
           </div>
-
+          <div class="mt-2" *ngIf="settingsModel.googleSheetId">
+            <a
+              id="openGoogleSheetLink"
+              mat-raised-button
+              color="primary"
+              [href]="'https://docs.google.com/spreadsheets/d/' + settingsModel.googleSheetId + '/edit'"
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              {{ 'Open Google Sheet' | translate }}
+            </a>
+          </div>
         </div>
         <br>
         <div class="row">

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

@@ -2,6 +2,8 @@ import {Component, OnDestroy, OnInit} from '@angular/core';
 import {Subscription} from 'rxjs';
 import {TimePlanningPnSettingsService} from '../../../services';
 import {TimePlanningSettingsModel} from '../../../models';
+import {selectCurrentUserIsFirstUser} from 'src/app/state';
+import {Store} from '@ngrx/store';
 
 @Component({
     selector: 'app-time-planning-settings',
@@ -13,8 +15,12 @@ export class TimePlanningSettingsComponent implements OnInit, OnDestroy {
   getSettings$: Subscription;
   settingsModel: TimePlanningSettingsModel = new TimePlanningSettingsModel();
   previousData: TimePlanningSettingsModel = new TimePlanningSettingsModel();
+  public selectCurrentUserIsFirstUser$ = this.store.select(selectCurrentUserIsFirstUser);
 
-  constructor(private timePlanningPnSettingsService: TimePlanningPnSettingsService) {
+  constructor(
+    private timePlanningPnSettingsService: TimePlanningPnSettingsService,
+    private store: Store
+  ) {
     this.previousData = {...this.settingsModel};
   }
   ngOnInit() {