MM-244 fixed

mekawy-issues
umasoodch 6 years ago
parent 196ec6c9e9
commit 3a0d2e7285

@ -95,11 +95,12 @@ export class LoginComponent implements OnInit, OnDestroy {
private checkUserResult: CheckUserAuthenticationResponse; private checkUserResult: CheckUserAuthenticationResponse;
ngOnInit() { ngOnInit() {
console.log("ENAD TEST!!!") this.cs.stopLoading();
// tslint:disable-next-line: triple-equals
if (TranslatorService.CURRENT_LANGUAGE == TranslatorService.EN) { if (TranslatorService.CURRENT_LANGUAGE == TranslatorService.EN) {
this.language = "US"; this.language = 'US';
} else { } else {
this.language = "AR"; this.language = 'AR';
} }
this.ts.switchLanguage(); this.ts.switchLanguage();
this.currentLang = TranslatorService.getCurrentLanguageCode(); this.currentLang = TranslatorService.getCurrentLanguageCode();
@ -118,72 +119,26 @@ export class LoginComponent implements OnInit, OnDestroy {
// } // }
this.events.subscribe('user', user => { this.events.subscribe('user', user => {
console.log('login compont: ' + user);
this.user = user; this.user = user;
}); });
this.deviceToken = localStorage.getItem('devicyeToken');
if (this.deviceToken) {
console.log('login enabled first time: ' + this.deviceToken);
this.deviceToken = localStorage.getItem('devicyeToken');
console.log('let deviceToken' + this.deviceToken);
if (this.deviceToken) {
console.log('login enabled first time: ' + this.deviceToken);
} else { } else {
console.log('no deviceToken' ); console.log('no deviceToken' );
this.pushService.startReceiving(); this.pushService.startReceiving();
setTimeout(() => {
// alert('login enabled second time: ' + this.deviceToken);
}, 1000);
} }
// setTimeout(() => {
// alert("this.logoutFlage in setTime" +localStorage.getItem('logoutFlage'));
// alert("this.this.user in setTime" + this.user);
// if(localStorage.getItem('logoutFlage')== "true"){
// this.getLastLoginInfo();
// }
// },1000);
// here will delete below part and depdding on user (response from getMobileInfo) // here will delete below part and depdding on user (response from getMobileInfo)
this.username = localStorage.getItem('user'); this.username = localStorage.getItem('user');
this.password = localStorage.getItem('password'); // ****// this.password = localStorage.getItem('password'); // ****//
const remember = localStorage.getItem('remember'); // ****// const remember = localStorage.getItem('remember'); // ****//
this.empname = localStorage.getItem('emp-name'); this.empname = localStorage.getItem('emp-name');
this.logintype = localStorage.getItem('login-type'); this.logintype = localStorage.getItem('login-type');
// tslint:disable-next-line: triple-equals // tslint:disable-next-line: triple-equals
if (remember == 'true') { this.remeberMe = true; } else { this.remeberMe = false; } if (remember == 'true') { this.remeberMe = true; } else { this.remeberMe = false; }
// here will be check on user if exite then s part and depdding on user (response from getMobileInfo)
if (this.user) {
// this.loginDiv=false;
// this.welcomeBack=true;
} else {
// this.user=true;
// this.welcomeBack=false;
}
// alert("user>>" + this.username);
// alert("pass>>>" + this.password);
// alert("remember>>>" + this.remeberMe);
/// call getLoginInfo
} }
ngOnDestroy(): void { ngOnDestroy(): void {
@ -191,14 +146,16 @@ export class LoginComponent implements OnInit, OnDestroy {
} }
public changeLanguage(langNumber) { public changeLanguage(langNumber) {
if(this.currentLang == langNumber){ // tslint:disable-next-line: triple-equals
if (this.currentLang == langNumber) {
return; return;
}else{ } else {
this.ts.switchLanguage(); this.ts.switchLanguage();
// tslint:disable-next-line: triple-equals
if (TranslatorService.CURRENT_LANGUAGE == TranslatorService.EN) { if (TranslatorService.CURRENT_LANGUAGE == TranslatorService.EN) {
this.language = "US"; this.language = 'US';
} else { } else {
this.language = "AR"; this.language = 'AR';
} }
this.currentLang = TranslatorService.getCurrentLanguageCode(); this.currentLang = TranslatorService.getCurrentLanguageCode();
} }
@ -215,36 +172,20 @@ export class LoginComponent implements OnInit, OnDestroy {
} }
public addValue(e): void { public addValue(e): void {
// console.log(e.currentTarget.checked); this.remeberMe = true;
this.remeberMe = true; // e.currentTarget.checked;
this.remeberMyInfo(); this.remeberMyInfo();
} }
public remeberMyInfo() { public remeberMyInfo() {
// if (this.remeberMe) {
if (this.username) {localStorage.setItem('user', this.username); } if (this.username) {localStorage.setItem('user', this.username); }
if (this.password) {localStorage.setItem('password', this.password); } if (this.password) {localStorage.setItem('password', this.password); }
localStorage.setItem('remember', 'true'); localStorage.setItem('remember', 'true');
// } else {
// localStorage.setItem("user", "");
// localStorage.setItem("password", "");
// localStorage.setItem("remember", "false");
// }
} }
public onLogin() { public onLogin() {
console.log('onLogin');
// this.checkAppUpdated();
// this.checkUserAuthentication();
this.deviceToken = localStorage.getItem('deviceToken'); this.deviceToken = localStorage.getItem('deviceToken');
console.log('let deviceToken' + this.deviceToken);
if (this.deviceToken) { if (this.deviceToken) {
console.log('login enabled first time: ' + this.deviceToken);
this.checkAppUpdated(); this.checkAppUpdated();
} else { } else {
console.log('no deviceToken' );
this.pushService.startReceiving(); this.pushService.startReceiving();
setTimeout(() => { setTimeout(() => {
this.deviceToken = localStorage.getItem('deviceToken'); this.deviceToken = localStorage.getItem('deviceToken');

@ -110,7 +110,7 @@
<span class="month-year-span">{{month}} {{year}}</span> <span class="month-year-span">{{month}} {{year}}</span>
</ion-col> </ion-col>
<ion-col [size]="2" style="text-align: right;"> <ion-col [size]="2" style="text-align: right;">
<ion-icon [ngClass]=" currentMonthName === month ? 'disabledArrow' : 'activeArrow'" ios="ios-arrow-dropright-circle" md="md-arrow-dropright-circle" (click)="nextSlide()"></ion-icon> <ion-icon *ngIf="currentMonthName !== month" [ngClass]=" currentMonthName === month ? 'disabledArrow' : 'activeArrow'" ios="ios-arrow-dropright-circle" md="md-arrow-dropright-circle" (click)="nextSlide()"></ion-icon>
</ion-col> </ion-col>
</ion-row> </ion-row>
</div> </div>

@ -418,12 +418,12 @@ p{
} }
} }
.no-data-available { .no-data-available {
background: white; background: white;
font-family: WorkSans-Regular; font-family: WorkSans-Regular;
padding: 30px; padding: 30px;
position: absolute; position: absolute;
left: 85px; left: 85px;
top: 50px; bottom: 20%;
} }
.disable-filter { .disable-filter {
pointer-events: none; pointer-events: none;

@ -241,6 +241,7 @@ export class HomeComponent implements OnInit {
if (filter.key === this.itemType) { if (filter.key === this.itemType) {
filter.disable = false; filter.disable = false;
filter.active = true; filter.active = true;
filter.value = 0;
this.selectedFilter = filter.name; this.selectedFilter = filter.name;
} else if (this.itemType === '') { } else if (this.itemType === '') {
filter.disable = false; filter.disable = false;

@ -16,7 +16,7 @@
<span class="month-year-span">{{month}} {{year}}</span> <span class="month-year-span">{{month}} {{year}}</span>
</ion-col> </ion-col>
<ion-col [size]="2" style="text-align: right;"> <ion-col [size]="2" style="text-align: right;">
<ion-icon [ngClass]=" currentMonthName === month ? 'disabledArrow' : 'activeArrow'" ios="ios-arrow-dropright-circle" md="md-arrow-dropright-circle" (click)="nextSlide()"></ion-icon> <ion-icon *ngIf="currentMonthName !== month" [ngClass]=" currentMonthName === month ? 'disabledArrow' : 'activeArrow'" ios="ios-arrow-dropright-circle" md="md-arrow-dropright-circle" (click)="nextSlide()"></ion-icon>
</ion-col> </ion-col>
</ion-row> </ion-row>
@ -28,7 +28,7 @@
<span class="month-year-span">{{month}} {{year}}</span> <span class="month-year-span">{{month}} {{year}}</span>
</ion-col> </ion-col>
<ion-col [size]="2" style="text-align: right;"> <ion-col [size]="2" style="text-align: right;">
<ion-icon [ngClass]=" currentMonthName === month ? 'disabledArrow' : 'activeArrow'" ios="ios-arrow-dropleft-circle" md="md-arrow-dropleft-circle" (click)="nextSlide()"></ion-icon> <ion-icon *ngIf="currentMonthName !== month" [ngClass]=" currentMonthName === month ? 'disabledArrow' : 'activeArrow'" ios="ios-arrow-dropleft-circle" md="md-arrow-dropleft-circle" (click)="nextSlide()"></ion-icon>
</ion-col> </ion-col>
</ion-row> </ion-row>
</div> </div>

Loading…
Cancel
Save