MOHEMM-SFH-COLORS
Sultan Khan 7 years ago
parent 7a58598b2c
commit 578d20ea2c

@ -9,32 +9,20 @@
<ion-grid> <ion-grid>
<ion-item> <ion-item>
<img class="item-icon" src="assets/imgs/password.png" item-start /> <img class="item-icon" src="assets/imgs/username.png" item-start />
<ion-label>{{'changePassword.newPassword' | translate}}</ion-label> <ion-label>{{ts.trPK('login','username')}}</ion-label>
<ion-input required type="password" <ion-input required type="text" [(ngModel)]="P_USER_NAME">
[(ngModel)]="P_NEW_PASSWORD">
</ion-input>
</ion-item>
<ion-item>
<img class="item-icon" src="assets/imgs/password.png" item-start />
<ion-label>{{'changePassword.confirmPassword' | translate}}</ion-label>
<ion-input required type="password"
[(ngModel)]="P_Confirm_NEW_PASSWORD">
</ion-input> </ion-input>
</ion-item> </ion-item>
</ion-grid> </ion-grid>
<page-trailer [small]="true"></page-trailer> <page-trailer [small]="true"></page-trailer>
<footer>
<ion-grid>
<ion-row class="ion-justify-content-center">
<ion-col [size]="10" [sizeLg]="8" [sizeXl]="6" no-padding>
<ion-button (click)="onForgot()" [disabled]="!isValidForm()" expand="block">
{{'general,submit' | translate}} </ion-button>
</ion-col>
</ion-row>
</ion-grid>
</footer>
</ion-content> </ion-content>
<ion-footer>
<div class="centerDiv">
<ion-button color="customnavy" ion-button (click)=" userCheck()">{{ts.trPK('login','username')}}</ion-button>
</div>
</ion-footer>

@ -31,8 +31,8 @@
<a (click)="signUp()">{{ts.trPK('login','signup')}}</a> <a (click)="signUp()">{{ts.trPK('login','signup')}}</a>
</div> </div>
<div class="gridDiv"> <div class="gridDiv">
<button class="gridBtn" ion-button (click)="changeLanguage()">English</button> <button class="gridBtn" ion-button (click)="changeLanguage()" [ngClass]="{'active':this.currentLang ==1}">English</button>
<button class="gridBtn arTxt" ion-button (click)="changeLanguage()">عربي</button> <button class="gridBtn arTxt" ion-button (click)="changeLanguage()" [ngClass]="{'active':this.currentLang ==2}">عربي</button>
</div> </div>
</ion-content> </ion-content>

@ -1,11 +1,15 @@
.signupDiv { .signupDiv {
font-size: 14px; font-size: 14px;
} }
.customGrid { .customGrid {
margin-bottom: 20px; margin-bottom: 20px;
} }
.gridBtn.active{
background:var(--customnavy) !important;
color:var(--light) !important;
}
.gridDiv{direction: rtl}
.pageTitle { .pageTitle {
color: var(--dark); color: var(--dark);
font-size: 23px; font-size: 23px;

@ -31,6 +31,11 @@ export class LoginComponent implements OnInit, OnDestroy {
isSupportAr:boolean=false; isSupportAr:boolean=false;
isAppleStore:boolean=false; isAppleStore:boolean=false;
memberLogin: any = {}; memberLogin: any = {};
private currentLang : any;
private patientOutSA: boolean;
private loginTokenID: string;
private isMobileFingerPrint: boolean;
private FingerPrintPatientIdentificationID: string;
constructor( constructor(
public cs: CommonService, public cs: CommonService,
public authService: AuthenticationService, public authService: AuthenticationService,
@ -51,6 +56,7 @@ export class LoginComponent implements OnInit, OnDestroy {
this.checkIfLoggedInBefore(); this.checkIfLoggedInBefore();
// this.splash.hide(); // this.splash.hide();
}, 100); }, 100);
this.currentLang = TranslatorService.getCurrentLanguageCode();
} }
ngOnDestroy(): void { ngOnDestroy(): void {
@ -58,6 +64,8 @@ export class LoginComponent implements OnInit, OnDestroy {
} }
public changeLanguage(){ public changeLanguage(){
this.ts.switchLanguage(); this.ts.switchLanguage();
this.currentLang = TranslatorService.getCurrentLanguageCode();
console.log(this.currentLang);
} }
private checkIfLoggedInBefore() { private checkIfLoggedInBefore() {
this.cs.startLoading(); this.cs.startLoading();
@ -393,11 +401,6 @@ export class LoginComponent implements OnInit, OnDestroy {
}, null, title); }, null, title);
} }
private patientOutSA: boolean;
private loginTokenID: string;
private isMobileFingerPrint: boolean;
private FingerPrintPatientIdentificationID: string;
private checkActivationCode(readedCode?) { private checkActivationCode(readedCode?) {
const request = new CheckActivationCodeRequest(); const request = new CheckActivationCodeRequest();
request.IsMobileFingerPrint = this.isMobileFingerPrint; request.IsMobileFingerPrint = this.isMobileFingerPrint;
@ -440,7 +443,7 @@ export class LoginComponent implements OnInit, OnDestroy {
if (this.authService.isAgreedBefore()) { if (this.authService.isAgreedBefore()) {
this.cs.openHome(); this.cs.openHome();
} else { } else {
this.cs.openAgreement(); // this.cs.openAgreement();
} }
}); });
} }

@ -540,7 +540,7 @@ export class AuthenticationService {
} else { } else {
this.cs.presentConfirmDialog(this.ts.trPK('login', 'enter-email'), this.cs.presentConfirmDialog(this.ts.trPK('login', 'enter-email'),
() => { () => {
this.cs.openPatientProfile(); //this.cs.openPatientProfile();
observer.complete(); observer.complete();
}); });
} }
@ -564,7 +564,7 @@ export class AuthenticationService {
private sessionTimeOutDialog() { private sessionTimeOutDialog() {
this.cs.presentConfirmDialog(this.ts.trPK('general', 'idle-relogin'), () => { this.cs.presentConfirmDialog(this.ts.trPK('general', 'idle-relogin'), () => {
this.cs.openUserLogin(); // this.cs.openUserLogin();
}); });
} }

Loading…
Cancel
Save