Merge branch 'MOHEMM-Q2-DEV' into enad-Q1

MOHEMM-SFH-COLORS
umasoodch 4 years ago
commit 2d47b50966

@ -16,8 +16,8 @@
<p class="text-style item-list-first-date">{{item.date}}</p>
<h2 class="text-style item-list-first-h" *ngIf="direction === 'en'">{{item.title_EN}}</h2>
<h2 class="text-style item-list-first-h" *ngIf="direction === 'ar'">{{item.title_AR}}</h2>
<p class="text-style item-list-first-p" *ngIf="direction === 'en'">{{item.body_EN}}</p>
<p class="text-style item-list-first-p" *ngIf="direction === 'ar'">{{item.body_EN}}</p>
<p class="text-style item-list-first-p" *ngIf="direction === 'en'"><span [innerHTML]="item.body_EN"></span></p>
<p class="text-style item-list-first-p" *ngIf="direction === 'ar'">{{item.body_AR}}</p>
</ion-label>
</ion-item>
</ion-card>
@ -33,7 +33,7 @@
<img [src]="item.img" class="image-center">
</ion-card-header>
<ion-card-content>
<p *ngIf="direction === 'en'" class="card-style-p">{{item.body_EN}}</p>
<p *ngIf="direction === 'en'" class="card-style-p"><span [innerHTML]="item.body_EN"></span></p>
<p *ngIf="direction === 'ar'" class="card-style-p">{{item.body_AR}}</p>
</ion-card-content>
</ion-card>
@ -42,7 +42,7 @@
<img [src]="item.img" [ngClass]="direction === 'en'? 'image-item-en': 'image-item-ar' ">
<ion-label style="margin: 5px; margin-top: -20px;">
<h2 class="item-list-h" *ngIf="direction === 'en'">{{item.title_EN}}</h2>
<p class="item-list-p-title" *ngIf="direction === 'en'">{{item.body_EN}}</p>
<p class="item-list-p-title" *ngIf="direction === 'en'"><span [innerHTML]="item.body_EN"></span></p>
<h2 class="item-list-h" *ngIf="direction === 'ar'">{{item.title_AR}}</h2>
<p class="item-list-p-title" *ngIf="direction === 'ar'">{{item.body_AR}}</p>
@ -52,7 +52,7 @@
<ion-item *ngIf="i > 0 && !item.isOpen && !item.img" (click)="toggleAnnouncement(item)" lines='none' class="announcement-items">
<ion-label style="margin: 10px;">
<h2 class="item-list-h" *ngIf="direction === 'en'">{{item.title_EN}}</h2>
<p class="item-list-p-title" *ngIf="direction === 'en'">{{item.body_EN}}</p>
<p class="item-list-p-title" *ngIf="direction === 'en'"><span [innerHTML]="item.body_EN"></span></p>
<h2 class="item-list-h" *ngIf="direction === 'ar'">{{item.title_AR}}</h2>
<p class="item-list-p-title" *ngIf="direction === 'ar'">{{item.body_AR}}</p>
@ -72,7 +72,7 @@
<div *ngIf='!item.img'></div>
</ion-card-header>
<ion-card-content>
<p *ngIf="direction === 'en'">{{item.body_EN}}</p>
<p *ngIf="direction === 'en'"><span [innerHTML]="item.body_EN"></span></p>
<p *ngIf="direction === 'ar'">{{item.body_AR}}</p>
</ion-card-content>
</ion-card>

@ -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(/\&nbsp;/g, '');
this.listOfAnnouncement[i].Title_AR = this.listOfAnnouncement[i].Title_AR.replace(/<\/?[^>]+(>|$)/g, "");
this.listOfAnnouncement[i].Title_AR = this.listOfAnnouncement[i].Title_AR.replace(/\&nbsp;/g, '');
this.listOfAnnouncement[i].EmailBody_EN = this.listOfAnnouncement[i].EmailBody_EN.replace(/<\/?[^>]+(>|$)/g, "");
this.listOfAnnouncement[i].EmailBody_EN = this.listOfAnnouncement[i].EmailBody_EN.replace(/\&nbsp;/g, '');
this.listOfAnnouncement[i].EmailBody_AR = this.listOfAnnouncement[i].EmailBody_AR.replace(/<\/?[^>]+(>|$)/g, "");
this.listOfAnnouncement[i].EmailBody_AR = this.listOfAnnouncement[i].EmailBody_AR.replace(/\&nbsp;/g, '');
this.listOfAnnouncement[i].Title_EN = this.listOfAnnouncement[i].Title_EN;
// this.listOfAnnouncement[i].Title_EN = this.listOfAnnouncement[i].Title_EN.replace(/\&nbsp;/g, '');
this.listOfAnnouncement[i].Title_AR = this.listOfAnnouncement[i].Title_AR;
// this.listOfAnnouncement[i].Title_AR = this.listOfAnnouncement[i].Title_AR.replace(/\&nbsp;/g, '');
this.listOfAnnouncement[i].EmailBody_EN = this.listOfAnnouncement[i].EmailBody_EN;
// this.listOfAnnouncement[i].EmailBody_EN = this.listOfAnnouncement[i].EmailBody_EN.replace(/\&nbsp;/g, '');
this.listOfAnnouncement[i].EmailBody_AR = this.listOfAnnouncement[i].EmailBody_AR;
// this.listOfAnnouncement[i].EmailBody_AR = this.listOfAnnouncement[i].EmailBody_AR.replace(/\&nbsp;/g, '');
this.arr[i] = {
id: this.listOfAnnouncement[i].rowID,
title_EN: this.listOfAnnouncement[i].Title_EN,

@ -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;

Loading…
Cancel
Save