MM-460 Fixed.

umar-issues
Salman Afzal 6 years ago
parent 06a99db85a
commit 5edb4a9e83

@ -92,7 +92,7 @@
<a (click)="forgetPasswordPage()">{{ts.trPK('login','forgot-password')}}</a> <a (click)="forgetPasswordPage()">{{ts.trPK('login','forgot-password')}}</a>
</div> --> </div> -->
<ion-row> <ion-row [ngStyle]="keyboardOpened === true ? {'display': 'none'} : {}">
<ion-col class="colPad"> <ion-col class="colPad">
<img class="centerDiv logoFotor" src="../assets/imgs/CSLogo.png" /> <img class="centerDiv logoFotor" src="../assets/imgs/CSLogo.png" />
</ion-col> </ion-col>

@ -16,6 +16,8 @@ import { Password } from '../models/password';
import { CheckUserAuthenticationRequest } from 'src/app/hmg-common/services/authentication/models/check-user-auth.request'; import { CheckUserAuthenticationRequest } from 'src/app/hmg-common/services/authentication/models/check-user-auth.request';
import { CheckAppVersionResponse } from 'src/app/hmg-common/services/authentication/models/check-app-version.response'; import { CheckAppVersionResponse } from 'src/app/hmg-common/services/authentication/models/check-app-version.response';
import { PushService } from 'src/app/hmg-common/services/push/push.service'; import { PushService } from 'src/app/hmg-common/services/push/push.service';
import { KeyboardService } from 'src/app/hmg-common/services/keyboard/keyboard.service';
import { KeyboardStatusModel } from 'src/app/hmg-common/services/keyboard/keyboard-status.model';
@Component({ @Component({
selector: 'login', selector: 'login',
@ -39,7 +41,8 @@ export class LoginComponent implements OnInit, OnDestroy {
public splash: SplashScreen, public splash: SplashScreen,
public sharedData: SharedDataService, public sharedData: SharedDataService,
public plt: Platform, public plt: Platform,
public pushService: PushService public pushService: PushService,
public keyboardService: KeyboardService
) { ) {
this.events.subscribe('logoutFlage', logoutFlage => { this.events.subscribe('logoutFlage', logoutFlage => {
console.log('login compont logoutFlage: ' + logoutFlage); console.log('login compont logoutFlage: ' + logoutFlage);
@ -93,6 +96,7 @@ export class LoginComponent implements OnInit, OnDestroy {
logoutFlage: boolean ; logoutFlage: boolean ;
getuser: any = ''; getuser: any = '';
getlastlogin: any; getlastlogin: any;
public keyboardOpened = false;
private checkUserResult: CheckUserAuthenticationResponse; private checkUserResult: CheckUserAuthenticationResponse;
@ -104,6 +108,7 @@ export class LoginComponent implements OnInit, OnDestroy {
// ); // );
// console.log("this.getlastlogin"+ this.getlastlogin); // console.log("this.getlastlogin"+ this.getlastlogin);
// } // }
this.monitorKeyboardChange();
this.currentLang = TranslatorService.getCurrentLanguageCode(); this.currentLang = TranslatorService.getCurrentLanguageCode();
console.log(TranslatorService.CURRENT_LANGUAGE) console.log(TranslatorService.CURRENT_LANGUAGE)
console.log(TranslatorService.EN) console.log(TranslatorService.EN)
@ -418,6 +423,10 @@ export class LoginComponent implements OnInit, OnDestroy {
}); });
} }
private monitorKeyboardChange() {
this.events.subscribe ( KeyboardService.KEYBOARD_STATUS , ( status: KeyboardStatusModel) => {
this.keyboardOpened = status.opened;
});
}
} }

@ -50,7 +50,7 @@ ion-input {
line-height: 0; line-height: 0;
font-size: 32px; font-size: 32px;
//border: solid 1px #ccc; //border: solid 1px #ccc;
border: solid 0.01cm #000000; border: 1px solid #ccc !important;
//box-shadow: 0 0 5px #ccc inset; //box-shadow: 0 0 5px #ccc inset;
outline: none; outline: none;
width: 20%; width: 20%;

Loading…
Cancel
Save