#837: adding selectors

Author: jgrobelski

src/app/pages/mensa/mensa.page.ts

@@ -61,7 +61,6 @@ export class MensaPage extends AbstractPage {
   }
 
   loadCampusMenu(refresher?) {
-    console.log('loadcampusmenu');
     if (!(refresher && refresher.target)) {
       this.isLoaded = false;
     }
@@ -83,8 +82,6 @@ export class MensaPage extends AbstractPage {
     this.noUlfMealsForDate = true;
     this.networkError = false;
 
-    console.log('canteen name: ' + this.campus.canteen_name);
-
     if (this.campus.canteen_name && this.campus.canteen_name.length > 0) {
       this.noMensaForLocation = false;
       this.ws
@@ -112,8 +109,6 @@ export class MensaPage extends AbstractPage {
               this.iconMapping = res.iconHashMap.entry;
             }
 
-            console.log('resp1_');
-
             if (this.campus.canteen_name === 'Griebnitzsee') {
               const ulfParam = 'UlfsCafe';
               this.ws

src/app/pages/mensa2/mensa2.page.html

@@ -3,7 +3,7 @@
     <ion-back-button mode="md" slot="start"></ion-back-button>
     <ion-button
       mode="md"
-      *ngIf="!(platform.is('ios') || platform.is('android'))"
+      *ngIf="ulfSelected && !(platform.is('ios') || platform.is('android'))"
       (click)="loadMenu(true)"
       slot="end"
       fill="clear"
@@ -15,13 +15,20 @@
   </ion-toolbar>
 
   <ion-toolbar mode="md">
-    <p>Changer</p>
+    <ion-segment value="mensen">
+      <ion-segment-button (click)="selectTab('mensen')" value="mensen">
+        <ion-label>Mensen</ion-label>
+      </ion-segment-button>
+      <ion-segment-button (click)="selectTab('ulfscoffee')" value="ulfscoffee">
+        <ion-label>Ulfs Kaffee</ion-label>
+      </ion-segment-button>
+    </ion-segment>
   </ion-toolbar>
 
-  <ion-toolbar *ngIf="isLoaded && !networkError">
+  <ion-toolbar *ngIf="ulfSelected && isLoaded && !networkError">
     <ion-grid>
       <ion-row>
-        <ion-col size="2">
+        <ion-col size="6">
           <app-date-picker
             [compactMode]="true"
             [inputDate]="selectedDate"
@@ -50,27 +57,38 @@
 </ion-header>
 
 <ion-content class="ion-no-padding">
-  <ion-refresher
-    *ngIf="platform.is('ios') || platform.is('android')"
-    slot="fixed"
-    (ionRefresh)="loadMenu($event)"
-  >
-    <ion-refresher-content
-      pullingIcon="refresh"
-      refreshingSpinner="dots"
-    ></ion-refresher-content>
-  </ion-refresher>
+  <div *ngIf="ulfSelected && isLoaded && !networkError">
+    <ion-refresher
+      *ngIf="platform.is('ios') || platform.is('android')"
+      slot="fixed"
+      (ionRefresh)="loadMenu($event)"
+    >
+      <ion-refresher-content
+        pullingIcon="refresh"
+        refreshingSpinner="dots"
+      ></ion-refresher-content>
+    </ion-refresher>
 
-  <div align="center" *ngIf="!isLoaded" class="ion-padding">
-    <ion-spinner name="dots"></ion-spinner>
+    <div align="center" *ngIf="!isLoaded" class="ion-padding">
+      <ion-spinner name="dots"></ion-spinner>
+    </div>
   </div>
 
-  <div *ngIf="isLoaded && !networkError">
+  <div *ngIf="ulfSelected && isLoaded && !networkError">
     <app-mensa-meal
       *ngIf="ulfMeals && !noUlfMealsForDate"
       [meals]="displayedUlfMeals"
       [mealForDate]="ulfMealForDate"
       [iconMapping]="ulfIconMapping"
     ></app-mensa-meal>
   </div>
+
+  <div *ngIf="mensenSelected && !networkError">
+    <p style="text-align: center; font-size: 24px">
+      Leider können wir nicht mehr die Speiseplan der Mensen abrufen und euch
+      nur auf den
+      <a href="https://swp.webspeiseplan.de/"> Webspeiseplan der SWP </a>
+      weiterleiten.
+    </p>
+  </div>
 </ion-content>

src/app/pages/mensa2/mensa2.page.ts

@@ -14,8 +14,10 @@ import { WebserviceWrapperService } from '../../services/webservice-wrapper/webs
   styleUrls: ['./mensa2.page.scss'],
 })
 export class Mensa2Page extends AbstractPage implements OnInit {
-  isLoaded;
-  networkError;
+  isLoaded = false;
+  ulfSelected = false;
+  mensenSelected = true;
+  networkError = false;
   selectedDate;
   currentDate = moment();
   filterKeywords = [];
@@ -38,9 +40,12 @@ export class Mensa2Page extends AbstractPage implements OnInit {
     this.loadMenu(false);
   }
 
-  loadMenu(refresher?) {
-    console.log('loadMenu');
+  selectTab(tabName: string) {
+    this.ulfSelected = tabName === 'ulfscoffee';
+    this.mensenSelected = tabName === 'mensen';
+  }
 
+  loadMenu(refresher?) {
     if (!(refresher && refresher.target)) {
       this.isLoaded = false;
     }
@@ -77,20 +82,16 @@ export class Mensa2Page extends AbstractPage implements OnInit {
               campus_canteen_name: ulfParam,
             } as IMensaRequestParams)
             .subscribe((resUlf: IMensaResponse) => {
-              console.log(JSON.stringify(resUlf));
-
               if (resUlf.meal) {
                 this.ulfMeals = resUlf.meal;
                 this.displayedUlfMeals = resUlf.meal;
               }
+              this.getFilterKeywords();
+              this.classifyMeals();
               if (resUlf.iconHashMap && resUlf.iconHashMap.entry) {
                 this.ulfIconMapping = resUlf.iconHashMap.entry;
               }
-              if (refresher && refresher.target) {
-                refresher.target.complete();
-              }
               this.isLoaded = true;
-              this.networkError = false;
               if (refresher && refresher.target) {
                 refresher.target.complete();
               }
@@ -106,6 +107,20 @@ export class Mensa2Page extends AbstractPage implements OnInit {
       );
   }
 
+  getFilterKeywords() {
+    this.filterKeywords = [];
+    for (const [index, meal] of this.displayedUlfMeals.entries()) {
+      if (this.ulfMealForDate[index]) {
+        for (const mealType of meal.type) {
+          if (!isInArray(this.filterKeywords, mealType)) {
+            this.filterKeywords.push(mealType);
+          }
+        }
+      }
+    }
+    this.filterKeywords.sort();
+  }
+
   pickDate($event) {
     this.selectedDate = $event;
     this.noUlfMealsForDate = true;
@@ -133,7 +148,6 @@ export class Mensa2Page extends AbstractPage implements OnInit {
 
   filterMenus(event) {
     const filter = convertToArray(event.detail.value);
-
     this.displayedUlfMeals = this.ulfMeals;
 
     if (filter && filter.length > 0) {
@@ -154,7 +168,6 @@ export class Mensa2Page extends AbstractPage implements OnInit {
         });
       }
     }
-
     this.classifyMeals();
   }