From cd910f4bdcb700055fb280e59374706a077c2466 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Tue, 28 Jun 2022 15:23:23 +0300 Subject: [PATCH] fixed mohemm IC issues --- Mohem/src/app/app.component.html | 6 ++--- .../app-update/app-update.component.html | 4 +-- .../app-update/app-update.component.scss | 10 ++++++++ Mohem/src/app/home/home.page.ts | 2 ++ .../app/notification/home/home.component.html | 4 +-- .../app/notification/home/home.component.ts | 3 +++ .../worklist-main-ic.component.html | 4 +-- .../worklist-main-ic.component.ts | 25 ++++++++++--------- .../worklist-main.component.html | 4 +-- .../transactions/transactions.component.html | 2 +- Mohem/src/assets/localization/i18n.json | 8 ++++++ 11 files changed, 47 insertions(+), 25 deletions(-) diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index f4f782cc..68c8e435 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -61,8 +61,7 @@
- - + @@ -184,8 +183,7 @@
- - + diff --git a/Mohem/src/app/authentication/app-update/app-update.component.html b/Mohem/src/app/authentication/app-update/app-update.component.html index b23ed2f3..2c9482cf 100644 --- a/Mohem/src/app/authentication/app-update/app-update.component.html +++ b/Mohem/src/app/authentication/app-update/app-update.component.html @@ -1,5 +1,5 @@ - -
+ +
diff --git a/Mohem/src/app/authentication/app-update/app-update.component.scss b/Mohem/src/app/authentication/app-update/app-update.component.scss index e69de29b..889cc1ba 100644 --- a/Mohem/src/app/authentication/app-update/app-update.component.scss +++ b/Mohem/src/app/authentication/app-update/app-update.component.scss @@ -0,0 +1,10 @@ + +@media only screen and (min-width: 540px) and (max-width: 767px) { + .biggerPhone { + .rocket-image { + img { + height: 350px; + } + } + } + } \ 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 98b422d6..ba73d0d5 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -427,6 +427,8 @@ export class HomePage implements OnInit { if (this.menuList[i].MENU_TYPE === 'M') { this.events.publish('myTeamFlag', 'true'); // this.common.sharedService.setSharedData('true', "myTeamFlag"); + } else { + this.events.publish('myTeamFlag', 'false'); } } diff --git a/Mohem/src/app/notification/home/home.component.html b/Mohem/src/app/notification/home/home.component.html index 31eda5f2..94b300d5 100644 --- a/Mohem/src/app/notification/home/home.component.html +++ b/Mohem/src/app/notification/home/home.component.html @@ -100,8 +100,8 @@
- - + + diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index 0ec194c5..1cc3bcc1 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -80,6 +80,7 @@ export class HomeComponent implements OnInit { public totalMR = 0; public totalIC = 0; public totalStamp = 0; + public worklistLength = 0; public showChart = false; @@ -423,6 +424,7 @@ export class HomeComponent implements OnInit { } this.WorklistService.getWorkList(this.WorkListObj, '', '', this.isPostNoLoad).subscribe((result) => { if (this.common.validResponse(result)) { + this.worklistLength = result.GetWorkList.length; this.handleWorkListResult(result.GetWorkList); } } @@ -589,6 +591,7 @@ export class HomeComponent implements OnInit { if (!this.isReachEnd && this.selectedFilter !== 'ITG') { this.WorklistService.getWorkList(this.WorkListObj, '', '', this.isPostNoLoad).subscribe((result) => { if (this.common.validResponse(result)) { + this.worklistLength = result.GetWorkList.length; this.handleWorkListResult(result.GetWorkList); } }); diff --git a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.html b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.html index c2161ae3..0206f5a4 100644 --- a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.html +++ b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.html @@ -414,7 +414,7 @@ - + {{approve_label}} @@ -426,7 +426,7 @@ - + {{reject_label}} diff --git a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts index 1d08ec1f..d4d94682 100644 --- a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts +++ b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts @@ -497,16 +497,16 @@ export class WorklistMainIcComponent implements OnInit { checkRequestType(index) { if (this.notificationArray[index].REQUEST_TYPE === 'PO') { - this.intializeNotificationDetail(); - } else - if (this.notificationArray[index].REQUEST_TYPE === 'PR') { + this.common.openWorklistMainPOPage(); + } else if (this.notificationArray[index].REQUEST_TYPE === 'PR') { this.common.openWorklistMainPRPage(); - } else - if (this.notificationArray[index].REQUEST_TYPE === 'MO') { + } else if (this.notificationArray[index].REQUEST_TYPE === 'MO') { this.common.openWorklistMainMRPage(); - } else { + } else if (this.notificationArray[index].REQUEST_TYPE === 'ITEM_CREATION') { + this.intializeNotificationDetail(); + } else { this.common.openWorklistMainPage(); - } + } } actionButton(action) { @@ -544,8 +544,8 @@ export class WorklistMainIcComponent implements OnInit { // } if ( - ButtonAction == "APPROVE" || - ButtonAction == "REJECT" || + ButtonAction == "APPROVED" || + ButtonAction == "REJECTED" || ButtonAction == "DEL" || ButtonAction == "CLOSE" ) { @@ -560,10 +560,10 @@ export class WorklistMainIcComponent implements OnInit { // this.WorkListActionObj, // WorklistMainPRComponent.PASS_NOTIFICATION_INFO // ); - if (ButtonAction == "APPROVE") { + if (ButtonAction == "APPROVED") { this.confirmMsg = this.ts.trPK('worklistMain', 'approveMsg') } - else if (ButtonAction == "REJECT") { + else if (ButtonAction == "REJECTED") { this.confirmMsg = this.ts.trPK('worklistMain', 'rejectMsg') } @@ -653,7 +653,8 @@ export class WorklistMainIcComponent implements OnInit { ButtonAction == "TRANSFER" || ButtonAction == "TRANSFER_INFO" || ButtonAction == "APPROVE_AND_FORWARD" || - ButtonAction == "FORWARD" + ButtonAction == "FORWARD" || + ButtonAction == "RETURNED" ) { diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.html b/Mohem/src/app/notification/worklist-main/worklist-main.component.html index 0bc23f9c..6400b618 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html @@ -317,12 +317,12 @@ -

Current

+

{{ 'general, current' | translate}}

-

Proposed

+

{{ 'general, proposed' | translate}}

diff --git a/Mohem/src/app/reports/transactions/transactions.component.html b/Mohem/src/app/reports/transactions/transactions.component.html index dd843220..fce2455c 100644 --- a/Mohem/src/app/reports/transactions/transactions.component.html +++ b/Mohem/src/app/reports/transactions/transactions.component.html @@ -44,7 +44,7 @@

{{'transaction,output' | translate}}

-

+

diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 1b044530..de8301ac 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -249,6 +249,14 @@ } }, "general": { + "current": { + "en": "Current", + "ar": "تيار" + }, + "proposed": { + "en": "Proposed", + "ar": "مقترح" + }, "fav-showData": { "en": "Please select an alphabet to see your favourites", "ar": "الرجاء تحديد الأبجدية لرؤية المفضلة لديك"