add some guards and advices, more otography corrections, version update
This commit is contained in:
+1
-1
@@ -1,5 +1,5 @@
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<widget id="com.unam.acatan.sintomapp" version="0.0.11" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
|
||||
<widget id="com.unam.acatan.sintomapp" version="0.0.12" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
|
||||
<name>SintomApp-Acatlan</name>
|
||||
<description>An app for control an visualizatión of a pandemic data like simphtoms evolution and sumarized data in the 'FES Acatán UNAM'</description>
|
||||
<author email="aisgxvso@comunidad.unam.com" href="http://ionicframework.com/">Axel Iván Solano González</author>
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
</ion-header>
|
||||
|
||||
<ion-content [fullscreen]="true" class="grad">
|
||||
<ion-icon slot="end" name="help-circle-outline" (click)="presentAlertCredenciales()"></ion-icon>
|
||||
<div class="ion-padding">
|
||||
<form #ngForm="ngForm">
|
||||
<ion-item color="translucent">
|
||||
@@ -22,6 +21,7 @@
|
||||
</ion-item>
|
||||
|
||||
<ion-item color="translucent">
|
||||
<ion-icon slot="end" name="help-circle-outline" (click)="presentAlertCredenciales()"></ion-icon>
|
||||
<ion-icon slot="start" name="key" color="secondary"></ion-icon>
|
||||
<ion-label position="floating">Contraseña</ion-label>
|
||||
<ion-input type="password" placeholder="Contraseña de escolares"
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
<ion-label color="ligth">Calle: {{ data.street }}</ion-label>
|
||||
</ion-item>
|
||||
<ion-item color="translucent">
|
||||
<ion-label color="ligth">Número: {{ data.noExt }} </ion-label>
|
||||
<ion-label color="ligth">Número Exterior: {{ data.noExt }} </ion-label>
|
||||
</ion-item>
|
||||
<ion-item color="translucent">
|
||||
<ion-label color="ligth">Número Interior: {{ data.noInt }}</ion-label>
|
||||
|
||||
@@ -36,19 +36,19 @@
|
||||
</ion-item>
|
||||
<ion-item color="translucent">
|
||||
<ion-label>Número Exterior: </ion-label>
|
||||
<ion-input placeholder="Número" type="number" [(ngModel)]="data.noExt" name="noExt" color="ligth" required></ion-input>
|
||||
<ion-input placeholder="Número Exterior" inputmode="numeric" [(ngModel)]="data.noExt" name="noExt" color="ligth" min=1 max=32000 maxlength=5 required></ion-input>
|
||||
</ion-item>
|
||||
<ion-item color="translucent">
|
||||
<ion-label>Número Interior: </ion-label>
|
||||
<ion-input placeholder="Número Interior" type="number" min=1 [(ngModel)]="data.noInt" name="noInt" color="ligth" ></ion-input>
|
||||
<ion-input placeholder="Número Interior" inputmode="numeric" min=1 [(ngModel)]="data.noInt" name="noInt" color="ligth" ></ion-input>
|
||||
</ion-item>
|
||||
<ion-item color="translucent">
|
||||
<ion-label>Colonia: </ion-label>
|
||||
<ion-input placeholder="Colonia" [(ngModel)]="data.suburb" name="suburb" color="ligth" required></ion-input>
|
||||
<ion-input placeholder="Colonia" [(ngModel)]="data.suburb" name="suburb" color="ligth" required ></ion-input>
|
||||
</ion-item>
|
||||
<ion-item color="translucent">
|
||||
<ion-label>Código postal: </ion-label>
|
||||
<ion-input placeholder="Codigo postal" inputmode="numeric" [(ngModel)]="data.cp" name="cp" color="ligth" required></ion-input>
|
||||
<ion-input placeholder="Codigo postal" inputmode="numeric" [(ngModel)]="data.cp" name="cp" color="ligth" maxlength=5 required></ion-input>
|
||||
</ion-item>
|
||||
<ion-item color="translucent">
|
||||
<ion-label>Estado: </ion-label>
|
||||
@@ -58,7 +58,7 @@
|
||||
</ion-content>
|
||||
<ion-footer>
|
||||
<div class="ion-padding">
|
||||
<ion-button (click)="sendUpdate()">
|
||||
<ion-button (click)="sendUpdate()" [disabled]="!ngForm.valid">
|
||||
<ion-icon name="save-outline"></ion-icon>
|
||||
Guardar
|
||||
</ion-button>
|
||||
|
||||
@@ -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({
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
Enviar
|
||||
</ion-button>
|
||||
<ion-title>
|
||||
Sintomas
|
||||
Síntomas
|
||||
</ion-title>
|
||||
</ion-toolbar>
|
||||
</ion-header>
|
||||
|
||||
Reference in New Issue
Block a user