Merge pull request #109 from sinfo/add-check-to-activities

fix: add activities check
sinfo · Feb 25, 2024 · a4bf888 · a4bf888
2 parents 0b5abaa + 93ecfbd
commit a4bf888
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/app/company/company-reservations/company-reservations.component.html b/src/app/company/company-reservations/company-reservations.component.html
@@ -144,10 +144,7 @@ <h5 style="margin-left: 5%;" [innerHTML]="'reservations.warning' | translate"></
         <div class="btn-group-vertical" role="group">
           <button class="btn btn-primary" type="button" (click)="makeReservation(confirmReservationPopup)"
             [innerHTML]="'reservations.submit' | translate"
-            *ngIf="latestReservation 
-            && latestReservation.issued === undefined 
-            && (latestReservation.stands.length === credentials.participationDays || availability.venue.stands.length === 0 || latestReservation.stands === undefined)">Submit
-            reservation</button>
+            *ngIf="isReadyToSubmit()">Submit reservation</button>
 
           <button *ngIf="showAllReservations" class="btn btn-primary" type="button"
             (click)="alternateShowAllReservations()" [innerHTML]=" 'reservations.current' | translate">

diff --git a/src/app/company/company-reservations/company-reservations.component.ts b/src/app/company/company-reservations/company-reservations.component.ts
@@ -252,6 +252,13 @@ export class CompanyReservationsComponent implements OnInit, OnDestroy {
       act.isInArray(this.latestReservation.activities) && this.latestReservation.isConfirmed();
   }
 
+  private isReadyToSubmit() {
+    return this.latestReservation
+            && this.latestReservation.issued === undefined
+            && this.credentials.activities.every(act => this.latestReservation.activities.find(e => act === e.kind) !== undefined)
+            && (this.latestReservation.stands.length === this.credentials.participationDays || this.availability.venue.stands.length === 0 || this.latestReservation.stands === undefined);
+  }
+
   private makeReservation(content) {
     const contiguous: boolean = this.latestReservation.daysAreContiguous();
     const same_stand: boolean = this.latestReservation.standIsSame();