-
{{getPassNotificationDetails.SUBJECT}}
+
+
+
{{getPassNotificationDetails.SUBJECT}}
-
-
+
+
-
- {{'worklistMain , itemReq'| translate}}
-
+
+ {{'worklistMain , itemReq'| translate}}
+
-
-
- {{'worklistMain, action' | translate}}
-
+
+
+ {{'worklistMain, action' | translate}}
+
-
-
+
+
{{'worklistMain, attach-file' | translate}}
-
+
-
- {{'worklistMain , info'| translate}}
-
-
+
+ {{'worklistMain , info'| translate}}
+
+
+
+
+
+
+ 0 ">
-
-
- {{pInformation}}
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{notificationList.ITEM_CODE}}
+
+
+
+
+
+
+
+
+ {{notificationList.UOM}}
+
+
+
+
+
+
+
+
+
+ {{notificationList.QUANTITY}}
-
-
-
-
+
+
+
+
+
+ {{notificationList.DATE_REQUIRED}}
+
+
-
-
-
-
+
-
-
+
-
-
+
+
+
+
+ {{notificationList.LINE_STATUS}}
+
-
-
-
+
+
+
+
+ {{notificationList.STATUS_DATE}}
+
-
-
-
+
-
-
+
+
+
+
+
+ {{notificationList.TRANSACTION_TYPE_NAME}}
+
-
-
-
-
- {{totalH}}
- {{valueH}}
+
+
+
+
+ {{notificationList.OPERATING_UNIT}}
+
-
-
- {{taxH}}
- {{taxvalueH}}
-
-
+
-
-
+
+
+
+
+
+ {{notificationList.ORGANIZATION_CODE}}
+
+
+
+
+
+ {{notificationList.ORGANIZATION_NAME}}
+
+
+
+
+
+
+
+
+
+ {{notificationList.FROM_SUBINVENTORY}}
+
+
+
+
+
+
+ {{notificationList.FROM_LOCATOR}}
+
-
-
-
+
-
+
+
+
+
+ {{notificationList.TO_SUBINVENTORY}}
+
+
+
+
+
+ {{notificationList.TO_LOCATOR}}
+
-
-
-
-
-
-
-
- 0 ">
+
+
-
-
-
-
-
+
+
+
+
+ {{notificationList.SHIP_TO_LOCATION}}
+
+
-
+
-
-
-
-
-
-
-
-
- {{notificationList.ITEM_CODE}}
-
-
-
-
-
-
-
-
- {{notificationList.UOM}}
-
-
-
-
-
-
-
-
-
- {{notificationList.QUANTITY}}
-
-
-
-
-
-
- {{notificationList.DATE_REQUIRED}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{notificationList.LINE_STATUS}}
-
-
-
-
-
-
- {{notificationList.STATUS_DATE}}
-
-
-
-
-
-
-
-
-
-
-
- {{notificationList.TRANSACTION_TYPE_NAME}}
-
-
-
-
-
-
- {{notificationList.OPERATING_UNIT}}
-
-
-
-
-
-
-
-
-
-
- {{notificationList.ORGANIZATION_CODE}}
-
-
-
-
-
-
- {{notificationList.ORGANIZATION_NAME}}
-
-
-
-
-
-
-
-
-
- {{notificationList.FROM_SUBINVENTORY}}
-
+
-
-
-
-
- {{notificationList.FROM_LOCATOR}}
-
+
+
+
-
-
-
-
- {{notificationList.TO_SUBINVENTORY}}
-
-
-
-
-
- {{notificationList.TO_LOCATOR}}
-
+
+
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
- {{notificationList.SHIP_TO_LOCATION}}
-
+
+
-
+
+
+
+
-
+ 0">
+
{{ 'general, empty' | translate}}
+
+ 0 ">
+
+
+
-
+
-
+
+
+
+
![]()
+

+
+
+
+ {{actionHistory.NAME}}
+
-
+
+ {{actionHistory.ACTION}}
+
+ {{actionHistory.NOTIFICATION_DATE| dateString }}
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0">
-
{{ 'general, empty' | translate}}
-
- 0 ">
-
-
-
-
+
{{ 'general,
+ load-more' | translate}}
+
+
+
+
+
+
+
+
+
+
+
+
+ 0">
+
{{ 'general, notAttch' | translate}}
+
+ 0 ">
-
+
+ {{i+1 }}. {{attachList.FILE_NAME}}
-
+
+
+
-
+
-
-
-->
+
-
-
![]()
-

-
-
-
- {{actionHistory.NAME}}
-
-
-
-
-
- Note: {{actionHistory.NOTE}}
-
-
+
+
+
+
+
-
+
+
+
+
+
+ {{pInformation}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- Note: {{actionHistory.NOTE}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
{{ actionHistory.visible ? 'Show less': 'Show More' }}
+
-
-
-
+
+
+
+
+ {{totalH}}
+ {{valueH}}
- {{actionHistory.ACTION}}
+
+
+ {{taxH}}
+ {{taxvalueH}}
+
+
-
- {{actionHistory.NOTIFICATION_DATE| dateString }}
-
-
-
-
-
+
+
- {{ 'general, load-more' | translate}}
-
-
-
-
-
-
-
-
-
-
- 0">
-
{{ 'general, notAttch' | translate}}
-
- 0 ">
-
-
-
-
-
- {{i+1 }}. {{attachList.FILE_NAME}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ {{ 'general, load-more' | translate}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- {{'worklistMain, Tran_Succ' | translate}}
-
+
+
+
+
+
+
+
+
+
+
+ {{'worklistMain, Tran_Succ' | translate}}
+
+
@@ -641,38 +651,38 @@
- {{approve_label}}
-
+ {{approve_label}}
+
- {{close_label}}
-
+ {{close_label}}
+
- {{reject_label}}
+ {{reject_label}}
- {{reqInfo_label}}
+ {{reqInfo_label}}
- {{'worklistMain, skip' | translate}}
+ {{'worklistMain, skip' | translate}}
- {{'worklistMain, more' | translate}}
+ {{'worklistMain, more' | translate}}
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 a00287ea..cc535bac 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
@@ -1,4 +1,4 @@
-import { Component, OnInit, ElementRef } from '@angular/core';
+import { Component, OnInit, ElementRef, ViewChild } from '@angular/core';
import { CommonService } from 'src/app/hmg-common/services/common/common.service';
import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service';
import { WorkListBodyRequest } from '../models/NotificationBodyReq';
@@ -35,6 +35,7 @@ import { MOItemHistoryRes } from '../models/MOItemHistoryRes';
import { MOItemHistoryReq } from '../models/MOItemHistoryReq';
import { GetOpenNotificationsResponse } from 'src/app/hmg-common/services/dashbored/models/GetOpenNotificationsResponse';
import { DashboredService } from 'src/app/hmg-common/services/dashbored/dashbored.service';
+import { IonSlides } from '@ionic/angular';
@Component({
selector: 'app-worklist-main-mr',
@@ -43,6 +44,7 @@ import { DashboredService } from 'src/app/hmg-common/services/dashbored/dashbore
})
export class WorklistMainMRComponent implements OnInit {
+ @ViewChild('slides') slides: IonSlides;
private WorkListBodyObj: WorkListBodyRequest;
private WorkListButtonsObj: WorkListButtonRequest;
private WorkListActionObj: WorkListActionRequest;
@@ -141,12 +143,57 @@ export class WorklistMainMRComponent implements OnInit {
this.WorkListAttachObj = new WorkListButtonRequest();
this.intializeNotificationDetail();
+ }
+ public segmentChanged(event: any) {
+ this.activeSegment = event.detail.value;
+ if(this.activeSegment === 'item-req')
+ {
+ this.slides.slideTo(0);
+ }
+ else if(this.activeSegment === 'action-history')
+ {
+ this.slides.slideTo(1);
+ }
+ else if(this.activeSegment === 'attach')
+ {
+ this.slides.slideTo(2);
+ }
+ else if(this.activeSegment === 'info')
+ {
+ this.slides.slideTo(3);
+ }
+ console.log(" event.detail.value: " + event.detail.value);
+ }
-
+ public slideChanged(event: any) {
+ this.slides.getActiveIndex().then(index => {
+ console.log(index);
+ console.log(event);
+ if(index === 0)
+ {
+ this.activeSegment = 'item-req';
+ }
+ else if(index === 1)
+ {
+ this.activeSegment = 'action-history';
+ }
+ else if(index === 2)
+ {
+ this.activeSegment = 'attach';
+ }
+ else if(index === 3)
+ {
+ this.activeSegment = 'info';
+ }
+ console.log(this.activeSegment);
+ });
}
- public segmentChanged(event: any) {
+
+
+
+ public segmentChanged1(event: any) {
this.activeSegment = event.detail.value;
console.log(' event.detail.value: ' + event.detail.value);
}
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 1d129790..d5ac165c 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
@@ -1,815 +1,575 @@
-
+
-
-
+
+
{{getPassNotificationDetails.SUBJECT}}
-
-
+
+
- {{'worklistMain,itemReq'| translate}}
-
-
+ {{'worklistMain,itemReq'| translate}}
+
+
- {{'worklistMain, action' | translate}}
-
+ [ngClass]="activeSegment == 'action-history' ? 'active-Segment' : 'normal-Segment'">
+ {{'worklistMain, action' | translate}}
+
-
- {{'worklistMain, attach-file' | translate}}
-
+
+ {{'worklistMain, attach-file' | translate}}
+
-
- {{'worklistMain, info'| translate}}
-
+
+ {{'worklistMain, info'| translate}}
+
+
+
+
-
-
-
-
-
-
-
- {{pInformation}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{totalH}}
- {{valueH}}
-
-
-
- {{taxH}}
- {{taxvalueH}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{ 'general, load-more' | translate}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0">
-
{{ 'general, empty' | translate}}
-
-
-
-
-
-
-
-
-
-
+ 0" style="width: 100% !important;">
+
{{ 'general, empty' | translate}}
+
+
+
-
-
-
-
-
-
-
-
-
-
- {{Lines.ITEM_CODE}}
-
-
-
-
-
- {{Lines.MFG}} *
-
-
-
-
-
-
-
-
-
- {{Lines.LINE_TYPE}}
-
-
-
-
-
-
- {{Lines.UOM}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{Lines.UNIT_PRICE}}
-
-
-
-
-
-
- {{Lines.LINE_AMOUNT}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{Lines.QUANTITY}}
-
-
-
-
-
-
- {{Lines.LINE_DISC_PERCENTAGE}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{Lines.NEED_BY_DATE}}
-
-
-
-
-
-
- {{Lines.PROMISED_DATE}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{Lines.DELIVER_TO_LOCATION}}
-
-
-
-
-
-
- {{Lines.PR_NUM}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{Lines.REQUESTOR}}
-
-
-
-
-
-
+
+
+
+
+
+ {{Lines.ITEM_CODE}}
+
+
+
+
+ {{Lines.MFG}} *
+
+
+
+
+
+
+ {{Lines.LINE_TYPE}}
+
+
+
+
+ {{Lines.UOM}}
+
+
+
+
+
+
+ {{Lines.UNIT_PRICE}}
+
+
+
+
+ {{Lines.LINE_AMOUNT}}
+
+
+
+
+
+
+ {{Lines.QUANTITY}}
+
+
+
+
+ {{Lines.LINE_DISC_PERCENTAGE}}
+
+
+
+
+
+
+
+ {{Lines.NEED_BY_DATE}}
+
+
+
+
+ {{Lines.PROMISED_DATE}}
+
+
+
+
+
+
+ {{Lines.DELIVER_TO_LOCATION}}
+
+
+
+
+
+ {{Lines.PR_NUM}}
+
+
+
+
+
+
+ {{Lines.REQUESTOR}}
+
+
+
+
+
+
+ {{ts.trPK('worklistMain','ITEM_HIS')}}
+
+
+
+
+
+
+ {{ts.trPK('worklistMain','QUOTATION_ANALYSIS')}}
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
+ 0">
+
{{ 'general, empty' | translate}}
+
+ 0 ">
+
+
+
+
+
+
+
+
![]()
+

+
+
+
+
+ {{actionHistory.NAME}}
+
-
+
+
+
+
+ Note: {{actionHistory.NOTE}}
+
+
-
-
- {{ts.trPK('worklistMain','ITEM_HIS')}}
-
+
-
-
-
+
+ Note: {{actionHistory.NOTE}}
-
-
-
+
+ {{
+ actionHistory.visible ? 'Show less': 'Show More'
+ }}
-
- {{ts.trPK('worklistMain','QUOTATION_ANALYSIS')}}
-
-
-
+
+
-
+
+ {{actionHistory.ACTION}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0">
-
{{ 'general, empty' | translate}}
-
- 0 ">
-
-
-
+ {{actionHistory.NOTIFICATION_DATE|
+ dateString }}
+
+
+
+
+
+
+
+ {{ 'general, load-more' | translate}}
+
+
+
+
+
+
+
+
+
+
+
+
+ 0">
+
{{ 'general, notAttch' | translate}}
+
+ 0 ">
-
+
+
+
+ {{i+1}}. {{attachList.FILE_NAME}}
-
-
-
![]()
-
-
-
- {{actionHistory.NAME}}
-
-
-
-
-
-
- Note: {{actionHistory.NOTE}}
-
-
-
-
-
-
-
- Note: {{actionHistory.NOTE}}
-
-
-
-
{{ actionHistory.visible ? 'Show less': 'Show More' }}
-
-
-
-
-
-
-
- {{actionHistory.ACTION}}
-
-
- {{actionHistory.NOTIFICATION_DATE| dateString }}
-
-
-
-
-
- {{ 'general, load-more' | translate}}
-
-
-
-
-
-
-
-
-
- 0">
-
{{ 'general, notAttch' | translate}}
-
- 0 ">
-
-
-
-
-
- {{i+1}}. {{attachList.FILE_NAME}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{totalH}}
+
+ {{valueH}}
+
+
+ {{taxH}}
+
+ {{taxvalueH}}
+
+
+
+
+
+
+ {{ 'general, load-more' | translate}}
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
{{'worklistMain, Tran_Succ' | translate}}
+
-
-
-
-
-
-
-