+
{{ "general, wifi-text" | translate }}
diff --git a/Mohem/src/app/home/attendance-options/attendance-options.component.ts b/Mohem/src/app/home/attendance-options/attendance-options.component.ts
index f655dcb9..6cc32f42 100644
--- a/Mohem/src/app/home/attendance-options/attendance-options.component.ts
+++ b/Mohem/src/app/home/attendance-options/attendance-options.component.ts
@@ -16,7 +16,8 @@ import { Response } from "src/app/hmg-common/services/models/response";
import { WifiWizard2 } from "@ionic-native/wifi-wizard-2/ngx";
import { OpenNativeSettings } from '@ionic-native/open-native-settings/ngx';
import { DevicePermissionsService } from 'src/app/hmg-common/services/device-permissions/device-permissions.service';
-
+import { Geolocation } from '@ionic-native/geolocation/ngx';
+import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx';
@Component({
@@ -32,8 +33,15 @@ export class AttendanceOptionsComponent implements OnInit {
public serviceEnableNFC = false;
public serviceEnableQR = false;
public serviceEnableWifi = false;
+ public enableLocationQR = false;
+ public enableLocationNFC = false;
+ public enableLocationWIFI = false;
public deviceNFC = false;
public nfcIOSSuccess = false;
+ public lat = 0;
+ public longt = 0;
+ public isFakeLocationUsed = false;
+ public deviceID: string;
constructor(
private nfc: NFC,
@@ -47,7 +55,9 @@ export class AttendanceOptionsComponent implements OnInit {
public ngZone: NgZone,
private wifiWizard2: WifiWizard2,
private openNativeSettings: OpenNativeSettings,
- private devicePermissionsService:DevicePermissionsService
+ private devicePermissionsService:DevicePermissionsService,
+ private geolocation: Geolocation,
+ public backgroundGeolocation: BackgroundGeolocation
) {}
ngOnInit() {
@@ -59,7 +69,6 @@ export class AttendanceOptionsComponent implements OnInit {
this.priviligeList = AuthenticationService.servicePrivilage;
this.setServicesPrivilage();
this.checkNFCStatus("one");
-
}
async checkNFCStatus(checkValue: string) {
@@ -110,6 +119,24 @@ export class AttendanceOptionsComponent implements OnInit {
) {
this.serviceEnableWifi = true;
}
+ if (
+ servicePrivilage.Previlege &&
+ servicePrivilage.ServiceName === "enableLocationQR"
+ ) {
+ this.enableLocationQR = true;
+ }
+ if (
+ servicePrivilage.Previlege &&
+ servicePrivilage.ServiceName === "enableLocationNFC"
+ ) {
+ this.enableLocationNFC = true;
+ }
+ if (
+ servicePrivilage.Previlege &&
+ servicePrivilage.ServiceName === "enableLocationWIFI"
+ ) {
+ this.enableLocationWIFI = true;
+ }
}
}
@@ -130,6 +157,7 @@ export class AttendanceOptionsComponent implements OnInit {
component: NfcModalComponent,
showBackdrop: true,
backdropDismiss: true,
+ componentProps:{ enableLocationNFC: this.enableLocationNFC, lat: this.lat, longt: this.longt},
});
modal.cssClass = "nfc-modal";
await modal.present();
@@ -138,12 +166,13 @@ export class AttendanceOptionsComponent implements OnInit {
public swipeAttendanceNFC(nfcSerialCode: any) {
const request: attendanceSwipeScannerRequest = new attendanceSwipeScannerRequest();
request.PointType = 2;
- request.Latitude = 0;
- request.Longitude = 0;
+ request.Latitude = this.lat;
+ request.Longitude = this.longt;
request.QRValue = "";
request.NFCValue = nfcSerialCode;
request.UID = this.device.uuid;
request.UserName = this.userData.EMPLOYEE_NUMBER;
+ request.IsGpsRequired = this.enableLocationNFC;
this.attendance_service
.attendanceSwipeScanner(request, () => {
console.log("Error inside in swipe attendance");
@@ -171,9 +200,28 @@ export class AttendanceOptionsComponent implements OnInit {
}
public startQRCode() {
- this.attendScanService.getDeviceLocation();
+ if (this.enableLocationQR) {
+ this.attendScanService.getDeviceLocation();
+ } else {
+ this.attendScanService.attendance(false);
+ }
}
+ public startNFCCode() {
+ if (this.enableLocationNFC) {
+ this.getDeviceLocation('NFC');
+ } else {
+ this.checkNFCStatus('two');
+ }
+ }
+
+ public startWIFICode() {
+ if (this.enableLocationWIFI) {
+ this.getDeviceLocation('WIFI');
+ } else {
+ this.startWifi();
+ }
+ }
// Wifi Attendance
public async startWifi() {
@@ -181,15 +229,14 @@ export class AttendanceOptionsComponent implements OnInit {
const isIOS = this.platform.is("ios");
const isWifiEnabled = await this.wifiWizard2.isWifiEnabled();
- if(isIOS){
+ if (isIOS) {
if(!isWifiEnabled){
this.showWifiNotEnabled();
return;
}
-
- }else if(isAndroid){
+ } else if(isAndroid) {
let locationPermission = await this.devicePermissionsService.requestLocationAutherization();
- if(!locationPermission){
+ if (!locationPermission) {
return;
}
@@ -198,30 +245,95 @@ export class AttendanceOptionsComponent implements OnInit {
this.startWifi();
}).catch((err) => {
console.debug(err);
- this.showWifiNotEnabled();
});
return;
- }
}
-
+
// opening wifi dailog if all above conditions are passed (isWifiEnabled == true)
let modal = await this.modalController.create({
component: WifiModalComponent,
showBackdrop: true,
backdropDismiss: false,
+ componentProps:{ enableLocationWIFI: this.enableLocationWIFI, lat: this.lat, longt: this.longt},
});
modal.cssClass = "wifi-modal";
await modal.present();
}
+}
showWifiNotEnabled(){
this.common.showErrorMessageDialog(()=>{
- // this.openNativeSettings.open('wifi').then(()=>{});
},
this.ts.trPK("general", "ok"),
this.ts.trPK("general","wifi-not-enable-text"));
}
-
+
+ getDeviceLocation(source: string) {
+ this.isFakeLocationUsed = false;
+ this.devicePermissionsService.requestLocationAutherization().then(granted => {
+ this.location = granted as boolean;
+ if (this.location) {
+ if (this.platform.is('android')) {
+ this.backgroundGeolocation.getCurrentLocation({ timeout: 10000, enableHighAccuracy: true, maximumAge: 3000 }).then((resp) => {
+ if (resp && (resp.latitude && resp.longitude)) {
+ if (resp.isFromMockProvider || resp.mockLocationsEnabled) {
+ this.isFakeLocationUsed = true;
+ this.fakeSwipeAttendance(source);
+ } else {
+ this.lat = resp.latitude;
+ this.longt = resp.longitude;
+ if (source === 'WIFI') {
+ this.startWifi();
+ } else if (source === 'NFC') {
+ this.checkNFCStatus('two');
+ }
+ }
+ } else {
+ this.common.presentAlert(this.ts.trPK('home', 'position-error'));
+ }
+ }, (error) => {
+ this.common.presentAlert(this.ts.trPK('home', 'position-error'));
+ });
+ } else {
+ this.geolocation.getCurrentPosition({maximumAge: 3000, timeout: 10000, enableHighAccuracy: true}).then(resp => {
+ if(resp && resp.coords.latitude && resp.coords.longitude) {
+ this.lat = resp.coords.latitude;
+ this.longt = resp.coords.longitude;
+ if (source === 'WIFI') {
+ this.startWifi();
+ } else if (source === 'NFC') {
+ this.checkNFCStatus('two');
+ }
+ } else {
+ this.common.presentAlert(this.ts.trPK('home', 'position-error'));
+ }
+ }).catch(error => {
+ this.common.presentAlert(this.ts.trPK('home', 'position-error'));
+ });
+ }
+ } else {
+ return false;
+ }
+ });
+ }
+
+ fakeSwipeAttendance(sourceName: string) {
+ const request: any = {};
+ request.Latitude = this.lat;
+ request.Longitude = this.longt;
+ request.QRValue = '';
+ request.NFCValue = sourceName === 'NFC' ? sourceName : '';
+ request.WifiValue = sourceName === 'WIFI' ? sourceName : '';
+ request.UID = this.deviceID;
+ request.EmployeeID = this.userData.EMPLOYEE_NUMBER;
+ this.attendance_service.fakeAttendanceSwipeScanner(request, () => {console.log('Error inside in swipe attendance');})
+ .subscribe((result: Response) => {
+ if (this.common.validResponse(result)) {
+ this.common.presentAlert(this.ts.trPK('home', 'fake-location'));
+ }
+ });
+ }
+
}
diff --git a/Mohem/src/app/home/models/attendanceSwipe.Request.ts b/Mohem/src/app/home/models/attendanceSwipe.Request.ts
index c6a1e8bd..063d2b3a 100644
--- a/Mohem/src/app/home/models/attendanceSwipe.Request.ts
+++ b/Mohem/src/app/home/models/attendanceSwipe.Request.ts
@@ -18,6 +18,7 @@ export class attendanceSwipeScannerRequest extends Request{
public PointType: number;
public NFCValue: string;
public WifiValue: string;
+ public IsGpsRequired: boolean;
}
diff --git a/Mohem/src/app/home/nfc-modal/nfc-modal.component.ts b/Mohem/src/app/home/nfc-modal/nfc-modal.component.ts
index 605b3e87..202e996f 100644
--- a/Mohem/src/app/home/nfc-modal/nfc-modal.component.ts
+++ b/Mohem/src/app/home/nfc-modal/nfc-modal.component.ts
@@ -19,6 +19,9 @@ export class NfcModalComponent implements OnInit {
public userData: any = {};
public gifStatus = false;
public nfcReader: any;
+ public enableLocationNFC: boolean;
+ public lat: number;
+ public longt: number;
constructor(
private nfc: NFC,
@@ -34,6 +37,7 @@ export class NfcModalComponent implements OnInit {
ngOnInit() {
this.userData = this.common.sharedService.getSharedData(AuthenticatedUser.SHARED_DATA, false);
this.startAndroidNfc();
+ console.log(this.enableLocationNFC);
}
ionViewDidLeave() {
@@ -56,12 +60,13 @@ export class NfcModalComponent implements OnInit {
this.nfcReader.unsubscribe();
const request: attendanceSwipeScannerRequest = new attendanceSwipeScannerRequest();
request.PointType = 2;
- request.Latitude = 0;
- request.Longitude = 0;
+ request.Latitude = this.lat;
+ request.Longitude = this.longt;
request.QRValue = "";
request.NFCValue = nfcSerialCode;
request.UID = this.device.uuid;
request.UserName = this.userData.EMPLOYEE_NUMBER;
+ request.IsGpsRequired = this.enableLocationNFC;
this.attendance_service.attendanceSwipeScanner(request, () => {
console.log('Error inside in swipe attendance');
this.modalController.dismiss();
diff --git a/Mohem/src/app/home/wifi-model/wifi-modal.component.ts b/Mohem/src/app/home/wifi-model/wifi-modal.component.ts
index 208682cf..6d8073d4 100644
--- a/Mohem/src/app/home/wifi-model/wifi-modal.component.ts
+++ b/Mohem/src/app/home/wifi-model/wifi-modal.component.ts
@@ -22,6 +22,9 @@ export class WifiModalComponent implements OnInit {
private ssid = CommonService.MOHEMM_WIFI_SSID;
private password = CommonService.MOHEMM_WIFI_PASSWORD;
private algo = 'WPA';
+ public enableLocationWIFI: boolean;
+ public lat: number;
+ public longt: number;
constructor(
public common: CommonService,
@@ -77,7 +80,7 @@ export class WifiModalComponent implements OnInit {
console.debug("Wifi Connected: Verified Access | " + value + " | " + ssid_);
setTimeout(() => {
this.swipeAttendanceWifi(ssid_);
- },2000);
+ },6000);
}else{
this.showErrorInvalidWorkspace();
}
@@ -134,13 +137,14 @@ export class WifiModalComponent implements OnInit {
async swipeAttendanceWifi(code:any) {
const request: attendanceSwipeScannerRequest = new attendanceSwipeScannerRequest();
request.PointType = 3;
- request.Latitude = 0;
- request.Longitude = 0;
+ request.Latitude = this.lat;
+ request.Longitude = this.longt;
request.QRValue = "";
request.NFCValue = "";
request.WifiValue = "100";
request.UID = this.device.uuid;
request.UserName = this.userData.EMPLOYEE_NUMBER;
+ request.IsGpsRequired = this.enableLocationWIFI;
this.attendance_service
.attendanceSwipeScanner(request, () => {
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 6fec7db6..a174e010 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,582 +1,592 @@
-
-
-
-
{{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.scss b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss
index dc67036f..df2dc68f 100644
--- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss
+++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss
@@ -105,4 +105,10 @@
// font-weight: bold;
// }
-
\ No newline at end of file
+.no-padding-label {
+ padding: 0px !important;
+}
+
+.margin-left {
+ margin-left: 30px;
+}
\ No newline at end of file
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..1ca7ee25 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,574 @@
-
+
-
-
+
+
{{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}}
+
-
-
-
-
-
-
-