Merge remote-tracking branch 'origin/development'

app/app.ts

@@ -1,6 +1,6 @@
 import { Component, Type, ViewChild } from '@angular/core';
 import { Nav, Platform, Loading } from 'ionic-angular';
-import { Keyboard, Splashscreen, StatusBar } from 'ionic-native';
+import { GoogleAnalytics, Keyboard, Splashscreen, StatusBar } from 'ionic-native';
 import { Deploy } from '@ionic/cloud-angular';
 
 import { AuthService } from './services/auth';
@@ -21,13 +21,17 @@ export class LustrumApp {
     private notifier: NotificationService,
     private deploy: Deploy
   ) {
-    this.initializeCordova();
     this.initializeRootPage();
+    if (this.platform.is('cordova')) {
+      this.initializeCordova();
+    }
   }
 
   private initializeCordova() {
     this.platform.ready().then(() => {
       Keyboard.disableScroll(true);
+      GoogleAnalytics.startTrackerWithId('UA-79997582-1');
+      GoogleAnalytics.enableUncaughtExceptionReporting(true);
       this.runDeploy();
     });
   }

app/directives/maps-href.ts

@@ -0,0 +1,37 @@
+import { Directive, ElementRef, Input, OnInit } from '@angular/core';
+import { Platform } from 'ionic-angular';
+
+
+@Directive({
+  selector: '[csrMapsHref]'
+})
+export class MapsHrefDirective implements OnInit {
+  @Input('csrMapsHref') mapsQuery: string;
+
+  private el: HTMLElement;
+
+  constructor(
+    el: ElementRef,
+    private platform: Platform
+  ) {
+    this.el = el.nativeElement;
+  }
+
+  ngOnInit() {
+    let query = encodeURIComponent(this.mapsQuery);
+    let url = this.getPlatformMapsUrl();
+    this.el.setAttribute('href', url + query);
+  }
+
+  private getPlatformMapsUrl(): string {
+    if (this.platform.is('mobile')) {
+      if (this.platform.is('ios')) {
+        return 'maps://maps.apple.com/?q=';
+      } else {
+        return 'geo:0,0?q=';
+      }
+    } else {
+      return 'https://maps.google.com?q=';
+    }
+  }
+}

app/pages/about/about.ts

@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
 import { Loading, NavController } from 'ionic-angular';
+import { GoogleAnalytics } from 'ionic-native';
 
 import { SystemBrowserDirective } from '../../directives/system-browser';
 import { AuthService } from '../../services/auth';
@@ -30,4 +31,8 @@ export class AboutPage {
     }, 1000);
   }
 
+  ionViewDidEnter() {
+    GoogleAnalytics.trackView('About');
+  }
+
 }

app/pages/event-detail/event-detail.html

@@ -9,7 +9,7 @@
 
   <div padding>
     <h4>{{ event.naam || event.titel }}</h4>
-    <p><a *ngIf="event.locatie" [href]="getLocationUrl(event.locatie)">
+    <p><a *ngIf="event.locatie" [csrMapsHref]="event.locatie">
       {{ event.locatie }}
     </a></p>
     <p subdued class="preserve-whitespace">{{ getDateTimes(event._meta.start, event._meta.end) }}</p>

app/pages/event-detail/event-detail.ts

@@ -1,16 +1,19 @@
 import { Component } from '@angular/core';
 import { DomSanitizationService } from '@angular/platform-browser';
 import { NavParams, Toast } from 'ionic-angular';
+import { GoogleAnalytics } from 'ionic-native';
 import * as moment from 'moment';
 import 'moment/locale/nl';
 
+import { MapsHrefDirective } from '../../directives/maps-href';
 import { NotificationService } from '../../services/notification';
 import { ApiData } from '../../services/api-data';
 import { Event } from '../../models/event';
 
 
 @Component({
-  templateUrl: 'build/pages/event-detail/event-detail.html'
+  templateUrl: 'build/pages/event-detail/event-detail.html',
+  directives: [MapsHrefDirective]
 })
 export class EventDetailPage {
   event: Event;
@@ -25,11 +28,6 @@ export class EventDetailPage {
     this.event = navParams.data;
   }
 
-  getLocationUrl(location: string): any {
-    let url = 'geo:0,0?q=' + encodeURIComponent(location);
-    return this.sanitizer.bypassSecurityTrustUrl(url);
-  }
-
   getDateTimes(start: any, end: any): string {
     let line1, line2: string;
     let multipleDays: boolean = !start.isSame(end, 'day');
@@ -77,6 +75,7 @@ export class EventDetailPage {
     this.apiData.postAction(cat, id, 'aanmelden').then((event: Event) => {
       this.apiData.addJoined(cat, Number(id));
       this.event = this.apiData.addEventMeta(event);
+      GoogleAnalytics.trackEvent('Events', 'Join', event._meta.category, id);
       return 'Aanmelden gelukt!';
     }, error => {
       console.log(error);
@@ -96,6 +95,7 @@ export class EventDetailPage {
     this.apiData.postAction(cat, id, 'afmelden').then((event: Event) => {
       this.apiData.removeJoined(cat, Number(id));
       this.event = this.apiData.addEventMeta(event);
+      GoogleAnalytics.trackEvent('Events', 'Leave', event._meta.category, id);
       return 'Afmelden gelukt!';
     }, error => {
       console.log(error);
@@ -105,4 +105,8 @@ export class EventDetailPage {
       this.processingAction = false;
     });
   }
+
+  ionViewDidEnter() {
+    GoogleAnalytics.trackView('Event Detail');
+  }
 }

app/pages/event-list/event-list.ts

@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
 import { Alert, Modal, NavController } from 'ionic-angular';
+import { GoogleAnalytics } from 'ionic-native';
 import * as _ from 'lodash';
 import * as moment from 'moment';
 import 'moment/locale/nl';
@@ -80,4 +81,8 @@ export class EventListPage {
     this.nav.push(EventDetailPage, event);
   }
 
+  ionViewDidEnter() {
+    GoogleAnalytics.trackView('Event List');
+  }
+
 }

app/pages/map/map.ts

@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
 import { NavController } from 'ionic-angular';
+import { GoogleAnalytics } from 'ionic-native';
 
 import { TripDetailPage } from '../trip-detail/trip-detail';
 import { TripDetailTwoPage } from '../trip-detail-two/trip-detail-two';
@@ -79,4 +80,8 @@ export class MapPage {
       mapEle.classList.add('show-map');
     });
   }
+
+  ionViewDidEnter() {
+    GoogleAnalytics.trackView('Map');
+  }
 }

app/pages/member-detail/member-detail.html

@@ -2,7 +2,7 @@
 <ion-header>
   <ion-navbar primary>
     <ion-title>{{ member.naam.voornaam }} {{ member.naam.tussenvoegsel }} {{ member.naam.achternaam }}</ion-title>
-    <ion-buttons end hideWhen="android">
+    <ion-buttons end showWhen="cordova" hideWhen="android">
       <button (click)="save()">
         <ion-icon name="person-add"></ion-icon>
       </button>
@@ -29,7 +29,7 @@ <h3>{{ member.email }}</h3>
     </a>
 
     <a ion-item detail-none [href]="'tel:' + member.mobiel">
-      <a button item-right clear [href]="getSafeUrl('sms', member.mobiel)">
+      <a button item-right clear [href]="getSafeUrl('sms', member.mobiel)" hideWhen="core">
         <ion-icon primary name="text" isActive="false"></ion-icon>
       </a>
       <a button item-right clear [href]="getSafeUrl('tel', member.mobiel)">
@@ -39,7 +39,7 @@ <h3>{{ member.email }}</h3>
       <h3>{{ member.mobiel }}</h3>
     </a>
 
-    <a ion-item detail-none [href]="getLocationUrl(member.huis)">
+    <a ion-item detail-none [csrMapsHref]="member.huis.adres + ', ' + member.huis.woonplaats">
       <ion-icon name="map" isActive="false" primary item-right></ion-icon>
       <p primary>{{ member.huis.naam || 'adres' }}</p>
       <h3>
@@ -71,7 +71,7 @@ <h3>{{ member.studie.naam }} ({{ member.studie.sinds }})</h3>
 
   </ion-list>
 
-  <button fab fab-right fab-bottom fab-fixed lustrumgreen showWhen="android" (click)="save()">
+  <button fab fab-right fab-bottom fab-fixed lustrumgreen showWhen="cordova" hideWhen="ios" (click)="save()">
     <ion-icon name="person-add"></ion-icon>
   </button>
 

app/pages/member-detail/member-detail.ts

@@ -1,16 +1,18 @@
 import { Component } from '@angular/core';
 import { DomSanitizationService } from '@angular/platform-browser';
 import { ActionSheet, NavController, NavParams, Platform } from 'ionic-angular';
-import { Contacts, Calendar } from 'ionic-native';
+import { Contacts, Calendar, GoogleAnalytics } from 'ionic-native';
 import * as moment from 'moment';
 import 'moment/locale/nl';
 
+import { MapsHrefDirective } from '../../directives/maps-href';
 import { NotificationService } from '../../services/notification';
 import { Member } from '../../models/member';
 
 
 @Component({
-  templateUrl: 'build/pages/member-detail/member-detail.html'
+  templateUrl: 'build/pages/member-detail/member-detail.html',
+  directives: [MapsHrefDirective]
 })
 export class MemberDetailPage {
   member: Member;
@@ -29,12 +31,6 @@ export class MemberDetailPage {
     this.member.geboortedatum = date;
   }
 
-  getLocationUrl(huis): any {
-    let q = encodeURIComponent(this.member.huis.adres + ', ' + this.member.huis.woonplaats);
-    let url = this.platform.is('ios') ? 'maps://maps.apple.com/?q=' : 'geo:0,0?q=';
-    return this.sanitizer.bypassSecurityTrustUrl(url + q);
-  }
-
   getSafeUrl(scheme: string, target: string): any {
     let url = scheme + ':' + encodeURIComponent(target);
     return this.sanitizer.bypassSecurityTrustUrl(url);
@@ -87,6 +83,7 @@ export class MemberDetailPage {
     let createdContact = Contacts.create(contact);
     createdContact.save(
       contact => {
+        GoogleAnalytics.trackEvent('Members', 'Save', 'New');
         this.notifier.notify('Succesvol opgeslagen in contacten.');
       },
       err => {
@@ -106,4 +103,8 @@ export class MemberDetailPage {
 
     Calendar.openCalendar(date.toDate());
   }
+
+  ionViewDidEnter() {
+    GoogleAnalytics.trackView('Member Detail');
+  }
 }

app/pages/member-list/member-list.html

@@ -3,18 +3,18 @@
   <ion-navbar primary>
     <ion-title>Ledenlijst</ion-title>
     <ion-buttons end>
-      <button showWhen="android" (click)="startSearch()">
+      <button hideWhen="ios" (click)="startSearch(searchFocus)">
         <ion-icon name="search"></ion-icon>
       </button>
     </ion-buttons>
-    <ion-searchbar showWhen="android" class="search-overlay" placeholder="Zoek op naam of lidnummer" [(ngModel)]="queryText" (ionInput)="queryMembers()" (ionBlur)="stopSearchSoft()" (ionCancel)="stopSearch()" [hidden]="!searching" debounce="50">
+    <ion-searchbar hideWhen="ios" class="search-overlay" placeholder="Zoek op naam of lidnummer" [(ngModel)]="queryText" #searchFocus (ionInput)="queryMembers()" (ionBlur)="stopSearchSoft()" (ionCancel)="stopSearch()" [hidden]="!searching" debounce="50">
     </ion-searchbar>
   </ion-navbar>
 </ion-header>
 
 <ion-content>
 
-  <ion-searchbar hideWhen="android" placeholder="Zoek op naam of lidnummer" [(ngModel)]="queryText" (ionInput)="queryMembers()" cancelButtonText="Annuleer" showCancelButton="true" debounce="50" *ngIf="groups.length > 0 && failedToLoad === false">
+  <ion-searchbar showWhen="ios" placeholder="Zoek op naam of lidnummer" [(ngModel)]="queryText" (ionInput)="queryMembers()" cancelButtonText="Annuleer" showCancelButton="true" debounce="50" [hidden]="groups.length === 0 || failedToLoad !== false">
   </ion-searchbar>
 
   <div *ngIf="groups.length === 0 && failedToLoad === false" padding text-center>

app/pages/member-list/member-list.scss

@@ -1,7 +1,8 @@
 
-.ios .member-list {
-  min-height: 100%;
-}
+// Disable as it seems buggy
+// .ios .member-list {
+//   min-height: 100%;
+// }
 
 .member-list {
   margin-bottom: 0;

app/pages/member-list/member-list.ts

@@ -1,5 +1,6 @@
-import { Component, ViewChild } from '@angular/core';
+import { Component, Renderer, ViewChild } from '@angular/core';
 import { Content, NavController, Platform } from 'ionic-angular';
+import { GoogleAnalytics } from 'ionic-native';
 import * as _ from 'lodash';
 
 import { IMemberGroup, IMemberShort } from '../../models/member';
@@ -23,7 +24,8 @@ export class MemberListPage {
   constructor(
     private apiData: ApiData,
     private nav: NavController,
-    private platform: Platform
+    private platform: Platform,
+    private renderer: Renderer
   ) {
     apiData.getMemberList().then((members: IMemberShort[]) => {
       let grouped = _.groupBy(members, c => c.achternaam.replace(/[a-z ']/g, '')[0]);
@@ -38,7 +40,8 @@ export class MemberListPage {
 
       // Hide searchbar by default on iOS
       if (this.platform.is('ios')) {
-        this.content.setScrollTop(44);
+        // Disable as it seems buggy
+        // this.content.setScrollTop(44);
       }
     }, () => {
       this.failedToLoad = true;
@@ -78,9 +81,13 @@ export class MemberListPage {
     this.lastQueryText = queryText;
   }
 
-  startSearch() {
+  startSearch(searchBar) {
     setTimeout(() => {
       this.searching = true;
+      setTimeout(() => {
+        let el = searchBar._searchbarInput.nativeElement;
+        this.renderer.invokeElementMethod(el, 'focus', []);
+      }, 0);
     }, 200);
   }
 
@@ -104,4 +111,8 @@ export class MemberListPage {
     });
   }
 
+  ionViewDidEnter() {
+    GoogleAnalytics.trackView('Member List');
+  }
+
 }

app/pages/tutorial/tutorial.ts

@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { NavController, Platform } from 'ionic-angular';
-import { StatusBar } from 'ionic-native';
+import { GoogleAnalytics, StatusBar } from 'ionic-native';
 
 import { LoginPage } from '../login/login';
 
@@ -44,6 +44,7 @@ export class TutorialPage {
   private ionViewDidEnter() {
     this.platform.ready().then(() => {
       StatusBar.styleDefault();
+      GoogleAnalytics.trackView('Tutorial');
     });
   }