From 3b3c704baeb21e410b68284e106e7398967fddeb Mon Sep 17 00:00:00 2001 From: enadhilal Date: Mon, 30 Aug 2021 12:30:14 +0300 Subject: [PATCH] fixing worklist design and announcement seacrch function --- .../work-list-main-itg.component.html | 96 +++++++++++++++---- .../work-list-main-itg.component.scss | 20 +++- .../work-list-main-itg.component.ts | 8 +- .../work-list-replacement-roll.component.scss | 5 +- .../work-list-replacement-roll.component.ts | 4 +- .../worklist-main-ic.component.html | 2 +- .../worklist-main-ic.component.ts | 6 ++ .../worklist-main-mr.component.html | 2 +- .../worklist-main-mr.component.ts | 7 ++ .../worklist-main-po.component.html | 2 +- .../worklist-main-po.component.ts | 6 ++ .../worklist-main-pr.component.html | 2 +- .../worklist-main-pr.component.ts | 6 ++ .../worklist-main.component.html | 2 +- .../worklist-main/worklist-main.component.ts | 5 + 15 files changed, 141 insertions(+), 32 deletions(-) diff --git a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html index 533fe3e9..02c7bb9e 100644 --- a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html +++ b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html @@ -37,11 +37,11 @@
- +
- +
@@ -88,8 +88,60 @@ + - + +
+ +
+
+ +
+
+ + + {{approvalInfo.Name}} + + +
+
+
+ Note: {{approvalInfo.Notes}} +
+
+ + +
+ +
+ Note: {{approvalInfo.Notes}} +
+ +
+
+ {{approvalInfo.Action}} + + + + {{returnDateTime(approvalInfo.Date) }} +
+ + + + + +
+
+ + +
+ +
+ @@ -139,11 +193,11 @@
- +
- +
@@ -191,7 +245,7 @@ - + - + - +
@@ -467,14 +522,14 @@ -
+
- + -
{{'worklistMain, Tran_Succ' | translate}}
+
{{'worklistMain, Tran_Succ' | translate}}
-
+
@@ -490,8 +545,9 @@ {{action.name}} - {{'worklistMain, request' | translate}} - + + {{'worklistMain, request' | translate}} + diff --git a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.scss b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.scss index 6310904b..7b9993ff 100644 --- a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.scss +++ b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.scss @@ -6,7 +6,7 @@ } .timeline-icon{ - width: 30px !important; + width: 55px !important; } .timeline:before{ position: fixed !important; @@ -24,4 +24,20 @@ .footer-btn-img{ max-width: none; width: 60px; -} \ No newline at end of file +} +.timeline-item{ + margin: 0; + white-space: nowrap; + font-size: 10px; + } + + .req_info{ + width: 25px; + height: 25px; + display: inline-block; + margin: 0; + } + + .deligate{ + margin-left: 25px; + } \ No newline at end of file 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 68429f62..f10b14aa 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 @@ -105,8 +105,8 @@ export class WorkListMainItgComponent implements OnInit { this.segmentsArray[this.segmentsArray.length] = { name: 'Approval Level', number: this.segmentsArray.length }; this.segmentsArray = [this.segmentsArray[1], this.segmentsArray[2], this.segmentsArray[0]]; this.segmentData = [this.segmentData[1], this.segmentData[0]]; + // this.workList = this.request_details.WFHistory.reverse(); this.workList = this.request_details.WFHistory; - ; this.options = this.request_details.AllowedActions; this.activeSegment = this.segmentsArray[0].name; for (let i = 0; i < this.options.length; i++) { @@ -534,4 +534,10 @@ export class WorkListMainItgComponent implements OnInit { } } + returnDateTime(stringDate: string){ + let allDateTime = stringDate.split(' '); + let time = allDateTime[1].split(':', 2); + return allDateTime[0] + ' ' + time[0] + ':' + time[1] + ' ' + allDateTime[2]; + } + } diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss index ee794132..f1bde295 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss @@ -155,14 +155,15 @@ button.item-button.button.button-md.button-clear.button-clear-md { } .radio-label{ - margin: 4px; + font-size: 9px; + margin: 4px; position: relative; bottom: 4px; } ion-radio{ --color-checked: #269db8; } -.center{text-align: center;padding: 0;} +.center{text-align: center;padding: 5px;} .boldTxtNav{ font-weight: bold; padding: 5px; 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 4112aa6e..3c2c856e 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 @@ -52,7 +52,7 @@ export class WorkListReplacementRollComponent implements OnInit { this.P_PAGE_LIMIT = 50; this.getPassActionMode = this.cs.sharedService.getSharedData('passActionMode', false); console.log(this.getPassActionMode); - this.getFavruite(); + // this.getFavruite(); this.getPassNotificationDetails = this.cs.sharedService.getSharedData('passNotificationInfo', false); this.getpassResAttr = this.cs.sharedService.getSharedData('passResAttr', false); console.log(this.getpassResAttr); @@ -414,7 +414,7 @@ export class WorkListReplacementRollComponent implements OnInit { if (selectValue == "1" || selectValue == "2" || selectValue == "3") { this.isSelect = true; - } + } if(selectValue === '4'){this.getFavruite();} else { this.isSelect = false; 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 7a2abd94..b22aa453 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 @@ -254,7 +254,7 @@ - {{actionHistory.NOTIFICATION_DATE| dateString }} + {{returnDateTime(actionHistory.NOTIFICATION_DATE)}}
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 a2569368..85c9c3f3 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 @@ -1272,4 +1272,10 @@ export class WorklistMainIcComponent implements OnInit { this.actionButton(flag); } + returnDateTime(stringDate: string){ + let allDateTime = stringDate.split(' '); + let time = allDateTime[1].split(':', 2); + return allDateTime[0] + ' ' + time[0] + ':' + time[1] + ' ' + allDateTime[2]; + } + } diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html index 09dd07e9..59a8ead5 100644 --- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html +++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html @@ -489,7 +489,7 @@ - {{actionHistory.NOTIFICATION_DATE| dateString }} + {{returnDateTime(actionHistory.NOTIFICATION_DATE)}} diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts index 139caa14..0c9b4b66 100644 --- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts +++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts @@ -1217,6 +1217,13 @@ export class WorklistMainMRComponent implements OnInit { this.common.sharedService.setSharedData(userData, 'requestInfoDelUser'); this.actionButton(flag); } + + returnDateTime(stringDate: string){ + let allDateTime = stringDate.split(' '); + let time = allDateTime[1].split(':', 2); + return allDateTime[0] + ' ' + time[0] + ':' + time[1] + ' ' + allDateTime[2]; + } + } diff --git a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html index dc6aa105..37ba1670 100644 --- a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html +++ b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html @@ -222,7 +222,7 @@ - {{actionHistory.NOTIFICATION_DATE| dateString }} + {{returnDateTime(actionHistory.NOTIFICATION_DATE)}} diff --git a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts index b9c60828..bc0a9746 100644 --- a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts +++ b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts @@ -1249,4 +1249,10 @@ export class WorklistMainPoComponent implements OnInit { this.common.sharedService.setSharedData(userData, 'requestInfoDelUser'); this.actionButton(flag); } + + returnDateTime(stringDate: string){ + let allDateTime = stringDate.split(' '); + let time = allDateTime[1].split(':', 2); + return allDateTime[0] + ' ' + time[0] + ':' + time[1] + ' ' + allDateTime[2]; + } } diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html index a65b67bc..ccc730ee 100644 --- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html +++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html @@ -252,7 +252,7 @@ - {{actionHistory.NOTIFICATION_DATE| dateString }} + {{returnDateTime(actionHistory.NOTIFICATION_DATE)}} diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts index fbb8ad2d..a89f4826 100644 --- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts +++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts @@ -1171,4 +1171,10 @@ export class WorklistMainPRComponent implements OnInit { this.common.sharedService.setSharedData(userData, 'requestInfoDelUser'); this.actionButton(flag); } + + returnDateTime(stringDate: string){ + let allDateTime = stringDate.split(' '); + let time = allDateTime[1].split(':', 2); + return allDateTime[0] + ' ' + time[0] + ':' + time[1] + ' ' + allDateTime[2]; + } } \ No newline at end of file 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 faa35e57..98b83c0d 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html @@ -358,7 +358,7 @@ - {{actionHistory.NOTIFICATION_DATE| dateString }} + {{returnDateTime(actionHistory.NOTIFICATION_DATE)}}