QA modifications

config.xml

@@ -27,6 +27,7 @@
     <preference name="KeyboardDisplayRequiresUserAction" value="false" />
     <preference name="AndroidPersistentFileLocation" value="Compatibility" />
     <preference name="AndroidExtraFilesystems" value="files,files-external,documents,sdcard,root" />
+    <preference name="Orientation" value="portrait" />
     <platform name="android">
         <allow-intent href="market:*" />
         <icon qualifier="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
@@ -38,15 +39,9 @@
         <splash qualifier="land-ldpi" src="resources/android/splash/drawable-land-ldpi-screen.png" />
         <splash qualifier="land-mdpi" src="resources/android/splash/drawable-land-mdpi-screen.png" />
         <splash qualifier="land-hdpi" src="resources/android/splash/drawable-land-hdpi-screen.png" />
-        <splash qualifier="land-xhdpi" src="resources/android/splash/drawable-land-xhdpi-screen.png" />
-        <splash qualifier="land-xxhdpi" src="resources/android/splash/drawable-land-xxhdpi-screen.png" />
-        <splash qualifier="land-xxxhdpi" src="resources/android/splash/drawable-land-xxxhdpi-screen.png" />
         <splash qualifier="port-ldpi" src="resources/android/splash/drawable-port-ldpi-screen.png" />
         <splash qualifier="port-mdpi" src="resources/android/splash/drawable-port-mdpi-screen.png" />
         <splash qualifier="port-hdpi" src="resources/android/splash/drawable-port-hdpi-screen.png" />
-        <splash qualifier="port-xhdpi" src="resources/android/splash/drawable-port-xhdpi-screen.png" />
-        <splash qualifier="port-xxhdpi" src="resources/android/splash/drawable-port-xxhdpi-screen.png" />
-        <splash qualifier="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png" />
     </platform>
     <platform name="ios">
         <preference name="CordovaWebViewEngine" value="CDVWKWebViewEngine" />

src/app/app.component.ts

@@ -53,7 +53,7 @@ export class MyApp {
       this.pages = [
           { icon: 'ios-arrow-forward', title: 'Solicita tu viaje', component: 'ChatPage'},
           { icon: 'ios-arrow-forward', title: 'Consejos para tu viaje', component: 'TraveladvicePage'},
-          { icon: 'ios-arrow-forward', title: 'Datos Utiles', component: 'UsefulinfoPage'},
+          { icon: 'ios-arrow-forward', title: 'Datos útiles', component: 'UsefulinfoPage'},
           { icon: 'ios-arrow-forward', title: 'Notificaciones', component: 'NotiListPage'},
       ];
 

src/pages/chat/chat.html

@@ -27,7 +27,8 @@
 
                 <div col-8 col-xl-8 *ngIf="travelAgencyHeader" class="custom-header">
                     <ion-buttons text-center>
-                        <button ion-button class="custom-header"> <img src="assets/imgs/Marqueta/logo.png" style="height: 30px;"></button>
+                        <button ion-button class="custom-header"> <img src="assets/imgs/Marqueta/logo.png"
+                                style="height: 30px;"></button>
                     </ion-buttons>
                 </div>
 
@@ -49,7 +50,7 @@
             </div>
 
             <div col-9 col-xl-9>
-                <p class="chathead"><b style="color: #5BA870;">{{name}}</b><br/>Online now</p>
+                <p class="chathead"><b style="color: #5BA870;">{{name}}</b><br />Online now</p>
             </div>
 
         </div>
@@ -58,27 +59,25 @@
 
 </ion-header>
 
-<ion-content fixed scrollDownOnLoad="true" (tap)="contentMouseDown($event)"
-             ionScrollEnd="hideKeybaord()">
+<ion-content fixed scrollDownOnLoad="true" (tap)="contentMouseDown($event)" ionScrollEnd="hideKeybaord()">
 
     <div class="message-wrap">
 
-        <div *ngFor="let msg of messages"
-            class="message"
-            [class.left]=" msg.userId === user.id "
+        <div *ngFor="let msg of messages" class="message" [class.left]=" msg.userId === user.id "
             [class.right]=" msg.userId === toUser.id">
 
-            <img class="user-img" alt="" src="assets/imgs/Marqueta/dgs.png"
-                 *ngIf="msg.userId === user.id">
+            <img class="user-img" alt="" src="assets/imgs/Marqueta/dgs.png" *ngIf="msg.userId === user.id">
 
-            <img class="user-img" alt="" src="assets/imgs/Marqueta/ad.png"
-                     *ngIf="msg.userId === toUser.id">
+            <img class="user-img" alt="" src="assets/imgs/Marqueta/ad.png" *ngIf="msg.userId === toUser.id">
 
             <div class="msg-detail">
                 <div class="msg-content">
                     <span class="triangle"></span>
-                    <p *ngIf = "!msg.file" class="line-breaker " [innerHTML]="msg.text">{{msg.text}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{msg.time}}</p>
-                    <p *ngIf = "msg.file" class="line-breaker " [innerHTML]="msg.text" (click)="fileDownLoad(msg.downloadUri, msg.fileName)">{{msg.text}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{msg.time}}</p>
+                    <p *ngIf="!msg.file" class="line-breaker " [innerHTML]="msg.text">
+                        {{msg.text}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{msg.time}}</p>
+                    <p *ngIf="msg.file" class="line-breaker " [innerHTML]="msg.text"
+                        (click)="fileDownLoad(msg.downloadUri, msg.fileName)">
+                        {{msg.text}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{msg.time}}</p>
                 </div>
             </div>
 
@@ -90,29 +89,27 @@
 
 <ion-footer class="footer" (touchstart)="footerTouchStart($event)">
 
-    <ion-grid >
+    <ion-grid>
 
         <div class="row">
 
-            <div col-2 col-xl-2 (click)="switchEmojiPicker()" style = "padding-left: 10px!important">
-                <button class="emojiIcon" ion-button clear icon-only item-right >
+            <div col-2 col-xl-2 (click)="switchEmojiPicker()" style="padding-left: 10px!important">
+                <button class="emojiIcon" ion-button clear icon-only item-right>
                     <ion-icon name="md-happy" (click)="switchEmojiPicker()"></ion-icon>
                 </button>
             </div>
 
             <div col-2 col-xl-2 (click)="sendFile()" style="padding-left: 0px!important">
-                <button class="emojiIcon" ion-button clear icon-only item-right >
-                    <ion-icon name="attach" ></ion-icon>
+                <button class="emojiIcon" ion-button clear icon-only item-right>
+                    <ion-icon name="attach"></ion-icon>
                 </button>
             </div>
 
-            <div col-7 col-xl-7 >
-                <ion-textarea type="text" #chat_input
-                    [(ngModel)]="editorMsg" (click)="onFocus()" (ngModelChange)="textAreaChange()"
-                              rows="1" fz-elastic class="chat-input"
-                    (keyup.enter)="sendMsg()" spellcheck="true" autoComplete="true"
-                              autocorrect="true" placeholder="Enviar mansaje..."
-                              [(ngModel)]="message"  ></ion-textarea>
+            <div col-7 col-xl-7>
+                <ion-textarea type="text" #chat_input [(ngModel)]="editorMsg" (click)="onFocus()"
+                    (ngModelChange)="textAreaChange()" rows="1" fz-elastic class="chat-input" (keyup.enter)="sendMsg()"
+                    spellcheck="true" autoComplete="true" autocorrect="true" placeholder="Escribir mensaje...."
+                    [(ngModel)]="message"></ion-textarea>
             </div>
 
             <div col-1 col-xl-1 style="margin-top: 6px;">
@@ -125,4 +122,4 @@
 
     <emoji-picker *ngIf="showEmojiPicker == true" [(ngModel)]="editorMsg"></emoji-picker>
 
-</ion-footer>
+</ion-footer>
\ No newline at end of file

src/pages/chat/chat.scss

 page-chat {
+  .backbtn {
+    margin:0px;
+    left:0px;
+    top:0px;
+    background:none;
+    position: absolute;
+    box-shadow: none;
+  }
+  .backbtn:active {
+    background: #B3061E;;
+  }
   .message-wrap .message .user-img {
     position: absolute;
     border-radius: 45px;

src/pages/formulary/formulary.html

@@ -7,13 +7,13 @@
     <img src="assets/imgs/Marqueta/logo.png" class="center headerimg">
 
     <br />
-    <h6 class="header6">En estos momentos nuestros ejecutivos se encuentran ocupados, por favor indiquenos su requerimiento y nuestro equipo se contactara con usted lo más pronto posible.</h6>
+    <h6 class="header6">En estos momentos nuestros ejecutivos se encuentran ocupados, por favor indíquenos su requerimiento y nuestro equipo se contactará con usted lo más pronto posible.</h6>
     <br />
 
     <form [formGroup]="messageForm" class="list center-form"  *ngIf="isSchema()">
         <ion-item>
             <ion-label stacked>{{shema.formulario[0].nombre}}</ion-label>
-            <ion-select formControlName="request" *ngIf="isSchema()" placeholder="Seleccione una opcion">
+            <ion-select formControlName="request" *ngIf="isSchema()" placeholder="Seleccione una opcion" okText="Aceptar" cancelText="Cancelar">
                 <ion-option *ngFor="let req of shema.formulario[0].opciones" [value]="req">{{req}}</ion-option>
             </ion-select>
         </ion-item>

src/pages/formulary/formulary.ts

@@ -38,6 +38,10 @@ export class FormularyPage {
     this.restProvider.getCofiguration().then(msg => {
       console.log(msg['formularioJson']);
       this.shema = msg['formularioJson']['formularioJson'];
+      if (this.isSchema()){
+        this.shema.formulario[0].nombre = this.capitalize(this.shema.formulario[0].nombre);
+        this.shema.formulario[1].nombre = this.capitalize(this.shema.formulario[1].nombre);
+      }
     });
   }
   isSchema(){
@@ -70,7 +74,7 @@ export class FormularyPage {
         console.log('resp: ' + data);
         //this.loader.hide();
         let alert = this.alertCtrl.create({
-          subTitle: 'Su solicitud fue recibida, en breve lo atenderemos!',
+          subTitle: '¡Su solicitud fue recibida, en breve lo atenderemos!',
           buttons: ['Aceptar']
         });
         alert.present();
@@ -82,7 +86,9 @@ export class FormularyPage {
       });
     }
   }
-
+  capitalize(str){
+    return str.charAt(0).toUpperCase() + str.slice(1);
+  }
   goback() {
     this.navCtrl.pop();
   }

src/pages/inquiry/inquiry.html

@@ -26,7 +26,7 @@
           </ion-col>
         </ion-row>
         <ion-row class="borderdrop" radio-group [(ngModel)]="siNo" name="res2" *ngIf="shema">
-          <ion-col col-2 col-xl-2></ion-col>
+          <ion-col col-1 col-xl-1></ion-col>
           <ion-col col-4 col-xl-4 style="margin:15px">
             <ion-label style="display: inline" *ngIf="shema[1].opcionesPregunta[0].textoOpcion">{{shema[1].opcionesPregunta[0].textoOpcion}}</ion-label>
             <ion-radio style="vertical-align:middle" value="0"></ion-radio>
@@ -35,7 +35,6 @@
               <ion-label style="display: inline" *ngIf="shema[1].opcionesPregunta[1].textoOpcion">{{shema[1].opcionesPregunta[1].textoOpcion}}</ion-label>
               <ion-radio style="vertical-align:middle" value="1" ></ion-radio>
           </ion-col>
-          <ion-col col-2 col-xl-2></ion-col>
         </ion-row>
       </ion-grid>
       <br />

src/pages/inquiry/inquiry.ts

@@ -43,7 +43,6 @@ export class InquiryPage {
     this.response[0].res = this.shema[0].opcionesPregunta[this.shema[0].opcionesPregunta.length - 1].valorOpcion;
     this.response[0].option = this.shema[0].opcionesPregunta[this.shema[0].opcionesPregunta.length - 1].idOpcion;
 
-    console.log('construct InquiryPage 1');
     this.storage.get('companyLogo').then((getcompanyLogo) => {
       this.getcompanyLogo = getcompanyLogo;
     });
@@ -72,7 +71,7 @@ export class InquiryPage {
     this.restProvider.save_inquiry(this.userID, this.response,this.conversationID).then(data => {
         console.log('resp: ' + data);
         let alert = this.alertCtrl.create({
-          subTitle: 'Gracias por brindarnos su valiosa opinion!',
+          subTitle: '¡Gracias por brindarnos tu valiosa opinión!',
           buttons: ['Aceptar']
         });
         alert.present();

src/pages/menu/menu.html

@@ -31,7 +31,7 @@
 
 			<ion-col col-6 col-xl-6 col-lg-6 col-md-6 (click)="usefulinfo()" class="colinfo">
 				<img src="assets/imgs/Marqueta/img_3.png" class="infoImg">
-				<p class="para">Datos utiles</p>
+				<p class="para">Datos útiles</p>
 			</ion-col>
 
 		</ion-row>
@@ -104,7 +104,7 @@
 
 			<ion-col col-6 col-xl-6 col-lg-6 col-md-6 (click)="usefulinfo()" class="colinfo" style="background-color: #817F86;">
 				<img src="assets/imgs/Marqueta/qqq.jpg" class="infoImg1">
-				<p class="para">Datos utiles</p>
+				<p class="para">Datos útiles</p>
 			</ion-col>
 
 		</ion-row>

src/pages/menu/menu.ts

@@ -116,7 +116,7 @@ export class MenuPage {
           alert.present();
 
         }*/
-        this.loader.show('Please Wait');
+        this.loader.show('Espera por favor');
         this.loader.hide();
         this.navCtrl.push("FormularyPage");
     });
@@ -125,7 +125,7 @@ export class MenuPage {
 
   traveladvice(){
 
-    this.loader.show('Please Wait');
+    this.loader.show('Espera por favor');
     this.loader.hide();
     this.navCtrl.push("TraveladvicePage");
 
@@ -133,7 +133,7 @@ export class MenuPage {
 
   usefulinfo(){
 
-    this.loader.show('Please Wait');
+    this.loader.show('Espera por favor');
     this.loader.hide();
     this.navCtrl.push("UsefulinfoPage");
 
@@ -141,7 +141,7 @@ export class MenuPage {
 
   phone(){
 
-    this.loader.show('Please Wait');
+    this.loader.show('Espera por favor');
 
     if(this.restProvider.getNetworkType() == 'none') {
 

src/pages/modal/modal.html

@@ -8,7 +8,7 @@
 
   <ion-navbar>
 
-    <ion-title>teléfonos de emergencia</ion-title>
+    <ion-title>Teléfonos de emergencia</ion-title>
 
     <ion-buttons end >
 

src/pages/passportlogin/passportlogin.html

@@ -38,7 +38,8 @@
 
 	    <br/>
 
-	    <div class="error-message">
+	    
+		<div class="error-message" *ngIf="error">
 			{{error}}
 		</div>
 

src/pages/passportlogin/passportlogin.ts

@@ -61,12 +61,15 @@ export class PassportloginPage {
 
     }
 
+    if (this.error){
+      this.error = null;
+    }
   }
 
   passportlogin(){
 
-    this.error = '';
-    this.loader.show('Please Wait');
+    this.error = null;
+    this.loader.show('Espera por favor');
 
     let rutData : any = this.passportloginForm.value.usuario;
 
@@ -98,9 +101,11 @@ export class PassportloginPage {
       }).catch(error => {
 
         this.loader.hide();
-        if(error.error['error'] == "RUT no existe") {
-            this.error = "Rut Invalido";
-        } else {
+        if (error.error['error'] == "RUT no existe") {
+          this.error = "Lo sentimos, el RUT proporcionado no se encuentra en nuestros registros ";
+        } else if (error.error['error'] == "Formato de RUT/Email no Valido") {
+          this.error = "El RUT ingresado no es válido";
+        }  else {
           this.error = error.error['error'];
         }
 

src/pages/password/password.ts

@@ -77,11 +77,12 @@ export class PasswordPage {
   passwordlogin(){
 
     this.error = '';
-    this.loader.show('Please Wait');
+    this.loader.show('Espera por favor');
     let clave : any = this.passwordloginForm.value.password;
 
     if(this.passwordloginForm.value.password == ''){
-      this.error = "please enter your Password";
+      this.loader.hide();
+      this.error = "Ingresa tu clave secreta";
     } else{
       window.localStorage.setItem('password', this.passwordloginForm.value.password);
       this.restProvider.getClaveData(this.rut, clave)

src/pages/resetpassword/resetpassword.html

@@ -26,17 +26,18 @@
 		<br/>
 
 		<ion-item class="itemclr">
-	      	<ion-label stacked>Please Enter Your Rut</ion-label>
-	        <ion-input type="text"  formControlName="rut" [class.invalid]="!resetForm.controls.rut.valid && resetForm.controls.rut.dirty" (keypress)="onChange($event)"></ion-input>
+			<ion-label stacked>Ingresa tu Rut (ej. 9456789-K, 18934567-4)</ion-label> 
+					<ion-input type="text"  formControlName="rut" [(ngModel)]="rut"  
+					[class.invalid]="!resetForm.controls.rut.valid && resetForm.controls.rut.dirty" (keypress)="onChange($event)"></ion-input>
 	    </ion-item>
 
 	     <div *ngIf="!resetForm.controls.rut.valid  && resetForm.controls.rut.dirty">
-	      	<p class="parag">Please enter a valid rut.</p>
+				<p class="parag">Por favor ingrese un Rut válido.</p>
 	    </div>
 
 	    <br/>
 
-	    <div class="error-message">
+	    <div class="error-message" *ngIf="error">
 			{{error}}
 		</div>
 

src/pages/resetpassword/resetpassword.ts

@@ -13,22 +13,22 @@ import { Storage } from '@ionic/storage';
 })
 export class ResetpasswordPage {
 
-  headerdisplay : any;
-  public resetForm:FormGroup;
-  error : any;
-  rut : any;
-  appid : any;
-  email : any;
-  idempresa : any;
+  headerdisplay: any;
+  public resetForm: FormGroup;
+  error: any;
+  rut: any;
+  appid: any;
+  email: any;
+  idempresa: any;
 
   constructor(public navCtrl: NavController, public navParams: NavParams,
-              public plt: Platform, private formBuilder: FormBuilder,
-              private loader: Loader, public toastCtrl: ToastController,
-              public restProvider: RestProvider, private storage: Storage) {
+    public plt: Platform, private formBuilder: FormBuilder,
+    private loader: Loader, public toastCtrl: ToastController,
+    public restProvider: RestProvider, private storage: Storage) {
 
     this.storage.get("isPassportLogin").then((resulst) => {
 
-      if(resulst){
+      if (resulst) {
         this.storage.get("rut").then((getRut) => {
           this.rut = getRut;
         });
@@ -45,14 +45,14 @@ export class ResetpasswordPage {
 
     });
 
-  	this.resetForm = formBuilder.group({
-	      rut: ['', Validators.compose([Validators.required, RutValidator.isValid])]
-	  });
+    this.resetForm = formBuilder.group({
+      rut: ['', Validators.compose([Validators.required, RutValidator.isValid])]
+    });
 
-  	if (this.plt.is('ios')) {
+    if (this.plt.is('ios')) {
       this.headerdisplay = true;
     } else if (this.plt.is('android')) {
-    	this.headerdisplay = false;
+      this.headerdisplay = false;
     }
 
   }
@@ -61,51 +61,61 @@ export class ResetpasswordPage {
     console.log('ionViewDidLoad ResetpasswordPage');
   }
 
-  onChange(){
-
-    if(this.resetForm.value.rut.length > -1){
-      this.error = '';
+  onChange() {
+    if (this.rut) {
+      if (this.rut.length > 1) {
+        if (this.rut.split("-")[1] || this.rut.split("-")[1] == "") {
+          this.rut = this.rut.split("-")[0] + this.rut.split("-")[1];
+        }
+        this.rut = this.rut.slice(0, this.rut.length - 1) + "-" + this.rut.slice(this.rut.length - 1, this.rut.length);
+      }
+    }
+    if (this.error) {
+      this.error = null;
     }
 
   }
 
-  reset(){
-  		this.error = ''
-  		this.loader.show('Please Wait');
-  		let rut = this.resetForm.value.rut;
-  		this.restProvider.getRecoverClave(rut, this.appid, this.idempresa)
-            .then(data => {
-              this.email = data['email'];
-              if(this.email){
-
-                this.loader.hide();
-
-                let toastSuccess = this.toastCtrl.create({
-                    message: 'Password sent, please check your mail!',
-                    duration: 6000,
-                    position: 'top',
-                    showCloseButton:true,
-                    closeButtonText:'X',
-                    cssClass: "toast-success",
-                });
-
-                toastSuccess.present();
-
-                this.navCtrl.push("PassportloginPage");
-
-              }
-
-              if(data['error']){
-                this.error = data['error'];
-              } else {
-                this.error = '';
-              }
-
-            }).catch(error => {
-              this.loader.hide();
-              this.error = error.error['error'];
+  reset() {
+    this.error = null
+    this.loader.show('Espera por favor');
+    let rut = this.resetForm.value.rut;
+    if (this.resetForm.value.rut == '' || this.resetForm.value.rut.length == 0) {
+      this.loader.hide();
+    } else {
+      this.restProvider.getRecoverClave(rut, this.appid, this.idempresa)
+        .then(data => {
+          this.email = data['email'];
+          if (this.email) {
+
+            this.loader.hide();
+
+            let toastSuccess = this.toastCtrl.create({
+              message: '¡Clave enviada, por favor verfica tu email!',
+              duration: 6000,
+              position: 'top',
+              showCloseButton: true,
+              closeButtonText: 'X',
+              cssClass: "toast-success",
             });
 
+            toastSuccess.present();
+
+            this.navCtrl.push("PassportloginPage");
+
+          }
+
+          if (data['error']) {
+            this.error = data['error'];
+          } else {
+            this.error = null;
+          }
+
+        }).catch(error => {
+          this.loader.hide();
+          this.error = error.error['error'];
+        });
+    }
   }
 
 }