diff --git a/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.ts b/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.ts index 8e522d69..4319395b 100644 --- a/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.ts +++ b/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.ts @@ -19,8 +19,12 @@ export class CardFilterComponent implements OnInit { ngOnInit() { this.direction = TranslatorService.getCurrentLanguageName(); console.log(this.direction); - if (this.direction == 'ar') { + if (this.direction == 'ar' && this.text == 'HR') { this.text = 'الموارد البشرية'; + } else if (this.direction == 'ar' && this.text == 'PR') { + this.text = 'طلب شراء'; + } else if (this.direction == 'ar' && this.text == 'PO') { + this.text = 'أمر شراء'; } } 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 bd933831..0f1f30c0 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 @@ -141,11 +141,11 @@ {{Lines.REQUESTOR}} - + diff --git a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts index f2e79a55..4e9d5f94 100644 --- a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts +++ b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts @@ -309,11 +309,11 @@ export class WorklistMainPoComponent implements OnInit { } } else if (Type == "PO") { - if (result.GetPoNotificationBodyList) { + if (result.SFH_GetPoNotificationBodyList) { // console.log("PO"); - this.POHeader = result.GetPoNotificationBodyList.POHeader; - this.POLines = result.GetPoNotificationBodyList.POLines; + this.POHeader = result.SFH_GetPoNotificationBodyList.POHeader; + this.POLines = result.SFH_GetPoNotificationBodyList.POLines; for (var i = 0; i < this.POHeader.length; i++) { this.PO_NUMBER = this.POHeader[i].PO_NUMBER; @@ -332,7 +332,7 @@ export class WorklistMainPoComponent implements OnInit { // HDR_ATTRIBUTE_VALUE } this.notificationBodyRes = - result.GetPoNotificationBodyList; + result.SFH_GetPoNotificationBodyList; } }// } @@ -1042,10 +1042,10 @@ export class WorklistMainPoComponent implements OnInit { this.worklistMainService.getPONotificationBody(this.WorkListBodyObj). subscribe((result: any) => { if (this.common.validResponse(result)) { - if (result.GetPoNotificationBodyList != undefined) { + if (result.SFH_GetPoNotificationBodyList != undefined) { 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) { this.IsReachEnd = true; } else { diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts index 74cc53ce..7aee1b8a 100644 --- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts +++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts @@ -307,12 +307,12 @@ export class WorklistMainPRComponent implements OnInit { result.GetAbsenceCollectionNotificationBodyList; } } else if (Type == 'PR') { - if (result.GetPrNotificationBodyList) { + if (result.SFH_GetPrNotificationBodyList) { console.log('PR'); - this.pInformation = result.GetPrNotificationBodyList.P_INFORMATION; + this.pInformation = result.SFH_GetPrNotificationBodyList.P_INFORMATION; - this.PRHeader = result.GetPrNotificationBodyList.PRHeader; - this.PRLines = result.GetPrNotificationBodyList.PRLines; + this.PRHeader = result.SFH_GetPrNotificationBodyList.PRHeader; + this.PRLines = result.SFH_GetPrNotificationBodyList.PRLines; for (var i = 0; i < this.PRHeader.length; i++) { if (this.PRHeader[i].HDR_ATTRIBUTE_NAME === 'Requisition Total') { this.totalH = this.PRHeader[i].HDR_ATTRIBUTE_NAME; @@ -329,7 +329,7 @@ export class WorklistMainPRComponent implements OnInit { // HDR_ATTRIBUTE_VALUE } this.notificationBodyRes = - result.GetPrNotificationBodyList; + result.SFH_GetPrNotificationBodyList; } } } @@ -962,11 +962,11 @@ export class WorklistMainPRComponent implements OnInit { this.worklistMainService.getPRNotificationBody(this.WorkListBodyObj). subscribe((result: any) => { if (this.common.validResponse(result)) { - if (result.GetPrNotificationBodyList != undefined) { + if (result.SFH_GetPrNotificationBodyList != undefined) { 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) { this.IsReachEnd = true; } else { diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts index 74e08e0b..54fe1136 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts @@ -441,10 +441,10 @@ export class WorklistMainComponent implements OnInit { if (this.common.validResponse(result)) { this.pInformation = result.P_INFORMATION; this.pQuestion = result.P_QUESTION; - if (Type == "EIT") { - if (result.GetEITCollectionNotificationBodyList) { + if (Type == "SIT") { + if (result.GetSITCollectionNotificationBodyList) { this.notificationBodyRes = - result.GetEITCollectionNotificationBodyList; + result.GetSITCollectionNotificationBodyList; if (this.notificationBodyRes[0].Collection_Notification) { console.log(this.notificationBodyRes[0].Collection_Notification); } diff --git a/Mohem/src/app/profile/home/home.component.html b/Mohem/src/app/profile/home/home.component.html index 35433380..61ada729 100644 --- a/Mohem/src/app/profile/home/home.component.html +++ b/Mohem/src/app/profile/home/home.component.html @@ -59,7 +59,7 @@ - + @@ -404,8 +404,8 @@ {{data.RELATIONSHIP}} - - + + {{ts.trPK('userProfile','remove')}}
{{data.RELATIONSHIP}}
{{ts.trPK('userProfile','remove')}}