From ed07f19848280b8c4216d3bf085f65bb3828bbf4 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Thu, 26 Aug 2021 12:58:26 +0300 Subject: [PATCH] fixing announsment design and add pageination, SMS page added label --- .../sms-page/sms-page.page.html | 2 ++ .../announcement/announcement.component.html | 18 +++++++----- .../announcement/announcement.component.ts | 29 +++++++++++++------ .../announcement.service.ts | 5 +++- .../services/models/announcement-request.ts | 3 ++ 5 files changed, 39 insertions(+), 18 deletions(-) diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.html b/Mohem/src/app/authentication/sms-page/sms-page.page.html index 815489bd..8ae3318c 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.html +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.html @@ -58,6 +58,8 @@ +

{{'general,noOfTriesLogin' | translate}}

+ diff --git a/Mohem/src/app/backend-integrations/announcement/announcement.component.html b/Mohem/src/app/backend-integrations/announcement/announcement.component.html index b4365c41..7c0f957b 100644 --- a/Mohem/src/app/backend-integrations/announcement/announcement.component.html +++ b/Mohem/src/app/backend-integrations/announcement/announcement.component.html @@ -9,15 +9,13 @@
- + - @@ -36,9 +34,9 @@

{{item.body_AR}}

- + --> - +

{{item.title_EN}}

@@ -49,7 +47,7 @@

{{item.date}}

- +

{{item.title_EN}}

@@ -60,7 +58,7 @@
- + {{item.title_EN}}

{{item.date}}

@@ -85,4 +83,8 @@ loadingText="Loading more data..."> - \ No newline at end of file + + + \ No newline at end of file diff --git a/Mohem/src/app/backend-integrations/announcement/announcement.component.ts b/Mohem/src/app/backend-integrations/announcement/announcement.component.ts index 18caf03e..9a4b5253 100644 --- a/Mohem/src/app/backend-integrations/announcement/announcement.component.ts +++ b/Mohem/src/app/backend-integrations/announcement/announcement.component.ts @@ -19,6 +19,9 @@ export class AnnouncementComponent implements OnInit { public numberOfListLength = 10; public announcememntCounter = this.numberOfListLength; @ViewChild(IonInfiniteScroll) infiniteScroll: IonInfiniteScroll; + public pageSize = 1; + public pageLength = 0; + public lengthCounter = 5; constructor( public announcementService: AnnouncementService, @@ -53,10 +56,12 @@ export class AnnouncementComponent implements OnInit { getAnnouncementListService() { let holdData; - this.announcementService.getAnnouncementListService().subscribe((result: any) => { + this.announcementService.getAnnouncementListService(this.pageSize).subscribe((result: any) => { if (this.common.validResponse(result)) { holdData = JSON.parse(result.Mohemm_ITG_ResponseItem); this.listOfAnnouncement = JSON.parse(holdData.result.data); + console.log(this.listOfAnnouncement); + this.pageLength = this.listOfAnnouncement[0].TotalItems; for (let i = 0; i < this.listOfAnnouncement.length; i++) { this.listOfAnnouncement[i].Title_EN = this.listOfAnnouncement[i].Title_EN; // this.listOfAnnouncement[i].Title_EN = this.listOfAnnouncement[i].Title_EN.replace(/\ /g, ''); @@ -82,23 +87,29 @@ export class AnnouncementComponent implements OnInit { } this.arrList = this.arr; + console.log(this.arrList); + console.log(this.listOfAnnouncement); } }); } loadData(event) { - let counter = this.numberOfListLength + this.announcememntCounter; + // let counter = this.numberOfListLength + this.announcememntCounter; setTimeout(() => { event.target.complete(); - for(let i = this.announcememntCounter; i < counter; i++) { - if(this.arrList[i]) { - this.announcementList.push(this.arrList[i]); - this.announcememntCounter ++; - } - } - if (this.announcememntCounter >= this.arrList.length) { + // for(let i = this.announcememntCounter; i < counter; i++) { + // if(this.arrList[i]) { + // this.announcementList.push(this.arrList[i]); + // this.announcememntCounter ++; + // } + // } + this.pageSize += 1; + if (this.lengthCounter >= this.pageLength) { event.target.disabled = true; + } else { + this.getAnnouncementListService(); } + this.lengthCounter += 5; }, 500); } 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 b2d3eddb..3bf931b0 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,10 +17,13 @@ export class AnnouncementService { ) { } - getAnnouncementListService(onError ?: any , oerrorLable ?: any) { + getAnnouncementListService(pageNumber: 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; 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 9a9119e6..563642aa 100644 --- a/Mohem/src/app/hmg-common/services/models/announcement-request.ts +++ b/Mohem/src/app/hmg-common/services/models/announcement-request.ts @@ -4,5 +4,8 @@ import { Request } from 'src/app/hmg-common/services/models/request'; export class AnnouncementRequest extends Request { public TokenID: string; public EmployeeNumber: string; + public ItgPageNo: number; + public ItgPageSize: number; + public ItgAwarenessID: number; }