Merge branch 'master' into copilot/extend-assigned-site-dialog-again

Author: renemadsen

.github/workflows/dotnet-core-master.yml

@@ -33,7 +33,7 @@ jobs:
     - name: Copy Dockerfile
       run: cp eform-angular-timeplanning-plugin/Dockerfile .
     - name: Build the tagged Docker image
-      run: docker build . -t microtingas/time-planning-container:latest -t microtingas/time-planning-container:1.0.0 --build-arg GITVERSION=1.0.0 --build-arg PLUGINVERSION=1.0.0
+      run: docker build . -t microtingas/time-planning-container:latest -t microtingas/time-planning-container:1.0.0 --build-arg GITVERSION=1.0.0 --build-arg PLUGINVERSION=1.0.0 --build-arg DISABLE_SENTRY=true
     - name: Tag builds
       run: |-
         docker tag microtingas/time-planning-container:latest microtingas/time-planning-container:latest

.github/workflows/dotnet-core-pr.yml

@@ -30,7 +30,7 @@ jobs:
     - name: Copy Dockerfile
       run: cp eform-angular-timeplanning-plugin/Dockerfile .
     - name: Build the tagged Docker image
-      run: docker build . -t microtingas/time-planning-container:latest -t microtingas/time-planning-container:1.0.0 --build-arg GITVERSION=1.0.0 --build-arg PLUGINVERSION=1.0.0
+      run: docker build . -t microtingas/time-planning-container:latest -t microtingas/time-planning-container:1.0.0 --build-arg GITVERSION=1.0.0 --build-arg PLUGINVERSION=1.0.0 --build-arg DISABLE_SENTRY=true
     - name: Tag builds
       run: |-
         docker tag microtingas/time-planning-container:latest microtingas/time-planning-container:latest

Dockerfile

@@ -1,5 +1,6 @@
 FROM node:22-bookworm-slim as node-env
 WORKDIR /app
+ARG DISABLE_SENTRY
 ENV PATH /app/node_modules/.bin:$PATH
 COPY eform-angular-frontend/eform-client ./
 RUN yarn install
@@ -9,6 +10,7 @@ FROM mcr.microsoft.com/dotnet/sdk:10.0-noble AS build-env
 WORKDIR /app
 ARG GITVERSION
 ARG PLUGINVERSION
+ARG DISABLE_SENTRY
 
 # Copy csproj and restore as distinct layers
 COPY eform-angular-frontend/eFormAPI/eFormAPI.Web ./eFormAPI.Web
@@ -19,6 +21,8 @@ RUN dotnet publish TimePlanning.Pn -o TimePlanning.Pn/out /p:Version=$PLUGINVERS
 # Build runtime image
 FROM mcr.microsoft.com/dotnet/aspnet:10.0-noble
 WORKDIR /app
+ARG DISABLE_SENTRY
+ENV DISABLE_SENTRY=${DISABLE_SENTRY}
 COPY --from=build-env /app/eFormAPI.Web/out .
 RUN mkdir -p ./Plugins/TimePlanning.Pn
 COPY --from=build-env /app/TimePlanning.Pn/out ./Plugins/TimePlanning.Pn

eform-client/cypress/e2e/plugins/time-planning-pn/b/dashboard-assert.spec.cy.ts

@@ -242,9 +242,11 @@ describe('Dashboard assert', () => {
     cy.wait('@index-update', { timeout: 60000 });
     cy.get('#firstColumn3').click();
     cy.get('#useGoogleSheetAsDefault').click();
+    cy.intercept('PUT', '**/api/time-planning-pn/settings/assigned-site').as('assign-site');
     cy.get('#saveButton').click();
+    cy.wait('@assign-site', {timeout: 60000});
     cy.wait('@index-update', { timeout: 160000 });
-    cy.wait(1000);
+    cy.wait(2000);
     cy.get('mat-tree-node').contains('Timeregistrering').click();
     cy.get('mat-toolbar > div > button .mat-mdc-button-persistent-ripple').first().parent().click();
     cy.get('#workingHoursSite').clear().type('c d');
@@ -279,7 +281,7 @@ describe('Dashboard assert', () => {
     cy.wait('@save');
     cy.get('#sumFlex7 input').should('contain.value', '41.45');
 
-    cy.intercept('POST', '**/api/time-planning-pn/working-hours/index').as('update');
+    // cy.intercept('POST', '**/api/time-planning-pn/working-hours/index').as('update');
     TimePlanningWorkingHoursPage.dateFormInput().click();
     selectDateRangeOnNewDatePicker(
       filtersNextWeek[0].dateRange.yearFrom, filtersNextWeek[0].dateRange.monthFrom,  filtersNextWeek[0].dateRange.dayFrom,
@@ -304,7 +306,7 @@ describe('Dashboard assert', () => {
       let id = `#planText${i+1}`;
       cy.get(id).find('input').clear().type(planTextsNextWeek[i].text);
     }
-    cy.intercept('PUT', '**/api/time-planning-pn/working-hours').as('save');
+    // cy.intercept('PUT', '**/api/time-planning-pn/working-hours').as('save');
     cy.get('#workingHoursSave').click();
     cy.wait('@save');
     cy.get('#sumFlex7 input').should('contain.value', '-14.55');
@@ -334,7 +336,7 @@ describe('Dashboard assert', () => {
       cy.get(id).find('input').clear().type(planTextsFutureWeek[i].text);
     }
 
-    cy.intercept('PUT', '**/api/time-planning-pn/working-hours').as('save');
+    // cy.intercept('PUT', '**/api/time-planning-pn/working-hours').as('save');
     cy.get('#workingHoursSave').click();
     cy.wait('@save');
     cy.get('mat-toolbar > div > button .mat-mdc-button-persistent-ripple').first().parent().click();
@@ -498,12 +500,12 @@ describe('Dashboard assert', () => {
       cy.get(id).find('input').clear().type(updatePlanTextsNextWeek[i].text);
     }
 
-    cy.intercept('PUT', '**/api/time-planning-pn/working-hours').as('save');
+    // cy.intercept('PUT', '**/api/time-planning-pn/working-hours').as('save');
     cy.get('#workingHoursSave').click();
     cy.wait('@save');
     cy.get('#sumFlex7 input').should('contain.value', '12.2');
 
-    cy.intercept('POST', '**/api/time-planning-pn/working-hours/index').as('update');
+    // cy.intercept('POST', '**/api/time-planning-pn/working-hours/index').as('update');
     TimePlanningWorkingHoursPage.dateFormInput().click();
     selectDateRangeOnNewDatePicker(
       filtersFutureWeek[0].dateRange.yearFrom, filtersFutureWeek[0].dateRange.monthFrom,  filtersFutureWeek[0].dateRange.dayFrom,

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

@@ -47,6 +47,7 @@ describe('Dashboard edit values', () => {
 
     cy.get('#workingHoursSite').click();
     cy.get('.ng-option').contains('ac ad').click();
+    cy.wait('@index-update', {timeout: 60000});
     cy.get('#firstColumn0').click();
 
     cy.get('mat-dialog-container', {timeout: 10000})
@@ -96,7 +97,10 @@ describe('Dashboard edit values', () => {
           });
       });
 
+    cy.intercept('PUT', '**/api/time-planning-pn/settings/assigned-site').as('assign-site');
     cy.get('#saveButton').scrollIntoView().click({force: true});
+    cy.wait('@assign-site', {timeout: 60000});
+    cy.wait('@index-update', {timeout: 60000});
     cy.get('mat-dialog-container', {timeout: 500}).should('not.exist');
     cy.wait(500);
 

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

@@ -167,7 +167,7 @@
           <div>{{ 'Enable fifth shift' | translate }}</div>
         </mat-checkbox>
       </div>
-      
+
       <!-- Manager settings -->
       <div class="d-flex flex-row" *ngIf="!data.resigned && selectCurrentUserIsAdmin$ | async">
         <mat-checkbox class="p-1"
@@ -195,7 +195,7 @@
           <mat-hint>{{ 'Select tags that this manager is responsible for' | translate }}</mat-hint>
         </mat-form-field>
       </div>
-      
+
       <div class="d-flex flex-row">
         <mat-checkbox class="p-1"
                       [id]="'resigned'"

eform-client/src/app/plugins/modules/time-planning-pn/components/plannings/time-planning-actions/version-history-modal/version-history-modal.component.html

@@ -1,6 +1,6 @@
 <div class="modal-header">
   <h4 class="modal-title">Version History</h4>
-  <button type="button" class="close" (click)="close()" aria-label="Close">
+  <button type="button" class="close btn-secondary btn-secondary--icon-rounded-border" (click)="close()" aria-label="Close">
     <span aria-hidden="true">&times;</span>
   </button>
 </div>
@@ -85,5 +85,5 @@ <h5>
 </div>
 
 <div class="modal-footer">
-  <button type="button" class="btn btn-secondary" (click)="close()">Close</button>
+  <button type="button" class="btn btn-cancel" (click)="close()">Close</button>
 </div>

eform-client/src/app/plugins/modules/time-planning-pn/components/plannings/time-planning-actions/version-history-modal/version-history-modal.component.scss

@@ -9,32 +9,32 @@
   flex: 1;
   overflow-y: auto;
   transition: flex 0.3s ease;
-  
+
   &.with-side-panel {
     flex: 0 0 50%;
   }
 }
 
 .version-section {
   margin-bottom: 30px;
-  
+
   h5 {
     font-size: 16px;
     font-weight: bold;
-    margin-bottom: 10px;
+    margin-bottom: 15px;
     padding-bottom: 5px;
-    border-bottom: 2px solid #dee2e6;
+    //border-bottom: 2px solid #dee2e6;
   }
 }
 
 .table {
   font-size: 14px;
-  
+
   th {
     background-color: #f8f9fa;
     font-weight: 600;
   }
-  
+
   td, th {
     padding: 8px;
     vertical-align: middle;
@@ -47,23 +47,23 @@
   padding-left: 20px;
   display: flex;
   flex-direction: column;
-  
+
   .side-panel-header {
     display: flex;
     justify-content: flex-end;
     margin-bottom: 10px;
   }
-  
+
   .side-panel-content {
     flex: 1;
     overflow: hidden;
   }
-  
+
   .map-container, .snapshot-container {
     width: 100%;
     height: 100%;
   }
-  
+
   .snapshot-image {
     max-width: 100%;
     max-height: 100%;
@@ -80,7 +80,7 @@
 .modal-header {
   border-bottom: 1px solid #dee2e6;
   padding: 15px 20px;
-  
+
   .modal-title {
     margin: 0;
     font-size: 20px;
@@ -100,7 +100,7 @@
 a {
   color: #007bff;
   text-decoration: none;
-  
+
   &:hover {
     text-decoration: underline;
   }

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

@@ -1,12 +1,12 @@
 <form [formGroup]="workdayForm">
   <div mat-dialog-title>
-    {{ data.planningPrDayModels.siteName }} -
-    {{ datePipe.transform(data.planningPrDayModels.date, 'dd.MM.yyyy') }}
-    ({{ data.planningPrDayModels.id }})
+    <div>{{ data.planningPrDayModels.siteName }} -
+      {{ datePipe.transform(data.planningPrDayModels.date, 'dd.MM.yyyy') }}
+      ({{ data.planningPrDayModels.id }})</div>
     <button
       *ngIf="selectCurrentUserIsFirstUser$ | async"
-      mat-icon-button
-      class="float-end"
+
+      class="float-end btn-secondary btn-secondary--icon-rounded-border"
       (click)="openVersionHistory()"
       matTooltip="View Version History">
       <mat-icon>history</mat-icon>

eform-client/src/app/plugins/modules/time-planning-pn/modules/registration-devices/components/registration-devices-actions/registration-devices-create-modal/registration-devices-create-modal.component.html

@@ -24,15 +24,14 @@ <h3 mat-dialog-title>{{ 'Create registration device' | translate}}</h3>
 </div>
 <div mat-dialog-actions class="d-flex flex-row justify-content-end">
   <button
-    mat-raised-button
-    color="accent"
+    class="btn-primary"
     (click)="createRegistrationDevice()"
     id="{{'registrationDeviceSaveBtn'}}"
   >
     {{'Create' | translate}}
   </button>
   <button
-    mat-raised-button
+    class="btn-cancel"
     id="{{'registrationDeviceCancelCreateBtn'}}"
     (click)="hide()"
   >