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

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

@ -1,6 +1,5 @@
<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">
@ -134,6 +133,7 @@
<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>

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

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