From fa39d7119e83a3d1185b2996fd0b3fc6d19b1c4c Mon Sep 17 00:00:00 2001 From: "Fatimah.Alshammari" Date: Sun, 12 Apr 2020 17:51:14 +0300 Subject: [PATCH 1/2] fix bugs --- Mohem/src/app/eit/home/home.component.html | 3 ++- Mohem/src/app/eit/home/home.component.scss | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Mohem/src/app/eit/home/home.component.html b/Mohem/src/app/eit/home/home.component.html index 1bb9e972..5a17cfae 100644 --- a/Mohem/src/app/eit/home/home.component.html +++ b/Mohem/src/app/eit/home/home.component.html @@ -70,7 +70,8 @@  {{subPage.PROMPT}} - + + diff --git a/Mohem/src/app/eit/home/home.component.scss b/Mohem/src/app/eit/home/home.component.scss index ccda4466..8aef286b 100644 --- a/Mohem/src/app/eit/home/home.component.scss +++ b/Mohem/src/app/eit/home/home.component.scss @@ -80,3 +80,16 @@ ion-icon::before { color: grey; transform: rotate(180deg); } + +.arrow-forward{ + float: right; + font-size: 25px; + color: grey; +} +.arrow-forward-ar{ + float: left; + font-size: 25px; + color: grey; + -webkit-transform: rotate(180deg); + transform: rotate(180deg); +} \ No newline at end of file From f4488ea35b36a51b6580e5c990cc466c0c208951 Mon Sep 17 00:00:00 2001 From: ashwaq Date: Sun, 12 Apr 2020 18:12:17 +0300 Subject: [PATCH 2/2] fix refresh data from replacment and rfc --- .../work-list-replacement-roll.component.ts | 8 +++----- .../work-list-rfc/work-list-rfc.component.ts | 9 +++------ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts index 5cd1e9e5..1db43447 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts @@ -289,11 +289,8 @@ export class WorkListReplacementRollComponent implements OnInit { handleApplayActionResult(result) { if (this.cs.validResponse(result)) { if (result.MessageStatus == 1) { + this.cs.sharedService.setSharedData(true, 'loadWorkList'); - // let msg=this.translate.translate("general.success"); - // this.cs.showAlert(msg); - // this.navCtrl.push("HomePage"); - // here show succsfull msg this.messageSuccess = true; @@ -305,7 +302,8 @@ export class WorkListReplacementRollComponent implements OnInit { data: "Success" }); - }, 5000); + }, 5000); + this.cs.openNotificationPage(); } diff --git a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts index 1bacb0b4..e8e41c87 100644 --- a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts +++ b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts @@ -123,12 +123,9 @@ export class WorkListRfcComponent implements OnInit { handleApplayActionResult(result) { if (this.cs.validResponse(result)) { if (result.MessageStatus == 1) { - // let msg:string=""; - // msg=this.translate.translate("general.success"); - // this.common.showAlert(msg); - // this.navCtrl.push("HomePage"); - // this.cs.openHome(); - // here show succsfull msg + this.cs.sharedService.setSharedData(true, 'loadWorkList'); + + this.messageSuccess = true; setTimeout(() => {