fixed feedback issues

enad-Q1
enadhilal 4 years ago
parent 4011346cdd
commit 332732f619

@ -58,20 +58,20 @@
</ion-label>
</ion-item>
<ion-card *ngIf="item.isOpen" (click)="toggleAnnouncement(item)" style="margin: 0px;">
<ion-card *ngIf="item.isOpen" (click)="closeAnnouncement(item)" style="margin: 0px;">
<ion-card-header style="background: transparent;">
<ion-card-title style="font-size: 20px; margin: 5px;" *ngIf="direction === 'en'">{{item.title_EN}} <br>
<p style="font-size: 12px; color: gray;">{{item.date}}</p>
<ion-card-title style="font-size: 20px; margin: 5px;" *ngIf="direction === 'en'">{{detialData.title_EN}} <br>
<p style="font-size: 12px; color: gray;">{{detialData.date}}</p>
</ion-card-title>
<ion-card-title style="font-size: 20px; margin: 5px;" *ngIf="direction === 'ar'">{{item.title_AR}} <br>
<p style="font-size: 12px; color: gray;">{{item.date}}</p>
<ion-card-title style="font-size: 20px; margin: 5px;" *ngIf="direction === 'ar'">{{detialData.title_AR}} <br>
<p style="font-size: 12px; color: gray;">{{detialData.date}}</p>
</ion-card-title>
<img *ngIf='item.img' [src]="item.img" class="image-center">
<div *ngIf='!item.img'></div>
<img *ngIf='detialData.img' [src]="detialData.img" class="image-center">
<div *ngIf='!detialData.img'></div>
</ion-card-header>
<ion-card-content>
<p *ngIf="direction === 'en'"><span [innerHTML]="item.body_EN"></span></p>
<p *ngIf="direction === 'ar'"><span [innerHTML]="item.body_AR"></span></p>
<p *ngIf="direction === 'en'"><span [innerHTML]="detialData.body_EN"></span></p>
<p *ngIf="direction === 'ar'"><span [innerHTML]="detialData.body_AR"></span></p>
</ion-card-content>
</ion-card>
</div>

@ -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();
});
}

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

@ -7,5 +7,6 @@ export class AnnouncementRequest extends Request {
public ItgPageNo: number;
public ItgPageSize: number;
public ItgAwarenessID: number;
public ItgRowID: number;
}

@ -448,6 +448,22 @@
</ng-container> -->
<!-- END -->
<ion-label>
<ion-item>
<ion-grid>
<ion-row>
<ion-col>
<p>{{ 'submitAbsence, comments' | translate}}</p>
</ion-col>
</ion-row>
<ion-row>
<ion-col>
<ion-input type='text' [(ngModel)]='commentText'></ion-input>
</ion-col>
</ion-row>
</ion-grid>
</ion-item>
</ion-label>
</ion-content>
<ion-content *ngIf="messageSuccess">

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

@ -235,9 +235,9 @@
</ion-list>
</div>
<button ion-button *ngIf="!IsReachEnd" class="itemHISBtn" (click)="loadMoreActionHistory()">
<!-- <button ion-button *ngIf="!IsReachEnd" class="itemHISBtn" (click)="loadMoreActionHistory()">
{{ 'general, load-more' | translate}}
</button>
</button> -->
</ion-card-content>
</ion-card>

@ -265,9 +265,9 @@
</ion-list>
</div>
<button ion-button *ngIf="!IsReachEnd" class="itemHISBtn" (click)="loadMoreActionHistory()">
<!-- <button ion-button *ngIf="!IsReachEnd" class="itemHISBtn" (click)="loadMoreActionHistory()">
{{ 'general, load-more' | translate}}
</button>
</button> -->
</ion-card-content>
</ion-card>

@ -373,9 +373,9 @@
</ion-list>
</div>
<button ion-button *ngIf="!IsReachEnd" class="itemHISBtn" (click)="loadMoreActionHistory()">
<!-- <button ion-button *ngIf="!IsReachEnd" class="itemHISBtn" (click)="loadMoreActionHistory()">
{{ 'general, load-more' | translate}}
</button>
</button> -->
</ion-card-content>
</ion-card>

Loading…
Cancel
Save