From 96eba572414efb59ed7932ec54cea91f84ccb7e8 Mon Sep 17 00:00:00 2001
From: jurit <juri.tanganelli@estrobit.com>
Date: Mon, 4 May 2020 00:12:49 +0200
Subject: [PATCH 1/2] fix discount error "formControlName must be used with a
 parent formGroup directive." added event startTime-endTime in eventlist main
 page for online events only

---
 src/app/event-display/event-display.component.html | 4 ++--
 src/app/event-display/event-display.component.ts   | 2 +-
 src/app/event-list/event-list.component.html       | 8 +++++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/app/event-display/event-display.component.html b/src/app/event-display/event-display.component.html
index b26633ee..93281849 100644
--- a/src/app/event-display/event-display.component.html
+++ b/src/app/event-display/event-display.component.html
@@ -180,7 +180,7 @@ <h5 class="alert-heading"><fa-icon [icon]="event.promotionsConfiguration.usePart
           </button>
         </div>
         <div *ngIf="displayPromoCodeForm" class="mt-2">
-          <ng-form [formGroup]="promoCodeForm">
+          <form [formGroup]="promoCodeForm">
             <div class="form-row">
               <div class="col-12 col-md-6 offset-md-1">
                 <div class="form-group">
@@ -194,7 +194,7 @@ <h5 class="alert-heading"><fa-icon [icon]="event.promotionsConfiguration.usePart
                 <button class="btn btn-light ml-2" translate="reservation-page-complete.cancel" type="button" (click)="togglePromoCodeVisible()"></button>
               </div>
             </div>
-          </ng-form>
+          </form>
         </div>
       </div>
 
diff --git a/src/app/event-display/event-display.component.ts b/src/app/event-display/event-display.component.ts
index 7af7b588..b20dbd1a 100644
--- a/src/app/event-display/event-display.component.ts
+++ b/src/app/event-display/event-display.component.ts
@@ -227,7 +227,7 @@ export class EventDisplayComponent implements OnInit {
   togglePromoCodeVisible(): void {
     this.displayPromoCodeForm = !this.displayPromoCodeForm;
     if (this.displayPromoCodeForm) {
-      setTimeout(() => this.promoCodeElement.nativeElement.focus());
+      setTimeout(() => this.promoCodeElement.nativeElement.focus(), 200);
     } else {
       this.promoCodeForm.get('promoCode').setValue(null);
     }
diff --git a/src/app/event-list/event-list.component.html b/src/app/event-list/event-list.component.html
index 30f7f3ed..556916dd 100644
--- a/src/app/event-list/event-list.component.html
+++ b/src/app/event-list/event-list.component.html
@@ -11,7 +11,13 @@ <h1 translate="event-list.title"></h1>
       </div>
       <div class="card-body">
         <h2 class="card-title">{{event.displayName}}</h2>
-        <p class="card-text"><fa-icon [icon]="['far', 'calendar-alt']" class="text-muted" [title]="'ticket.date-time' | translate"></fa-icon>&nbsp;{{event.formattedBeginDate[translate.currentLang]}} <span class="text-muted" *ngIf="displayTimeZoneInfo(event)">&nbsp; ({{event.timeZone}})</span></p>
+        <p class="card-text" *ngIf="event.formattedBeginDate[translate.currentLang] == event.formattedEndDate[translate.currentLang]"><fa-icon [icon]="['far', 'calendar-alt']" class="text-muted" [title]="'ticket.date-time' | translate"></fa-icon>&nbsp;{{event.formattedBeginDate[translate.currentLang]}} 
+          <span *ngIf="isEventOnline(event)"> ({{event.formattedBeginTime[translate.currentLang]}}-{{event.formattedEndTime[translate.currentLang]}})</span>
+          <span class="text-muted" *ngIf="displayTimeZoneInfo(event)">&nbsp; ({{event.timeZone}})</span></p>
+        <p class="card-text text-muted mt-1" *ngIf="!isEventOnline(event)">{{event.location}}</p>
+        <p class="card-text" *ngIf="event.formattedBeginDate[translate.currentLang] != event.formattedEndDate[translate.currentLang]"><fa-icon [icon]="['far', 'calendar-alt']" class="text-muted" [title]="'ticket.date-time' | translate"></fa-icon>&nbsp;{{event.formattedBeginDate[translate.currentLang]}} 
+          <span *ngIf="isEventOnline(event)"> {{event.formattedBeginTime[translate.currentLang]}}&nbsp;-&gt;&nbsp;{{event.formattedEndDate[translate.currentLang]}}&nbsp;{{event.formattedEndTime[translate.currentLang]}}</span>
+          <span class="text-muted" *ngIf="displayTimeZoneInfo(event)">&nbsp; ({{event.timeZone}})</span></p>
         <p class="card-text text-muted mt-1" *ngIf="!isEventOnline(event)">{{event.location}}</p>
       </div>
       <div class="card-footer border-top-0 bg-white">

From fd608dd09d02d6cd6d59e641da784474f2b25d6f Mon Sep 17 00:00:00 2001
From: jurit <juri.tanganelli@estrobit.com>
Date: Tue, 8 Sep 2020 15:15:12 +0200
Subject: [PATCH 2/2] Expired event management fo onLine event: please ensure
 that the file
 /alf.io/blob/master/src/main/resources/alfio/i18n/public.properties has the
 following entry: event.online.expired=Sorry, your event is expired. Check the
 event date in your reservation email, thanks.

---
 gradle.properties                                  |  2 +-
 src/app/update-ticket/update-ticket.component.html | 13 +++++++------
 src/app/update-ticket/update-ticket.component.ts   |  2 ++
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index a403a3c4..4757544e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
 group=com.github.alfio-event
-version=1.0-SNAPSHOT
\ No newline at end of file
+version=1.0-BACCINELLI
\ No newline at end of file
diff --git a/src/app/update-ticket/update-ticket.component.html b/src/app/update-ticket/update-ticket.component.html
index 29c68c1a..8133be6d 100644
--- a/src/app/update-ticket/update-ticket.component.html
+++ b/src/app/update-ticket/update-ticket.component.html
@@ -3,10 +3,11 @@
         <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-danger': eventExpired, 'alert-info': !eventExpired && !ticket.onlineEventStarted, 'alert-success': !eventExpired && ticket.onlineEventStarted}" *ngIf="isEventOnline && !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>
+            <span *ngIf="!eventExpired && !ticket.onlineEventStarted">{{'event.online.not-started' | translate:{ '0' : ticketOnlineCheckInDate } }}</span>
+            <span *ngIf="!eventExpired && ticket.onlineEventStarted">{{'event.online.started' | translate }}</span>
+            <span *ngIf="eventExpired">{{'event.online.expired' | translate }}</span>
           </div>
         </div>
         <h2>{{'show-ticket.header.title' | translate:{ '0' : event.displayName } }}</h2>
@@ -18,9 +19,9 @@ <h3 class="card-title flex-md-shrink-0" *ngIf="ticket.assigned">{{ticket.fullNam
                 <h3 class="card-title text-muted" *ngIf="!ticket.assigned">{{'reservation-page-complete.ticket-not-assigned' | translate }}</h3>
               </div>
 
-              <hr *ngIf="!ticketFormVisible">
+              <hr *ngIf="!eventExpired && !ticketFormVisible">
 
-              <div class="row justify-content-end" *ngIf="!ticketFormVisible">
+              <div class="row justify-content-end" *ngIf="!eventExpired && !ticketFormVisible">
                 <div class="col-lg-3 col-sm-6 col-12 mb-2" *ngIf="!isEventOnline && 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>
@@ -38,7 +39,7 @@ <h3 class="card-title text-muted" *ngIf="!ticket.assigned">{{'reservation-page-c
                 </div>
               </div>
 
-              <div class="mt-4" *ngIf="ticketFormVisible">
+              <div class="mt-4" *ngIf="!eventExpired && ticketFormVisible">
                 <div class="alert alert-info" translate="reservation-page-complete.info-update" *ngIf="event.assignmentConfiguration.enableTicketTransfer && ticket.assigned && !ticket.locked"></div>
                 <form [formGroup]="formGroup" (submit)="updateTicket()">
                     <app-ticket-form [ticket]="ticket" [event]="event" [form]="formGroup"></app-ticket-form>
diff --git a/src/app/update-ticket/update-ticket.component.ts b/src/app/update-ticket/update-ticket.component.ts
index f8b48c42..4eb60faa 100644
--- a/src/app/update-ticket/update-ticket.component.ts
+++ b/src/app/update-ticket/update-ticket.component.ts
@@ -27,6 +27,7 @@ export class UpdateTicketComponent implements OnInit {
   categoryName: string;
   emailSent: boolean;
   ticketFormVisible: boolean;
+  eventExpired: boolean;
 
   constructor(
     private ticketService: TicketService,
@@ -49,6 +50,7 @@ export class UpdateTicketComponent implements OnInit {
         this.i18nService.setPageTitle('show-ticket.header.title', event.displayName);
         this.handleTicketResponse(ticketsByCategory);
         this.analytics.pageView(event.analyticsConfiguration);
+        this.eventExpired = this.event.datesWithOffset.endDateTime <= Date.now();
       }, e => {
         if (e instanceof HttpErrorResponse && e.status === 404) {
           this.router.navigate(['']);