fixed sfh reported issues

MOHEMM-PHASE-2-SFH
umasoodch 3 years ago
parent 5e947bc260
commit 60e48aeeb1

@ -19,8 +19,12 @@ export class CardFilterComponent implements OnInit {
ngOnInit() { ngOnInit() {
this.direction = TranslatorService.getCurrentLanguageName(); this.direction = TranslatorService.getCurrentLanguageName();
console.log(this.direction); console.log(this.direction);
if (this.direction == 'ar') { if (this.direction == 'ar' && this.text == 'HR') {
this.text = 'الموارد البشرية'; this.text = 'الموارد البشرية';
} else if (this.direction == 'ar' && this.text == 'PR') {
this.text = 'طلب شراء';
} else if (this.direction == 'ar' && this.text == 'PO') {
this.text = 'أمر شراء';
} }
} }

@ -141,11 +141,11 @@
<ion-label class="labelValue" for="">{{Lines.REQUESTOR}} </ion-label> <ion-label class="labelValue" for="">{{Lines.REQUESTOR}} </ion-label>
</ion-col> </ion-col>
</ion-row> </ion-row>
<ion-row> <!-- <ion-row>
<ion-col> <ion-col>
<div style="text-align: center"> <div style="text-align: center">
<button ion-button class="itemHISBtn" <button ion-button class="itemHISBtn"
(click)="getItemHistory(Lines.ITEM_ID)"> (click)="getItemHistory(Lines.ITEM_CODE)">
{{ts.trPK('worklistMain','ITEM_HIS')}} {{ts.trPK('worklistMain','ITEM_HIS')}}
</button> </button>
</div> </div>
@ -153,12 +153,12 @@
<ion-col> <ion-col>
<div style="text-align: center"> <div style="text-align: center">
<button ion-button class="itemHISBtn" <button ion-button class="itemHISBtn"
(click)="getQutationAnalysis(Lines.PO_HEADER_ID ,Lines.ITEM_ID)"> (click)="getQutationAnalysis(Lines.PO_HEADER_ID ,Lines.ITEM_CODE)">
{{ts.trPK('worklistMain','QUOTATION_ANALYSIS')}} {{ts.trPK('worklistMain','QUOTATION_ANALYSIS')}}
</button> </button>
</div> </div>
</ion-col> </ion-col>
</ion-row> </ion-row> -->
</ion-grid> </ion-grid>
</div> </div>
</accordin-tab-custom> </accordin-tab-custom>

@ -309,11 +309,11 @@ export class WorklistMainPoComponent implements OnInit {
} }
} else if (Type == "PO") { } else if (Type == "PO") {
if (result.GetPoNotificationBodyList) { if (result.SFH_GetPoNotificationBodyList) {
// console.log("PO"); // console.log("PO");
this.POHeader = result.GetPoNotificationBodyList.POHeader; this.POHeader = result.SFH_GetPoNotificationBodyList.POHeader;
this.POLines = result.GetPoNotificationBodyList.POLines; this.POLines = result.SFH_GetPoNotificationBodyList.POLines;
for (var i = 0; i < this.POHeader.length; i++) { for (var i = 0; i < this.POHeader.length; i++) {
this.PO_NUMBER = this.POHeader[i].PO_NUMBER; this.PO_NUMBER = this.POHeader[i].PO_NUMBER;
@ -332,7 +332,7 @@ export class WorklistMainPoComponent implements OnInit {
// HDR_ATTRIBUTE_VALUE // HDR_ATTRIBUTE_VALUE
} }
this.notificationBodyRes = this.notificationBodyRes =
result.GetPoNotificationBodyList; result.SFH_GetPoNotificationBodyList;
} }
}// }//
} }
@ -1042,10 +1042,10 @@ export class WorklistMainPoComponent implements OnInit {
this.worklistMainService.getPONotificationBody(this.WorkListBodyObj). this.worklistMainService.getPONotificationBody(this.WorkListBodyObj).
subscribe((result: any) => { subscribe((result: any) => {
if (this.common.validResponse(result)) { if (this.common.validResponse(result)) {
if (result.GetPoNotificationBodyList != undefined) { if (result.SFH_GetPoNotificationBodyList != undefined) {
this.P_PAGE_NUM++; this.P_PAGE_NUM++;
this.WorkListBodyObj.P_PAGE_NUM = this.P_PAGE_NUM; this.WorkListBodyObj.P_PAGE_NUM = this.P_PAGE_NUM;
(result.GetPoNotificationBodyList).forEach(element => { (result.SFH_GetPoNotificationBodyList).forEach(element => {
if (element.ROW_NUM == element.NO_OF_ROWS) { if (element.ROW_NUM == element.NO_OF_ROWS) {
this.IsReachEnd = true; this.IsReachEnd = true;
} else { } else {

@ -307,12 +307,12 @@ export class WorklistMainPRComponent implements OnInit {
result.GetAbsenceCollectionNotificationBodyList; result.GetAbsenceCollectionNotificationBodyList;
} }
} else if (Type == 'PR') { } else if (Type == 'PR') {
if (result.GetPrNotificationBodyList) { if (result.SFH_GetPrNotificationBodyList) {
console.log('PR'); console.log('PR');
this.pInformation = result.GetPrNotificationBodyList.P_INFORMATION; this.pInformation = result.SFH_GetPrNotificationBodyList.P_INFORMATION;
this.PRHeader = result.GetPrNotificationBodyList.PRHeader; this.PRHeader = result.SFH_GetPrNotificationBodyList.PRHeader;
this.PRLines = result.GetPrNotificationBodyList.PRLines; this.PRLines = result.SFH_GetPrNotificationBodyList.PRLines;
for (var i = 0; i < this.PRHeader.length; i++) { for (var i = 0; i < this.PRHeader.length; i++) {
if (this.PRHeader[i].HDR_ATTRIBUTE_NAME === 'Requisition Total') { if (this.PRHeader[i].HDR_ATTRIBUTE_NAME === 'Requisition Total') {
this.totalH = this.PRHeader[i].HDR_ATTRIBUTE_NAME; this.totalH = this.PRHeader[i].HDR_ATTRIBUTE_NAME;
@ -329,7 +329,7 @@ export class WorklistMainPRComponent implements OnInit {
// HDR_ATTRIBUTE_VALUE // HDR_ATTRIBUTE_VALUE
} }
this.notificationBodyRes = this.notificationBodyRes =
result.GetPrNotificationBodyList; result.SFH_GetPrNotificationBodyList;
} }
} }
} }
@ -962,11 +962,11 @@ export class WorklistMainPRComponent implements OnInit {
this.worklistMainService.getPRNotificationBody(this.WorkListBodyObj). this.worklistMainService.getPRNotificationBody(this.WorkListBodyObj).
subscribe((result: any) => { subscribe((result: any) => {
if (this.common.validResponse(result)) { if (this.common.validResponse(result)) {
if (result.GetPrNotificationBodyList != undefined) { if (result.SFH_GetPrNotificationBodyList != undefined) {
this.P_PAGE_NUM++; this.P_PAGE_NUM++;
this.WorkListBodyObj.P_PAGE_NUM = this.P_PAGE_NUM; this.WorkListBodyObj.P_PAGE_NUM = this.P_PAGE_NUM;
(result.GetPrNotificationBodyList).forEach(element => { (result.SFH_GetPrNotificationBodyList).forEach(element => {
if (element.ROW_NUM == element.NO_OF_ROWS) { if (element.ROW_NUM == element.NO_OF_ROWS) {
this.IsReachEnd = true; this.IsReachEnd = true;
} else { } else {

@ -441,10 +441,10 @@ export class WorklistMainComponent implements OnInit {
if (this.common.validResponse(result)) { if (this.common.validResponse(result)) {
this.pInformation = result.P_INFORMATION; this.pInformation = result.P_INFORMATION;
this.pQuestion = result.P_QUESTION; this.pQuestion = result.P_QUESTION;
if (Type == "EIT") { if (Type == "SIT") {
if (result.GetEITCollectionNotificationBodyList) { if (result.GetSITCollectionNotificationBodyList) {
this.notificationBodyRes = this.notificationBodyRes =
result.GetEITCollectionNotificationBodyList; result.GetSITCollectionNotificationBodyList;
if (this.notificationBodyRes[0].Collection_Notification) { if (this.notificationBodyRes[0].Collection_Notification) {
console.log(this.notificationBodyRes[0].Collection_Notification); console.log(this.notificationBodyRes[0].Collection_Notification);
} }

@ -59,7 +59,7 @@
</div> </div>
</ion-col> </ion-col>
<!-- (click)="selectedSegment('family')" --> <!-- (click)="selectedSegment('family')" -->
<ion-col [size]="3" (click)="selectedSegment('family')" style="pointer-events: none; opacity: 0.4;"> <ion-col [size]="3" (click)="selectedSegment('family')">
<div class="action-button col-button"> <div class="action-button col-button">
<img *ngIf="!familyMemberSegment" style="width: 40px;" src="../assets/imgs/profile-icons/family.svg"> <img *ngIf="!familyMemberSegment" style="width: 40px;" src="../assets/imgs/profile-icons/family.svg">
<img *ngIf="familyMemberSegment" style="width: 40px;" src="../assets/imgs/profile-icons/family-g.svg"> <img *ngIf="familyMemberSegment" style="width: 40px;" src="../assets/imgs/profile-icons/family-g.svg">
@ -404,8 +404,8 @@
<ion-col size='4'> <ion-col size='4'>
<ion-label><p style="font-weight: bold; font-size: 14px;">{{data.RELATIONSHIP}}</p></ion-label> <ion-label><p style="font-weight: bold; font-size: 14px;">{{data.RELATIONSHIP}}</p></ion-label>
</ion-col> </ion-col>
<ion-col [size]='direction === "ltr" ? 5 : 8 ' [offset]='direction === "ltr" ? 3 : 0 '> <ion-col [size]='direction === "ltr" ? 5 : 8 ' [offset]='direction === "ltr" ? 3 : 0 ' [ngClass]="dependentDetails && dependentDetails.DELETE_BUTTON === 'Y' ? '' :'disabledButton'">
<div [ngClass]="direction === 'ltr' ? 'float-right-moe' :'float-left-moe'" class='family-member-button' style="height: 32px !important;" (click)='RemoveFunction(data)' [ngClass]="dependentDetails && dependentDetails.DELETE_BUTTON === 'Y' ? '' :'disabledButton'"> <div [ngClass]="direction === 'ltr' ? 'float-right-moe' :'float-left-moe'" class='family-member-button' style="height: 32px !important;" (click)='RemoveFunction(data)'>
<ion-icon name="trash" style="width: 20px; height: 20px; color: #CA3332;"></ion-icon> <ion-icon name="trash" style="width: 20px; height: 20px; color: #CA3332;"></ion-icon>
<p style="color: #CA3332;">{{ts.trPK('userProfile','remove')}}</p> <p style="color: #CA3332;">{{ts.trPK('userProfile','remove')}}</p>
</div> </div>

Loading…
Cancel
Save