From 8fa93adf37c19a39a8725cf92f774b2ee45ad0c1 Mon Sep 17 00:00:00 2001
From: Thiemann96 <e_thie10@uni-muenster.de>
Date: Fri, 20 Mar 2020 17:38:23 +0100
Subject: [PATCH] Added error messages

---
 src/pages/error/error.html           |  4 +-
 src/pages/error/error.scss           |  1 +
 src/pages/ota-wizard/ota-wizard.scss |  1 +
 src/pages/ota-wizard/ota-wizard.ts   | 69 ++++++++++++++++++----------
 4 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/src/pages/error/error.html b/src/pages/error/error.html
index a8c1a90..053c7bb 100644
--- a/src/pages/error/error.html
+++ b/src/pages/error/error.html
@@ -11,8 +11,8 @@
     <ion-row>
       There was an error when trying to login. The error code is:<code>{{error.message}}</code>.
     </ion-row>
-    <ion-row>
-      <p>      {{errorMessages[error.message]}}      </p>
+    <ion-row class="errorMessage">
+      <p >      {{errorMessages[error.message]}}      </p>
     </ion-row>
     <ion-row>
       <ion-col col-8>
diff --git a/src/pages/error/error.scss b/src/pages/error/error.scss
index b00e4af..d9b8e38 100644
--- a/src/pages/error/error.scss
+++ b/src/pages/error/error.scss
@@ -1,3 +1,4 @@
 page-error {
+    font-size:2.5rem;
 
 }
diff --git a/src/pages/ota-wizard/ota-wizard.scss b/src/pages/ota-wizard/ota-wizard.scss
index 5434a3a..133bdbe 100644
--- a/src/pages/ota-wizard/ota-wizard.scss
+++ b/src/pages/ota-wizard/ota-wizard.scss
@@ -13,6 +13,7 @@ page-ota-wizard {
     color:lightslategray;
     margin:10px;
   }
+
   ion-slide {
     h4 {
       margin-bottom: 40px;
diff --git a/src/pages/ota-wizard/ota-wizard.ts b/src/pages/ota-wizard/ota-wizard.ts
index 969d847..f37413d 100644
--- a/src/pages/ota-wizard/ota-wizard.ts
+++ b/src/pages/ota-wizard/ota-wizard.ts
@@ -10,6 +10,8 @@ import {
   Slides,
   NavController,
   NavParams,
+  ModalController,
+  LoadingController,
 } from 'ionic-angular'
 import { Network } from '@ionic-native/network'
 import { Subscription } from 'rxjs/Subscription';
@@ -17,7 +19,7 @@ import { Subscription } from 'rxjs/Subscription';
 import { OtaWifiProvider, WifiStrategy } from '../../providers/ota-wifi/ota-wifi';
 import { CompilerProvider } from '../../providers/compiler/compiler';
 import { LoggingProvider } from '../../providers/logging/logging';
-
+import {ErrorPage} from '../../pages/error/error'
 @IonicPage()
 @Component({
   selector: 'page-ota-wizard',
@@ -57,8 +59,10 @@ export class OtaWizardPage implements OnInit, OnDestroy {
     private navCtrl: NavController,
     private webcompiler: CompilerProvider,
     private changedetect: ChangeDetectorRef,
+    public loadingController: LoadingController,
+    public modalCtrl: ModalController,
     logger: LoggingProvider,
-    navParams : NavParams,
+    navParams: NavParams,
   ) {
     // for OTA to work, the new sketch has to include the OTA logic as well.
     // to ensure that, we're prepending it here to the sketch.
@@ -108,55 +112,72 @@ export class OtaWizardPage implements OnInit, OnDestroy {
     this.log.debug('initialized')
   }
 
-  ngOnDestroy () {
+  ngOnDestroy() {
     this.onlineSub.unsubscribe()
     this.offlineSub.unsubscribe()
   }
 
-  onWifiRefresh () {
+  onWifiRefresh() {
     this.handleWifiSelection(true)
   }
 
-  onClose () {
+  onClose() {
     this.navCtrl.pop()
   }
 
-  toggleManual(){
-    if(this.modus === "manual"){
+  toggleManual() {
+    if (this.modus === "manual") {
       this.modus = "automatic"
     }
     else {
       this.modus = "manual"
     }
   }
-  showAutomatic(){
+  showAutomatic() {
     this.automatic = true;
     this.manual = false;
     this.slides.slideNext()
   }
 
-  showManual(){
+  showManual() {
     this.manual = true;
     this.automatic = false;
     this.slides.slideNext()
 
   }
-  
-  async makeRequest(){
-    
-    try{
+
+
+  showModal(message){
+    let modal = this.modalCtrl.create(ErrorPage,message);
+
+    modal.onDidDismiss(()=>{
+
+    })
+
+    modal.present();
+  }
+
+  async makeRequest() {
+    const loading = await this.loadingController.create({
+      content: 'Pinging senseBox...'
+    });
+    try {
       // open modal that shows loading
+
+      loading.present();
       await this.otaWifi.activateOtaMode();
       this.requestSuccessful = true;
     }
-    catch(err){
+    catch (err) {
+      this.showModal(err);
       console.log(err)
     }
+    loading.dismiss();
     // Sends request; upon successful response go to next slide (wifi selection)
 
   }
   // call logic for each slide
-  onSlideChange () {
+  onSlideChange() {
     this.slideHistory.push(OtaSlides[this.currentSlide])
     console.log(this.currentSlide)
     switch (this.currentSlide) {
@@ -182,24 +203,24 @@ export class OtaWizardPage implements OnInit, OnDestroy {
     }
   }
 
-  get currentSlide (): OtaSlides {
+  get currentSlide(): OtaSlides {
     const current = this.slides.getActiveIndex()
     const hiddenOffset = this.hiddenSlides.filter(slide => slide <= current).length
     return current + hiddenOffset
   }
 
-  slideIsHidden (slide: OtaSlides): boolean {
+  slideIsHidden(slide: OtaSlides): boolean {
     return this.hiddenSlides.indexOf(slide) !== -1
   }
 
-  private hideSlide (slide: OtaSlides) {
+  private hideSlide(slide: OtaSlides) {
     if (this.currentSlide === slide) return
     if (this.slideIsHidden(slide)) return
     this.hiddenSlides.push(slide)
     this.slides.update()
   }
 
-  async connectToSensebox (ssid: string) {
+  async connectToSensebox(ssid: string) {
     this.counts.connect++
     this.state.wifiSelection = 'connecting'
     try {
@@ -214,14 +235,14 @@ export class OtaWizardPage implements OnInit, OnDestroy {
     }
   }
 
-  private handleCompilation () {
+  private handleCompilation() {
     this.slides.lockSwipeToNext(!this.compiledSketch)
 
     // need to go online for compilation. compilation is retriggered via this.onlineSub
     if (!this.state.isOnline) {
       switch (this.otaWifi.strategy) {
         case WifiStrategy.Automatic:
-          // TODO: auto connect to previous network, if available
+        // TODO: auto connect to previous network, if available
         default:
           this.state.compilation = 'go-online'
           break
@@ -231,7 +252,7 @@ export class OtaWizardPage implements OnInit, OnDestroy {
     }
   }
 
-  private async handleWifiSelection (force = false) {
+  private async handleWifiSelection(force = false) {
     if (this.otaWifi.strategy === WifiStrategy.Automatic) {
       this.slides.lockSwipeToNext(true)
 
@@ -255,7 +276,7 @@ export class OtaWizardPage implements OnInit, OnDestroy {
     }
   }
 
-  private async handleUpload () {
+  private async handleUpload() {
     this.counts.upload++
     this.state.upload = 'uploading'
     try {
@@ -271,7 +292,7 @@ export class OtaWizardPage implements OnInit, OnDestroy {
     }
   }
 
-  private async compileSketch () {
+  private async compileSketch() {
     this.counts.compile++
     this.state.compilation = 'compiling'
     try {