Added error messages

development
Thiemann96 5 years ago
parent ce3216c159
commit 8fa93adf37

@ -11,7 +11,7 @@
<ion-row> <ion-row>
There was an error when trying to login. The error code is:<code>{{error.message}}</code>. There was an error when trying to login. The error code is:<code>{{error.message}}</code>.
</ion-row> </ion-row>
<ion-row> <ion-row class="errorMessage">
<p > {{errorMessages[error.message]}} </p> <p > {{errorMessages[error.message]}} </p>
</ion-row> </ion-row>
<ion-row> <ion-row>

@ -1,3 +1,4 @@
page-error { page-error {
font-size:2.5rem;
} }

@ -13,6 +13,7 @@ page-ota-wizard {
color:lightslategray; color:lightslategray;
margin:10px; margin:10px;
} }
ion-slide { ion-slide {
h4 { h4 {
margin-bottom: 40px; margin-bottom: 40px;

@ -10,6 +10,8 @@ import {
Slides, Slides,
NavController, NavController,
NavParams, NavParams,
ModalController,
LoadingController,
} from 'ionic-angular' } from 'ionic-angular'
import { Network } from '@ionic-native/network' import { Network } from '@ionic-native/network'
import { Subscription } from 'rxjs/Subscription'; import { Subscription } from 'rxjs/Subscription';
@ -17,7 +19,7 @@ import { Subscription } from 'rxjs/Subscription';
import { OtaWifiProvider, WifiStrategy } from '../../providers/ota-wifi/ota-wifi'; import { OtaWifiProvider, WifiStrategy } from '../../providers/ota-wifi/ota-wifi';
import { CompilerProvider } from '../../providers/compiler/compiler'; import { CompilerProvider } from '../../providers/compiler/compiler';
import { LoggingProvider } from '../../providers/logging/logging'; import { LoggingProvider } from '../../providers/logging/logging';
import {ErrorPage} from '../../pages/error/error'
@IonicPage() @IonicPage()
@Component({ @Component({
selector: 'page-ota-wizard', selector: 'page-ota-wizard',
@ -57,6 +59,8 @@ export class OtaWizardPage implements OnInit, OnDestroy {
private navCtrl: NavController, private navCtrl: NavController,
private webcompiler: CompilerProvider, private webcompiler: CompilerProvider,
private changedetect: ChangeDetectorRef, private changedetect: ChangeDetectorRef,
public loadingController: LoadingController,
public modalCtrl: ModalController,
logger: LoggingProvider, logger: LoggingProvider,
navParams: NavParams, navParams: NavParams,
) { ) {
@ -142,16 +146,33 @@ export class OtaWizardPage implements OnInit, OnDestroy {
} }
async makeRequest(){
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 { try {
// open modal that shows loading // open modal that shows loading
loading.present();
await this.otaWifi.activateOtaMode(); await this.otaWifi.activateOtaMode();
this.requestSuccessful = true; this.requestSuccessful = true;
} }
catch (err) { catch (err) {
this.showModal(err);
console.log(err) console.log(err)
} }
loading.dismiss();
// Sends request; upon successful response go to next slide (wifi selection) // Sends request; upon successful response go to next slide (wifi selection)
} }

Loading…
Cancel
Save