add support for hybrid events (#54)

alfio-event · Dec 14, 2020 · 0c79c99 · 0c79c99
1 parent dee7983
commit 0c79c99
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 12 deletions.
diff --git a/src/app/event-display/event-display.component.html b/src/app/event-display/event-display.component.html
@@ -100,8 +100,12 @@ <h3 translate="show-event.sold-out.header"></h3>
       <div *ngFor="let category of ticketCategories;let counter = index" formArrayName="reservation">
         <app-item-card [currentLang]="translate.currentLang" [item]="category" [formGroupName]="''+counter" [parentFormGroup]="reservationFormItem(reservationForm, counter)" [additionalClass]="category.accessRestricted ? 'ticket-category-restricted border-warning shadow-sm ': ''">
           <span class="item-title">
-            {{category.name}} <span class="d-inline badge badge-warning ml-2" *ngIf="ticketsLeftCountVisibleForCategory(category)">{{"show-event.tickets.left" | translate: {'0': category.availableTickets} }}</span>
+            {{category.name}}
           </span>
+          <div class="item-badges mb-2">
+            <span *ngIf="displayOnlineTicketTag(category)" class="badge badge-success">{{'event.online.badge' | translate}}</span>
+            <span class="badge badge-warning" [class.ml-2]="displayOnlineTicketTag(category)" *ngIf="ticketsLeftCountVisibleForCategory(category)">{{"show-event.tickets.left" | translate: {'0': category.availableTickets} }}</span>
+          </div>
           <div class="item-price">
             <span *ngIf="category.free" translate="common.free"></span>
             <span *ngIf="!category.free">

diff --git a/src/app/event-display/event-display.component.ts b/src/app/event-display/event-display.component.ts
@@ -287,6 +287,10 @@ export class EventDisplayComponent implements OnInit {
     return this.event.format == 'ONLINE';
   }
 
+  public displayOnlineTicketTag(category: TicketCategory): boolean {
+    return this.event.format === 'HYBRID' && category.ticketAccessType === 'ONLINE';
+  }
+
   get displayMap(): boolean {
     return (this.event.mapUrl && this.event.mapUrl.length > 0) && !this.isEventOnline;
   }

diff --git a/src/app/item-card/item-card.html b/src/app/item-card/item-card.html
@@ -5,6 +5,7 @@ <h3 class="card-title pr-1">
         <ng-content select=".item-title"></ng-content>
       </h3>
       <div class="card-sale-period">
+        <ng-content select=".item-badges"></ng-content>
         <app-item-sale-period [item]="item" [currentLang]="currentLang"></app-item-sale-period>
       </div>
       <div class="card-item-price">

diff --git a/src/app/model/event.ts b/src/app/model/event.ts
@@ -77,7 +77,7 @@ export class PaymentProxyWithParameters {
     parameters: {[key: string]: any};
 }
 
-export type EventFormat = 'IN_PERSON' | 'ONLINE';
+export type EventFormat = 'IN_PERSON' | 'ONLINE' | 'HYBRID';
 
 export type PaymentMethod = 'CREDIT_CARD' | 'PAYPAL' | 'IDEAL' | 'BANK_TRANSFER' | 'ON_SITE'
                             | 'APPLE_PAY' | 'BANCONTACT' | 'ING_HOME_PAY' | 'BELFIUS' | 'PRZELEWY_24' | 'KBC' | 'NONE';

diff --git a/src/app/model/reservation-info.ts b/src/app/model/reservation-info.ts
@@ -1,5 +1,6 @@
 import { Ticket } from './ticket';
 import { PaymentProxy, PaymentMethod, PaymentProxyWithParameters } from './event';
+import { TicketAccessType } from './ticket-category';
 
 export class ReservationInfo {
     id: string;
@@ -49,6 +50,7 @@ export class ReservationStatusInfo {
 
 export class TicketsByTicketCategory {
     name: string;
+    ticketAccessType: TicketAccessType;
     tickets: Ticket[];
 }
 

diff --git a/src/app/model/ticket-category.ts b/src/app/model/ticket-category.ts
@@ -1,6 +1,9 @@
+export type TicketAccessType = 'INHERIT' | 'IN_PERSON' | 'ONLINE';
+
 export class TicketCategory {
     id: number;
     name: string;
+    ticketAccessType: TicketAccessType;
     bounded: boolean;
     maximumSaleableTickets: number;
     description: {[key: string]: string};
@@ -23,3 +26,4 @@ export class TicketCategory {
 
     availableTickets: number | null;
 }
+
diff --git a/src/app/reservation/success/success.component.html b/src/app/reservation/success/success.component.html
@@ -53,10 +53,10 @@ <h3 class="card-title text-muted" *ngIf="!ticket.assigned">{{'reservation-page-c
         <hr *ngIf="!ticketFormVisible">
 
         <div class="row justify-content-end" *ngIf="!ticketFormVisible">
-          <div class="col-lg-3 col-sm-6 col-12 mb-2" *ngIf="!isEventOnline && ticket.assigned && !ticket.cancellationEnabled" >
+          <div class="col-lg-3 col-sm-6 col-12 mb-2" *ngIf="!isOnlineTicket(tc) && ticket.assigned && !ticket.cancellationEnabled" >
             <a [routerLink]="['/event', event.shortName, 'ticket', ticket.uuid, 'view']" target="_blank" class="btn btn-default btn-block"><fa-icon [icon]="['fas', 'search-plus']" a11yRole="presentation"></fa-icon> {{'reservation-page-complete.show-ticket'|translate}}</a>
           </div>
-          <div class="col-lg-3 col-sm-6 col-12 mt-2 mt-md-0 mb-2" *ngIf="!isEventOnline && ticket.assigned">
+          <div class="col-lg-3 col-sm-6 col-12 mt-2 mt-md-0 mb-2" *ngIf="!isOnlineTicket(tc) && ticket.assigned">
             <a [attr.href]="'/api/v2/public/event/' + event.shortName + '/ticket/' + ticket.uuid + '/download-ticket'" class="btn btn-default btn-block"><fa-icon [icon]="['fas', 'download']" a11yRole="presentation"></fa-icon> {{'reservation-page-complete.download-ticket'|translate}}</a>
           </div>
           <div class="col-lg-3 col-sm-6 col-12 mt-2 mt-md-0 mb-2" *ngIf="ticket.assigned">

diff --git a/src/app/reservation/success/success.component.ts b/src/app/reservation/success/success.component.ts
@@ -5,11 +5,13 @@ import { Event } from 'src/app/model/event';
 import { EventService } from 'src/app/shared/event.service';
 import { TicketService } from 'src/app/shared/ticket.service';
 import { Ticket } from 'src/app/model/ticket';
-import { ReservationInfo } from 'src/app/model/reservation-info';
+import { ReservationInfo, TicketsByTicketCategory } from 'src/app/model/reservation-info';
 import { I18nService } from 'src/app/shared/i18n.service';
 import { AnalyticsService } from 'src/app/shared/analytics.service';
 import { handleServerSideValidationError } from 'src/app/shared/validation-helper';
 import { FormGroup } from '@angular/forms';
+import { TicketCategory } from 'src/app/model/ticket-category';
+import { TryCatchStmt } from '@angular/compiler';
 
 @Component({
   selector: 'app-success',
@@ -132,8 +134,9 @@ export class SuccessComponent implements OnInit {
         && this.reservationInfo.invoiceOrReceiptDocumentPresent;
   }
 
-  get isEventOnline(): boolean {
-    return this.event.format == 'ONLINE';
+  public isOnlineTicket(category: TicketsByTicketCategory): boolean {
+    return this.event.format == 'ONLINE'
+      || (this.event.format == 'HYBRID' && category.ticketAccessType == 'ONLINE');
   }
 
 }
diff --git a/src/app/update-ticket/update-ticket.component.html b/src/app/update-ticket/update-ticket.component.html
@@ -3,7 +3,7 @@
         <app-event-header [event]="event"></app-event-header>
     </header>
     <main class="mt-5">
-        <div class="alert mb-5" [ngClass]="{'alert-info': !ticket.onlineEventStarted, 'alert-success': ticket.onlineEventStarted}" *ngIf="isEventOnline && !ticketFormVisible">
+        <div class="alert mb-5" [ngClass]="{'alert-info': !ticket.onlineEventStarted, 'alert-success': ticket.onlineEventStarted}" *ngIf="isOnlineTicket && !ticketFormVisible">
           <div class="font-weight-bold text-center">
             <span *ngIf="!ticket.onlineEventStarted">{{'event.online.not-started' | translate:{ '0' : ticketOnlineCheckInDate } }}</span>
             <span *ngIf="ticket.onlineEventStarted">{{'event.online.started' | translate }}</span>
@@ -21,10 +21,10 @@ <h3 class="card-title text-muted" *ngIf="!ticket.assigned">{{'reservation-page-c
               <hr *ngIf="!ticketFormVisible">
 
               <div class="row justify-content-end" *ngIf="!ticketFormVisible">
-                <div class="col-lg-3 col-sm-6 col-12 mb-2" *ngIf="!isEventOnline && ticket.assigned && !ticket.cancellationEnabled" >
+                <div class="col-lg-3 col-sm-6 col-12 mb-2" *ngIf="!isOnlineTicket && ticket.assigned && !ticket.cancellationEnabled" >
                   <a [routerLink]="['/event', event.shortName, 'ticket', ticket.uuid, 'view']" target="_blank" class="btn btn-default btn-block"><fa-icon [icon]="['fas', 'search-plus']" a11yRole="presentation"></fa-icon> {{'reservation-page-complete.show-ticket'|translate}}</a>
                 </div>
-                <div class="col-lg-3 col-sm-6 col-12 mt-2 mt-md-0 mb-2" *ngIf="!isEventOnline && ticket.assigned">
+                <div class="col-lg-3 col-sm-6 col-12 mt-2 mt-md-0 mb-2" *ngIf="!isOnlineTicket && ticket.assigned">
                   <a [attr.href]="'/api/v2/public/event/' + event.shortName + '/ticket/' + ticket.uuid + '/download-ticket'" class="btn btn-default btn-block"><fa-icon [icon]="['fas', 'download']" a11yRole="presentation"></fa-icon> {{'reservation-page-complete.download-ticket'|translate}}</a>
                 </div>
                 <div class="col-lg-3 col-sm-6 col-12 mt-2 mt-md-0 mb-2" *ngIf="ticket.assigned">

diff --git a/src/app/update-ticket/update-ticket.component.ts b/src/app/update-ticket/update-ticket.component.ts
@@ -12,6 +12,7 @@ import { Ticket } from '../model/ticket';
 import { handleServerSideValidationError } from '../shared/validation-helper';
 import { TicketsByTicketCategory } from '../model/reservation-info';
 import { TranslateService } from '@ngx-translate/core';
+import { TicketAccessType, TicketCategory } from '../model/ticket-category';
 
 @Component({
   selector: 'app-update-ticket',
@@ -27,6 +28,7 @@ export class UpdateTicketComponent implements OnInit {
   categoryName: string;
   emailSent: boolean;
   ticketFormVisible: boolean;
+  ticketAccessType: TicketAccessType;
 
   constructor(
     private ticketService: TicketService,
@@ -58,6 +60,7 @@ export class UpdateTicketComponent implements OnInit {
   }
 
   private handleTicketResponse(ticketsByCategory: TicketsByTicketCategory): void {
+    this.ticketAccessType = ticketsByCategory.ticketAccessType;
     this.ticket = ticketsByCategory.tickets[0];
     this.formGroup = this.ticketService.buildFormGroupForTicket(this.ticket);
     this.categoryName = ticketsByCategory.name;
@@ -92,8 +95,9 @@ export class UpdateTicketComponent implements OnInit {
       });
   }
 
-  get isEventOnline(): boolean {
-    return this.event.format === 'ONLINE';
+  get isOnlineTicket(): boolean {
+    return this.event.format == 'ONLINE'
+      || (this.event.format == 'HYBRID' && this.ticketAccessType == 'ONLINE');
   }
 
   get ticketOnlineCheckInDate(): string {