nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-1493: Small changes in task-history-query 

TSK-1493:
This commit is contained in:
Sofie Hofmann 2020-12-21 15:08:06 +01:00
parent f42f79ef69
commit 149aae8e85
5 changed files with 122 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/app/administration/components/access-items-management/access-items-management.component.ts
View File

@ -127,12 +127,12 @@ export class AccessItemsManagementComponent implements OnInit {
filterAccessItems() { filterAccessItems() {
if (this.accessItemsForm.value.accessIdFilter) { if (this.accessItemsForm.value.accessIdFilter) {
this.accessItems = this.accessItems.filter((value) => this.accessItems = this.accessItems.filter((value) =>
value.accessName.toLowerCase().includes(this.accessItemsForm.value.accessIdFilter) value.accessName.toLowerCase().includes(this.accessItemsForm.value.accessIdFilter.toLowerCase())
); );
} }
if (this.accessItemsForm.value.workbasketKeyFilter) { if (this.accessItemsForm.value.workbasketKeyFilter) {
this.accessItems = this.accessItems.filter((value) => this.accessItems = this.accessItems.filter((value) =>
value.workbasketKey.toLowerCase().includes(this.accessItemsForm.value.workbasketKeyFilter) value.workbasketKey.toLowerCase().includes(this.accessItemsForm.value.workbasketKeyFilter.toLowerCase())
); );
} }
} }

1
web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.ts
View File

@ -169,7 +169,6 @@ export class WorkbasketAccessItemsComponent implements OnInit, OnChanges, OnDest
} }
ngOnChanges(changes?: SimpleChanges) { ngOnChanges(changes?: SimpleChanges) {
console.log('change');
if (changes.action) { if (changes.action) {
this.setBadge(); this.setBadge();
} }

2
web/src/app/history/services/task-history-query/task-history-query.service.ts
View File

@ -3,7 +3,7 @@ import { TaskHistoryEventResourceData } from 'app/shared/models/task-history-eve
import { QueryParameters } from 'app/shared/models/query-parameters'; import { QueryParameters } from 'app/shared/models/query-parameters';
import { TaskanaQueryParameters } from 'app/shared/util/query-parameters'; import { TaskanaQueryParameters } from 'app/shared/util/query-parameters';
import { Sorting, TaskHistoryQuerySortParameter } from 'app/shared/models/sorting'; import { Sorting, TaskHistoryQuerySortParameter } from 'app/shared/models/sorting';
import { Observable, of } from 'rxjs'; import { Observable } from 'rxjs';
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
import { StartupService } from '../../../shared/services/startup/startup.service'; import { StartupService } from '../../../shared/services/startup/startup.service';
import { TaskHistoryQueryFilterParameter } from '../../../shared/models/task-history-query-filter-parameter'; import { TaskHistoryQueryFilterParameter } from '../../../shared/models/task-history-query-filter-parameter';

214
web/src/app/history/task-history-query/task-history-query.component.html
View File

@ -1,139 +1,139 @@
<div class="example-container mat-elevation-z8"> <div class="task-history-query">
<div class="example-table-container"> <table mat-table [dataSource]="data"
<table mat-table [dataSource]="data" class="example-table" matSort matSortActive="created" matSortDisableClear matSortDirection="asc">
matSort matSortActive="created" matSortDisableClear matSortDirection="asc">
<ng-container matColumnDef="parentBusinessProcessId"> <ng-container matColumnDef="parentBusinessProcessId">
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Parent BPI</th> <th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Parent BPI</th>
<td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).parentBusinessProcessId}}</td> <td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).parentBusinessProcessId}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="businessProcessId"> <ng-container matColumnDef="businessProcessId">
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>BPI</th> <th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>BPI</th>
<td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).businessProcessId}}</td> <td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).businessProcessId}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="taskId"> <ng-container matColumnDef="taskId">
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Task Id</th> <th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Task Id</th>
<td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).taskId}}</td> <td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).taskId}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="eventType"> <ng-container matColumnDef="eventType">
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Event type</th> <th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Event type</th>
<td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).eventType}}</td> <td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).eventType}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="created"> <ng-container matColumnDef="created">
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Created</th> <th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Created</th>
<td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).created}}</td> <td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).created}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="userId"> <ng-container matColumnDef="userId">
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>User Id</th> <th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>User Id</th>
<td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).userId}}</td> <td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).userId}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="domain"> <ng-container matColumnDef="domain">
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Domain</th> <th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Domain</th>
<td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).domain}}</td> <td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).domain}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="workbasketKey"> <ng-container matColumnDef="workbasketKey">
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Workbasket key</th> <th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Workbasket key</th>
<td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).workbasketKey}}</td> <td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).workbasketKey}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="porCompany"> <ng-container matColumnDef="porCompany">
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Obj company</th> <th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Obj company</th>
<td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).porCompany}}</td> <td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).porCompany}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="porSystem"> <ng-container matColumnDef="porSystem">
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Obj system</th> <th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Obj system</th>
<td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).porSystem}}</td> <td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).porSystem}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="porInstance"> <ng-container matColumnDef="porInstance">
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Obj instance</th> <th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Obj instance</th>
<td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).porInstance}}</td> <td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).porInstance}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="porType"> <ng-container matColumnDef="porType">
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Obj type</th> <th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Obj type</th>
<td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).porType}}</td> <td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).porType}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="porValue"> <ng-container matColumnDef="porValue">
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Obj value</th> <th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Obj value</th>
<td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).porValue}}</td> <td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).porValue}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="taskClassificationKey"> <ng-container matColumnDef="taskClassificationKey">
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Classification key</th> <th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Classification key</th>
<td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).taskClassificationKey}}</td> <td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).taskClassificationKey}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="taskClassificationCategory"> <ng-container matColumnDef="taskClassificationCategory">
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Classification category</th> <th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Classification category</th>
<td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).taskClassificationCategory}}</td> <td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).taskClassificationCategory}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="attachmentClassificationKey"> <ng-container matColumnDef="attachmentClassificationKey">
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Attachment Classification Key</th> <th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Attachment Classification Key</th>
<td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).attachmentClassificationKey}}</td> <td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).attachmentClassificationKey}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="custom1"> <ng-container matColumnDef="custom1">
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Custom 1</th> <th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Custom 1</th>
<td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).custom1}}</td> <td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).custom1}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="custom2"> <ng-container matColumnDef="custom2">
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Custom 2</th> <th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Custom 2</th>
<td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).custom2}}</td> <td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).custom2}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="custom3"> <ng-container matColumnDef="custom3">
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Custom 3</th> <th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Custom 3</th>
<td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).custom3}}</td> <td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).custom3}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="custom4"> <ng-container matColumnDef="custom4">
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Custom 4</th> <th mat-header-cell *matHeaderCellDef mat-sort-header disableClear>Custom 4</th>
<td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).custom4}}</td> <td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).custom4}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="oldData"> <ng-container matColumnDef="oldData">
<th mat-header-cell *matHeaderCellDef>Old data</th> <th mat-header-cell *matHeaderCellDef>Old data</th>
<td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).oldData}}</td> <td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).oldData}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="newData"> <ng-container matColumnDef="newData">
<th mat-header-cell *matHeaderCellDef>New data</th> <th mat-header-cell *matHeaderCellDef>New data</th>
<td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).newData}}</td> <td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).newData}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="comment"> <ng-container matColumnDef="comment">
<th mat-header-cell *matHeaderCellDef>Comment</th> <th mat-header-cell *matHeaderCellDef>Comment</th>
<td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).comment}}</td> <td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).comment}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="oldValue"> <ng-container matColumnDef="oldValue">
<th mat-header-cell *matHeaderCellDef>Old value</th> <th mat-header-cell *matHeaderCellDef>Old value</th>
<td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).oldValue}}</td> <td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).oldValue}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="newValue"> <ng-container matColumnDef="newValue">
<th mat-header-cell *matHeaderCellDef>New value</th> <th mat-header-cell *matHeaderCellDef>New value</th>
<td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).newValue}}</td> <td mat-cell *matCellDef="let element">{{convertToTaskHistoryEventData(element).newValue}}</td>
</ng-container> </ng-container>
<tr mat-header-row *matHeaderRowDef="getDisplayColumns()"></tr> <tr mat-header-row *matHeaderRowDef="getDisplayColumns()"></tr>
<tr mat-row *matRowDef="let row; columns: getDisplayColumns()"></tr> <tr mat-row *matRowDef="let row; columns: getDisplayColumns()"></tr>
</table> </table>
<div class="task-history-query__pagination-wrapper">
<taskana-shared-pagination [numberOfItems]="data.length" <taskana-shared-pagination [numberOfItems]="data.length"
[page]="pageInformation"></taskana-shared-pagination> [page]="pageInformation"></taskana-shared-pagination>
</div> </div>

23
web/src/app/history/task-history-query/task-history-query.component.scss
View File

@ -1,12 +1,13 @@
.example-loading-shade { .task-history-query {
position: absolute; height: calc(100vh - 56px);
top: 0; width: auto;
left: 0; overflow-x: scroll;
bottom: 56px; overflow-y: auto;
right: 0;
background: rgba(0, 0, 0, 0.15); &__pagination-wrapper {
z-index: 1; position: absolute;
display: flex; bottom: 16px;
align-items: center; width: 100%;
justify-content: center; }
} }