bb_if_produktiv/pocketapp
0
0 Fork 0
Code Issues 2 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into '76-display-correct-bus-start-end'

Browse Source 
Recovered lost other

See merge request psiweb/psiapp!11
This commit was merged in pull request #105.
This commit is contained in:
gansner_p committed 2020-05-08 17:04:57 +02:00
2 parents 6db18f204b 9db453654c
commit 76e42b9b74
1 file changed
+71 -70
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/psicheckin/psicheckin.page.html
+71 -70
View File
@@ -9,78 +9,79 @@
<ion-button size="small" slot="start" fill="clear" color="dark" (click)="presentHelpModal()">
<ion-icon name="help-circle-outline"></ion-icon>
</ion-button>
<img alt="PSI logo" slot="end" class="titleicon" [src]="assets + '/psi_logo.svg'" width="80px" routerLink="/home" />
<img alt="PSI logo" slot="end" class="titleicon" [src]="assets + '/psi_logo.svg'" width="80px" routerLink="/home"/>
</ion-toolbar>
</ion-header>
<ion-content color="medium" scroll-y="false">
<ion-slides (ionSlideDidChange)="checkSelections()" pager="true" [options]="slideOpts">
<ion-slide>
<ion-card>
<ion-card-header>
<ion-card-title>
Which day would you like to configure?
</ion-card-title>
</ion-card-header>
<ion-card-content>
<h3>Please choose an option bellow</h3>
<ion-button *ngIf="this.workday.toDateString() != this.today.toDateString()" [color]="allSelectionsCheckedToday ? 'success' : 'dark'" fill="outline"
(click)="selectDay('workday');goToSlide(1)">
{{workday | date: 'EEEE'}}
<ion-icon *ngIf="allSelectionsCheckedToday" name="checkmark"></ion-icon>
</ion-button>
<ion-button *ngIf="this.workday.toDateString() == this.today.toDateString()" [color]="allSelectionsCheckedToday ? 'success' : 'dark'" fill="outline"
(click)="selectDay('workday');goToSlide(1)">
Today
<ion-icon *ngIf="allSelectionsCheckedToday" name="checkmark"></ion-icon>
</ion-button>
<ion-button [color]="allSelectionsCheckedTomorrow ? 'success' : 'dark'" fill="outline"
(click)="selectDay('nextworkday');goToSlide(1)">
{{nextworkday | date: 'EEEE'}}
<ion-icon *ngIf="allSelectionsCheckedTomorrow" name="checkmark"></ion-icon>
</ion-button>
</ion-card-content>
</ion-card>
</ion-slide>
<ion-slide>
<ion-card>
<ion-card-header>
<ion-card-title>
How do you get to PSI?
</ion-card-title>
<ion-card-subtitle>
{{selectedDate | date}}
</ion-card-subtitle>
</ion-card-header>
<ion-card-content>
<h3>Please choose an option below</h3>
<ion-button fill="outline" color="dark" (click)="presentTransportModal()">by Bus
</ion-button>
<ion-button fill="outline" color="dark" (click)="goToSlide(2)">Other</ion-button>
</ion-card-content>
</ion-card>
</ion-slide>
<ion-slide>
<ion-card>
<ion-card-header>
<ion-card-title>
Where are you going for lunch?
</ion-card-title>
<ion-card-subtitle>
{{selectedDate | date}}
</ion-card-subtitle>
</ion-card-header>
<ion-card-content>
<h3>Please choose an option bellow</h3>
<ion-button fill="outline" color="dark" (click)="presentRestaurantModal(0)">OASE
</ion-button>
<ion-button fill="outline" color="dark" (click)="presentRestaurantModal(1)">Timeout
</ion-button>
<ion-button fill="outline" color="dark" (click)="goToSlide(0)">Other
</ion-button>
</ion-card-content>
</ion-card>
</ion-slide>
</ion-slides>
<ion-slides (ionSlideDidChange)="checkSelections()" pager="true" [options]="slideOpts">
<ion-slide>
<ion-card>
<ion-card-header>
<ion-card-title>
Which day would you like to configure?
</ion-card-title>
</ion-card-header>
<ion-card-content>
<h3>Please choose an option bellow</h3>
<ion-button *ngIf="this.workday.toDateString() != this.today.toDateString()"
[color]="allSelectionsCheckedToday ? 'success' : 'dark'" fill="outline"
(click)="selectDay('workday');goToSlide(1)">
{{workday | date: 'EEEE'}}
<ion-icon *ngIf="allSelectionsCheckedToday" name="checkmark"></ion-icon>
</ion-button>
<ion-button *ngIf="this.workday.toDateString() == this.today.toDateString()"
[color]="allSelectionsCheckedToday ? 'success' : 'dark'" fill="outline"
(click)="selectDay('workday');goToSlide(1)">
Today
<ion-icon *ngIf="allSelectionsCheckedToday" name="checkmark"></ion-icon>
</ion-button>
<ion-button [color]="allSelectionsCheckedTomorrow ? 'success' : 'dark'" fill="outline"
(click)="selectDay('nextworkday');goToSlide(1)">
{{nextworkday | date: 'EEEE'}}
<ion-icon *ngIf="allSelectionsCheckedTomorrow" name="checkmark"></ion-icon>
</ion-button>
</ion-card-content>
</ion-card>
</ion-slide>
<ion-slide>
<ion-card>
<ion-card-header>
<ion-card-title>
How do you get to PSI?
</ion-card-title>
<ion-card-subtitle>
{{selectedDate | date}}
</ion-card-subtitle>
</ion-card-header>
<ion-card-content>
<h3>Please choose an option below</h3>
<ion-button fill="outline" color="dark" (click)="presentTransportModal()">by Bus
</ion-button>
<ion-button fill="outline" color="dark" (click)="selectOtherTransport()">Other</ion-button>
</ion-card-content>
</ion-card>
</ion-slide>
<ion-slide>
<ion-card>
<ion-card-header>
<ion-card-title>
Where are you going for lunch?
</ion-card-title>
<ion-card-subtitle>
{{selectedDate | date}}
</ion-card-subtitle>
</ion-card-header>
<ion-card-content>
<h3>Please choose an option bellow</h3>
<ion-button fill="outline" color="dark" (click)="presentRestaurantModal(0)">OASE
</ion-button>
<ion-button fill="outline" color="dark" (click)="presentRestaurantModal(1)">Timeout
</ion-button>
<ion-button fill="outline" color="dark" (click)="selectOtherCatering()">Other
</ion-button>
</ion-card-content>
</ion-card>
</ion-slide>
</ion-slides>
</ion-content>