From 56ab8399d3f222c868ce66fb1362cabdd2b47578 Mon Sep 17 00:00:00 2001 From: Salman Afzal Date: Mon, 13 Apr 2020 14:21:28 +0300 Subject: [PATCH 1/8] fixed back button issue --- .../src/app/attendance-tracking/home/home.component.html | 8 ++++++-- Mohem/src/theme/styles.scss | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Mohem/src/app/attendance-tracking/home/home.component.html b/Mohem/src/app/attendance-tracking/home/home.component.html index 1a4ae913..93afa6d3 100644 --- a/Mohem/src/app/attendance-tracking/home/home.component.html +++ b/Mohem/src/app/attendance-tracking/home/home.component.html @@ -16,12 +16,16 @@ Attendance Tracking --> + + -
+
{{curentDate}}
{{ts.trPK('attendance-tracking','today-time-left')}} diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index e468a642..7ccd3aed 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1318,6 +1318,9 @@ border:0px height: 0px !important; display: none !important; } +.attendance-home .header-toolbar-new { + --background: #094773 !important; +} .header-toolbar-new { --background: #22c6b3; } From 94a3f61e91f1b640964a9916250bbd372d836f64 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Mon, 13 Apr 2020 17:01:56 +0300 Subject: [PATCH 2/8] fixed refresh issue --- Mohem/src/app/notification/home/home.component.html | 8 ++++---- Mohem/src/app/notification/home/home.component.ts | 10 ++++++++-- .../work-list-main-itg/work-list-main-itg.component.ts | 6 ++++++ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Mohem/src/app/notification/home/home.component.html b/Mohem/src/app/notification/home/home.component.html index ebd99437..124e0f0b 100644 --- a/Mohem/src/app/notification/home/home.component.html +++ b/Mohem/src/app/notification/home/home.component.html @@ -10,7 +10,7 @@
{{ts.trPK('work-list','open-analysis')}}
-
+
{{newWorkListResponse.length + ITGCount}} {{ts.trPK('work-list','of')}} {{newWorkListResponse.length}} {{ts.trPK('work-list','of')}}

{{totalRequestCount}}

@@ -18,11 +18,11 @@

{{newWorkListResponse[0].NO_OF_ROWS}}

{{ts.trPK('work-list','total')}}
{{ts.trPK('work-list','open-reqest')}}
- - + +
- + { + this.receivedITGCount = true; this.ITGCount = result.TotalCount; this.totalRequestCount = this.totalRequestCount + result.TotalCount; + this.data.datasets[0].data[4] = this.ITGCount; this.filters[5].value = result.TotalCount; }); } diff --git a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts index 9078511f..aa888e24 100644 --- a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts +++ b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts @@ -242,6 +242,7 @@ export class WorkListMainItgComponent implements OnInit { } else if (result.MessageStatus == 1) { console.log("hello action 1"); + this.common.sharedService.setSharedData(true, 'loadWorkList'); this.common.presentAlert(this.ts.trPK('worklistMain', 'Tran_Succ')); @@ -260,6 +261,7 @@ export class WorkListMainItgComponent implements OnInit { this.common.presentAlert(this.ts.trPK('general', 'error-itg')); } else if (result.MessageStatus == 1) { + this.common.sharedService.setSharedData(true, 'loadWorkList'); this.common.presentAlert(this.ts.trPK('worklistMain', 'Tran_Succ')); this.confirmMsg(2) @@ -284,6 +286,7 @@ export class WorkListMainItgComponent implements OnInit { } if (result.MessageStatus == 1) { + this.common.sharedService.setSharedData(true, 'loadWorkList'); this.common.presentAlert(this.ts.trPK('worklistMain', 'Tran_Succ')); this.confirmMsg(3) @@ -303,6 +306,7 @@ export class WorkListMainItgComponent implements OnInit { this.common.presentAlert(this.ts.trPK('general', 'error-itg')); } else if (result.MessageStatus == 1) { + this.common.sharedService.setSharedData(true, 'loadWorkList'); this.common.presentAlert(this.ts.trPK('worklistMain', 'Tran_Succ')); this.confirmMsg(4) @@ -323,6 +327,7 @@ export class WorkListMainItgComponent implements OnInit { this.common.presentAlert(this.ts.trPK('general', 'error-itg')); } else if (result.MessageStatus == 1) { + this.common.sharedService.setSharedData(true, 'loadWorkList'); this.common.presentAlert(this.ts.trPK('worklistMain', 'Tran_Succ')); this.confirmMsg(5) @@ -346,6 +351,7 @@ export class WorkListMainItgComponent implements OnInit { this.common.presentAlert(this.ts.trPK('general', 'error-itg')); } else if (result.MessageStatus == 1) { + this.common.sharedService.setSharedData(true, 'loadWorkList'); this.common.presentAlert(this.ts.trPK('worklistMain', 'Tran_Succ')); this.confirmMsg(6) From 9984c275da8fa6dc5180410bf4a68d64c5d7861d Mon Sep 17 00:00:00 2001 From: umasoodch Date: Mon, 13 Apr 2020 17:20:12 +0300 Subject: [PATCH 3/8] keyboard isuse fixed --- Mohem/src/app/app.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mohem/src/app/app.component.ts b/Mohem/src/app/app.component.ts index bfa57d03..819ae3d9 100644 --- a/Mohem/src/app/app.component.ts +++ b/Mohem/src/app/app.component.ts @@ -137,7 +137,7 @@ export class AppComponent implements OnInit, AfterViewInit { console.log("this.TeamFlag>>>>>>>>>"+ this.TeamFlag); } private initializeDirection() { - this.direction = TranslatorService.getCurrentDirection(); + // this.direction = TranslatorService.getCurrentDirection(); } private watchUserLoginChangeEvents() { this.events.subscribe( From 55ded3b340180a9eaded1721115977e6f6b19fee Mon Sep 17 00:00:00 2001 From: umasoodch Date: Mon, 13 Apr 2020 17:59:33 +0300 Subject: [PATCH 4/8] fixed direction issue --- Mohem/src/app/app.component.ts | 2 +- Mohem/src/app/authentication/login/login.component.html | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Mohem/src/app/app.component.ts b/Mohem/src/app/app.component.ts index 819ae3d9..bfa57d03 100644 --- a/Mohem/src/app/app.component.ts +++ b/Mohem/src/app/app.component.ts @@ -137,7 +137,7 @@ export class AppComponent implements OnInit, AfterViewInit { console.log("this.TeamFlag>>>>>>>>>"+ this.TeamFlag); } private initializeDirection() { - // this.direction = TranslatorService.getCurrentDirection(); + this.direction = TranslatorService.getCurrentDirection(); } private watchUserLoginChangeEvents() { this.events.subscribe( diff --git a/Mohem/src/app/authentication/login/login.component.html b/Mohem/src/app/authentication/login/login.component.html index 2d7c2a05..0237a655 100644 --- a/Mohem/src/app/authentication/login/login.component.html +++ b/Mohem/src/app/authentication/login/login.component.html @@ -35,15 +35,15 @@ -
+