Merge branch 'master' of github.com:Ecodev/my-ichtus

Ecodev · Oct 2, 2024 · 1040573 · 1040573
2 parents a55433f + aa63a59
commit 1040573
Show file tree

Hide file tree

Showing 76 changed files with 1,435 additions and 1,810 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -24,7 +24,7 @@ jobs:
               with:
                   fetch-depth: 2
 
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
                   node-version: '18'
 
@@ -35,13 +35,13 @@ jobs:
                   tools: cs2pr
                   extensions: imagick
 
-            - uses: actions/cache@v3
+            - uses: actions/cache@v4
               with:
                   path: ~/.cache/composer
                   key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
                   restore-keys: ${{ runner.os }}-composer-
 
-            - uses: actions/cache@v3
+            - uses: actions/cache@v4
               with:
                   path: ~/.cache/yarn
                   key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}

diff --git a/angular.json b/angular.json
@@ -49,12 +49,6 @@
                     },
                     "configurations": {
                         "production": {
-                            "fileReplacements": [
-                                {
-                                    "replace": "client/environments/environment.ts",
-                                    "with": "client/environments/environment.prod.ts"
-                                }
-                            ],
                             "outputHashing": "all",
                             "budgets": [
                                 {
@@ -163,7 +157,7 @@
                                     "type": "initial",
                                     // DO NOT MODIFY THIS, instead, if you see this error, triple-check why we included
                                     // more code into Vanilla and if https://navigations.ichtus.club will still work with this new build
-                                    "maximumError": "374kb"
+                                    "maximumError": "385.11 kB"
                                 },
                                 {
                                     "type": "anyComponentStyle",

diff --git a/client/app/admin/accounts/account/account.component.ts b/client/app/admin/accounts/account/account.component.ts
@@ -25,9 +25,10 @@ import {MatTabsModule} from '@angular/material/tabs';
 import {MoneyComponent} from '../../../shared/components/money/money.component';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import Big from 'big.js';
-import {startWith, switchMap, takeUntil} from 'rxjs';
+import {startWith, switchMap} from 'rxjs';
 import {AccountType} from '../../../shared/generated-types';
 import {MatTooltip, MatTooltipModule} from '@angular/material/tooltip';
+import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
 
 @Component({
     selector: 'app-account',
@@ -94,7 +95,7 @@ export class AccountComponent extends NaturalAbstractDetail<AccountService, Natu
         parent.valueChanges
             .pipe(
                 startWith(parent.value),
-                takeUntil(this.ngUnsubscribe),
+                takeUntilDestroyed(this.destroyRef),
                 switchMap(value => {
                     this.nextCodeAvailable = null; // Hide invalid code as soon as we can
 

diff --git a/client/app/admin/accounts/accounting-report/accounting-report.component.html b/client/app/admin/accounts/accounting-report/accounting-report.component.html
@@ -1,4 +1,4 @@
-<h2 mat-dialog-title>Exporter bilan + PP</h2>
+<h2 mat-dialog-title>Exporter bilan + résultat</h2>
 <mat-dialog-content [formGroup]="form">
     <div class="nat-vertical">
         <mat-form-field>
@@ -14,6 +14,22 @@ <h2 mat-dialog-title>Exporter bilan + PP</h2>
             }
         </mat-form-field>
         <mat-checkbox formControlName="showBudget">Afficher le budget</mat-checkbox>
+        <mat-checkbox formControlName="compareWithPrevious" (change)="compareCheck($event)"
+            >Comparer avec l'exercice précédent</mat-checkbox
+        >
+        @if (form.get('compareWithPrevious')?.value) {
+            <mat-form-field>
+                <mat-label>Date précédente</mat-label>
+                <input
+                    matInput
+                    formControlName="datePrevious"
+                    [matDatepicker]="pickerPrevious"
+                    [max]="form.get('date')?.value"
+                />
+                <mat-datepicker-toggle matIconSuffix [for]="pickerPrevious" />
+                <mat-datepicker #pickerPrevious />
+            </mat-form-field>
+        }
     </div>
 </mat-dialog-content>
 

diff --git a/client/app/admin/accounts/accounting-report/accounting-report.component.ts b/client/app/admin/accounts/accounting-report/accounting-report.component.ts
@@ -5,7 +5,7 @@ import {MatDatepickerModule} from '@angular/material/datepicker';
 import {MatInputModule} from '@angular/material/input';
 import {MatFormFieldModule} from '@angular/material/form-field';
 import {MatDialogModule} from '@angular/material/dialog';
-import {MatCheckboxModule} from '@angular/material/checkbox';
+import {MatCheckboxChange, MatCheckboxModule} from '@angular/material/checkbox';
 
 @Component({
     selector: 'app-accounting-report',
@@ -27,6 +27,14 @@ export class AccountingReportComponent {
     public readonly form = new FormGroup({
         date: new FormControl(new Date(), [Validators.required]),
         showBudget: new FormControl(false),
+        compareWithPrevious: new FormControl(false),
+        datePrevious: new FormControl(null),
     });
     public readonly today = new Date();
+
+    public compareCheck(e: MatCheckboxChange): void {
+        if (!e.checked) {
+            this.form.get('datePrevious')?.setValue(null);
+        }
+    }
 }
diff --git a/client/app/admin/accounts/accounts/accounts.component.html b/client/app/admin/accounts/accounts/accounts.component.html
@@ -179,7 +179,7 @@
                 }
             </div>
         </div>
-        @if (permissionsService.crud?.account.create) {
+        @if ((permissionsService.crud | async)?.account.create) {
             <natural-fixed-button icon="add" [routerLink]="addLink()" />
         }
     </div>

diff --git a/client/app/admin/accounts/accounts/accounts.component.ts b/client/app/admin/accounts/accounts/accounts.component.ts
@@ -36,6 +36,7 @@ type AccountingDialogData = never;
 type AccountingClosingDialogResult = Date;
 type AccountingExportDialogResult = {
     date: Date;
+    datePrevious: null | Date;
     showBudget: boolean;
 };
 
@@ -142,7 +143,7 @@ export class AccountsComponent extends NaturalAbstractNavigableList<AccountServi
                 if (result) {
                     button.disabled = true;
                     this.accountService
-                        .getReportExportLink(result.date, result.showBudget)
+                        .getReportExportLink(result.date, result.datePrevious, result.showBudget)
                         .pipe(finalize(() => (button.disabled = false)))
                         .subscribe(url => {
                             window.location.href = url;

diff --git a/client/app/admin/accounts/services/account.queries.ts b/client/app/admin/accounts/services/account.queries.ts
@@ -123,8 +123,8 @@ export const deleteAccounts = gql`
 `;
 
 export const exportAccountingReport = gql`
-    mutation ExportAccountingReport($date: Date, $showBudget: Boolean!) {
-        exportAccountingReport(date: $date, showBudget: $showBudget)
+    mutation ExportAccountingReport($date: Date!, $datePrevious: Date, $showBudget: Boolean!) {
+        exportAccountingReport(date: $date, datePrevious: $datePrevious, showBudget: $showBudget)
     }
 `;
 

diff --git a/client/app/admin/accounts/services/account.service.ts b/client/app/admin/accounts/services/account.service.ts
@@ -121,10 +121,12 @@ export class AccountService extends NaturalAbstractModelService<
 
     public getReportExportLink(
         date: Date,
+        datePrevious: Date | null = null,
         showBudget: boolean,
     ): Observable<ExportAccountingReport['exportAccountingReport']> {
         const variables: ExportAccountingReportVariables = {
             date: formatIsoDateTime(date),
+            datePrevious: datePrevious ? formatIsoDateTime(datePrevious) : null,
             showBudget: showBudget,
         };
 

diff --git a/client/app/admin/admin/admin.component.html b/client/app/admin/admin/admin.component.html
@@ -137,10 +137,10 @@
                             >
                             <a mat-list-item routerLinkActive="active" routerLink="license">Certifications</a>
                             <a mat-list-item routerLinkActive="active" routerLink="bookable-tag">Tags de réservables</a>
-                            @if (permissionsService.crud?.configuration?.create) {
+                            @if ((permissionsService.crud | async)?.configuration?.create) {
                                 <a mat-list-item routerLinkActive="active" routerLink="support">Guide / Support</a>
                             }
-                            @if (permissionsService.crud?.configuration?.create) {
+                            @if ((permissionsService.crud | async)?.configuration?.create) {
                                 <a mat-list-item routerLinkActive="active" routerLink="announcement">Annonce</a>
                             }
                             <a mat-list-item routerLinkActive="active" routerLink="log">Activité</a>
@@ -161,7 +161,7 @@
                                     >Frais, remboursements et factures</a
                                 >
                             }
-                            @if (permissionsService.crud?.transaction?.create) {
+                            @if ((permissionsService.crud | async)?.transaction?.create) {
                                 <a mat-list-item routerLinkActive="active" routerLink="import">Import BVR</a>
                             }
                             <a mat-list-item routerLinkActive="active" routerLink="transaction-tag">Tags</a>

diff --git a/client/app/admin/admin/admin.component.ts b/client/app/admin/admin/admin.component.ts
@@ -10,6 +10,7 @@ import {
     NaturalSidenavComponent,
     NaturalSidenavContentComponent,
 } from '@ecodev/natural';
+import {AsyncPipe} from '@angular/common';
 
 @Component({
     selector: 'app-admin',
@@ -25,6 +26,7 @@ import {
         RouterLink,
         NaturalSidenavContentComponent,
         RouterOutlet,
+        AsyncPipe,
     ],
 })
 export class AdminComponent {

diff --git a/client/app/admin/bookableTags/bookableTags/bookableTags.component.html b/client/app/admin/bookableTags/bookableTags/bookableTags.component.html
@@ -67,6 +67,6 @@
     </div>
 }
 
-@if (permissionsService.crud?.bookableTag.create) {
+@if ((permissionsService.crud | async)?.bookableTag.create) {
     <natural-fixed-button icon="add" [routerLink]="['/admin/bookable-tag/new']" />
 }
diff --git a/client/app/admin/bookableTags/bookableTags/bookableTags.component.ts b/client/app/admin/bookableTags/bookableTags/bookableTags.component.ts
@@ -16,6 +16,7 @@ import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
 import {MatTooltipModule} from '@angular/material/tooltip';
 import {MatSortModule} from '@angular/material/sort';
 import {MatTableModule} from '@angular/material/table';
+import {AsyncPipe} from '@angular/common';
 
 @Component({
     selector: 'app-bookable-tags',
@@ -34,6 +35,7 @@ import {MatTableModule} from '@angular/material/table';
         MatPaginatorModule,
         NaturalFixedButtonComponent,
         RouterLink,
+        AsyncPipe,
     ],
 })
 export class BookableTagsComponent extends NaturalAbstractList<BookableTagService> implements OnInit {

diff --git a/client/app/admin/bookables/bookable/bookable.component.ts b/client/app/admin/bookables/bookable/bookable.component.ts
@@ -32,7 +32,7 @@ import {PermissionsService} from '../../../shared/services/permissions.service';
 import {BookableTagService} from '../../bookableTags/services/bookableTag.service';
 import {ImageService} from '../services/image.service';
 import {accountHierarchicConfiguration} from '../../../shared/hierarchic-selector/AccountHierarchicConfiguration';
-import {Observable, of, takeUntil} from 'rxjs';
+import {Observable, of} from 'rxjs';
 import {map, switchMap} from 'rxjs/operators';
 import {
     availableColumnsForBookingsWithOwnerOnlyTrainers,
@@ -50,6 +50,7 @@ import {MatTabsModule} from '@angular/material/tabs';
 import {MatButtonModule} from '@angular/material/button';
 import {CommonModule} from '@angular/common';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
+import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
 
 @Component({
     selector: 'app-bookable',
@@ -108,7 +109,7 @@ export class BookableComponent extends NaturalAbstractDetail<BookableService, Na
             const bookingType = this.form.controls.bookingType;
             const simultaneousBookingMaximum = this.form.controls.simultaneousBookingMaximum;
             bookingType.valueChanges
-                .pipe(takeUntil(this.ngUnsubscribe))
+                .pipe(takeUntilDestroyed(this.destroyRef))
                 .subscribe(value => simultaneousBookingMaximum.setValue(value === BookingType.SelfApproved ? 1 : -1));
         }
 

diff --git a/client/app/admin/bookables/bookables/bookables.component.html b/client/app/admin/bookables/bookables/bookables.component.html
@@ -101,7 +101,7 @@
                                 <span>{{ element.purchasePrice | currency: 'CHF' : 'symbol' : '1.0-0' }}</span>
                             }
                         </td>
-                        <td *matFooterCellDef mat-footer-cellnatural-align-right>
+                        <td *matFooterCellDef mat-footer-cell natural-align-right>
                             @if (dataSource.data?.totalPurchasePrice > 0) {
                                 <span>
                                     {{ dataSource.data?.totalPurchasePrice | currency: 'CHF' : 'symbol' : '1.0-0' }}
@@ -125,7 +125,7 @@
                                 <span>{{ element.initialPrice | currency: 'CHF' : 'symbol' : '1.0-0' }}</span>
                             }
                         </td>
-                        <td *matFooterCellDef mat-footer-cellnatural-align-right>
+                        <td *matFooterCellDef mat-footer-cell natural-align-right>
                             @if (dataSource.data?.totalInitialPrice > 0) {
                                 <span>
                                     {{ dataSource.data?.totalInitialPrice | currency: 'CHF' : 'symbol' : '1.0-0' }}
@@ -149,7 +149,7 @@
                                 <span>{{ element.periodicPrice | currency: 'CHF' : 'symbol' : '1.0-0' }}</span>
                             }
                         </td>
-                        <td *matFooterCellDef mat-footer-cellnatural-align-right>
+                        <td *matFooterCellDef mat-footer-cell natural-align-right>
                             @if (dataSource.data?.totalPeriodicPrice > 0) {
                                 <span>
                                     {{ dataSource.data?.totalPeriodicPrice | currency: 'CHF' : 'symbol' : '1.0-0' }}
@@ -301,6 +301,6 @@
 The hideCreateFab flag is there to hide the create button for admins (is hidden for other users too.
 If we want to display the FAB, we need to add padding in bottom of page to prevent overlay over paginator
 -->
-@if (!route.snapshot.data.hideCreateFab && permissionsService.crud?.bookable.create) {
+@if (!route.snapshot.data.hideCreateFab && (permissionsService.crud | async)?.bookable.create) {
     <natural-fixed-button icon="add" [routerLink]="['/admin/bookable/new']" />
 }
diff --git a/client/app/admin/bookables/bookables/usage-bookables.component.ts b/client/app/admin/bookables/bookables/usage-bookables.component.ts
@@ -14,7 +14,7 @@ import {
 import {CommonModule, DatePipe} from '@angular/common';
 import {UsageBookables} from '../../../shared/generated-types';
 import {BookingService} from '../../bookings/services/booking.service';
-import {switchMap, takeUntil} from 'rxjs/operators';
+import {switchMap} from 'rxjs/operators';
 import {UserService} from '../../users/services/user.service';
 import {ParentComponent} from './parent.component';
 import {of} from 'rxjs';
@@ -28,6 +28,7 @@ import {MatSortModule} from '@angular/material/sort';
 import {MatTableModule} from '@angular/material/table';
 import {MatDialog} from '@angular/material/dialog';
 import {MatSnackBar} from '@angular/material/snack-bar';
+import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
 
 @Component({
     selector: 'app-usage-bookables',
@@ -94,7 +95,7 @@ export class UsageBookablesComponent extends ParentComponent<UsageBookableServic
 
         this.futureOwner$
             .pipe(
-                takeUntil(this.ngUnsubscribe),
+                takeUntilDestroyed(this.destroyRef),
                 switchMap(futureOwner =>
                     futureOwner ? this.userService.getPendingApplications(futureOwner) : of({items: []}),
                 ),

diff --git a/client/app/admin/bookings/bookings/bookings.component.html b/client/app/admin/bookings/bookings/bookings.component.html
@@ -237,6 +237,6 @@
     </div>
 }
 
-@if (permissionsService.crud?.booking.create && !!showFabButton) {
+@if ((permissionsService.crud | async)?.booking.create && !!showFabButton) {
     <natural-fixed-button icon="add" [routerLink]="['/admin/booking/new']" />
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -179,7 +179,7 @@ @@
                     }
                 </div>
             </div>
-            @if (permissionsService.crud?.account.create) {
+            @if ((permissionsService.crud | async)?.account.create) {
                 <natural-fixed-button icon="add" [routerLink]="addLink()" />
             }
         </div>
@@ Expand Down @@