sxhundred/ISA-Frontend
1
0
Fork 0
mirror of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend synced 2025-12-31 09:37:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merged PR 900: #2209 TK Ongoing Tasks fixed Filter settings and styling issue

Browse Source 
#2209 TK Ongoing Tasks fixed Filter settings and styling issue
This commit is contained in:
Nino Righi
2021-10-07 12:07:36 +00:00
committed by Lorenz Hilpert
parent 7b49fbc85c
commit d96729fb89
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/page/task-calendar/src/lib/components/task-list/task-list-item.component.html
View File

@@ -24,7 +24,7 @@
<div class="task-content">
<div class="task-content-title">
<b>{{ item?.title }}</b>
<ui-icon class="icon" icon="camera" size="16px" *ngIf="item.requiresImageOnConfirmation"></ui-icon>
<ui-icon class="icon" icon="camera" [style.transform]="'rotateX(0deg)'" size="16px" *ngIf="item.requiresImageOnConfirmation"></ui-icon>
<ui-icon class="icon" icon="attachment" size="16px" *ngIf="hasAttachments$ | async"></ui-icon>
<ui-icon class="icon icon-update-comment" icon="refresh" size="16px" *ngIf="!!item.updateComment"></ui-icon>
</div>

6
apps/page/task-calendar/src/lib/components/task-list/task-list.component.ts
View File

@@ -67,11 +67,13 @@ export class TaskListComponent {
const processingStatus = this.domainTaskCalendarService.getProcessingStatusList(item);
if (
type === 'Task' &&
processingStatus.includes('InProcess') &&
(processingStatus.includes('InProcess') || processingStatus.includes('Approved')) &&
!processingStatus.includes('Removed') &&
!processingStatus.includes('Uncompleted') &&
!processingStatus.includes('Overdue') &&
!processingStatus.includes('Completed')
) {
return new Date(item.taskDate) < this.today;
return new Date(item.publicationDate || item.taskDate) < this.today;
}
return false;
});