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

feat(representation): add segment slider and pull to refresh #14

Merged
merged 1 commit into from
Apr 19, 2016
Merged

feat(representation): add segment slider and pull to refresh #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
76 changes: 42 additions & 34 deletions app/pages/representation/representation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,49 +28,57 @@
</ion-content>
</ion-menu>

<ion-navbar *navbar>
<ion-navbar *navbar secondary>
<button (click)="toggleMenu()" royal dark menuToggle>
<ion-icon name="menu"></ion-icon>
</button>
<ion-title>
Vertretungen
Vertretungen {{ currentClass !== '*' ? ' der ' + currentClass : '' }}
</ion-title>
</ion-navbar>

<ion-content #content>
<div padding>
<ion-segment [(ngModel)]="selectedSegment" (change)="onSegmentDayChanged($event)">
<ion-segment-button value="today">
{{ todayDate | date: 'dd/MM/y'}}
</ion-segment-button>
<ion-segment-button value="tomorrow">
{{ tomorrowDate | date: 'dd/MM/y'}}
</ion-segment-button>
</ion-segment>
</div>

<div padding>
<ion-segment [(ngModel)]="viewDay">
<ion-segment-button value="today" >
{{ todayDate | date: 'dd/MM/y'}}
</ion-segment-button>
<ion-segment-button value="tomorrow">
{{ tomorrowDate | date: 'dd/MM/y'}}
</ion-segment-button>
</ion-segment>
</div>
<ion-content #content scrollable [hidden]="(isLoadingToday && isLoadingTomorrow)">

<div [ngSwitch]="viewDay">
<div *ngFor="#set of [{ data: todayPromise, key: 'today'}, { data: tomorrowPromise, key: 'tomorrow'}]">
<ion-list *ngSwitchWhen="set.key">
<div *ngFor="#item of set.data | async | asyncDefault: [{notFound: true}]">
<div *ngIf="item.notFound">
<ion-item>
Es sind keine Vertretungen vorhanden.
</ion-item>
</div>
<div *ngIf="!item.notFound">
<button ion-item (click)="showMore(item)">
<ion-icon item-right>
<img [src]="item.type | toIcon">
</ion-icon>
<h2>{{ item.type | toTitle }}</h2>
<p>{{ item.hour }}. Stunde</p>
</button>
<ion-refresher (refresh)="refreshTodayRepresentations(session, backend, $event, refresher)">
</ion-refresher>

<ion-slides (change)="onSlideDayChanged($event)" id="loopSlider" menuLeft>
<ion-slide *ngFor="#set of slides" scrollable>
<ion-list>
<div>
<div *ngFor="#item of set.data | async | asyncDefault: [{notFound: true}]">

<div *ngIf="item.notFound">
<ion-item>
Es sind keine Vertretungen vorhanden.
</ion-item>
</div>

<div *ngIf="!item.notFound">
<button ion-item (click)="showMore(item)">
<ion-icon item-right>
<img [src]="item.type | toIcon">
</ion-icon>
<h2>{{ item.type | toTitle }}</h2>
<p>{{ item.hour }}. Stunde</p>
</button>
</div>
</div>
</div>
</div>
</ion-list>
</div>
</div>
</ion-list>
</ion-slide>
</ion-slides>


</ion-content>
15 changes: 15 additions & 0 deletions app/pages/representation/representation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//Fixes a bug from ionic: can't scroll when have an ion-slide element inside a ion-content element
ion-slide[scrollable] {
min-height: 100%;
display: block;
overflow-y: scroll;
}

[menuLeft] {
min-height: 100%;
padding-left: 5px;
}

[hidden] {
display: none;
}
Copy link
Owner

Choose a reason for hiding this comment

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

Attribute Selectors are slow IE11

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Well.....good joke :P

96 changes: 91 additions & 5 deletions app/pages/representation/representation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Page, NavController, Modal, MenuController} from "ionic-angular/index";
import {IonicApp, Page, Alert, Loading, NavController, Modal, MenuController} from "ionic-angular";
import {BackendConnector} from "../../services/BackendConnector";
import {SessionAccessor} from "../../services/SessionAccessor";
import {JWTDecoder} from '../../services/JWTDecoder';
Expand All @@ -25,24 +25,45 @@ export class RepresentationPage {
todayPromise: Promise<any>;
tomorrowPromise: Promise<any>;

isLoadingToday: boolean = false;
isLoadingTomorrow: boolean = false;

selectedSegment = 'today';
slides: Array<any>;

isMenuAnimating: boolean = false;

constructor(private backend: BackendConnector,
private nav: NavController,
private session: SessionAccessor,
private dateUtil: DateUtil,
private jwtDecoder: JWTDecoder,
private menu: MenuController) {
private menu: MenuController,
private app: IonicApp) {

this.todayDate = dateUtil.getTodayDate();
this.tomorrowDate = dateUtil.getTomorrowDate();

session.getToken().then((token) => {
this.currentUser = JSON.parse(jwtDecoder.decodeToken(token)).username;
this.currentClass = JSON.parse(jwtDecoder.decodeToken(token)).class;
this.todayPromise = backend.sendRepresentationRequest(this.todayDate, token);
this.tomorrowPromise = backend.sendRepresentationRequest(this.tomorrowDate, token);
this.refreshTodayRepresentations(session, backend);
this.refreshTomorrowRepresentations(session, backend);
});
}

onSegmentDayChanged(segmentButton) {
var sliderComponent = this.app.getComponent('loopSlider');

const selectedIndex = this.slides.findIndex((slide) => {
return slide.key === segmentButton.value;
});
sliderComponent.slider.slideTo(selectedIndex);
}

onSlideDayChanged(slider) {
const currentSlide = this.slides[slider.activeIndex];
this.selectedSegment = currentSlide.key;
}

showMore(item) {
Expand All @@ -68,7 +89,6 @@ export class RepresentationPage {
}

showRepresentations() {
//Add refreshing representations
this.toggleMenu();
}

Expand All @@ -77,4 +97,70 @@ export class RepresentationPage {
this.nav.setRoot(ContactPage);
});
}

refreshTodayRepresentations(session: SessionAccessor, backend: BackendConnector, refresher?) {
this.isLoadingToday = true;

var loadingDialog = Loading.create({
content: 'Lade Vertretungen...'
});
this.nav.present(loadingDialog);

session.getToken().then((token) => {
(this.todayPromise = backend.sendRepresentationRequest(this.todayDate, token))
.then(success => {
this.isLoadingToday = false;
loadingDialog.dismiss();
}, error => {
this.isLoadingToday = false;
loadingDialog.dismiss();
this.nav.present(Alert.create({
title: 'Keine Verbindung.',
subTitle: 'Es konnte keine Verbindung hergestellt werden. Überprüfe deine Internetverbindung!'
}));
});

this.slides = [{
data: this.todayPromise,
key: 'today'
}, {
data: this.tomorrowPromise,
key: 'tomorrow'
}];
});
if (refresher) refresher.complete();
}

refreshTomorrowRepresentations(session: SessionAccessor, backend: BackendConnector, refresher?) {
this.isLoadingTomorrow = true;

var loadingDialog = Loading.create({
content: 'Lade Vertretungen...'
});
this.nav.present(loadingDialog);

session.getToken().then((token) => {
(this.tomorrowPromise = backend.sendRepresentationRequest(this.tomorrowDate, token))
.then(success => {
this.isLoadingTomorrow = false;
loadingDialog.dismiss();
}, error => {
this.isLoadingTomorrow = false;
loadingDialog.dismiss();
if(!refresher) this.nav.present(Alert.create({
title: 'Keine Verbindung.',
subTitle: 'Es konnte keine Verbindung hergestellt werden. Überprüfe deine Internetverbindung!'
}));
});

this.slides = [{
data: this.todayPromise,
key: 'today'
}, {
data: this.tomorrowPromise,
key: 'tomorrow'
}];
});
if (refresher) refresher.complete();
}
}