+
{{ 'general, empty' | translate}}
0">
diff --git a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss
index 96965e58..fb652af8 100644
--- a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss
+++ b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss
@@ -186,7 +186,7 @@ ion-card-content.confirm-details{
.timeline .timeline-item {
- width: 40px;
+ // width: 40px;
}
@@ -199,8 +199,8 @@ ion-card-content.confirm-details{
.empImge{
border-radius: 50%;
- width:100%;
- height: 100%;
+ width:60px;
+ height: 60px;
border: #dedede solid 1px;
}
diff --git a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.ts b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.ts
index 87c43df9..7e556283 100644
--- a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.ts
+++ b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.ts
@@ -1,6 +1,6 @@
-import { Component, OnInit } 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 { Component, OnInit } 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 { ApproversList } from '../models/approvers';
import { MenuResponse } from 'src/app/hmg-common/services/menu/models/menu-response';
import { WorkListButtonRequest } from 'src/app/eit/models/NotificationButtonReq';
@@ -16,23 +16,23 @@ import { WorkListAttachViewComponent } from 'src/app/notification/work-list-atta
import { FileUploader } from 'ng2-file-upload';
import { SubmitAbsenceModalComponent } from '../submit-absence-modal/submit-absence-modal.component';
@Component({
- selector: "app-absence-confirm",
- templateUrl: "./absence-confirm.component.html",
- styleUrls: ["./absence-confirm.component.scss"]
+ selector: 'app-absence-confirm',
+ templateUrl: './absence-confirm.component.html',
+ styleUrls: ['./absence-confirm.component.scss']
})
export class AbsenceConfirmComponent implements OnInit {
direction:string;
P_TransactionID: number;
- approversList: ApproversList;
- selEmp: string = "";
+ approversList = [];
+ selEmp: string = '';
respID: number;
- absComments: string = "";
+ absComments: string = '';
selMenu: MenuResponse;
attachItems: any;
attachListDisplay: any;
isTrue: any = 0;
getPassNotificationDetails: any;
- menuType: string = "";
+ menuType: string = '';
attachmentRes: any;
objIndex1: any;
attachListOver: any = [];
@@ -63,7 +63,7 @@ export class AbsenceConfirmComponent implements OnInit {
true
);
this.selEmp = this.getPassNotificationDetails.SELECTED_EMPLOYEE_NUMBER;
- this.menuType = "E";
+ this.menuType = 'E';
this.respID = -999;
// this.getApproversList();
// console.log("this.getPassNotificationDetails.P_NOTIFICATION_ID :"+this.getPassNotificationDetails.NOTIFICATION_ID);
@@ -130,7 +130,7 @@ export class AbsenceConfirmComponent implements OnInit {
return el.isSuccess == true;
});
this.attachListOver = filtered;
- let msg: string = "";
+ let msg: string = '';
// msg = this.translate.translate("addAttach.errorMsg");
//this.common.showAlert(msg);
}
@@ -168,7 +168,7 @@ export class AbsenceConfirmComponent implements OnInit {
if (this.common.validResponse(result)) {
this.isSubmitBtnClicked = true;
//if(this.isResubmitAbs==false){
- let msg: string = this.ts.trPK("general", "messageSuccess");
+ let msg: string = this.ts.trPK('general', 'messageSuccess');
this.common.presentAlert(msg);
// }
@@ -180,7 +180,7 @@ export class AbsenceConfirmComponent implements OnInit {
getApproversList() {
let body: any = {
P_TRANSACTION_ID: this.P_TransactionID,
- P_AME_TRANSACTION_TYPE: "SSHRMS",
+ P_AME_TRANSACTION_TYPE: 'SSHRMS',
P_PAGE_NUM: 1,
P_PAGE_LIMIT: 1000
};
@@ -210,7 +210,7 @@ export class AbsenceConfirmComponent implements OnInit {
});
modal.onDidDismiss()
.then((data) => {
- if (data == "cancel" || data == "undefined") {
+ if (data == 'cancel' || data == 'undefined') {
return;
} else {
if (!str) {
@@ -246,7 +246,7 @@ async openSubmitModal() {
.then((data) => {
console.log(data.data);
- if (data.data == "cancel" || data.data == undefined) {
+ if (data.data == 'cancel' || data.data == undefined) {
return;
} else {
this.startAbApproval();
@@ -324,7 +324,7 @@ async openSubmitModal() {
this.submitConService.updateAttach(req).subscribe((result: any) => {
if (this.common.validResponse(result)) {
if (result.MessageStatus == 1) {
- let msg: string = "";
+ let msg: string = '';
// msg = this.translate.translate("addAttach.attachUpdate");
// this.common.showAlert(msg);
@@ -351,7 +351,7 @@ async openSubmitModal() {
};
this.submitConService.delteAttach(req).subscribe((result: any) => {
if (this.common.validResponse(result)) {
- if (result.DeleteAttachmentList.P_RETURN_STATUS === "S") {
+ if (result.DeleteAttachmentList.P_RETURN_STATUS === 'S') {
this.getAttachment(this.getPassNotificationDetails.NOTIFICATION_ID);
// let msg: string = "";
// msg = this.translate.translate("addAttach.deleteAttach");
@@ -391,8 +391,8 @@ async openSubmitModal() {
// this.uploader.onWhenAddingFileFailed = function (item: any, filter: any, options: any){
if (!(this.filterAllowedType.indexOf(input.target.files[0].type) > -1)) {
- let msg: string = "";
- msg = this.ts.trPK("general", "notSupport");
+ let msg: string = '';
+ msg = this.ts.trPK('general', 'notSupport');
this.common.presentAlert(msg);
return
} // todo: show alert that you tried uploading wrong files
@@ -427,7 +427,7 @@ async openSubmitModal() {
pushObject(fileData, name, type) {
- console.log("before push: "+ this.index);
+ console.log('before push: '+ this.index);
//this.attachListOver.length++;
try {
let array = name.split('.');
diff --git a/Mohem/src/app/absence/home/home.component.html b/Mohem/src/app/absence/home/home.component.html
index bd9572a7..1065792b 100644
--- a/Mohem/src/app/absence/home/home.component.html
+++ b/Mohem/src/app/absence/home/home.component.html
@@ -230,10 +230,10 @@
-
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/Mohem/src/app/hmg-common/ui/sms/sms.page.ts b/Mohem/src/app/hmg-common/ui/sms/sms.page.ts
index fc7242ca..b684a622 100644
--- a/Mohem/src/app/hmg-common/ui/sms/sms.page.ts
+++ b/Mohem/src/app/hmg-common/ui/sms/sms.page.ts
@@ -18,31 +18,14 @@ import { AlertController } from '@ionic/angular';
styleUrls: ['./sms.page.scss'],
})
export class SmsPage implements OnInit {
- public timeInSeconds : number ;
- public time : number;
- public runTimer : boolean;
- public static SHARED_DATA = 'h2o-login-details';
- public hasStarted : boolean;
- public countryCode: CountryCode;
- public hasFinished : boolean;
- public remainingTime : number;
- public displayTime : string = "";
- // public userData: UserDetailsModel;
- public mobile : string;
- public country_code : string;
- public id : string;
- public MobileNumber : string;
- public token : string;
- public resend : boolean = false;
- public smc_code : any;
constructor(public cs: CommonService,
- public ts: TranslatorService,
- public alertController: AlertController,
- public smsService: SmsReaderService,
- public sharedData: SharedDataService,
- private modalCtrl:ModalController,
- private navParams: NavParams,
- public smsservice: SMSService) {
+ public ts: TranslatorService,
+ public alertController: AlertController,
+ public smsService: SmsReaderService,
+ public sharedData: SharedDataService,
+ private modalCtrl: ModalController,
+ private navParams: NavParams,
+ public smsservice: SMSService) {
this.initTimer();
this.startTimer();
@@ -59,13 +42,30 @@ export class SmsPage implements OnInit {
// }
// });
}
+ public static SHARED_DATA = 'h2o-login-details';
+ public timeInSeconds: number ;
+ public time: number;
+ public runTimer: boolean;
+ public hasStarted: boolean;
+ public countryCode: CountryCode;
+ public hasFinished: boolean;
+ public remainingTime: number;
+ public displayTime = '';
+ // public userData: UserDetailsModel;
+ public mobile: string;
+ // tslint:disable-next-line: variable-name
+ public country_code: string;
+ public id: string;
+ public MobileNumber: string;
+ public token: string;
+ public resend = false;
+ public smc_code: any;
ngOnInit() {
}
-
- closeModal()
- {
+
+ closeModal() {
this.modalCtrl.dismiss();
}
@@ -74,8 +74,8 @@ export class SmsPage implements OnInit {
}
initTimer() {
- if (!this.timeInSeconds) {
- this.timeInSeconds = 60;
+ if (!this.timeInSeconds) {
+ this.timeInSeconds = 60;
}
this.time = this.timeInSeconds;
this.runTimer = false;
@@ -84,22 +84,22 @@ export class SmsPage implements OnInit {
this.remainingTime = this.timeInSeconds;
this.displayTime = this.getSecondsAsDigitalClock(this.remainingTime);
}
-
+
startTimer() {
this.runTimer = true;
this.hasStarted = true;
this.resend = false;
this.timerTick();
}
-
+
pauseTimer() {
this.runTimer = false;
}
-
+
resumeTimer() {
this.startTimer();
}
-
+
timerTick() {
setTimeout(() => {
if (!this.runTimer) { return; }
@@ -107,31 +107,29 @@ export class SmsPage implements OnInit {
this.displayTime = this.getSecondsAsDigitalClock(this.remainingTime);
if (this.remainingTime > 0) {
this.timerTick();
- }
- else {
+ } else {
this.hasFinished = true;
this.resend = true;
}
}, 1000);
}
-
+
getSecondsAsDigitalClock(inputSeconds: number) {
- var sec_num = parseInt(inputSeconds.toString(), 10); // don't forget the second param
- var hours = Math.floor(sec_num / 3600);
- var minutes = Math.floor((sec_num - (hours * 3600)) / 60);
- var seconds = sec_num - (hours * 3600) - (minutes * 60);
- var hoursString = '';
- var minutesString = '';
- var secondsString = '';
- hoursString = (hours < 10) ? "0" + hours : hours.toString();
- minutesString = (minutes < 10) ? "0" + minutes : minutes.toString();
- secondsString = (seconds < 10) ? "0" + seconds : seconds.toString();
+ let sec_num = parseInt(inputSeconds.toString(), 10); // don't forget the second param
+ let hours = Math.floor(sec_num / 3600);
+ let minutes = Math.floor((sec_num - (hours * 3600)) / 60);
+ let seconds = sec_num - (hours * 3600) - (minutes * 60);
+ let hoursString = '';
+ let minutesString = '';
+ let secondsString = '';
+ hoursString = (hours < 10) ? '0' + hours : hours.toString();
+ minutesString = (minutes < 10) ? '0' + minutes : minutes.toString();
+ secondsString = (seconds < 10) ? '0' + seconds : seconds.toString();
return minutesString + ':' + secondsString;
}
- validate()
- {
- //this.checkSMSActivationCode(this.smc_code);
+ validate() {
+ // this.checkSMSActivationCode(this.smc_code);
SMSService.code = this.smc_code;
this.stopSMSMonitoring();
this.modalCtrl.dismiss();
@@ -160,16 +158,15 @@ export class SmsPage implements OnInit {
this.smsService.stopSMSMonitoring();
}
- public ResendOTP()
- {
- this.id= SMSService.national_id;
- this.mobile= SMSService.mobile_number;
- this.country_code= SMSService.country_code;
+ public ResendOTP() {
+ this.id = SMSService.national_id;
+ this.mobile = SMSService.mobile_number;
+ this.country_code = SMSService.country_code;
console.log(this.id);
console.log(this.mobile);
console.log(this.country_code);
-
- let zip =this.country_code;
+
+ const zip = this.country_code;
// if (this.country_code.indexOf('+') !== -1) {
// zip = this.country_code.substring(this.country_code.indexOf('+') + 1);
// }
diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts
index f0be12f4..60dfc34f 100644
--- a/Mohem/src/app/home/home.page.ts
+++ b/Mohem/src/app/home/home.page.ts
@@ -359,6 +359,7 @@ export class HomePage implements OnInit {
for (let i = 0; i < this.menuList.length; i++) {
if (this.menuList[i].MENU_TYPE === 'M') {
this.events.publish('myTeamFlag', 'true');
+ // this.common.sharedService.setSharedData('true', "myTeamFlag");
}
}
diff --git a/Mohem/src/app/my-specialist/home/home.component.ts b/Mohem/src/app/my-specialist/home/home.component.ts
index d820bbaf..ea4bf9f2 100644
--- a/Mohem/src/app/my-specialist/home/home.component.ts
+++ b/Mohem/src/app/my-specialist/home/home.component.ts
@@ -133,7 +133,7 @@ export class HomeComponent implements OnInit {
}
}
- private getSpecialistInfo(i) {
+ public getSpecialistInfo(i) {
// this.navCtrl.push("MyTeamPage", { employee: this.specialistEmpList[i], isSpecialist: true });
this.cs.sharedService.setSharedData(this.specialistEmpList[i], MyTeamService.EMPLOYEE_SHARED_DATA);
this.cs.sharedService.setSharedData(true, 'isSpecialist');
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 7750f3d9..43ea2773 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
@@ -25,7 +25,7 @@ export class ApplyActionModalComponent implements OnInit {
messageSuccess: boolean;
- constructor( private ts: TranslatorService,private modalCtrl: ModalController, private cs: CommonService,public worklistMainService: WorklistMainService,
+ constructor( public ts: TranslatorService,private modalCtrl: ModalController, private cs: CommonService,public worklistMainService: WorklistMainService,
) {
this.getPassNotificationDetails = this.cs.sharedService.getSharedData('passNotificationInfo',false);
diff --git a/Mohem/src/app/notification/item-history/item-history.component.ts b/Mohem/src/app/notification/item-history/item-history.component.ts
index fba66ff8..5016f982 100644
--- a/Mohem/src/app/notification/item-history/item-history.component.ts
+++ b/Mohem/src/app/notification/item-history/item-history.component.ts
@@ -26,7 +26,7 @@ export class ItemHistoryComponent implements OnInit {
constructor(
public worklistMainService: WorklistMainService,
private cs: CommonService,
- private ts: TranslatorService,
+ public ts: TranslatorService,
private modalCtrl: ModalController,
public worklistService: WorklistService
) {
diff --git a/Mohem/src/app/notification/mo-item-history/mo-item-history.component.html b/Mohem/src/app/notification/mo-item-history/mo-item-history.component.html
index 846a9cfe..e89751b5 100644
--- a/Mohem/src/app/notification/mo-item-history/mo-item-history.component.html
+++ b/Mohem/src/app/notification/mo-item-history/mo-item-history.component.html
@@ -1,3 +1,226 @@
-
- mo-item-history works!
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0">
+
{{ 'general, empty' | translate}}
+
+ 0 ">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{itemHistory.REQUEST_NUMBER}}
+
+
+
+
+
+
+
+ {{itemHistory.UNIT_OF_MEASURE}}
+
+
+
+
+
+
+
+
+ {{itemHistory.QUANTITY}}
+
+
+
+
+
+
+
+ {{itemHistory.DATE_REQUIRED}}
+
+
+
+
+
+
+
+
+
+
+ {{itemHistory.LINE_STATUS_DIS}}
+
+
+
+
+
+
+
+
+ {{itemHistory.STATUS_DATE}}
+
+
+
+
+
+
+
+
+
+
+ {{itemHistory.TRANSACTION_TYPE_NAME}}
+
+
+
+
+
+
+
+
+ {{itemHistory.ORGANIZATION_NAME}}
+
+
+
+
+
+
+
+
+
+
+ {{itemHistory.ORGANIZATION_CODE}}
+
+
+
+
+
+
+
+
+ {{itemHistory.OPERATING_UNIT_NAME}}
+
+
+
+
+
+
+
+
+
+
+ {{itemHistory.FROM_SUBINVENTORY_CODE}}
+
+
+
+
+
+
+
+
+ {{itemHistory.FROM_LOCATOR}}
+
+
+
+
+
+
+
+
+
+
+ {{itemHistory.TO_SUBINVENTORY_CODE}}
+
+
+
+
+
+
+
+
+ {{itemHistory.TO_LOCATOR}}
+
+
+
+
+
+
+
+
+
+
+ {{itemHistory.SHIP_TO_LOCATION}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mohem/src/app/notification/mo-item-history/mo-item-history.component.scss b/Mohem/src/app/notification/mo-item-history/mo-item-history.component.scss
index e69de29b..ae11a4d9 100644
--- a/Mohem/src/app/notification/mo-item-history/mo-item-history.component.scss
+++ b/Mohem/src/app/notification/mo-item-history/mo-item-history.component.scss
@@ -0,0 +1,31 @@
+.itemeHistoryist {
+ background: #f0efef;
+ padding: 6px;
+ /* margin-top: 20px; */
+ /* width: 100%;*/
+}
+ion-label.labelValue.sc-ion-label-ios-h.sc-ion-label-ios-s.ios.hydrated,
+ion-label.labelValue.sc-ion-label-md-h.sc-ion-label-md-s.md.hydrated
+{
+ // white-space: pre-wrap !important;
+ // --color: initial;
+ // display: block;
+ // color: var(--color);
+ // font-family: var(--ion-font-family,inherit);
+ // font-size: inherit;
+ // text-overflow: ellipsis;
+ // overflow: hidden;
+ // -webkit-box-sizing: border-box;
+ // box-sizing: border-box
+
+
+
+ --color: initial;
+ display: contents !important;
+ font-family: var(--ion-font-family, inherit);
+ font-size: inherit;
+ text-overflow: ellipsis !important;
+ white-space: pre;
+ overflow: hidden;
+ box-sizing: border-box;
+}
\ No newline at end of file
diff --git a/Mohem/src/app/notification/mo-item-history/mo-item-history.component.ts b/Mohem/src/app/notification/mo-item-history/mo-item-history.component.ts
index 67073b99..f67d319d 100644
--- a/Mohem/src/app/notification/mo-item-history/mo-item-history.component.ts
+++ b/Mohem/src/app/notification/mo-item-history/mo-item-history.component.ts
@@ -1,4 +1,11 @@
import { Component, OnInit } from '@angular/core';
+import { WorklistMainService } from '../service/work-list.main.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';
+import { WorklistService } from '../service/worklist.service';
+import { MOItemHistoryReq } from '../models/MOItemHistoryReq';
+import { MOItemHistoryRes } from '../models/MOItemHistoryRes';
@Component({
selector: 'app-mo-item-history',
@@ -6,12 +13,111 @@ import { Component, OnInit } from '@angular/core';
styleUrls: ['./mo-item-history.component.scss'],
})
export class MoItemHistoryComponent implements OnInit {
+ getPassMOInfo: any;
+ itemHistoryRes: any;
+ IsReachEnd: boolean = false;
+ P_PAGE_NUM: number = 1;
+ P_PAGE_LIMIT: number = 50;
+ MOItemHistoryReq: any;
- constructor() { }
+ constructor(
+ public worklistMainService: WorklistMainService,
+ private cs: CommonService,
+ private ts: TranslatorService,
+ public worklistService: WorklistService
+ ) {
+ this.getPassMOInfo = this.cs.sharedService.getSharedData('passMOReq');
+
+ this.MOItemHistoryReq = new MOItemHistoryReq();
+ this.MOItemHistoryReq.P_PAGE_NUM = this.P_PAGE_NUM;
+ this.MOItemHistoryReq.P_PAGE_LIMIT = this.P_PAGE_LIMIT;
+ this.MOItemHistoryReq.P_ITEM_ID= this.getPassMOInfo.P_ITEM_ID;
+ this.MOItemHistoryReq.P_ORG_ID= this.getPassMOInfo.P_ORG_ID;
+
+ }
ngOnInit() {
+ this.getMOItemHistory(this.getPassMOInfo.P_ITEM_ID,this.getPassMOInfo.P_ORG_ID);
+
+
+
+ }
+
+ getMOItemHistory(itemID ,orgID) {
+ console.log(itemID);
+ this.IsReachEnd = false;
+ const request = new MOItemHistoryReq();
+ request.P_ITEM_ID = parseInt(itemID);
+ request.P_PAGE_LIMIT = 100;
+ request.P_PAGE_NUM = 1;
+ request.P_ORG_ID= parseInt(orgID);
+
+
+
+ this.worklistMainService.getMOItemHistory(request).
+ subscribe((result: MOItemHistoryRes) => {
+
+ this.handleItemHistoryResult(result);
+ });
+ }
+
+
+ handleItemHistoryResult(result) {
+ if (this.cs.validResponse(result)) {
+ if (this.cs.hasData(result.GetMoItemHistoryList)) {
+ this.itemHistoryRes = result.GetMoItemHistoryList;
+ this.P_PAGE_NUM++;
+ this.MOItemHistoryReq.P_PAGE_NUM = this.P_PAGE_NUM;
+ let lastItemIndex = this.itemHistoryRes.length - 1;
+ if (result.GetMoItemHistoryList[lastItemIndex]) {
+ let lastitem = result.GetMoItemHistoryList[lastItemIndex];
+ if (lastitem.NO_OF_ROWS == lastitem.ROW_NUM) {
+ this.IsReachEnd = true;
+ } else {
+ this.IsReachEnd = false;
+ }
+ }
+ }
+
+ }
+
+}
+
+
+doInfinite(infiniteScroll) {
+ if (!this.IsReachEnd) {
+ // this.POItemHistoryReq.P_PAGE_NUM = this.P_PAGE_NUM;
+ this.worklistMainService.getMOItemHistory(this.MOItemHistoryReq).
+ subscribe((result: any) => {
+ if (this.cs.validResponse(result)) {
+ if (result.GetMoItemHistoryList != undefined) {
+ this.MOItemHistoryReq.P_PAGE_NUM=this.P_PAGE_NUM++;
+ (result.GetMoItemHistoryList).forEach(element => {
+ if (element.ROW_NUM == element.NO_OF_ROWS) {
+ this.IsReachEnd = true;
+ } else {
+ this.IsReachEnd = false;
+ }
+ this.itemHistoryRes.push(element);
+ }, (Error) => console.log(Error), () => infiniteScroll.target.complete());
+ }// if list length >0
+ else {
+ this.IsReachEnd = true;
+ }
+ }// if response == 1
+ //this.pageNum++;
+ infiniteScroll.target.complete();
+
+ });
+ } else {
+ if (infiniteScroll)
+ infiniteScroll.target.complete();
}
+}//end infiniteScroll
+
+
+
}
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
index 3a52bbc2..5057534b 100644
--- 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
@@ -11,7 +11,7 @@ import { TranslatorService } from 'src/app/hmg-common/services/translator/transl
export class MoreActionModalComponent implements OnInit {
actionBtns :any =[];
radioButtonValue: any;
- constructor( private ts: TranslatorService,private modalCtrl: ModalController, private cs: CommonService){}
+ constructor( public ts: TranslatorService,private modalCtrl: ModalController, private cs: CommonService){}
ngOnInit() {
console.log("modal");
diff --git a/Mohem/src/app/notification/notification.module.ts b/Mohem/src/app/notification/notification.module.ts
index caa8cc34..e191db27 100644
--- a/Mohem/src/app/notification/notification.module.ts
+++ b/Mohem/src/app/notification/notification.module.ts
@@ -27,10 +27,10 @@ import { QutationAnalysisComponent } from './qutation-analysis/qutation-analysis
import { WorklistMainMRComponent } from './worklist-main-mr/worklist-main-mr.component';
import { WorklistAdvancedSearchComponent } from './worklist-advanced-search/worklist-advanced-search.component';
import { WorkListMainItgComponent } from './work-list-main-itg/work-list-main-itg.component';
-
// import { WorklistMainComponent } from './worklist-main/worklist-main.component';
-import {MoreActionModalComponent} from './more-action-modal/more-action-modal.component'
+import {MoreActionModalComponent} from './more-action-modal/more-action-modal.component'
import { WorkListReplacementItgComponent } from './work-list-replacement-itg/work-list-replacement-itg.component';
+import { MoItemHistoryComponent } from './mo-item-history/mo-item-history.component';
const routes: Routes = [
@@ -114,7 +114,11 @@ const routes: Routes = [
{
path: 'worklist-replacement-itg',
component: WorkListReplacementItgComponent
- }
+ },
+ {
+ path: 'item-history-MO',
+ component: MoItemHistoryComponent
+ }
]
}
];
@@ -148,7 +152,8 @@ const routes: Routes = [
WorklistMainMRComponent,
WorklistAdvancedSearchComponent,
WorkListMainItgComponent,
- WorkListReplacementItgComponent
+ WorkListReplacementItgComponent,
+ MoItemHistoryComponent
// WorklistMainComponent
],
entryComponents: [
diff --git a/Mohem/src/app/notification/qutation-analysis/qutation-analysis.component.ts b/Mohem/src/app/notification/qutation-analysis/qutation-analysis.component.ts
index 3739b984..e7b915c4 100644
--- a/Mohem/src/app/notification/qutation-analysis/qutation-analysis.component.ts
+++ b/Mohem/src/app/notification/qutation-analysis/qutation-analysis.component.ts
@@ -28,7 +28,7 @@ export class QutationAnalysisComponent implements OnInit {
doInfiniteReq: any;
constructor(public worklistMainService: WorklistMainService,
private cs: CommonService,
- private ts: TranslatorService,
+ public ts: TranslatorService,
private modalCtrl: ModalController,
public worklistService: WorklistService) {
this.getPassPOItemID = this.cs.sharedService.getSharedData('passPOInfo',false);
diff --git a/Mohem/src/app/notification/service/work-list.main.service.ts b/Mohem/src/app/notification/service/work-list.main.service.ts
index 55721b2a..2876fe15 100644
--- a/Mohem/src/app/notification/service/work-list.main.service.ts
+++ b/Mohem/src/app/notification/service/work-list.main.service.ts
@@ -34,7 +34,7 @@ export class WorklistMainService {
public static getPRNotificationBody =
"Services/ERP.svc/REST/GET_PR_NOTIFICATION_BODY";
public static getPOItemHistory = "Services/ERP.svc/REST/GET_PO_ITEM_HISTORY";
- public static getMOItemHistory = "GET_MO_ITEM_HISTORY";
+ public static getMOItemHistory = "Services/ERP.svc/REST/GET_MO_ITEM_HISTORY";
public static getNotificationButtons =
"Services/ERP.svc/REST/GET_NOTIFICATION_BUTTONS";
public static getUserInfo = "Services/ERP.svc/REST/Get_UserInformation";
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 41f21f98..c6848fb7 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
@@ -8,7 +8,7 @@
-
+ [ngClass]="{'bg-blue-dot' : approvalInfo.Action === 'Submit', 'bg-green-dot':approvalInfo.Action === 'Approved', 'bg-red-dot':approvalInfo.Action === 'Rejected', 'bg-gray-dot':approvalInfo.Action === 'Pending'}"
+ [class]="direction == 'en'? 'timeline-thumb-en timeline-icon': 'timeline-thumb-ar timeline-icon'"
+ [ngClass]="{'bg-gray-dot' : approvalInfo.Action === ''}">
{{approvalInfo.Action}}
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 189a7245..5de8fd21 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
@@ -53,6 +53,7 @@ export class WorkListMainItgComponent implements OnInit {
public actionBTN: { name: string, image: string, isAvailable: boolean }[] = [];
index2: number;
direction: string;
+ defaultSegment = '';
constructor(
public common: CommonService,
public ts: TranslatorService,
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 bf60a710..164924ff 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
@@ -11,7 +11,7 @@