From 90703f2c7f92d9025ab31bdde4838acff929e739 Mon Sep 17 00:00:00 2001
From: "Wonko T. Sane" <42@wonko.de>
Date: Sat, 27 May 2017 22:08:01 +0200
Subject: [PATCH] =?UTF-8?q?info-button=20f=C3=BCr=20programm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/config.xml | 2 +-
src/src/pages/programme/programme.html | 5 ++++-
src/src/pages/programme/programme.ts | 17 +++++++++++++----
src/src/providers/lectures-provider.ts | 5 ++++-
4 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/config.xml b/src/config.xml
index acc1dc1..1291172 100644
--- a/src/config.xml
+++ b/src/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
-<widget id="de.night.of.science" version="0.0.11" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="de.night.of.science" version="0.0.12" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>Night of Science</name>
<description>An awesome Ionic/Cordova app.</description>
<author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team
diff --git a/src/src/pages/programme/programme.html b/src/src/pages/programme/programme.html
index 85ac5fd..b1b24ed 100644
--- a/src/src/pages/programme/programme.html
+++ b/src/src/pages/programme/programme.html
@@ -6,7 +6,10 @@
<ion-title>Programm</ion-title>
</ion-navbar>
<ion-toolbar>
- <ion-title text-center>{{room}}</ion-title>
+ <ion-title text-center>{{room}}
+ <button ion-button clear icon-right (click)="showAlert()">
+ <ion-icon name='beer'></ion-icon>
+ </button></ion-title>
</ion-toolbar>
</ion-header>
diff --git a/src/src/pages/programme/programme.ts b/src/src/pages/programme/programme.ts
index a0d6e8d..3d9c128 100644
--- a/src/src/pages/programme/programme.ts
+++ b/src/src/pages/programme/programme.ts
@@ -3,7 +3,7 @@ import { NavController, NavParams, LoadingController } from 'ionic-angular';
import { LecturesProvider } from '../../providers/lectures-provider';
import { ViewChild } from '@angular/core';
import { Slides } from 'ionic-angular';
-
+import { AlertController } from 'ionic-angular';
@Component({
selector: 'page-programme',
@@ -16,14 +16,14 @@ export class Programme {
times: any[] = [];
loading: any;
lecturesData: any;
- constructor(public navCtrl: NavController, public navParams: NavParams, public lecturesProvider: LecturesProvider, public loadingCtrl: LoadingController) {
+ constructor(public navCtrl: NavController, public navParams: NavParams,public alertCtrl: AlertController, public lecturesProvider: LecturesProvider, public loadingCtrl: LoadingController) {
this.loading = this.loadingCtrl.create({
content: `
<ion-spinner ></ion-spinner>`
});
console.log("using lecturesprovider" + this.lecturesProvider);
- this.lecturesData = this.lecturesProvider.lecturesData;
-
+ //this.lecturesData = this.lecturesProvider.lecturesData;
+ this.room = this.lecturesProvider.lecturesData[0].name;
}
@@ -113,4 +113,13 @@ export class Programme {
let currentIndex = this.slides.getActiveIndex();
this.room = this.lecturesProvider.lecturesData[currentIndex].name;
}
+
+ showAlert() {
+ let alert = this.alertCtrl.create({
+ title: 'Programminformationen',
+ subTitle: 'Version: '+ this.lecturesProvider.lecturesVersion +'<br/>Source: '+ this.lecturesProvider.source,
+ buttons: ['OK']
+ });
+ alert.present();
+ }
}
diff --git a/src/src/providers/lectures-provider.ts b/src/src/providers/lectures-provider.ts
index 8f127f3..3019ec3 100644
--- a/src/src/providers/lectures-provider.ts
+++ b/src/src/providers/lectures-provider.ts
@@ -12,6 +12,7 @@ export class LecturesProvider {
lecturesVersion: string;
lecturesData: any;
initial: any = null;
+ source: String = "";
constructor(public http: Http, public storage: Storage) {
console.log("Lectures Provider instatiated");
if (!this.initial){
@@ -20,8 +21,10 @@ export class LecturesProvider {
storage.get("lecturesVersion").then((version) => {
if (version){
console.log('lectures version: '+ version);
+ this.lecturesVersion = version;
storage.get("lecturesData").then((schedule) => {
this.lecturesData = JSON.parse(schedule);
+ this.source = "localstorage"
});
} else {
console.log('no lectures data: new install');
@@ -33,7 +36,7 @@ export class LecturesProvider {
console.log("Lectures loaded from json");
storage.set('lecturesData',JSON.stringify(this.lecturesData));
storage.set('lecturesVersion',this.lecturesVersion);
-
+ this.source = "json"
},
err =>{
console.error("Error : "+err);
--
GitLab