diff --git a/config.xml b/config.xml index 6ee0140..8bbf4f7 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/resources/android/icon/drawable-hdpi-icon.png b/resources/android/icon/drawable-hdpi-icon.png index 9ab45b8..0b1e38b 100644 Binary files a/resources/android/icon/drawable-hdpi-icon.png and b/resources/android/icon/drawable-hdpi-icon.png differ diff --git a/resources/android/icon/drawable-ldpi-icon.png b/resources/android/icon/drawable-ldpi-icon.png index 4fc7da7..aca80f9 100644 Binary files a/resources/android/icon/drawable-ldpi-icon.png and b/resources/android/icon/drawable-ldpi-icon.png differ diff --git a/resources/android/icon/drawable-mdpi-icon.png b/resources/android/icon/drawable-mdpi-icon.png index 4cc723e..440255d 100644 Binary files a/resources/android/icon/drawable-mdpi-icon.png and b/resources/android/icon/drawable-mdpi-icon.png differ diff --git a/resources/android/icon/drawable-xhdpi-icon.png b/resources/android/icon/drawable-xhdpi-icon.png index 69adf0c..f6a2876 100644 Binary files a/resources/android/icon/drawable-xhdpi-icon.png and b/resources/android/icon/drawable-xhdpi-icon.png differ diff --git a/resources/android/icon/drawable-xxhdpi-icon.png b/resources/android/icon/drawable-xxhdpi-icon.png index ebc8503..ea12955 100644 Binary files a/resources/android/icon/drawable-xxhdpi-icon.png and b/resources/android/icon/drawable-xxhdpi-icon.png differ diff --git a/resources/android/icon/drawable-xxxhdpi-icon.png b/resources/android/icon/drawable-xxxhdpi-icon.png index 9b587f8..d0bdae8 100644 Binary files a/resources/android/icon/drawable-xxxhdpi-icon.png and b/resources/android/icon/drawable-xxxhdpi-icon.png differ diff --git a/resources/icon.png b/resources/icon.png index bc6c891..4a3a13c 100644 Binary files a/resources/icon.png and b/resources/icon.png differ diff --git a/resources/icon3.png b/resources/icon3.png new file mode 100644 index 0000000..bc6c891 Binary files /dev/null and b/resources/icon3.png differ diff --git a/resources/ios/icon/icon-1024.png b/resources/ios/icon/icon-1024.png index a861e96..51328a5 100644 Binary files a/resources/ios/icon/icon-1024.png and b/resources/ios/icon/icon-1024.png differ diff --git a/resources/ios/icon/icon-108@2x.png b/resources/ios/icon/icon-108@2x.png index 7e0d7a7..b0777e3 100644 Binary files a/resources/ios/icon/icon-108@2x.png and b/resources/ios/icon/icon-108@2x.png differ diff --git a/resources/ios/icon/icon-20.png b/resources/ios/icon/icon-20.png index 2151b3d..df534f2 100644 Binary files a/resources/ios/icon/icon-20.png and b/resources/ios/icon/icon-20.png differ diff --git a/resources/ios/icon/icon-20@2x.png b/resources/ios/icon/icon-20@2x.png index 071e8fd..54c31a3 100644 Binary files a/resources/ios/icon/icon-20@2x.png and b/resources/ios/icon/icon-20@2x.png differ diff --git a/resources/ios/icon/icon-20@3x.png b/resources/ios/icon/icon-20@3x.png index ed2c9b3..cf14fbd 100644 Binary files a/resources/ios/icon/icon-20@3x.png and b/resources/ios/icon/icon-20@3x.png differ diff --git a/resources/ios/icon/icon-24@2x.png b/resources/ios/icon/icon-24@2x.png index 3ab8b79..440255d 100644 Binary files a/resources/ios/icon/icon-24@2x.png and b/resources/ios/icon/icon-24@2x.png differ diff --git a/resources/ios/icon/icon-27.5@2x.png b/resources/ios/icon/icon-27.5@2x.png index 6b94b27..5e8c461 100644 Binary files a/resources/ios/icon/icon-27.5@2x.png and b/resources/ios/icon/icon-27.5@2x.png differ diff --git a/resources/ios/icon/icon-29.png b/resources/ios/icon/icon-29.png index 923ff95..3355dfc 100644 Binary files a/resources/ios/icon/icon-29.png and b/resources/ios/icon/icon-29.png differ diff --git a/resources/ios/icon/icon-29@2x.png b/resources/ios/icon/icon-29@2x.png index 02d0a32..89268dc 100644 Binary files a/resources/ios/icon/icon-29@2x.png and b/resources/ios/icon/icon-29@2x.png differ diff --git a/resources/ios/icon/icon-29@3x.png b/resources/ios/icon/icon-29@3x.png index b4f28c6..3fe0870 100644 Binary files a/resources/ios/icon/icon-29@3x.png and b/resources/ios/icon/icon-29@3x.png differ diff --git a/resources/ios/icon/icon-40.png b/resources/ios/icon/icon-40.png index 071e8fd..54c31a3 100644 Binary files a/resources/ios/icon/icon-40.png and b/resources/ios/icon/icon-40.png differ diff --git a/resources/ios/icon/icon-40@2x.png b/resources/ios/icon/icon-40@2x.png index a56a69e..9cf6ee6 100644 Binary files a/resources/ios/icon/icon-40@2x.png and b/resources/ios/icon/icon-40@2x.png differ diff --git a/resources/ios/icon/icon-40@3x.png b/resources/ios/icon/icon-40@3x.png index a2af2a2..a2850cc 100644 Binary files a/resources/ios/icon/icon-40@3x.png and b/resources/ios/icon/icon-40@3x.png differ diff --git a/resources/ios/icon/icon-44@2x.png b/resources/ios/icon/icon-44@2x.png index 58dbccc..4c07eda 100644 Binary files a/resources/ios/icon/icon-44@2x.png and b/resources/ios/icon/icon-44@2x.png differ diff --git a/resources/ios/icon/icon-50.png b/resources/ios/icon/icon-50.png index 841479a..64133c5 100644 Binary files a/resources/ios/icon/icon-50.png and b/resources/ios/icon/icon-50.png differ diff --git a/resources/ios/icon/icon-50@2x.png b/resources/ios/icon/icon-50@2x.png index 306ece8..8fc5d24 100644 Binary files a/resources/ios/icon/icon-50@2x.png and b/resources/ios/icon/icon-50@2x.png differ diff --git a/resources/ios/icon/icon-60.png b/resources/ios/icon/icon-60.png index ed2c9b3..cf14fbd 100644 Binary files a/resources/ios/icon/icon-60.png and b/resources/ios/icon/icon-60.png differ diff --git a/resources/ios/icon/icon-60@2x.png b/resources/ios/icon/icon-60@2x.png index a2af2a2..a2850cc 100644 Binary files a/resources/ios/icon/icon-60@2x.png and b/resources/ios/icon/icon-60@2x.png differ diff --git a/resources/ios/icon/icon-60@3x.png b/resources/ios/icon/icon-60@3x.png index aac6a95..ea8580e 100644 Binary files a/resources/ios/icon/icon-60@3x.png and b/resources/ios/icon/icon-60@3x.png differ diff --git a/resources/ios/icon/icon-72.png b/resources/ios/icon/icon-72.png index 79ebf3a..0b1e38b 100644 Binary files a/resources/ios/icon/icon-72.png and b/resources/ios/icon/icon-72.png differ diff --git a/resources/ios/icon/icon-72@2x.png b/resources/ios/icon/icon-72@2x.png index 3609a08..ea12955 100644 Binary files a/resources/ios/icon/icon-72@2x.png and b/resources/ios/icon/icon-72@2x.png differ diff --git a/resources/ios/icon/icon-76.png b/resources/ios/icon/icon-76.png index e057878..6876828 100644 Binary files a/resources/ios/icon/icon-76.png and b/resources/ios/icon/icon-76.png differ diff --git a/resources/ios/icon/icon-76@2x.png b/resources/ios/icon/icon-76@2x.png index f50f37c..20d0035 100644 Binary files a/resources/ios/icon/icon-76@2x.png and b/resources/ios/icon/icon-76@2x.png differ diff --git a/resources/ios/icon/icon-83.5@2x.png b/resources/ios/icon/icon-83.5@2x.png index dabc6d3..2540813 100644 Binary files a/resources/ios/icon/icon-83.5@2x.png and b/resources/ios/icon/icon-83.5@2x.png differ diff --git a/resources/ios/icon/icon-86@2x.png b/resources/ios/icon/icon-86@2x.png index 06c0926..bfd8a63 100644 Binary files a/resources/ios/icon/icon-86@2x.png and b/resources/ios/icon/icon-86@2x.png differ diff --git a/resources/ios/icon/icon-98@2x.png b/resources/ios/icon/icon-98@2x.png index 921c500..8540477 100644 Binary files a/resources/ios/icon/icon-98@2x.png and b/resources/ios/icon/icon-98@2x.png differ diff --git a/resources/ios/icon/icon.png b/resources/ios/icon/icon.png index 0f555a7..dd3a65f 100644 Binary files a/resources/ios/icon/icon.png and b/resources/ios/icon/icon.png differ diff --git a/resources/ios/icon/icon@2x.png b/resources/ios/icon/icon@2x.png index 6cf73a0..0a78435 100644 Binary files a/resources/ios/icon/icon@2x.png and b/resources/ios/icon/icon@2x.png differ diff --git a/resources/ios/splash/Default-1792h~iphone.png b/resources/ios/splash/Default-1792h~iphone.png index db7e40f..dd01874 100644 Binary files a/resources/ios/splash/Default-1792h~iphone.png and b/resources/ios/splash/Default-1792h~iphone.png differ diff --git a/resources/ios/splash/Default-2436h.png b/resources/ios/splash/Default-2436h.png index 1c942e6..cde1606 100644 Binary files a/resources/ios/splash/Default-2436h.png and b/resources/ios/splash/Default-2436h.png differ diff --git a/resources/ios/splash/Default-2688h~iphone.png b/resources/ios/splash/Default-2688h~iphone.png index 06629e7..9ab74d8 100644 Binary files a/resources/ios/splash/Default-2688h~iphone.png and b/resources/ios/splash/Default-2688h~iphone.png differ diff --git a/resources/ios/splash/Default-568h@2x~iphone.png b/resources/ios/splash/Default-568h@2x~iphone.png index 2556215..2bd90a8 100644 Binary files a/resources/ios/splash/Default-568h@2x~iphone.png and b/resources/ios/splash/Default-568h@2x~iphone.png differ diff --git a/resources/ios/splash/Default-667h.png b/resources/ios/splash/Default-667h.png index beb8425..f2fe476 100644 Binary files a/resources/ios/splash/Default-667h.png and b/resources/ios/splash/Default-667h.png differ diff --git a/resources/ios/splash/Default-736h.png b/resources/ios/splash/Default-736h.png index fbe8c39..8fa8cb7 100644 Binary files a/resources/ios/splash/Default-736h.png and b/resources/ios/splash/Default-736h.png differ diff --git a/resources/ios/splash/Default-Landscape-1792h~iphone.png b/resources/ios/splash/Default-Landscape-1792h~iphone.png index dbca234..50f1f1c 100644 Binary files a/resources/ios/splash/Default-Landscape-1792h~iphone.png and b/resources/ios/splash/Default-Landscape-1792h~iphone.png differ diff --git a/resources/ios/splash/Default-Landscape-2436h.png b/resources/ios/splash/Default-Landscape-2436h.png index 83579a8..b91b331 100644 Binary files a/resources/ios/splash/Default-Landscape-2436h.png and b/resources/ios/splash/Default-Landscape-2436h.png differ diff --git a/resources/ios/splash/Default-Landscape-2688h~iphone.png b/resources/ios/splash/Default-Landscape-2688h~iphone.png index 4b7b199..1a6cb31 100644 Binary files a/resources/ios/splash/Default-Landscape-2688h~iphone.png and b/resources/ios/splash/Default-Landscape-2688h~iphone.png differ diff --git a/resources/ios/splash/Default-Landscape-736h.png b/resources/ios/splash/Default-Landscape-736h.png index a90743d..2b346d8 100644 Binary files a/resources/ios/splash/Default-Landscape-736h.png and b/resources/ios/splash/Default-Landscape-736h.png differ diff --git a/resources/ios/splash/Default-Landscape@2x~ipad.png b/resources/ios/splash/Default-Landscape@2x~ipad.png index c8d6753..82e5804 100644 Binary files a/resources/ios/splash/Default-Landscape@2x~ipad.png and b/resources/ios/splash/Default-Landscape@2x~ipad.png differ diff --git a/resources/ios/splash/Default-Landscape~ipad.png b/resources/ios/splash/Default-Landscape~ipad.png index 634a05a..649efa1 100644 Binary files a/resources/ios/splash/Default-Landscape~ipad.png and b/resources/ios/splash/Default-Landscape~ipad.png differ diff --git a/resources/ios/splash/Default-Portrait@2x~ipad.png b/resources/ios/splash/Default-Portrait@2x~ipad.png index a2be1ca..d8195dd 100644 Binary files a/resources/ios/splash/Default-Portrait@2x~ipad.png and b/resources/ios/splash/Default-Portrait@2x~ipad.png differ diff --git a/resources/ios/splash/Default-Portrait~ipad.png b/resources/ios/splash/Default-Portrait~ipad.png index 620bea7..452e712 100644 Binary files a/resources/ios/splash/Default-Portrait~ipad.png and b/resources/ios/splash/Default-Portrait~ipad.png differ diff --git a/resources/ios/splash/Default@2x~iphone.png b/resources/ios/splash/Default@2x~iphone.png index e0af464..aab04c1 100644 Binary files a/resources/ios/splash/Default@2x~iphone.png and b/resources/ios/splash/Default@2x~iphone.png differ diff --git a/resources/ios/splash/Default~iphone.png b/resources/ios/splash/Default~iphone.png index 1e1b9eb..d130976 100644 Binary files a/resources/ios/splash/Default~iphone.png and b/resources/ios/splash/Default~iphone.png differ diff --git a/src/app/manual/manual.page.html b/src/app/manual/manual.page.html index c885c44..86afe5f 100644 --- a/src/app/manual/manual.page.html +++ b/src/app/manual/manual.page.html @@ -15,7 +15,7 @@

Aplicación para seguimiento de síntomas.

- Esta aplicación esta diseñada para dar seguimiento a los síntomas de una pandemia, en ella los usuarios pueden plasmar los síntomas que presenten a lo largo de su patología para informar a la comunidad y prevenir a los compañeros. + Esta aplicación está diseñada para capturar información del alumnado que presenta síntomas relacionados con el COVID-19. La información se enviará al Secretario Técnico para dar seguimiento y si es necesario canalizar al área correspondiente

@@ -24,7 +24,7 @@

Página de datos del alumno.

- En esta página el alumno agregará datos de interés para dar seguimiento al Secretario Técnico. El alumno podra editar estos datos; ellos serán utilizados por los Secretarios Técnicos para evaluar las estrategias a seguir. + En esta página el alumnado captura datos personales que son enviados al Secretario Técnico.

@@ -33,7 +33,7 @@

Página de síntomas.

- Aquí se deberán seleccionar los síntomas que el alumno presenta en ese día y luego presionar el botón de enviar para que los síntomas puedan ser visualizados por el Secretario Técnico más adelante. + En esta página el alumnado selecciona los síntomas relacionados al COVID-19 que presenta ese día y los envía para que el Secretario Técnico los visualice posteriormente.

@@ -42,7 +42,7 @@

Página de fotos.

- En esta página se deberá seleccionar el archivo: jpg, png, jpeg, (archivos de imagen en general). Para validar el tratamiento o diagnóstico del Secretario Técnico. + En esta página el alumnado selecciona el archivo de imagen (jpg, jpeg, png) que enviará con la información capturada al Secretario Técnico para evaluarla y en su caso turnar al área correspondiente.

diff --git a/src/app/student/student.page.html b/src/app/student/student.page.html index 7f7cf1d..f8d99bc 100644 --- a/src/app/student/student.page.html +++ b/src/app/student/student.page.html @@ -47,15 +47,19 @@ Infectado: {{ data.infected }} - - - Sintomas {{dateString}} - - - - {{ simptom.symptoms.description}} + + + + + {{date.key}} + + + {{simptom.description}} + + + diff --git a/src/app/student/student.page.ts b/src/app/student/student.page.ts index 61bb9d3..1ee8372 100644 --- a/src/app/student/student.page.ts +++ b/src/app/student/student.page.ts @@ -1,6 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { ActionSheetController, ToastController } from '@ionic/angular'; +import { debug } from 'console'; import { AuthService } from '../services/auth.service'; import { LoaderService } from '../services/loader.service'; @@ -14,9 +15,7 @@ export class StudentPage implements OnInit { data= {id: "", email:"", name:"", phone:"", street:"", noExt:0, noInt:0, suburb:"",cp:"", state:"",infected:false, user:{name:"",username:""}} photos = []; - simpthoms = []; - date:Date - dateString = "" + simpthoms = new Map(); constructor( private toast:ToastController, @@ -32,9 +31,21 @@ export class StudentPage implements OnInit { }); this.auth.store.get(`secretary/evolution/${JSON.parse(res.value).user.name}`).subscribe( all =>{ console.log(all); - this.simpthoms = all; - this.date = new Date(this.simpthoms[0].dateTime); - this.dateString = this.date.toDateString(); + all.forEach(element => { + var tmpSimpData = []; + let date = new Date(element.dateTime); + let dateString:String = date.toDateString(); + var simpthom = element.symptoms; + let keys = Array.from(this.simpthoms.keys()); + if (keys.includes(dateString)){ + tmpSimpData = this.simpthoms.get(dateString); + tmpSimpData.push(simpthom); + this.simpthoms.set(dateString, tmpSimpData) + } else { + tmpSimpData.push(simpthom); + this.simpthoms.set(dateString, tmpSimpData) + } + }); }); }); } @@ -85,6 +96,10 @@ export class StudentPage implements OnInit { await actionSheet.present(); } + toArray(answers: object) { + return Object.keys(answers).map(key => answers[key]) + } + async presentToast(alumno:String) { var mensajeFinal = 'El alumno: ' + alumno + "ah sido confirmado"; const toast = await this.toast.create({ diff --git a/src/app/tab1/tab1.page.html b/src/app/tab1/tab1.page.html index f99bb34..5c50743 100644 --- a/src/app/tab1/tab1.page.html +++ b/src/app/tab1/tab1.page.html @@ -40,7 +40,7 @@ Número Interior: - + Colonia: @@ -48,7 +48,7 @@ Código postal: - + Estado: diff --git a/src/app/tab1/tab1.page.ts b/src/app/tab1/tab1.page.ts index bef664e..2faf062 100644 --- a/src/app/tab1/tab1.page.ts +++ b/src/app/tab1/tab1.page.ts @@ -35,7 +35,8 @@ export class Tab1Page implements OnInit{ this.data.cp = res.cp; this.data.state = res.state; this.name=res.name; - if (this.data.email != ""){ + var re = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/ + if (re.test(this.data.email)){ this.availableToSymtoms = true; } }