fix worklist

arabic-version
ashwaq 6 years ago
parent fee59fb259
commit 85a5087b44

@ -790,7 +790,7 @@ export class ConfirmLoginComponent implements OnInit {
request.DeviceType= this.cs.getDeviceType();
request.DeviceToken="5ca8a69cf1804db55264c349edffb99b9d63acd9fa9b6b18956bcb2ad3f2ba36";//this.deviceToken;
request.DeviceToken=this.deviceToken;//"5ca8a69cf1804db55264c349edffb99b9d63acd9fa9b6b18956bcb2ad3f2ba36";//this.deviceToken;
//request.TokenID=

@ -300,7 +300,7 @@ export class LoginComponent implements OnInit, OnDestroy {
console.log(result);
this.loginData.LogInTokenID = result.LogInTokenID;
this.loginData.P_USER_NAME = this.username;
this.loginData.EmployeeName =result.MemberLoginList[0].EMPLOYEE_NAME;
// this.loginData.EmployeeName =result.MemberLoginList[0].EMPLOYEE_NAME;
this.cs.sharedService.setSharedData(this.loginData.P_USER_NAME, LoginRequest.SHARED_DATA);
this.sharedData.setSharedData(this.loginData, AuthenticationService.LOGIN_DATA);

@ -25,7 +25,7 @@
</ion-list-header> -->
<ion-radio-group>
<ion-item *ngFor="let RepList of getRepList">
<ion-item lines="none" *ngFor="let RepList of getRepList">
<!-- <ion-col> -->
<ion-label>{{RepList.USER_NAME}}</ion-label>
<ion-label>{{RepList.EMPLOYEE_DISPLAY_NAME}}</ion-label>

@ -8,7 +8,7 @@
<ion-content >
<ion-list style="margin-bottom:2px !important" [hidden]="isAnswer==true">
<ion-item>
<ion-item lines="none">
<ion-label class="boldTxtNav">{{'replacementRoll, searchBy' | translate}}</ion-label>
<ion-select okText='{{"general, ok" | translate }}' cancelText='{{"general, cancel" | translate }}'
[(ngModel)]="searchBy">

@ -199,7 +199,6 @@ export class WorkListReplacementRollComponent implements OnInit {
}
submitAction() {
this.selEmp
if (this.selEmp && this.isAnswer == false) {
// this.selectedUserInf = this.ReplacementList[this.selEmp];
@ -212,6 +211,7 @@ export class WorkListReplacementRollComponent implements OnInit {
this.WorkListActionObj.P_FORWARD_TO_USER_NAME = this.selectedUserInf.USER_NAME;
this.WorkListActionObj.P_ACTION_MODE = this.getPassActionMode;
this.WorkListActionObj.P_COMMENTS = this.userNote;// response Attr
this.modalCtrl.dismiss();
this.workListMainService.actionButton(this.WorkListActionObj).
subscribe((result: any) => {
@ -233,6 +233,7 @@ export class WorkListReplacementRollComponent implements OnInit {
this.WorkListActionObj.P_FORWARD_TO_USER_NAME = null;
this.WorkListActionObj.P_ACTION_MODE = this.getPassActionMode;
this.WorkListActionObj.P_COMMENTS = this.userNote;// response Attr
this.modalCtrl.dismiss();
this.workListMainService.actionButton(this.WorkListActionObj).
subscribe((result: any) => {
@ -252,10 +253,15 @@ export class WorkListReplacementRollComponent implements OnInit {
handleApplayActionResult(result) {
if (this.cs.validResponse(result)) {
if (result.MessageStatus == 1) {
// let msg=this.translate.translate("general.success");
// this.cs.showAlert(msg);
// this.navCtrl.push("HomePage");
// here show succsfull msg
this.cs.openNotificationPage();
}
} // valid it
}

@ -22,7 +22,7 @@
<ion-item>
<ion-item lines="none">
<div class="square-container">
<div (click)="select(rfcEmployeeList,i)" *ngFor="let rfcEmployeeList of RFCEmployeeListListRes; let i = index;"
class="square">

@ -100,6 +100,8 @@ export class WorkListRfcComponent implements OnInit {
this.WorkListActionObj.P_ACTION_MODE = "RFC";
this.WorkListActionObj.P_COMMENTS = this.userNote;// response Attr
this.WorkListActionObj.P_APPROVER_INDEX = this.seqNo;
this.modalCtrl.dismiss();
this.workListMainService.actionButton(this.WorkListActionObj).
subscribe((result: any) => {
this.handleApplayActionResult(result);
@ -126,6 +128,8 @@ export class WorkListRfcComponent implements OnInit {
// this.common.showAlert(msg);
// this.navCtrl.push("HomePage");
// this.cs.openHome();
// here show succsfull msg
this.cs.openNotificationPage();
}
} // valid it

@ -326,7 +326,7 @@ export class WorklistMainMRComponent implements OnInit {
actionButton(action) {
console.log("actionButton" + action);
alert("don't forget");
// alert("don't forget");
//let ButtonAction: string = this.actionType;
let ButtonAction: string = action;
var responseAttrDic = this.notExampleJsonObject;

@ -362,7 +362,7 @@ export class WorklistMainPoComponent implements OnInit {
actionButton(action) {
console.log("actionButton" + action);
alert("don't forget");
// alert("don't forget");
//let ButtonAction: string = this.actionType;
let ButtonAction: string = action;

@ -361,7 +361,7 @@ export class WorklistMainPRComponent implements OnInit {
actionButton(action) {
console.log("actionButton" + action);
alert("don't forget");
//alert("don't forget");
//let ButtonAction: string = this.actionType;
let ButtonAction: string = action;

@ -322,6 +322,7 @@ export class WorklistMainComponent implements OnInit {
} // End handleWorkListButtonsResult
applyAction(WorkListActionObj) {
console.log("MemberLoginList");
this.worklistMainService
.actionButton(WorkListActionObj)
.subscribe((result: any) => {
@ -411,7 +412,7 @@ export class WorklistMainComponent implements OnInit {
this.WorkListActionObj.P_FORWARD_TO_USER_NAME = "";
this.WorkListActionObj.P_ACTION_MODE = ButtonAction;
this.WorkListActionObj.P_COMMENTS = "";
// this.WorkListActionObj.RespondAttributeList = this.P_RESPOND_ATTRIBUTES_TBL;
this.WorkListActionObj.RespondAttributeList = this.P_RESPOND_ATTRIBUTES_TBL;
this.common.sharedService.setSharedData(
this.getPassNotificationDetails,

Loading…
Cancel
Save