diff --git a/Mohem/src/app/hmg-common/hmg-common.module.ts b/Mohem/src/app/hmg-common/hmg-common.module.ts
index 59242c26..18f7e8c0 100644
--- a/Mohem/src/app/hmg-common/hmg-common.module.ts
+++ b/Mohem/src/app/hmg-common/hmg-common.module.ts
@@ -103,6 +103,7 @@ import { AccordinTabCustomComponent} from './ui/accordin-custom/accordin-tab-cus
import{ConfirmLoginComponent} from '../authentication/confirm-login/confirm-login.component'
import{WelcomeComponent} from './ui/welcome-login/welcome.component'
import {DashboredService} from './services/dashbored/dashbored.service'
+// import {TurncatePipe} from '../pipes/turncate/turncate.pipe'
@NgModule({
imports: [
CommonModule,
@@ -130,6 +131,7 @@ import {DashboredService} from './services/dashbored/dashbored.service'
DatePipeTransform,
DateTimePipe,
SafeHtmlPipe,
+ // TurncatePipe,
BackButtonComponent,
IfDatePipe,
DynamicTableComponent,
@@ -186,6 +188,7 @@ import {DashboredService} from './services/dashbored/dashbored.service'
DividerComponent,
NavButtonsComponent,
DatePipeTransform,
+ // TurncatePipe,
TranslatePipe,
DateTimePipe,
SafeHtmlPipe,
diff --git a/Mohem/src/app/hmg-common/services/common/common.service.ts b/Mohem/src/app/hmg-common/services/common/common.service.ts
index 532e6bd4..165833a2 100644
--- a/Mohem/src/app/hmg-common/services/common/common.service.ts
+++ b/Mohem/src/app/hmg-common/services/common/common.service.ts
@@ -424,7 +424,7 @@ export class CommonService {
{
text: cancelLabel,
role: "cancel",
- cssClass: "cancelBtn",
+ cssClass: "checkOutCancelBtn",
handler: () => {
if (onCancel) {
onCancel();
@@ -436,7 +436,7 @@ export class CommonService {
text: acceptLabel,
role: "Confirm",
- cssClass: "confirmBtn",
+ cssClass: "checkOutOkBtn",
handler: () => {
diff --git a/Mohem/src/app/hmg-common/services/dashbored/models/GetSubordinatesLeavesRequest.ts b/Mohem/src/app/hmg-common/services/dashbored/models/GetSubordinatesLeavesRequest.ts
index 30a4befd..378cc5e6 100644
--- a/Mohem/src/app/hmg-common/services/dashbored/models/GetSubordinatesLeavesRequest.ts
+++ b/Mohem/src/app/hmg-common/services/dashbored/models/GetSubordinatesLeavesRequest.ts
@@ -4,5 +4,5 @@ export class GetSubordinatesLeavesRequest extends Request{
//public static SHARED_DATA = '';
public P_DATE_FROM :any;
public P_DATE_TO :any;
-
+ public P_SELECTED_EMPLOYEE_NUMBER:any;
}
\ No newline at end of file
diff --git a/Mohem/src/app/hmg-common/ui/accordin-custom/accordin-tab-custom/accordin-tab-custom.component.scss b/Mohem/src/app/hmg-common/ui/accordin-custom/accordin-tab-custom/accordin-tab-custom.component.scss
index 14151600..18ee0a3a 100644
--- a/Mohem/src/app/hmg-common/ui/accordin-custom/accordin-tab-custom/accordin-tab-custom.component.scss
+++ b/Mohem/src/app/hmg-common/ui/accordin-custom/accordin-tab-custom/accordin-tab-custom.component.scss
@@ -49,9 +49,9 @@
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden !important;
- font-size: 0.46cm;
+ font-size: 16px;
width: 78%;
- font-weight: bold;
+ font-weight: bold !important;
}
diff --git a/Mohem/src/app/notification/apply-action-modal/apply-action-modal.component.ts b/Mohem/src/app/notification/apply-action-modal/apply-action-modal.component.ts
index 666e31b9..cc5f068a 100644
--- a/Mohem/src/app/notification/apply-action-modal/apply-action-modal.component.ts
+++ b/Mohem/src/app/notification/apply-action-modal/apply-action-modal.component.ts
@@ -19,9 +19,9 @@ export class ApplyActionModalComponent implements OnInit {
constructor( private ts: TranslatorService,private modalCtrl: ModalController, private cs: CommonService,public worklistMainService: WorklistMainService,
) {
- this.getPassNotificationDetails = this.cs.sharedService.getSharedData('passNotificationInfo');
- this.getpassResAttr = this.cs.sharedService.getSharedData('passResAttr');
- this.getPassNotification = this.cs.sharedService.getSharedData('ApplyActionModalPage');
+ this.getPassNotificationDetails = this.cs.sharedService.getSharedData('passNotificationInfo',false);
+ this.getpassResAttr = this.cs.sharedService.getSharedData('passResAttr' ,false);
+ this.getPassNotification = this.cs.sharedService.getSharedData('ApplyActionModalPage',false);
}
diff --git a/Mohem/src/app/notification/item-history/item-history.component.html b/Mohem/src/app/notification/item-history/item-history.component.html
index c68df82b..1ac2132a 100644
--- a/Mohem/src/app/notification/item-history/item-history.component.html
+++ b/Mohem/src/app/notification/item-history/item-history.component.html
@@ -21,8 +21,8 @@
{{ts.trPK('worklistMain','info')}}
-->
-
- 0">
+
+
0">
{{ 'general, empty' | translate}}
0 ">
diff --git a/Mohem/src/app/notification/more-action-modal/more-action-modal.component.html b/Mohem/src/app/notification/more-action-modal/more-action-modal.component.html
new file mode 100644
index 00000000..8a39b98e
--- /dev/null
+++ b/Mohem/src/app/notification/more-action-modal/more-action-modal.component.html
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{button.BUTTON_LABEL}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ts.trPK('general','ok')}}
+
+
+
+
+ {{ts.trPK('general','cancel')}}
+
+
+
+
+
\ No newline at end of file
diff --git a/Mohem/src/app/notification/more-action-modal/more-action-modal.component.scss b/Mohem/src/app/notification/more-action-modal/more-action-modal.component.scss
new file mode 100644
index 00000000..8c01def2
--- /dev/null
+++ b/Mohem/src/app/notification/more-action-modal/more-action-modal.component.scss
@@ -0,0 +1,22 @@
+.rowBtn{
+ display: flex;
+ flex-direction: row;
+ justify-content: center;
+ align-items: center;
+}
+
+.Header{
+ color: black !important;
+ font-size: 16px !important;
+ font-weight: bold !important;;
+ margin: 0;
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ transform: translate(-58px, 2px);
+}
+
+.labelRadio{
+ color: black !important;
+ font-weight: bold !important;
+}
\ No newline at end of file
diff --git a/Mohem/src/app/notification/more-action-modal/more-action-modal.component.spec.ts b/Mohem/src/app/notification/more-action-modal/more-action-modal.component.spec.ts
new file mode 100644
index 00000000..20fcff12
--- /dev/null
+++ b/Mohem/src/app/notification/more-action-modal/more-action-modal.component.spec.ts
@@ -0,0 +1,27 @@
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { MoreActionModalComponent } from './more-action-modal.component';
+
+describe('MoreActionModalComponent', () => {
+ let component: MoreActionModalComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ MoreActionModalComponent ],
+ schemas: [CUSTOM_ELEMENTS_SCHEMA],
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(MoreActionModalComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/Mohem/src/app/notification/more-action-modal/more-action-modal.component.ts b/Mohem/src/app/notification/more-action-modal/more-action-modal.component.ts
new file mode 100644
index 00000000..3a52bbc2
--- /dev/null
+++ b/Mohem/src/app/notification/more-action-modal/more-action-modal.component.ts
@@ -0,0 +1,44 @@
+import { Component, OnInit } from '@angular/core';
+import { CommonService } from 'src/app/hmg-common/services/common/common.service';
+import { ModalController } from '@ionic/angular';
+import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service';
+
+@Component({
+ selector: 'app-more-action-modal',
+ templateUrl: './more-action-modal.component.html',
+ styleUrls: ['./more-action-modal.component.scss'],
+})
+export class MoreActionModalComponent implements OnInit {
+ actionBtns :any =[];
+ radioButtonValue: any;
+ constructor( private ts: TranslatorService,private modalCtrl: ModalController, private cs: CommonService){}
+
+ ngOnInit() {
+ console.log("modal");
+ this.actionBtns = this.cs.sharedService.getSharedData("passActionMore" , false);
+ console.log("modal");
+
+ }
+ closeModal() {
+ this.modalCtrl.dismiss();
+ }
+
+ radioSelect(v) {
+ this.radioButtonValue = v;
+ console.log("radio selected"+v);
+ }
+
+ OkBtnModal() {
+ if (!this.radioButtonValue) {
+ let msg: string = this.ts.trPK("replacementRoll", "msg");
+ this.cs.presentAlert(msg);
+ return;
+ } else {
+ let data = this.radioButtonValue;
+ this.modalCtrl.dismiss(data);
+ }
+ }
+
+
+
+}
diff --git a/Mohem/src/app/notification/notification.module.ts b/Mohem/src/app/notification/notification.module.ts
index df9194f2..7b2004ac 100644
--- a/Mohem/src/app/notification/notification.module.ts
+++ b/Mohem/src/app/notification/notification.module.ts
@@ -26,7 +26,7 @@ import { ItemHistoryComponent } from './item-history/item-history.component';
import { QutationAnalysisComponent } from './qutation-analysis/qutation-analysis.component';
import { WorklistMainMRComponent } from './worklist-main-mr/worklist-main-mr.component';
// import { WorklistMainComponent } from './worklist-main/worklist-main.component';
-
+import {MoreActionModalComponent} from './more-action-modal/more-action-modal.component'
const routes: Routes = [
@@ -98,7 +98,11 @@ const routes: Routes = [
{
path:'worklist-main-MR',
component:WorklistMainMRComponent
- }
+ },
+ {
+ path: 'more-action-modal',
+ component: MoreActionModalComponent
+ },
]
}
];
@@ -119,6 +123,7 @@ const routes: Routes = [
WorkListReplacementRollComponent,
WorkListRfcComponent,
ViewNoteModalComponent,
+ MoreActionModalComponent,
ApplyActionModalComponent,
ViewReplacementModalComponent,
WorkListActionHistoryComponent,
diff --git a/Mohem/src/app/notification/qutation-analysis/qutation-analysis.component.html b/Mohem/src/app/notification/qutation-analysis/qutation-analysis.component.html
index 69ab83e9..92236371 100644
--- a/Mohem/src/app/notification/qutation-analysis/qutation-analysis.component.html
+++ b/Mohem/src/app/notification/qutation-analysis/qutation-analysis.component.html
@@ -22,7 +22,7 @@
-->
- 0">
+
0">
{{ 'general, empty' | translate}}
0 ">
diff --git a/Mohem/src/app/notification/view-replacement-modal/view-replacement-modal.component.scss b/Mohem/src/app/notification/view-replacement-modal/view-replacement-modal.component.scss
index b4736409..d28c9952 100644
--- a/Mohem/src/app/notification/view-replacement-modal/view-replacement-modal.component.scss
+++ b/Mohem/src/app/notification/view-replacement-modal/view-replacement-modal.component.scss
@@ -9,3 +9,7 @@ ion-content {
padding-top: 30px !important;
border: solid 1px #dedede;
}
+:host(.activated) .item-native {
+ background: var(--red) !important;
+ color: var(--grey) !important;
+}
\ No newline at end of file
diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html
index ea8e644f..2aaf95d6 100644
--- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html
+++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html
@@ -1,13 +1,13 @@
-
-
+
-
+
{{'replacementRoll, searchBy' | translate}}
-
-
+
+
+
+
+
+
-
-
-
-
+
-
+
\ No newline at end of file
diff --git a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.scss b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.scss
index 129d608e..6b2ebadc 100644
--- a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.scss
+++ b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.scss
@@ -4,4 +4,131 @@
min-height: 45px;
min-width: 200px;
}
+ button.item-button.button.button-md.button-clear.button-clear-md {
+ background-color: transparent;
+ }
+
+ .footer-button {
+ border-radius: 3px;
+ padding: 0 1.1em;
+ min-height: 45px;
+ min-width: 200px;
+ }
+
+ // ion-item {
+ // margin-top: 5%;
+ // margin-right: 7%;
+ // width: 100%;
+ // }
+ .ionItem{
+ border: #e4e4e4 solid;
+ /* margin: 6px; */
+ /* padding: 11px; */
+ height: 85px;
+ width: 164px;
+ border-radius: 5px;
+ text-align: center;
+
+ }
+
+
+ .profileImageDiv{
+ text-align: center;
+ margin-bottom: -27px;
+ z-index: 3;
+ position: relative;
+ top: 0;
+
+ }
+ .profileImage{
+ width:60px !important;
+ // margin-left: -25px;
+ // margin-right: 22px;
+ }
+
+ .activated{
+ border: #209a83 0.02cm solid ;
+ }
+ .deactivated{ border: #e4e4e4 0.02cm solid;
+ }
+ .repContentDiv{
+ text-align: center;
+ width: 85%;
+ font-size: 14px;
+ border: #e4e4e4 solid;
+ border-radius: 5px;
+ padding: 20px 8px 8px 8px;
+ margin-top: -9px;
+ margin-right: -35px
+
+ }
+ .selIEmpDiv{
+ text-align: right;
+ margin-bottom: -26px;
+ margin-right: 0px;
+ z-index: 3;
+ position: relative;
+ top: 0;
+ }
+
+ .selIEmpImage{
+ width:22px !important
+
+ }
+
+ .noteInput{
+ border: solid var(--gray) 1px;
+ border-radius: 15px;
+ margin: 8px 17px 0px 17px;
+ padding: 10px 2px 10px 2px;
+ }
+ .filterInput{
+ border: solid var(--gray) 1px;
+ border-radius: 21px;
+ padding-left: 10px !important;
+ }
+ .filterBtn{
+ background: var(--newgreen);
+ --background: var (--newgreen);
+ border-radius: 50%;
+ height: 60px;
+ width: 60px;
+ }
+
+
+
+ *{
+ box-sizing: border-box;
+ }
+
+ .square-container{
+ // padding: 8px;
+ width:100%;
+ }
+ .square{
+ // width:calc(100% / 2);
+ width:50%;
+ float:left;
+ position: relative;
+ // padding-bottom: calc(100% / 2);
+ }
+
+ .square .content{
+ width: calc(100% - 16px) !important;
+ height: calc(100% - 16px) !important;
+ margin: 8px;
+ padding: 16px;
+ // position: absolute;
+ color: white;
+ border-radius: 9px;
+ text-align: center;
+ // background-color: #0095ff;
+ // box-shadow: 0 2px 5px rgba(0, 0, 0, 0.26);
+ }
+
+
+
+
+
+
\ No newline at end of file
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 56e32a62..c22eba21 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
@@ -6,6 +6,7 @@ import { WorKListRFCEmployeeResponse } from '../models/RFC-EmployeeRes';
import { WorklistService } from '../service/worklist.service';
import { CommonService } from 'src/app/hmg-common/services/common/common.service';
import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service';
+import { ModalController } from '@ionic/angular';
@Component({
selector: 'app-work-list-rfc',
@@ -29,8 +30,15 @@ export class WorkListRfcComponent implements OnInit {
getpassResAttr: any = [];
P_PAGE_NUM: number = 1;
P_PAGE_LIMIT: number = 100;
-
- constructor(public worklistService: WorklistService, private cs: CommonService, private ts: TranslatorService, public workListMainService: WorklistMainService) {
+ active: any;
+
+ constructor(
+ public worklistService: WorklistService,
+ private cs: CommonService,
+ private ts: TranslatorService,
+ public workListMainService: WorklistMainService,
+ public modalCtrl: ModalController
+ ) {
this.getPassNotificationDetails = this.cs.sharedService.getSharedData('passNotificationInfo');
this.getpassResAttr = this.cs.sharedService.getSharedData('passResAttr');
@@ -153,5 +161,22 @@ export class WorkListRfcComponent implements OnInit {
infiniteScroll.target.complete();
}
}//end infiniteScroll
+ closeModal() {
+ this.modalCtrl.dismiss();
+ }
+
+ select(selectEmp,index){
+ console.log(selectEmp.USER_NAME);
+ console.log(selectEmp.SEQ);
+ this.radioButtonValue=selectEmp.USER_NAME
+ this.seqNo = selectEmp.SEQ;
+//////////////////////////////////////////////////////////////
+ // let emp: any = this.RFCEmployeeListListRes[v];
+ // this.seqNo = emp.SEQ;
+ // this.radioButtonValue = emp.USER_NAME;
+
+
+ this.active=index;
+ }
}
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 886bf8d7..15f6e4ea 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
@@ -1,4 +1,4 @@
-
+
-
-
-
-
- {{ts.trPK('worklistMain','info')}}
-
-
-
- {{ts.trPK('worklistMain','itemReq')}}
-
-
-
-
- {{'worklistMain, actionHis' | translate}}
-
-
-
-
-
- {{'general, attachment' | translate}}
-
-
-
-
-
+
+
+ {{getPassNotificationDetails.SUBJECT}}
+
+
+
+
+
+
+
+ {{ts.trPK('worklistMain','itemReq')}}
+
+
+
+ {{'worklistMain, action' | translate}}
+
+
+
+ {{'general, file' | translate}}
+
+
+
+
+ {{ts.trPK('worklistMain','info')}}
+
+
+
+
+
+
-
-
- {{pInformation}}
-
-
+
+
+ {{pInformation}}
+
+
+
-
-
-
-
-
-
-
- {{ts.trPK('worklistMain','to')}}
-
-
+
+ {{ts.trPK('worklistMain','to')}}
+
+
-
- {{getPassNotificationDetails.TO_USER}}
-
-
+
+ {{getPassNotificationDetails.TO_USER}}
+
+
-
-
- {{ts.trPK('worklistMain','sent')}}
-
-
+
+
+ {{ts.trPK('worklistMain','sent')}}
+
+
-
- {{getPassNotificationDetails.BEGIN_DATE}}
-
-
-
-
- {{ts.trPK('worklistMain','closed')}}
-
-
+
+ {{getPassNotificationDetails.BEGIN_DATE}}
+
-
- {{getPassNotificationDetails.END_DATE}}
-
-
-
-
- {{ts.trPK('worklistMain','id')}}
-
-
+
+ {{ts.trPK('worklistMain','closed')}}
+
+
-
- {{getPassNotificationDetails.NOTIFICATION_ID}}
-
-
-
-
- {{ts.trPK('worklistMain','responder')}}
-
-
+
+ {{getPassNotificationDetails.END_DATE}}
+
+
-
+
+
+
+ {{ts.trPK('worklistMain','id')}}
+
+
+
+
- {{getPassNotificationDetails.RESPONDER}}
-
-
+ {{getPassNotificationDetails.NOTIFICATION_ID}}
+
+
+ {{ts.trPK('worklistMain','responder')}}
+
+
-
-
- {{ts.trPK('worklistMain','subject')}}
-
+
+ {{getPassNotificationDetails.RESPONDER}}
+
+
+
+
+
+
+ {{ts.trPK('worklistMain','subject')}}
+
-
- {{getPassNotificationDetails.SUBJECT}}
-
-
+ {{getPassNotificationDetails.SUBJECT}}
+
+
-
+
-
+
-
-
+
+
-
- {{header.HDR_ATTRIBUTE_NAME}}
-
+
+ {{header.HDR_ATTRIBUTE_NAME}}
+
- {{header.HDR_ATTRIBUTE_VALUE}}
-
-
+ {{header.HDR_ATTRIBUTE_VALUE}}
+
+
-
-
+
+
-
-
-
-
- {{totalH}}
- {{valueH}}
+
+
+
+
+ {{totalH}}
+ {{valueH}}
-
-
- {{taxH}}
- {{taxvalueH}}
+
+
+ {{taxH}}
+ {{taxvalueH}}
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
+
- 0">
-
{{ 'general, empty' | translate}}
-
- 0 ">
+ 0">
+
{{ 'general, empty' | translate}}
+
+ 0 ">
-
-
+
+
-
-
+
+
+
-
+
+
+
+
+
+
-
+
+
{{i+1}}. {{notificationList.DESCRIPTION}}
-
-
-
- {{ts.trPK('worklistMain','code')}}
-
-
-
+
+
+
+
+ {{ts.trPK('worklistMain','code')}}
+
+
+
- {{notificationList.ITEM_CODE}}
-
-
-
- {{ts.trPK('worklistMain','unit')}}
-
-
- {{notificationList.UOM}}
-
-
-
-
-
-
- {{ts.trPK('worklistMain','quantity')}}
-
-
- {{notificationList.QUANTITY}}
+ {{notificationList.QUANTITY}}
-
-
- {{ts.trPK('worklistMain','Date_Req')}}
-
-
- {{notificationList.DATE_REQUIRED}}
-
-
-
-
+ {{notificationList.DATE_REQUIRED}}
+
+
+
-
-
- {{ts.trPK('worklistMain','line_status')}}
-
-
- {{notificationList.LINE_STATUS}}
-
+ {{notificationList.LINE_STATUS}}
+
-
- {{ts.trPK('worklistMain','date_status')}}
-
-
- {{notificationList.STATUS_DATE}}
-
-
-
+ {{notificationList.STATUS_DATE}}
+
-
+
+
-
- {{ts.trPK('worklistMain','trans_type')}}
-
-
- {{notificationList.TRANSACTION_TYPE_NAME}}
-
+ {{notificationList.TRANSACTION_TYPE_NAME}}
+
-
- {{ts.trPK('worklistMain','operating_unit')}}
-
-
- {{notificationList.OPERATING_UNIT}}
-
+ {{notificationList.OPERATING_UNIT}}
+
-
-
+
+
+
+ {{ts.trPK('worklistMain','organization_code')}}
+
+
+ {{notificationList.ORGANIZATION_CODE}}
+
+
+ {{ts.trPK('worklistMain','organization')}}
+
+
+ {{notificationList.ORGANIZATION_NAME}}
+
+
+
-
- {{ts.trPK('worklistMain','organization_code')}}
-
-
- {{notificationList.ORGANIZATION_CODE}}
-
+
+ {{ts.trPK('worklistMain','from_subinventory')}}
+
+
+ {{notificationList.FROM_SUBINVENTORY}}
+
-
- {{ts.trPK('worklistMain','organization')}}
-
-
- {{notificationList.ORGANIZATION_NAME}}
-
-
-
-
+ {{notificationList.FROM_LOCATOR}}
+
+
+
-
- {{ts.trPK('worklistMain','from_subinventory')}}
-
-
- {{notificationList.FROM_SUBINVENTORY}}
-
+ {{notificationList.TO_SUBINVENTORY}}
+
-
- {{ts.trPK('worklistMain','from_locator')}}
-
-
- {{notificationList.FROM_LOCATOR}}
-
+ {{notificationList.TO_LOCATOR}}
+
-
+
-
+
-
- {{ts.trPK('worklistMain','to_subinventory')}}
-
-
- {{notificationList.TO_SUBINVENTORY}}
-
+ {{notificationList.SHIP_TO_LOCATION}}
+
-
- {{ts.trPK('worklistMain','to_locator')}}
-
-
- {{notificationList.TO_LOCATOR}}
-
+
-
-
+
+
+
+
+
+
+
+
+
-
- {{ts.trPK('worklistMain','ShipToLocation')}}
-
-
- {{notificationList.SHIP_TO_LOCATION}}
-
+
+
-
+
+
+
+
+ 0">
+
{{ 'general, empty' | translate}}
+
+ 0 ">
+
+
+
+
+
-
+

-
-
-
-
+
+ -->
-
-
+
+
![]()
+

+
+
+
+ {{actionHistory.NAME}}
+
- 0">
-
{{ 'general, empty' | translate}}
-
- 0 ">
-
-
-
+
+
+
+ Note: {{actionHistory.NOTE}}
+
+
-
-
-
-
+
-
-
- {{actionHistory.ACTION}}
- {{actionHistory.NAME}}
-
-
- {{actionHistory.NOTIFICATION_DATE| dateString }}
-
-
-
-
-
+
- Load More
-
-
-
-
-
-
-
-
- 0">
-
{{ 'general, notAttch' | translate}}
-
- 0 ">
-
-
-
-
-
-
-

-
- 
-
-
-

-
-
-

-
-
- {{attachList.SEQ_NUM }}. {{attachList.FILE_NAME}}
-
-
-
-
-
-
+
+
+
{{actionHistory.ACTION}}
+
+
+ {{actionHistory.NOTIFICATION_DATE| dateString }}
+
+
-
-
+
+
-
-
+ Load More
+
+
+
+
+
+
-
+ 0">
+
{{ 'general, notAttch' | translate}}
+
+ 0 ">
+
+
+
+
+

+
+ 
+
+
+

+
+
+

+
+
+ {{attachList.SEQ_NUM }}. {{attachList.FILE_NAME}}
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
- 0">
+
0">
{{ 'general, empty' | translate}}
0 ">
-
+
-
+
-
-
+
+
![]()
+
+ {{actionHistory.NAME}}
+
+
+
+
+
+
+ Note: {{actionHistory.NOTE}}
+
+
+
+
+
+
+
+ Note: {{actionHistory.NOTE}} {{actionHistory.NOTE}}
+
+
+
+
{{ actionHistory.visible ? 'Show less': 'Show More' }}
+
+
+
+
+
+
+
{{actionHistory.ACTION}}
- {{actionHistory.NAME}}
-
+
- {{actionHistory.NOTIFICATION_DATE| dateString }}
+ {{actionHistory.NOTIFICATION_DATE| dateString }}
@@ -619,72 +647,110 @@
-
-
-
-
-
- 0">
-
{{ 'general, notAttch' | translate}}
-
+
+
+
+ 0">
+
{{ 'general, notAttch' | translate}}
+
0 ">
-
-
-
-
-
-

-
- 
-
-
-

-
-
-

-
-
- {{attachList.SEQ_NUM }}. {{attachList.FILE_NAME}}
-
+
+
+
+

+
+ 
+
+
+

+
+
+

+
+
+ {{attachList.SEQ_NUM }}. {{attachList.FILE_NAME}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
Transaction Successful
+
-
+