diff --git a/config.xml b/config.xml index ad92d44..6ee0140 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - + SintomApp-Acatlan An app for control an visualizatión of a pandemic data like simphtoms evolution and sumarized data in the 'FES Acatán UNAM' Axel Iván Solano González diff --git a/src/app/loggin/loggin.page.html b/src/app/loggin/loggin.page.html index 5b7d9f6..06f8854 100644 --- a/src/app/loggin/loggin.page.html +++ b/src/app/loggin/loggin.page.html @@ -7,7 +7,6 @@ -
@@ -22,6 +21,7 @@ + Contraseña Calle: {{ data.street }} - Número: {{ data.noExt }} + Número Exterior: {{ data.noExt }} Número Interior: {{ data.noInt }} diff --git a/src/app/tab1/tab1.page.html b/src/app/tab1/tab1.page.html index 74d369e..f99bb34 100644 --- a/src/app/tab1/tab1.page.html +++ b/src/app/tab1/tab1.page.html @@ -36,19 +36,19 @@ Número Exterior: - + Número Interior: - + Colonia: - + Código postal: - + Estado: @@ -58,7 +58,7 @@
- + Guardar diff --git a/src/app/tab1/tab1.page.ts b/src/app/tab1/tab1.page.ts index 145816b..bef664e 100644 --- a/src/app/tab1/tab1.page.ts +++ b/src/app/tab1/tab1.page.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { NavController } from '@ionic/angular'; +import { AlertController, NavController } from '@ionic/angular'; import { LocalNotifications } from '@ionic-native/local-notifications/ngx'; import { AuthService } from '../services/auth.service'; import { LoaderService } from '../services/loader.service'; @@ -15,15 +15,17 @@ export class Tab1Page implements OnInit{ data={ email:"" ,phone:null,street:"",noExt:null, noInt:null ,suburb:"",cp:"",state:""}; + availableToSymtoms = false; + constructor( private auth: AuthService, private loader: LoaderService, private localNotifications: LocalNotifications, private nav: NavController, - public activatedRoute : ActivatedRoute) { + public activatedRoute : ActivatedRoute, + public alertController: AlertController) { this.auth.store.get("info").subscribe( res => { - console.log("Response on loggin",res) this.data.email = res.email; this.data.phone = res.phone; this.data.street = res.street; @@ -33,6 +35,9 @@ export class Tab1Page implements OnInit{ this.data.cp = res.cp; this.data.state = res.state; this.name=res.name; + if (this.data.email != ""){ + this.availableToSymtoms = true; + } } ); } @@ -43,11 +48,29 @@ export class Tab1Page implements OnInit{ const request = this.auth.store.create("update",this.data); console.log(request); this.loader.do(request, 'Guardando información'); + this.availableToSymtoms = true; } moveOn(){ + if(this.availableToSymtoms){ this.nav.navigateForward('/simtoms') } + else { + this.alertSave() + } + } + + async alertSave() { + const alert = await this.alertController.create({ + cssClass: 'my-custom-class', + header: 'Atención', + message: 'Recuerda guardar tu información antes de enviar tus sintomas', + buttons: ['OK'] + }); + await alert.present(); + const { role } = await alert.onDidDismiss(); + console.log('onDidDismiss resolved with role', role); + } dailyNotification(){ this.localNotifications.schedule({ diff --git a/src/app/tab2/tab2.page.html b/src/app/tab2/tab2.page.html index 4cff421..4719059 100644 --- a/src/app/tab2/tab2.page.html +++ b/src/app/tab2/tab2.page.html @@ -6,7 +6,7 @@ Enviar - Sintomas + Síntomas