From 332732f61920460b34b49de2b77900970375731b Mon Sep 17 00:00:00 2001 From: enadhilal Date: Sun, 29 Aug 2021 16:25:58 +0300 Subject: [PATCH] fixed feedback issues --- .../announcement/announcement.component.html | 18 ++++---- .../announcement/announcement.component.ts | 46 ++++++++++++++++--- .../announcement.service.ts | 3 +- .../services/models/announcement-request.ts | 1 + .../work-list-main-itg.component.html | 16 +++++++ .../work-list-main-itg.component.ts | 5 ++ .../worklist-main-po.component.html | 4 +- .../worklist-main-pr.component.html | 4 +- .../worklist-main.component.html | 4 +- 9 files changed, 79 insertions(+), 22 deletions(-) diff --git a/Mohem/src/app/backend-integrations/announcement/announcement.component.html b/Mohem/src/app/backend-integrations/announcement/announcement.component.html index e3001246..7402c007 100644 --- a/Mohem/src/app/backend-integrations/announcement/announcement.component.html +++ b/Mohem/src/app/backend-integrations/announcement/announcement.component.html @@ -58,20 +58,20 @@ - + - {{item.title_EN}}
-

{{item.date}}

+ {{detialData.title_EN}}
+

{{detialData.date}}

- {{item.title_AR}}
-

{{item.date}}

+ {{detialData.title_AR}}
+

{{detialData.date}}

- -
+ +
-

-

+

+

diff --git a/Mohem/src/app/backend-integrations/announcement/announcement.component.ts b/Mohem/src/app/backend-integrations/announcement/announcement.component.ts index c3d6a9bf..aab4b825 100644 --- a/Mohem/src/app/backend-integrations/announcement/announcement.component.ts +++ b/Mohem/src/app/backend-integrations/announcement/announcement.component.ts @@ -22,6 +22,14 @@ export class AnnouncementComponent implements OnInit { public pageSize = 1; public pageLength = 0; public lengthCounter = 5; + public detialData: { + id: number, + title_EN: string, + title_AR: string, + body_EN: string, + body_AR: string, + img?: string, + date: Date}; constructor( public announcementService: AnnouncementService, @@ -37,24 +45,51 @@ export class AnnouncementComponent implements OnInit { filterList(event) { const val = event.target.value; if (val === '') { - this.announcementList = this.arr; + this.announcementList = this.arrList; } - this.announcementList = this.arr.filter((item) => { + this.announcementList = this.arrList.filter((item) => { return (item.title_EN.toLowerCase().indexOf(val.toLowerCase()) > -1); }); } toggleAnnouncement(item) { + this.common.startLoading(); + let holdData; + let data; this.announcementList.forEach(element => { if (element.id === item.id) { - element.isOpen = !element.isOpen; + this.announcementService.getAnnouncementListService(this.pageSize, item.id).subscribe((result: any) => { + if (this.common.validResponse(result)) { + holdData = JSON.parse(result.Mohemm_ITG_ResponseItem); + data = JSON.parse(holdData.result.data)[0]; + console.log(data); + this.detialData = { + id: data.rowID, + title_EN: data.Title_EN, + title_AR: data.Title_AR, + body_EN: data.Body_EN, + body_AR: data.Body_AR, + date: data.created, + img: data.Banner_Image + }; + element.isOpen = !element.isOpen; + this.common.stopLoading(); + } + console.log(this.detialData); + }); } else { element.isOpen = false; } }); } + + closeAnnouncement(item){ + item.isOpen = false; + } + getAnnouncementListService() { + this.common.startLoading(); let holdData; this.announcementService.getAnnouncementListService(this.pageSize).subscribe((result: any) => { if (this.common.validResponse(result)) { @@ -83,11 +118,10 @@ export class AnnouncementComponent implements OnInit { if ( i < this.numberOfListLength){ this.announcementList.push(this.arr[i]); } - + this.arrList.push(this.arr[i]); } - this.arrList = this.arr; - console.log(this.announcementList); } + this.common.stopLoading(); }); } diff --git a/Mohem/src/app/hmg-common/services/announcement-services/announcement.service.ts b/Mohem/src/app/hmg-common/services/announcement-services/announcement.service.ts index 3bf931b0..1a3c9bac 100644 --- a/Mohem/src/app/hmg-common/services/announcement-services/announcement.service.ts +++ b/Mohem/src/app/hmg-common/services/announcement-services/announcement.service.ts @@ -17,13 +17,14 @@ export class AnnouncementService { ) { } - getAnnouncementListService(pageNumber: number, onError ?: any , oerrorLable ?: any) { + getAnnouncementListService(pageNumber: number, id?: number, onError ?: any , oerrorLable ?: any) { const request = new AnnouncementRequest(); this.authService.authenticateRequest(request); request.EmployeeNumber = request.P_USER_NAME; request.ItgPageNo = pageNumber; request.ItgPageSize = 5; request.ItgAwarenessID = 0; + request.ItgRowID = (id) ? Number(id) : 0; return this.con.post( AnnouncementService.getAnnouncemntList, request, diff --git a/Mohem/src/app/hmg-common/services/models/announcement-request.ts b/Mohem/src/app/hmg-common/services/models/announcement-request.ts index 563642aa..d82c439c 100644 --- a/Mohem/src/app/hmg-common/services/models/announcement-request.ts +++ b/Mohem/src/app/hmg-common/services/models/announcement-request.ts @@ -7,5 +7,6 @@ export class AnnouncementRequest extends Request { public ItgPageNo: number; public ItgPageSize: number; public ItgAwarenessID: number; + public ItgRowID: number; } 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 fb428b73..533fe3e9 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 @@ -448,6 +448,22 @@ --> + + + + + +

{{ 'submitAbsence, comments' | translate}}

+
+
+ + + + + +
+
+
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 30563539..68429f62 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 @@ -106,6 +106,7 @@ export class WorkListMainItgComponent implements OnInit { this.segmentsArray = [this.segmentsArray[1], this.segmentsArray[2], this.segmentsArray[0]]; this.segmentData = [this.segmentData[1], this.segmentData[0]]; this.workList = this.request_details.WFHistory; + ; this.options = this.request_details.AllowedActions; this.activeSegment = this.segmentsArray[0].name; for (let i = 0; i < this.options.length; i++) { @@ -279,6 +280,9 @@ export class WorkListMainItgComponent implements OnInit { }); } else if (action === 2) {// reject url = WorkListMainItgComponent.REJECT; + if (!comments) { + this.common.presentAlert(this.ts.trPK('worklist', 'empty-comment')); + } else { this.workListService.getITGActionRequest(request, url) .subscribe((result: any) => { if (result.MessageStatus !== 1) { @@ -294,6 +298,7 @@ export class WorkListMainItgComponent implements OnInit { }, 2000); } }); + } } else if (action === 3) {// request more info request.NewUserEMPId = this.replcamentID; url = WorkListMainItgComponent.REQUEST_INFORMATION; 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 a9d0179d..dc6aa105 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 @@ -235,9 +235,9 @@ -