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 8c45af78..7a2abd94 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 @@ -202,78 +202,79 @@ - - - -
-

{{ 'general, empty' | translate}}

-
-
- -
- - -
- -
- - -
-
- - - {{actionHistory.NAME}} - - -
-
-
-
- Note: {{actionHistory.NOTE}} -
-
- - -
- -
- Note: {{actionHistory.NOTE}} - - -
- + + -
+
+

{{ 'general, empty' | translate}}

+
+
+ +
+ + +
+
+ +
+
+ + + {{actionHistory.NAME}} + + +
+
+
+ Note: {{actionHistory.NOTE}} +
+
+ + +
+ +
+ Note: {{actionHistory.NOTE}} + + +
+ + +
+
+ {{actionHistory.ACTION}} + + + + {{actionHistory.NOTIFICATION_DATE| dateString }} +
+ + + + + +
+
- -
- {{actionHistory.ACTION}} - - - - {{actionHistory.NOTIFICATION_DATE| - dateString }} - - - +
- -
- - + + - + + diff --git a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.scss b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.scss index ffee0278..409f7446 100644 --- a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.scss +++ b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.scss @@ -1,112 +1,3 @@ -// .itemHISBtn{ -// padding: 5px; -// color: var(--light); -// background: var(--darkgray); -// border-radius: 3px; -// width: 85%; -// height: 40px; -// } - - -// .rowBtn{ -// display: flex; -// flex-direction: row; -// justify-content: center; -// align-items: center; -// background: white; -// } - - - -// .rowBorder{ -// border-bottom: solid 0.03cm var(--grayBG); - -// } -// .colBorder{ -// border-right: solid 0.03cm var(--grayBG); - -// } - -// .dateActionHistory{ -// text-align: end; -// // margin-top: -25px; -// } - - -// .actionBtn{ -// --border-radius: 50% !important; -// height: 55px; -// width: 55px; -// --background: var(--newgreen); // will be dynamic -// background: transparent; -// margin:10px; -// } - -// .itemAttch{ -// border-radius: 11px; -// margin: 8px; -// --min-height: 60px; -// --max-height: 60px; -// } - -// .less { -// max-height: 54px; -// } - -// .noDataDiv{ -// background: #ffffff; -// height: 11%; -// text-align: center; -// padding-top: 1px; -// border-radius: 10px; -// margin: 10px; -// } - - -// .container { -// font-size: 14px; -// line-height: 14px; -// height: 16px; -// overflow: hidden; -// text-align: justify; -// } - -// .show { -// overflow: visible; -// height: auto; -// } - -// .showMore{ -// padding: 0px; -// background: transparent; -// color: blue; -// text-decoration: underline; -// font-size: 14px; -// } - -// .succssfullMSG{ -// height: 100%; -// width: 100%; -// background: var(--newgreen); -// color: white; -// font-weight: bold; -// font-size: 20px; -// text-align: center; -// vertical-align: middle; -// padding-top: 30px; -// } - -// .succssfullIcon{ -// width: 60%; -// text-align: center; -// height: 60%; -// } - -// .subjectNotification{ -// text-align: center; -// padding-top: 10px; -// font-weight: bold; -// } .no-padding-label { padding: 0px !important; @@ -141,4 +32,19 @@ .action-btn { white-space: nowrap; font-size: 10px; - } \ No newline at end of file + } + .name{ + color:black !important ;font-weight: bold; + } + .timeline-item{ + margin: 0; + white-space: nowrap; + font-size: 10px; + } + .req_info{ + width: 25px; + height: 25px; + display: inline-block; + margin: 5px; + } + \ No newline at end of file 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 0e6f77e5..a2569368 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 @@ -37,7 +37,7 @@ import { WorkListReplacementRollComponent } from '../work-list-replacement-roll/ import { WorkListRfcComponent } from '../work-list-rfc/work-list-rfc.component'; import { DashboredService } from 'src/app/hmg-common/services/dashbored/dashbored.service'; import { GetOpenNotificationsResponse } from 'src/app/hmg-common/services/dashbored/models/GetOpenNotificationsResponse'; -import { IonSlides } from '@ionic/angular';​ +import { IonSlides } from '@ionic/angular'; @Component({ selector: 'app-worklist-main-ic', @@ -129,7 +129,7 @@ export class WorklistMainIcComponent implements OnInit { reqInfo_label: any; closeDis: boolean = false; selectedFilter: string; -; + ; close_label: any; constructor( @@ -472,11 +472,11 @@ export class WorklistMainIcComponent implements OnInit { if (index < this.notificationArray.length) { this.common.sharedService.setSharedData(this.notificationArray[index], HomeComponent.NOTIFICATION_DATA); this.activeSegment = 'line_details'; - if(this.selectedFilter === 'ALL'){ - this.checkRequestType(index); + if (this.selectedFilter === 'ALL') { + this.checkRequestType(index); } else if (previousRequest === this.notificationArray[index].REQUEST_TYPE) { this.checkRequestType(index); - }else { + } else { this.common.openNotificationPage(); } } else { @@ -485,7 +485,7 @@ export class WorklistMainIcComponent implements OnInit { } - checkRequestType(index){ + checkRequestType(index) { if (this.notificationArray[index].REQUEST_TYPE === 'PO') { this.intializeNotificationDetail(); } else @@ -1193,7 +1193,7 @@ export class WorklistMainIcComponent implements OnInit { async openRepRolModal() { - + this.common.sharedService.setSharedData(this.actionHistoryRes, 'actionHistoryData'); const modal = await this.modalCtrl.create({ component: WorkListReplacementRollComponent, @@ -1267,6 +1267,9 @@ export class WorklistMainIcComponent implements OnInit { } }); } - + openRequestInfoDel(userData, flag) { + this.common.sharedService.setSharedData(userData, 'requestInfoDelUser'); + this.actionButton(flag); + } }