diff --git a/Mohem/src/app/backend-integrations/announcement/announcement.component.html b/Mohem/src/app/backend-integrations/announcement/announcement.component.html index cc826322..efcec635 100644 --- a/Mohem/src/app/backend-integrations/announcement/announcement.component.html +++ b/Mohem/src/app/backend-integrations/announcement/announcement.component.html @@ -16,8 +16,8 @@

{{item.date}}

{{item.title_EN}}

{{item.title_AR}}

-

{{item.body_EN}}

-

{{item.body_EN}}

+

+

{{item.body_AR}}

@@ -33,7 +33,7 @@ -

{{item.body_EN}}

+

{{item.body_AR}}

@@ -42,7 +42,7 @@

{{item.title_EN}}

-

{{item.body_EN}}

+

{{item.title_AR}}

{{item.body_AR}}

@@ -52,7 +52,7 @@

{{item.title_EN}}

-

{{item.body_EN}}

+

{{item.title_AR}}

{{item.body_AR}}

@@ -72,7 +72,7 @@
-

{{item.body_EN}}

+

{{item.body_AR}}

diff --git a/Mohem/src/app/backend-integrations/announcement/announcement.component.ts b/Mohem/src/app/backend-integrations/announcement/announcement.component.ts index d9cf6c7d..18caf03e 100644 --- a/Mohem/src/app/backend-integrations/announcement/announcement.component.ts +++ b/Mohem/src/app/backend-integrations/announcement/announcement.component.ts @@ -58,14 +58,14 @@ export class AnnouncementComponent implements OnInit { holdData = JSON.parse(result.Mohemm_ITG_ResponseItem); this.listOfAnnouncement = JSON.parse(holdData.result.data); for (let i = 0; i < this.listOfAnnouncement.length; i++) { - this.listOfAnnouncement[i].Title_EN = this.listOfAnnouncement[i].Title_EN.replace(/<\/?[^>]+(>|$)/g, ""); - this.listOfAnnouncement[i].Title_EN = this.listOfAnnouncement[i].Title_EN.replace(/\ /g, ''); - this.listOfAnnouncement[i].Title_AR = this.listOfAnnouncement[i].Title_AR.replace(/<\/?[^>]+(>|$)/g, ""); - this.listOfAnnouncement[i].Title_AR = this.listOfAnnouncement[i].Title_AR.replace(/\ /g, ''); - this.listOfAnnouncement[i].EmailBody_EN = this.listOfAnnouncement[i].EmailBody_EN.replace(/<\/?[^>]+(>|$)/g, ""); - this.listOfAnnouncement[i].EmailBody_EN = this.listOfAnnouncement[i].EmailBody_EN.replace(/\ /g, ''); - this.listOfAnnouncement[i].EmailBody_AR = this.listOfAnnouncement[i].EmailBody_AR.replace(/<\/?[^>]+(>|$)/g, ""); - this.listOfAnnouncement[i].EmailBody_AR = this.listOfAnnouncement[i].EmailBody_AR.replace(/\ /g, ''); + this.listOfAnnouncement[i].Title_EN = this.listOfAnnouncement[i].Title_EN; + // this.listOfAnnouncement[i].Title_EN = this.listOfAnnouncement[i].Title_EN.replace(/\ /g, ''); + this.listOfAnnouncement[i].Title_AR = this.listOfAnnouncement[i].Title_AR; + // this.listOfAnnouncement[i].Title_AR = this.listOfAnnouncement[i].Title_AR.replace(/\ /g, ''); + this.listOfAnnouncement[i].EmailBody_EN = this.listOfAnnouncement[i].EmailBody_EN; + // this.listOfAnnouncement[i].EmailBody_EN = this.listOfAnnouncement[i].EmailBody_EN.replace(/\ /g, ''); + this.listOfAnnouncement[i].EmailBody_AR = this.listOfAnnouncement[i].EmailBody_AR; + // this.listOfAnnouncement[i].EmailBody_AR = this.listOfAnnouncement[i].EmailBody_AR.replace(/\ /g, ''); this.arr[i] = { id: this.listOfAnnouncement[i].rowID, title_EN: this.listOfAnnouncement[i].Title_EN, diff --git a/Mohem/src/app/offersdiscount/services/service.ts b/Mohem/src/app/offersdiscount/services/service.ts index 7aae3117..b3bd357f 100644 --- a/Mohem/src/app/offersdiscount/services/service.ts +++ b/Mohem/src/app/offersdiscount/services/service.ts @@ -30,7 +30,7 @@ export class OfferDiscountService { var request = this.authService.getAuthenticatedRequest(); request['EmployeeNumber'] = request.UserName; request['ItgIsActive'] = true; - request['ItgPageSize'] = 5; + request['ItgPageSize'] = 10; request['ItgPageNo'] = pageNo; if (catId) { request['ItgCategoryID'] = categoryId;