fixed worklist issues

arabic-version
umasoodch 6 years ago
parent d6dc300cf6
commit 470e1c7d8e

@ -70,8 +70,8 @@
<div [ngClass]="showFormattedData.length > 0 ? 'work-list-container' : ''" *ngIf='selectedFilter != "ITG"'> <div [ngClass]="showFormattedData.length > 0 ? 'work-list-container' : ''" *ngIf='selectedFilter != "ITG"'>
<div *ngFor="let formattedData of showFormattedData; let i = index"> <div *ngFor="let formattedData of showFormattedData; let i = index">
<span class="date-span">{{formattedData.date}}</span> <span class="date-span">{{formattedData.date}}</span>
<div (click)="openNotificationDetail(data.value)" class="date-data" *ngFor="let workList of formattedData.data; let j = index"> <div class="date-data" *ngFor="let workList of formattedData.data; let j = index">
<p>{{workList.SUBJECT}}</p> <p (click)="openNotificationDetail(workList)">{{workList.SUBJECT}}</p>
</div> </div>
</div> </div>
</div> </div>

@ -312,7 +312,8 @@ export class HomeComponent implements OnInit {
arrayToFilter = this.newWorkListResponse.filter((workList) => { arrayToFilter = this.newWorkListResponse.filter((workList) => {
return workList.ITEM_TYPE === filter; return workList.ITEM_TYPE === filter;
}); });
this.showFormattedData = this.categorizeData(arrayToFilter); const sortData = this.sortArray(arrayToFilter);
this.showFormattedData = this.categorizeData(sortData);
} }
} }
@ -417,12 +418,12 @@ export class HomeComponent implements OnInit {
} }
openNotificationDetail(obj) { openNotificationDetail(obj) {
this.common.sharedService.setSharedData(obj[0], HomeComponent.NOTIFICATION_DATA); this.common.sharedService.setSharedData(obj, HomeComponent.NOTIFICATION_DATA);
if (obj.REQUEST_TYPE === 'PR') { if (obj.REQUEST_TYPE === 'PR') {
this.common.openWorklistMainPRPage(); this.common.openWorklistMainPRPage();
} else if (obj[0].REQUEST_TYPE === 'PO') { } else if (obj.REQUEST_TYPE === 'PO') {
this.common.openWorklistMainPOPage(); this.common.openWorklistMainPOPage();
} else if (obj[0].REQUEST_TYPE === 'MO') { } else if (obj.REQUEST_TYPE === 'MO') {
this.common.openWorklistMainMRPage(); this.common.openWorklistMainMRPage();
} else { } else {
this.common.openWorklistMainPage(); this.common.openWorklistMainPage();

Loading…
Cancel
Save