Fix integration errors

Author: leonardoespinosa

i4t_mobile/src/assets/i18n/en.json

@@ -129,7 +129,9 @@
                 "ERROR_TITLE": "Error"
             },
             "SIGN_OUT": "Sign Out",
-            "MSG_COMFIRM": "Your data has been updated"
+            "MSG_COMFIRM": "Your data has been updated",
+            "FULL_NAME": "Full name",
+            "GENDER": "Gender"
         },
         "CODE_TYPE_SELECT": {
             "TITTLE": "Type of code",

i4t_mobile/src/assets/i18n/es.json

@@ -129,7 +129,9 @@
                 "ERROR_TITLE": "Error"
             },
             "SIGN_OUT": "Cerrar sesión",
-            "MSG_COMFIRM": "Tus datos han sido actualizados"
+            "MSG_COMFIRM": "Tus datos han sido actualizados",
+            "FULL_NAME": "Nombres y apellidos",
+            "GENDER": "Género"
         },
         "CODE_TYPE_SELECT": {
             "TITTLE": "Tipo de código",

i4t_mobile/src/pages/auth/signup/signup.html

@@ -42,18 +42,6 @@
       <div *ngIf="signupForm.controls['username'].hasError('maxlength') && signupForm.controls['username'].touched" class="error-message">
         <p class="error-message">{{'MOBILE.SIGNUP.MAX_LENGTH_USERNAME' | translate}}</p>
       </div>
-
-
-      <ion-item>
-        <ion-label floating>
-          <ion-icon name="gender"></ion-icon>
-          {{'MOBILE.SIGNUP.GENDER' | translate}}
-        </ion-label>
-        <ion-select formControlName="gender" [(ngModel)]="_selectedGender" style="color: white">
-          <ion-option *ngFor="let gender of _genderArray" value="{{gender.value}}">{{gender.label | translate}}</ion-option>
-        </ion-select>
-      </ion-item>
-
       <ion-item>
         <ion-label floating>
           <ion-icon name="mail"></ion-icon>

i4t_mobile/src/pages/auth/signup/signup.ts

@@ -53,8 +53,7 @@ export class SignupComponent implements OnInit {
             username: new FormControl('', [Validators.required, Validators.minLength(6), Validators.maxLength(20)]),
             email: new FormControl('', [Validators.required, Validators.minLength(6), Validators.maxLength(40), CustomValidators.emailValidator]),
             password: new FormControl('', [Validators.required, Validators.minLength(8), Validators.maxLength(20)]),
-            confirmPassword: new FormControl('', [Validators.required, Validators.minLength(8), Validators.maxLength(20)]),
-            gender: new FormControl('', [Validators.required])
+            confirmPassword: new FormControl('', [Validators.required, Validators.minLength(8), Validators.maxLength(20)])
         });
         this.error = '';
 
@@ -66,11 +65,9 @@ export class SignupComponent implements OnInit {
     register() {
 
         if (this.signupForm.value.password == this.signupForm.value.confirmPassword) {
-
-            this.userProfile.first_name = "";
-            this.userProfile.last_name = "";
+            this.userProfile.full_name = "";
             this.userProfile.language_code = this.userLang;
-            this.userProfile.gender = this.signupForm.value.gender;
+            this.userProfile.gender = "";
 
             if (this.signupForm.valid) {
                 let confirmMsg: string;

i4t_mobile/src/pages/customer/options/settings/settings.html

@@ -43,6 +43,7 @@ <h2 style="font-weight: bold;">{{'MOBILE.SETTINGS.MY_DATA' | translate}}</h2>
                         <ion-label floating>{{'MOBILE.USERNAME' | translate}}</ion-label>
                         <ion-input formControlName="username" type="text"></ion-input>
                     </ion-item>
+
                     <ion-item *ngIf="_userForm.controls['first_name']">
                         <ion-label floating>{{'MOBILE.SETTINGS.FIRST_NAME' | translate}}</ion-label>
                         <ion-input formControlName="first_name" type="text"></ion-input>
@@ -51,6 +52,21 @@ <h2 style="font-weight: bold;">{{'MOBILE.SETTINGS.MY_DATA' | translate}}</h2>
                         <ion-label floating>{{'MOBILE.SETTINGS.LAST_NAME' | translate}}</ion-label>
                         <ion-input formControlName="last_name" type="text"></ion-input>
                     </ion-item>
+
+                    <ion-item *ngIf="_userForm.controls['full_name']">
+                        <ion-label floating>{{'MOBILE.SETTINGS.FULL_NAME' | translate}}</ion-label>
+                        <ion-input formControlName="full_name" type="text"></ion-input>
+                    </ion-item>
+
+                    <ion-item *ngIf="_userForm.controls['gender']">
+                        <ion-label>
+                            <ion-icon name="gender"></ion-icon>
+                            {{'MOBILE.SETTINGS.GENDER' | translate}}
+                        </ion-label>
+                        <ion-select formControlName="gender" [(ngModel)]="_selectedGender">
+                            <ion-option *ngFor="let gender of _genderArray" value="{{gender.value}}">{{gender.label | translate}}</ion-option>
+                        </ion-select>
+                    </ion-item>
                 </ion-list>
 
                 <div *ngIf="this._user.username">

i4t_mobile/src/pages/customer/options/settings/settings.ts

@@ -41,15 +41,13 @@ export class SettingsPage implements OnInit, OnDestroy {
   private _languageCode: string;
   private _imageProfile: string;
   private _userLang: string;
-
   private _user: any;
   private _userDetail: any;
   private _languages: any;
-
   private _validateChangeEmail: boolean = true;
   private _validateChangePass: boolean = true;
-
   private disconnectSubscription: Subscription;
+  private _genderArray: any[] = [];
 
   /**
    * SettingsPage constructor
@@ -88,7 +86,6 @@ export class SettingsPage implements OnInit, OnDestroy {
    * ionViewWillEnter implementation
    */
   ionViewWillEnter() {
-    this.init();
   }
 
   init() {
@@ -104,6 +101,9 @@ export class SettingsPage implements OnInit, OnDestroy {
       });
     });
 
+    this._genderArray = [{ value: "SIGNUP.MALE_GENDER", label: "SIGNUP.MALE_GENDER" },
+    { value: "SIGNUP.FEMALE_GENDER", label: "SIGNUP.FEMALE_GENDER" },
+    { value: "SIGNUP.OTHER_GENDER", label: "SIGNUP.OTHER_GENDER" }];
 
     this._userDetailSubscription = MeteorObservable.subscribe('getUserDetailsByUser', Meteor.userId()).takeUntil(this.ngUnsubscribe).subscribe(() => {
       this._ngZone.run(() => {
@@ -121,9 +121,10 @@ export class SettingsPage implements OnInit, OnDestroy {
         }
 
         if (this._user && this._user.username) {
-          this._userForm = this.formBuilder.group({
+          this._userForm = new FormGroup({
             username: new FormControl({ value: this._user.username, disabled: !controlsDisabled }),
-            language_code: new FormControl({ value: this._user.profile.language_code, disabled: controlsDisabled })
+            language_code: new FormControl({ value: this._user.profile.language_code, disabled: controlsDisabled }),
+            gender: new FormControl({value: this._user.profile.gender, disabled: controlsDisabled})
           });
 
           this._validateChangePass = false;
@@ -134,11 +135,16 @@ export class SettingsPage implements OnInit, OnDestroy {
             controlsDisabled = true
           }
 
+          /** 
           let first_name: FormControl = new FormControl({ value: this._user.profile.first_name, disabled: controlsDisabled });
           this._userForm.addControl('first_name', first_name);
 
           let last_name: FormControl = new FormControl({ value: this._user.profile.last_name, disabled: controlsDisabled });
           this._userForm.addControl('last_name', last_name);
+          */
+
+          let full_name: FormControl = new FormControl({ value: this._user.profile.full_name, disabled: controlsDisabled });
+          this._userForm.addControl('full_name', full_name);
         }
       });
     });
@@ -180,9 +186,11 @@ export class SettingsPage implements OnInit, OnDestroy {
             $set:
               {
                 profile: {
-                  first_name: this._userForm.value.first_name,
-                  last_name: this._userForm.value.last_name,
-                  language_code: this._userForm.value.language_code
+                  //first_name: this._userForm.value.first_name,
+                  //last_name: this._userForm.value.last_name,
+                  full_name: this._userForm.value.full_name,
+                  language_code: this._userForm.value.language_code,
+                  gender: this._userForm.value.gender
                 }
               }
           });

i4t_web/client/imports/app/web/administrator/administration/collaborators/edition/collaborators-edition.component.html

@@ -23,12 +23,19 @@
             </table>
             <table style="width: 100%" cellspacing="0">
                 <tr>
-                    <td colspan="3" style="padding-top: 10px;">
+                    <td colspan="1" style="padding-top: 10px;">
                         <mat-form-field style="width: 100%">
                             <input matInput required formControlName="fullName" placeholder="{{'NAME' | translate}}" minlength="1" maxlength="70" #inputName/>
                             <mat-hint align="end">{{inputName.value.length}} / 50</mat-hint>
                         </mat-form-field>
                     </td>
+                    <td colspan="2" style="padding-top: 10px; width: 50%">
+                        <mat-form-field style="width: 100%">
+                            <mat-select formControlName="gender" placeholder="{{'SIGNUP.GENDER_LBL' | translate}}" required>
+                                <mat-option *ngFor="let gender of _genderArray" value="{{gender.value}}">{{gender.label | translate}}</mat-option>
+                            </mat-select>
+                        </mat-form-field>
+                    </td>
                 </tr>
             </table>
             <table style="width: 100%" cellspacing="0">
@@ -77,8 +84,8 @@
             <mat-card-subtitle>{{'COLLABORATORS.PASSWORD_MSG' | translate}}</mat-card-subtitle>
             <div>
                 <mat-form-field style="width: 100%">
-                    <input matInput formControlName="new_password" placeholder="{{'SETTINGS.NEW_PASSWORD' | translate}}" #inputNewPassword
-                        type="password" />
+                    <input matInput formControlName="new_password" placeholder="{{'SETTINGS.NEW_PASSWORD' | translate}}" #inputNewPassword type="password"
+                    />
                     <mat-hint align="end">{{inputNewPassword.value.length}} / 40</mat-hint>
                 </mat-form-field>
                 <div *ngIf="_collaboratorEditionForm.controls['new_password'].hasError('required') && _collaboratorEditionForm.controls['new_password'].touched"
@@ -90,8 +97,8 @@
             </div>
             <div>
                 <mat-form-field style="width: 100%">
-                    <input matInput formControlName="confirm_new_password" placeholder="{{'SETTINGS.CONFIRM_NEW_PASSWORD' | translate}}"
-                        #inputConfirmNewPassword type="password" />
+                    <input matInput formControlName="confirm_new_password" placeholder="{{'SETTINGS.CONFIRM_NEW_PASSWORD' | translate}}" #inputConfirmNewPassword
+                        type="password" />
                     <mat-hint align="end">{{inputConfirmNewPassword.value.length}} / 40</mat-hint>
                 </mat-form-field>
                 <div *ngIf="_collaboratorEditionForm.controls['confirm_new_password'].hasError('required') && _collaboratorEditionForm.controls['confirm_new_password'].touched"

i4t_web/client/imports/app/web/administrator/administration/collaborators/edition/collaborators-edition.component.ts

@@ -53,6 +53,8 @@ export class CollaboratorsEditionComponent implements OnInit, OnDestroy {
     private _showTablesSelect: boolean = false;
     private _disabledTablesAssignment: boolean = true;
 
+    private _genderArray: any[] = [];
+
     /**
      * CollaboratorsEditionComponent constructor
      * @param {Router} _router 
@@ -97,12 +99,17 @@ export class CollaboratorsEditionComponent implements OnInit, OnDestroy {
             table_end: [this.selectUserDetail.table_assignment_end],
             new_password: new FormControl('', [Validators.minLength(8), Validators.maxLength(20)]),
             confirm_new_password: new FormControl('', [Validators.minLength(8), Validators.maxLength(20)]),
+            gender: [this.selectUser.profile.gender, [Validators.required]]
         });
         this._tableInit = this.selectUserDetail.table_assignment_init;
         this._tableEnd = this.selectUserDetail.table_assignment_end;
         this._establishments = Establishments.find({}).zone();
         this._roles = Roles.find({}).zone();
         this._tableSub = MeteorObservable.subscribe('getTablesByEstablishmentWork', this.selectUser._id).takeUntil(this._ngUnsubscribe).subscribe();
+
+        this._genderArray = [{ value: "SIGNUP.MALE_GENDER", label: "SIGNUP.MALE_GENDER" },
+        { value: "SIGNUP.FEMALE_GENDER", label: "SIGNUP.FEMALE_GENDER" },
+        { value: "SIGNUP.OTHER_GENDER", label: "SIGNUP.OTHER_GENDER" }];
     }
 
     /**
@@ -182,7 +189,7 @@ export class CollaboratorsEditionComponent implements OnInit, OnDestroy {
                                 full_name: this._collaboratorEditionForm.value.fullName,
                                 language_code: this.selectUser.profile.language_code,
                                 image: this.selectUser.profile.image,
-                                gender: this.selectUser.profile.gender
+                                gender: this._collaboratorEditionForm.value.gender
                             }
                         }
                     });
@@ -247,6 +254,7 @@ export class CollaboratorsEditionComponent implements OnInit, OnDestroy {
         this._collaboratorEditionForm.controls['email'].reset();
         this._collaboratorEditionForm.controls['password'].reset();
         this._collaboratorEditionForm.controls['confirmPassword'].reset();
+        this._collaboratorEditionForm.controls['gender'].reset();
 
         this._router.navigate(['app/collaborators']);
     }

i4t_web/client/imports/app/web/auth/admin-signup/admin-signup.component.html

@@ -32,32 +32,6 @@ <h3 style="width: 100%; text-align: center">
                             <div *ngIf="signupForm.controls['fullName'].hasError('required') && signupForm.controls['fullName'].touched" class="error-message">{{'ADMIN_SIGNUP.REQUIRED_FULLNAME' | translate}}</div>
                             <div *ngIf="signupForm.controls['fullName'].hasError('maxlength') && signupForm.controls['fullName'].touched" class="error-message">{{'ADMIN_SIGNUP.MAX_LENGTH_FULLNAME' | translate}}</div>
 
-                            <mat-form-field style="width: 100%">
-                                <mat-select formControlName="gender" placeholder="{{'SIGNUP.GENDER_LBL' | translate}}">
-                                    <mat-option *ngFor="let gender of _genderArray" value="{{gender.value}}">{{gender.label | translate}}</mat-option>
-                                </mat-select>
-                            </mat-form-field>
-
-                            <mat-form-field style="width: 100%; margin-top: 10px">
-                                <mat-select formControlName="country" [(ngModel)]="_selectedCountry" placeholder="{{'ADMIN_SIGNUP.COUNTRY' | translate}}">
-                                    <mat-option *ngFor="let country of _countries | async" value="{{country._id}}" (click)="changeCountry(country)">{{country.name | translate}}</mat-option>
-                                </mat-select>
-                            </mat-form-field>
-
-                            <mat-form-field style="width: 100%; margin-top: 10px">
-                                <mat-select formControlName="city" [(ngModel)]="_selectedCity" placeholder="{{'ADMIN_SIGNUP.CITY' | translate}}">
-                                    <mat-option *ngFor="let city of _cities | async" value="{{city._id}}" (click)="changeCity()">{{city.name}}</mat-option>
-                                    <mat-option *ngIf="(_cities | async)?.length > 0" (click)="changeOtherCity('0000');" value="0000">{{'OTHER' | translate}}</mat-option>
-                                </mat-select>
-                            </mat-form-field>
-
-                            <mat-form-field *ngIf="_showOtherCity" style="width: 100%; margin-top: 15px">
-                                <input matInput formControlName="otherCity" placeholder="{{'ADMIN_SIGNUP.WHICH_ONE' | translate}}" required>
-                            </mat-form-field>
-                            <div *ngIf="signupForm.controls['otherCity'].hasError('required') && signupForm.controls['otherCity'].touched && _showOtherCity"
-                                class="error-message">{{'ADMIN_SIGNUP.REQUIRED_OTHER' | translate}}</div>
-                            <div *ngIf="signupForm.controls['otherCity'].hasError('maxlength') && signupForm.controls['otherCity'].touched && _showOtherCity"
-                                class="error-message">{{'ADMIN_SIGNUP.MAX_LENGTH_OTHER' | translate}}</div>
 
                             <mat-form-field style="width: 100%;">
                                 <input matInput formControlName="username" placeholder="{{'ADMIN_SIGNUP.USERNAME' | translate}}" required>
@@ -95,7 +69,7 @@ <h3 style="width: 100%; text-align: center">
                                 class="error-message">{{'ADMIN_SIGNUP.MAX_LENGTH_PASSWORD' | translate}}</div>
                             <div *ngIf="showConfirmError" class="error-message"> {{'ADMIN_SIGNUP.PASSWORD_NOT_MATCH' | translate}}</div>
 
-                            <button mat-raised-button class="primary-button pb-tr" type="submit" [disabled]="!signupForm.valid">{{'ADMIN_SIGNUP.SIGNUP' | translate}}</button>
+                            <button mat-raised-button class="primary-button pb-tr" style="width: 100%" type="submit" [disabled]="!signupForm.valid">{{'ADMIN_SIGNUP.SIGNUP' | translate}}</button>
                         </form>
                         <div style="text-align: center; padding-top: 10px">
                             {{'ADMIN_SIGNUP.ALREADY_ACCOUNT'| translate}}
@@ -150,33 +124,6 @@ <h2 class="opacity revealOnScroll" data-animation="fadeInDown" data-timeout="300
             <span>{{'ADMIN_SIGNUP.GENERAL_INFO' | translate}}</span>
         </div>
         <form [formGroup]="signupForm" (ngSubmit)="register()" novalidate>
-            <mat-form-field style="width: 100%">
-                <mat-select formControlName="gender" placeholder="{{'SIGNUP.GENDER_LBL' | translate}}">
-                    <mat-option *ngFor="let gender of _genderArray" value="{{gender.value}}">{{gender.label | translate}}</mat-option>
-                </mat-select>
-            </mat-form-field>
-
-            <mat-form-field style="width: 100%; margin-top: 10px">
-                <mat-select formControlName="country" [(ngModel)]="_selectedCountry" placeholder="{{'ADMIN_SIGNUP.COUNTRY' | translate}}">
-                    <mat-option *ngFor="let country of _countries | async" value="{{country._id}}" (click)="changeCountry(country)">{{country.name | translate}}</mat-option>
-                </mat-select>
-            </mat-form-field>
-
-            <mat-form-field style="width: 100%; margin-top: 10px">
-                <mat-select formControlName="city" [(ngModel)]="_selectedCity" placeholder="{{'ADMIN_SIGNUP.CITY' | translate}}">
-                    <mat-option *ngFor="let city of _cities | async" value="{{city._id}}" (click)="changeCity()">{{city.name}}</mat-option>
-                    <mat-option *ngIf="(_cities | async)?.length > 0" (click)="changeOtherCity('0000');" value="0000">{{'OTHER' | translate}}</mat-option>
-                </mat-select>
-            </mat-form-field>
-
-            <mat-form-field *ngIf="_showOtherCity" style="width: 100%; margin-top: 15px">
-                <input matInput formControlName="otherCity" placeholder="{{'ADMIN_SIGNUP.WHICH_ONE' | translate}}" required>
-            </mat-form-field>
-            <div *ngIf="signupForm.controls['otherCity'].hasError('required') && signupForm.controls['otherCity'].touched && _showOtherCity"
-                class="error-message">{{'ADMIN_SIGNUP.REQUIRED_OTHER' | translate}}</div>
-            <div *ngIf="signupForm.controls['otherCity'].hasError('maxlength') && signupForm.controls['otherCity'].touched && _showOtherCity"
-                class="error-message">{{'ADMIN_SIGNUP.MAX_LENGTH_OTHER' | translate}}</div>
-
             <div style="width: 100%; text-align: center; margin-top: 30px">
                 <span>{{'ADMIN_SIGNUP.USER_PASSWD' | translate}}</span>
             </div>
@@ -234,4 +181,4 @@ <h2 class="opacity revealOnScroll" data-animation="fadeInDown" data-timeout="300
     <div class="copy">
         <span>comeygana © 2018. {{'ADMIN_SIGNUP.COPYRIGHT' | translate}}</span>
     </div>
-</div>
+</div>