Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Expired event management for online events #50

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Expired event management for online events #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96eba57
fix discount error "formControlName must be used with a parent formGr…
May 3, 2020
81d3f1f
Merge branch 'master' of https://github.com/baccinelli/alf.io-public-…
Sep 7, 2020
fd608dd
Expired event management fo onLine event: please ensure that the file
Sep 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
group=com.github.alfio-event
version=1.0-SNAPSHOT
version=1.0-BACCINELLI
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be better if this file is not committed :)

13 changes: 7 additions & 6 deletions src/app/update-ticket/update-ticket.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions src/app/update-ticket/update-ticket.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export class UpdateTicketComponent implements OnInit {
categoryName: string;
emailSent: boolean;
ticketFormVisible: boolean;
eventExpired: boolean;

constructor(
private ticketService: TicketService,
Expand All @@ -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(['']);
Expand Down