From 8d1ad091e937e84d849039b745576f1479ab41e2 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Wed, 4 Mar 2020 08:45:57 +0300 Subject: [PATCH 1/5] add image and fix text and chaneg the BG color for any page did not have data --- Mohem/src/app/absence/home/home.component.html | 4 ++-- .../src/app/eit/eit-list/eit-list.component.html | 12 ++++++------ Mohem/src/app/home/home.page.ts | 8 ++++---- Mohem/src/assets/imgs/box.png | Bin 0 -> 9470 bytes Mohem/src/assets/localization/i18n.json | 2 +- Mohem/src/imgs/box.png | Bin 0 -> 9470 bytes Mohem/src/theme/styles.scss | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 Mohem/src/assets/imgs/box.png create mode 100644 Mohem/src/imgs/box.png diff --git a/Mohem/src/app/absence/home/home.component.html b/Mohem/src/app/absence/home/home.component.html index 86fd1dcc..07feaeaf 100644 --- a/Mohem/src/app/absence/home/home.component.html +++ b/Mohem/src/app/absence/home/home.component.html @@ -13,7 +13,7 @@ - +
@@ -148,7 +148,7 @@
- + diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.html b/Mohem/src/app/eit/eit-list/eit-list.component.html index b442044d..36b2b14c 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.html +++ b/Mohem/src/app/eit/eit-list/eit-list.component.html @@ -5,7 +5,7 @@ - +
@@ -157,7 +157,7 @@ *ngIf="!getResEITTransactionList || getResEITTransactionList[0]?.Collection_Transaction.length <= 0"> - +

{{'general, noData' | translate}}

@@ -228,12 +228,12 @@
- -
+ -
+ \ No newline at end of file diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index 02bde739..9fcfad65 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -542,7 +542,7 @@ export class HomePage implements OnInit { (result: OpenMissingSwipesResponse) => { if (this.common.validResponse(result)) { const key = "GetOpenMissingSwipesList"; - this.statsButtons[1].statsValue = result[key].P_OPEN_MISSING_SWIPES; + this.statsButtons[1].statsValue = Math.ceil(result[key].P_OPEN_MISSING_SWIPES); } } ); @@ -613,7 +613,7 @@ openPeriodDateDashbored() { ITGCountAllNotification() { this.workListService.getITGDetails().subscribe((result: any) => { this.statsButtons[0].statsValue = - this.countAllNotification + result.TotalCount; + Math.ceil(this.countAllNotification + result.TotalCount); }); } @@ -693,7 +693,7 @@ getSubordinatesAttStatus() { "HMG Annual Vacation Accrual Plan" ) { this.statsButtons[2].statsValue = - accrualBalance.ACCRUAL_NET_ENTITLEMENT; + Math.ceil(accrualBalance.ACCRUAL_NET_ENTITLEMENT); this.common.sharedService.setSharedData( accrualBalance, "leaveAccrualBalance" @@ -711,7 +711,7 @@ getSubordinatesAttStatus() { totalTicketsLeft + accrualBalance.ACCRUAL_NET_ENTITLEMENT; } } - this.statsButtons[3].statsValue = totalTicketsLeft; + this.statsButtons[3].statsValue = Math.ceil(totalTicketsLeft); } }); } diff --git a/Mohem/src/assets/imgs/box.png b/Mohem/src/assets/imgs/box.png new file mode 100644 index 0000000000000000000000000000000000000000..a34ee59df1856409ffefb0d4670bea7106c0e9f3 GIT binary patch literal 9470 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 QeE Date: Thu, 5 Mar 2020 12:05:06 +0300 Subject: [PATCH 2/5] orienttion --- Mohem/config.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/Mohem/config.xml b/Mohem/config.xml index 55d5ce3c..0943daff 100644 --- a/Mohem/config.xml +++ b/Mohem/config.xml @@ -20,6 +20,7 @@ + From 14e2654ae49b87587278a70dd3b7d886d7086728 Mon Sep 17 00:00:00 2001 From: ashwaq Date: Thu, 5 Mar 2020 12:41:26 +0300 Subject: [PATCH 3/5] fix login --- Mohem/src/app/app.component.ts | 88 ++++++++++++++++++- .../authentication/login/login.component.ts | 73 ++++++++++++--- .../ui/welcome-login/welcome.component.ts | 2 +- Mohem/src/app/pipes/pipes.module.ts | 5 +- 4 files changed, 152 insertions(+), 16 deletions(-) diff --git a/Mohem/src/app/app.component.ts b/Mohem/src/app/app.component.ts index 01c88780..fd62f41e 100644 --- a/Mohem/src/app/app.component.ts +++ b/Mohem/src/app/app.component.ts @@ -10,6 +10,9 @@ import { SMSCheckResponse } from "src/app/hmg-common/services/authentication/mod import { PushService } from '../../src/app/hmg-common/services/push/push.service'; import { LazyLoadingService } from "./hmg-common/services/lazy-loading/lazy-loading.service"; import { DomSanitizer } from '@angular/platform-browser'; +// import { SplashScreen } from '@ionic-native/splash-screen'; +import { SplashScreen } from '@ionic-native/splash-screen/ngx'; + @Component({ selector: "app-root", @@ -29,10 +32,12 @@ export class AppComponent implements OnInit, AfterViewInit { companyDesc: string = "Powered By Cloud Solutions"; public direction = "ltr"; User_Job_name: string; + public logoutFlage: any =false; requestGetLoginInfo: { DeviceType: string; DeviceToken: string; //this.deviceToken }; user: boolean; + deviceToken: string; constructor( public ts: TranslatorService, private cs: CommonService, @@ -43,7 +48,9 @@ export class AppComponent implements OnInit, AfterViewInit { private menu: MenuController, private authService: AuthenticationService, private sanitizer: DomSanitizer, - public pushService: PushService + public pushService: PushService, + private splashScreen: SplashScreen + ) { this.events.subscribe("img-change", displayImg => { console.log("app compont: "+displayImg); @@ -78,6 +85,11 @@ export class AppComponent implements OnInit, AfterViewInit { private startReceivingPushService() { console.log("platform.ready") this.pushService.startReceiving(); + setTimeout(() => { + + this.getLastLoginInfo(); + },5000); + } subscribeEvents() { this.events.subscribe("setMenu", () => { @@ -128,8 +140,14 @@ export class AppComponent implements OnInit, AfterViewInit { } logout() { this.cs.sharedService.clearAll(); - this.menu.toggle(); - this.cs.openLogin(); + //this.menu.toggle(); + this.menu.enable(false); + this.logoutFlage=true; + this.events.publish('logoutFlage', this.logoutFlage); + + this.getLastLoginInfo(); + // this.cs.openLogin(); + } // profile() { @@ -166,6 +184,70 @@ export class AppComponent implements OnInit, AfterViewInit { this.menu.toggle(); } + getLastLoginInfo(){ + this.deviceToken= localStorage.getItem('devicyeToken'); + console.log("let deviceToken app" + this.deviceToken); + + if (this.deviceToken) { + console.log('login enabled first time: ' + this.deviceToken); + } else { + console.log("no deviceToken" ); + + this.pushService.startReceiving(); + setTimeout(() => { + this.deviceToken= localStorage.getItem('deviceToken'); + console.log('login enabled second time: ' + this.deviceToken); + + }, 1000); + } + + + this.requestGetLoginInfo= { + DeviceType:this.cs.getDeviceType(),//'Android', + DeviceToken:this.deviceToken//"5ca8a69cf1804db55264c349edffb99b9d63acd9fa9b6b18956bcb2ad3f2ba36"//this.deviceToken + } + this.authService.getLoginInfo(this.requestGetLoginInfo,() => {}, this.ts.trPK('general', 'ok')).subscribe(res => { + + if (this.cs.validResponse(res)) { + + if(res.Mohemm_GetMobileLoginInfoList.length > 0){ + + this.cs.sharedService.setSharedData( + // res.Patient_SELECTDeviceIMEIbyIMEIList[0], + res.Mohemm_GetMobileLoginInfoList[0], + AuthenticationService.IMEI_USER_DATA + ); + this.user = true; + this.events.publish('user', this.user); + + this.splashScreen.hide(); + if(this.logoutFlage){ + this.cs.openLogin(); + + } + + } + else{ + this.user = false; + this.events.publish('user', this.user); + this.splashScreen.hide(); + if(this.logoutFlage){ + this.cs.openLogin(); + + } + + } + + + }else{ + // this.user = false; + // this.splashScreen.hide(); + // if(this.logoutFlage){ + // this.cs.openLogin(); + // } + } + }); + } } diff --git a/Mohem/src/app/authentication/login/login.component.ts b/Mohem/src/app/authentication/login/login.component.ts index 7442330d..aa8ad0a2 100644 --- a/Mohem/src/app/authentication/login/login.component.ts +++ b/Mohem/src/app/authentication/login/login.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit, NgZone, OnDestroy } from "@angular/core"; import { CommonService } from "src/app/hmg-common/services/common/common.service"; import { AuthenticationService } from "src/app/hmg-common/services/authentication/authentication.service"; import { Router } from "@angular/router"; -import { AlertController, Platform } from "@ionic/angular"; +import { AlertController, Platform, Events } from "@ionic/angular"; import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service"; import { CheckUserAuthenticationResponse } from "src/app/hmg-common/services/authentication/models/check-user-auth.response"; import { SmsReaderService } from "src/app/hmg-common/services/sms/sms-reader.service"; @@ -49,6 +49,8 @@ export class LoginComponent implements OnInit, OnDestroy { user: boolean =false; DeviceType: string; requestGetLoginInfo:any; + logoutFlage: boolean ; + getuser:any=""; constructor( public cs: CommonService, @@ -58,40 +60,89 @@ export class LoginComponent implements OnInit, OnDestroy { public ts: TranslatorService, public smsService: SmsReaderService, private faio: FingerprintAIO, + public events:Events, public ngZone: NgZone, public device: Device, public splash: SplashScreen, public sharedData: SharedDataService, public plt: Platform, public pushService: PushService - ) { } + ) { + this.events.subscribe("logoutFlage", logoutFlage => { + console.log("login compont logoutFlage: "+logoutFlage); + if(logoutFlage == true){ + console.log(" subscribe check logoutFlage: "+logoutFlage); + this.logoutFlage = logoutFlage; + localStorage.setItem('logoutFlage',logoutFlage); + } + }); + + this.getuser = this.cs.sharedService.getSharedData( + AuthenticationService.IMEI_USER_DATA, + false + ); + // alert(" this.getuser "+this.getuser); + if(this.getuser){ + this.user = true; + + } + else{ + this.user = false; + + } + } ngOnInit() { // this.deviceToken= this.cs.sharedService.getSharedData(AuthenticationService.DEVICE_TOKEN, false); // console.log("get deviceToken login"+ this.deviceToken) + + + // this.getuser = this.cs.sharedService.getSharedData( + // AuthenticationService.IMEI_USER_DATA, + // false + // ); + + // if(this.getuser){ + // console.log("this.getuser"+this.getuser); + // this.logoutFlage = true; + + // } + + this.events.subscribe("user", user => { + console.log("login compont: "+user); + this.user = user; + + }); + + + this.deviceToken= localStorage.getItem('devicyeToken'); - console.log("let deviceToken" + this.deviceToken); + console.log("let deviceToken" + this.deviceToken); if (this.deviceToken) { - console.log('login enabled first time: ' + this.deviceToken); + console.log('login enabled first time: ' + this.deviceToken); } else { console.log("no deviceToken" ); this.pushService.startReceiving(); setTimeout(() => { - this.deviceToken= localStorage.getItem('deviceToken'); - console.log('login enabled second time: ' + this.deviceToken); + // alert('login enabled second time: ' + this.deviceToken); }, 1000); } - setTimeout(() => { + // setTimeout(() => { + // alert("this.logoutFlage in setTime" +localStorage.getItem('logoutFlage')); + // alert("this.this.user in setTime" + this.user); + + // if(localStorage.getItem('logoutFlage')== "true"){ + // this.getLastLoginInfo(); - this.getLastLoginInfo(); - },5000); + // } + // },1000); @@ -355,12 +406,14 @@ export class LoginComponent implements OnInit, OnDestroy { getLastLoginInfo(){ this.requestGetLoginInfo= { - DeviceType:this.cs.getDeviceType(), + DeviceType:this.cs.getDeviceType(),//"Android",//this.cs.getDeviceType(), DeviceToken:this.deviceToken//"5ca8a69cf1804db55264c349edffb99b9d63acd9fa9b6b18956bcb2ad3f2ba36"//this.deviceToken } this.authService.getLoginInfo(this.requestGetLoginInfo,() => {}, this.ts.trPK('general', 'ok')).subscribe(res => { if (this.cs.validResponse(res)) { + if(res.Mohemm_GetMobileLoginInfoList.length > 0){ + this.cs.sharedService.setSharedData( // res.Patient_SELECTDeviceIMEIbyIMEIList[0], res.Mohemm_GetMobileLoginInfoList[0], diff --git a/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.ts b/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.ts index 31d50324..aa5abdec 100644 --- a/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.ts +++ b/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.ts @@ -87,7 +87,7 @@ export class WelcomeComponent implements OnInit, AfterViewInit, OnDestroy { false ); - console.log( this.user); + console.log( "this.user in welcome login"+ this.user); this.userName = localStorage.getItem("user"); this.password = localStorage.getItem("password"); diff --git a/Mohem/src/app/pipes/pipes.module.ts b/Mohem/src/app/pipes/pipes.module.ts index c754645c..3a3a580a 100644 --- a/Mohem/src/app/pipes/pipes.module.ts +++ b/Mohem/src/app/pipes/pipes.module.ts @@ -2,12 +2,13 @@ import { NgModule } from '@angular/core'; import { DateStringPipe } from './date-string/date-string'; import { FilterLangPipe } from './filter-lang/filter-lang'; import { TurncatePipe } from './turncate/turncate.pipe'; +import{ JsonDatePipe} from './json-date/json-date' @NgModule({ - declarations: [DateStringPipe, + declarations: [DateStringPipe,JsonDatePipe, FilterLangPipe, TurncatePipe], imports: [], exports: [DateStringPipe, - FilterLangPipe,TurncatePipe] + FilterLangPipe,TurncatePipe,JsonDatePipe] }) export class PipesModule {} From 3651f5a04a622998f732945fcbfd6c1d62491030 Mon Sep 17 00:00:00 2001 From: Mohamed Mekawy Date: Thu, 5 Mar 2020 12:52:06 +0300 Subject: [PATCH 4/5] edit math floor --- Mohem/src/app/home/home.page.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index 9fcfad65..f23aec0e 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -542,7 +542,7 @@ export class HomePage implements OnInit { (result: OpenMissingSwipesResponse) => { if (this.common.validResponse(result)) { const key = "GetOpenMissingSwipesList"; - this.statsButtons[1].statsValue = Math.ceil(result[key].P_OPEN_MISSING_SWIPES); + this.statsButtons[1].statsValue = Math.floor(result[key].P_OPEN_MISSING_SWIPES); } } ); @@ -613,7 +613,7 @@ openPeriodDateDashbored() { ITGCountAllNotification() { this.workListService.getITGDetails().subscribe((result: any) => { this.statsButtons[0].statsValue = - Math.ceil(this.countAllNotification + result.TotalCount); + Math.floor(this.countAllNotification + result.TotalCount); }); } @@ -693,7 +693,7 @@ getSubordinatesAttStatus() { "HMG Annual Vacation Accrual Plan" ) { this.statsButtons[2].statsValue = - Math.ceil(accrualBalance.ACCRUAL_NET_ENTITLEMENT); + Math.floor(accrualBalance.ACCRUAL_NET_ENTITLEMENT); this.common.sharedService.setSharedData( accrualBalance, "leaveAccrualBalance" @@ -711,7 +711,7 @@ getSubordinatesAttStatus() { totalTicketsLeft + accrualBalance.ACCRUAL_NET_ENTITLEMENT; } } - this.statsButtons[3].statsValue = Math.ceil(totalTicketsLeft); + this.statsButtons[3].statsValue = Math.floor(totalTicketsLeft); } }); } From 289e5f14526072d54ef24a86ecf0807a1ecc02f1 Mon Sep 17 00:00:00 2001 From: Mohamed Mekawy Date: Thu, 5 Mar 2020 15:11:12 +0300 Subject: [PATCH 5/5] enhance login --- Mohem/config.xml | 5 +++- Mohem/src/app/app.component.ts | 28 +++++++++++++++---- .../services/common/common.service.ts | 10 ++++++- .../hmg-common/services/push/push.service.ts | 5 ++++ 4 files changed, 40 insertions(+), 8 deletions(-) diff --git a/Mohem/config.xml b/Mohem/config.xml index 55d5ce3c..866ace59 100644 --- a/Mohem/config.xml +++ b/Mohem/config.xml @@ -15,11 +15,14 @@ - + + + + diff --git a/Mohem/src/app/app.component.ts b/Mohem/src/app/app.component.ts index ee77b995..0a08df19 100644 --- a/Mohem/src/app/app.component.ts +++ b/Mohem/src/app/app.component.ts @@ -88,9 +88,9 @@ export class AppComponent implements OnInit, AfterViewInit { console.log("platform.ready") this.pushService.startReceiving(); setTimeout(() => { - + console.log(" in setTimeout startReceiving"); this.getLastLoginInfo(); - },5000); + },4000); } subscribeEvents() { @@ -202,8 +202,18 @@ export class AppComponent implements OnInit, AfterViewInit { } getLastLoginInfo(){ - this.deviceToken= localStorage.getItem('devicyeToken'); - console.log("let deviceToken app" + this.deviceToken); + + + console.log(" getLastLoginInfo"); + console.log("get method :"+this.cs.getDeviceToken()); + this.deviceToken= this.cs.getDeviceToken(); + //this.cs.sharedService.getSharedData("new-device-token",false);// localStorage.getItem('devicyeToken'); + console.log("let deviceToken app" + this.cs.sharedService.getSharedData("new-device-token",false)); + console.log("localStorage.getItem app" + localStorage.getItem('devicyeToken')); + console.log("sheard DEVICE_TOKEN" + this.cs.sharedService.getSharedData(AuthenticationService.DEVICE_TOKEN, false)); + + + if (this.deviceToken) { console.log('login enabled first time: ' + this.deviceToken); @@ -236,8 +246,10 @@ export class AppComponent implements OnInit, AfterViewInit { ); this.user = true; this.events.publish('user', this.user); + setTimeout(() => { + this.splashScreen.hide(); + },3000); - this.splashScreen.hide(); if(this.logoutFlage){ this.cs.openLogin(); @@ -247,7 +259,11 @@ export class AppComponent implements OnInit, AfterViewInit { else{ this.user = false; this.events.publish('user', this.user); - this.splashScreen.hide(); + + setTimeout(() => { + this.splashScreen.hide(); + },3000); + if(this.logoutFlage){ this.cs.openLogin(); diff --git a/Mohem/src/app/hmg-common/services/common/common.service.ts b/Mohem/src/app/hmg-common/services/common/common.service.ts index 660e0b80..08163c91 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -80,6 +80,7 @@ export class CommonService { private loadingProgress: any; public updateImage:boolean=false; public setUpdateImg:any; + DT: any; constructor( public nav: NavController, public router: Router, @@ -1412,6 +1413,13 @@ public getMonthNameAr(value: number): string { return objImg; } - + setDeviceToken(deviceToken){ + this.DT=deviceToken; + } + + getDeviceToken(){ + return this.DT; + } + } diff --git a/Mohem/src/app/hmg-common/services/push/push.service.ts b/Mohem/src/app/hmg-common/services/push/push.service.ts index 95d50785..c1b5ed3f 100644 --- a/Mohem/src/app/hmg-common/services/push/push.service.ts +++ b/Mohem/src/app/hmg-common/services/push/push.service.ts @@ -222,7 +222,12 @@ export class PushService { this.firebasex.getToken().then(token => { // alert("token: "+ token); + this.cs.sharedService.setSharedData(token, "new-device-token"); + localStorage.setItem('deviceToken', token); + this.cs.setDeviceToken(token); //last way to set the device Token to get it through getDeviceToken + this.registerInBackend(token); + }).catch(error => console.error('Error getting token', error));