mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-24 17:32:15 +00:00
Merge branch 'development' of https://github.com/Alfresco/alfresco-ng2-components into development
This commit is contained in:
@@ -38,6 +38,7 @@
|
|||||||
[presetColumn]="presetColumn"
|
[presetColumn]="presetColumn"
|
||||||
[page]="taskPage"
|
[page]="taskPage"
|
||||||
[size]="paginationPageSize"
|
[size]="paginationPageSize"
|
||||||
|
[selectionMode]="selectionMode"
|
||||||
[processDefinitionKey]="taskFilter?.filter?.processDefinitionKey"
|
[processDefinitionKey]="taskFilter?.filter?.processDefinitionKey"
|
||||||
[name]="taskFilter?.filter?.name"
|
[name]="taskFilter?.filter?.name"
|
||||||
[assignment]="taskFilter?.filter?.assignment"
|
[assignment]="taskFilter?.filter?.assignment"
|
||||||
@@ -146,6 +147,7 @@
|
|||||||
<adf-process-instance-list
|
<adf-process-instance-list
|
||||||
#processList
|
#processList
|
||||||
*ngIf="processFilter?.filter" [appId]="processFilter?.appId"
|
*ngIf="processFilter?.filter" [appId]="processFilter?.appId"
|
||||||
|
[selectionMode]="selectionMode"
|
||||||
[processDefinitionKey]="processFilter?.filter?.processDefinitionKey"
|
[processDefinitionKey]="processFilter?.filter?.processDefinitionKey"
|
||||||
[presetColumn]="presetColumn"
|
[presetColumn]="presetColumn"
|
||||||
[state]="processFilter?.filter?.state"
|
[state]="processFilter?.filter?.state"
|
||||||
@@ -251,20 +253,32 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="adf-grid-item adf-settings-details" fxFlex.gt-md="1 1 auto">
|
<div class="adf-grid-item adf-settings-details" fxFlex.gt-md="1 1 auto">
|
||||||
<div>
|
<div>
|
||||||
<mat-slide-toggle id="adf-show-task-filter-icon" (change)="changeTaskFilterIcon()" [checked]="showTaskFilterIcon">Show task filters icons</mat-slide-toggle>
|
<mat-slide-toggle id="adf-show-task-filter-icon" [(ngModel)]="showTaskFilterIcon">Show task filters icons
|
||||||
|
</mat-slide-toggle>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<mat-slide-toggle id="adf-show-process-filter-icon" (change)="changeProcessFilterIcon()" [checked]="showProcessFilterIcon">Show process filters icons</mat-slide-toggle>
|
<mat-slide-toggle id="adf-show-process-filter-icon" [(ngModel)]="showProcessFilterIcon">Show process filters icons
|
||||||
|
</mat-slide-toggle>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<mat-slide-toggle id="adf-show-header" (change)="toggleHeaderContent()" [checked]="showHeaderContent">{{ 'PS-TAB.TASK-SHOW-HEADER'| translate }}</mat-slide-toggle>
|
<mat-slide-toggle id="adf-show-header" (change)="toggleHeaderContent()"
|
||||||
|
[checked]="showHeaderContent">{{ 'PS-TAB.TASK-SHOW-HEADER'| translate }}
|
||||||
|
</mat-slide-toggle>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<mat-slide-toggle id="adf-process-multiselect" (change)="toggleTasProcesssMultiselect()" [checked]="multiSelectProcess">Multiselect Process List</mat-slide-toggle>
|
<mat-slide-toggle id="adf-process-multiselect" [(ngModel)]="multiSelectProcess" >Multiselect Process List
|
||||||
|
</mat-slide-toggle>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<mat-slide-toggle id="adf-task-multiselect" (change)="toggleTaskMultiselect()" [checked]="multiSelectTask">Multiselect Task List</mat-slide-toggle>
|
<mat-slide-toggle id="adf-task-multiselect" [(ngModel)]="multiSelectTask" >Multiselect Task List
|
||||||
|
</mat-slide-toggle>
|
||||||
</div>
|
</div>
|
||||||
|
<br>
|
||||||
|
<mat-radio-group [(ngModel)]="selectionMode">
|
||||||
|
<mat-radio-button value="multiple">multiple</mat-radio-button>
|
||||||
|
<mat-radio-button value="single">single</mat-radio-button>
|
||||||
|
<mat-radio-button value="none">none</mat-radio-button>
|
||||||
|
</mat-radio-group>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</mat-tab>
|
</mat-tab>
|
||||||
|
@@ -120,6 +120,7 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit
|
|||||||
selectFirstReport = false;
|
selectFirstReport = false;
|
||||||
multiSelectTask = false;
|
multiSelectTask = false;
|
||||||
multiSelectProcess = false;
|
multiSelectProcess = false;
|
||||||
|
selectionMode = 'single';
|
||||||
|
|
||||||
private tabs = { tasks: 0, processes: 1, reports: 2 };
|
private tabs = { tasks: 0, processes: 1, reports: 2 };
|
||||||
|
|
||||||
@@ -504,19 +505,4 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit
|
|||||||
this.currentTaskId = null;
|
this.currentTaskId = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
changeTaskFilterIcon() {
|
|
||||||
this.showTaskFilterIcon = !this.showTaskFilterIcon;
|
|
||||||
}
|
|
||||||
|
|
||||||
changeProcessFilterIcon() {
|
|
||||||
this.showProcessFilterIcon = !this.showProcessFilterIcon;
|
|
||||||
}
|
|
||||||
|
|
||||||
toggleTasProcesssMultiselect() {
|
|
||||||
this.multiSelectProcess = !this.multiSelectProcess;
|
|
||||||
}
|
|
||||||
|
|
||||||
toggleTaskMultiselect() {
|
|
||||||
this.multiSelectTask = !this.multiSelectTask;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@@ -63,7 +63,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.mat-form-field-label-wrapper {
|
.mat-form-field-label-wrapper {
|
||||||
top: 22px !important;
|
top: 22px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mat-input-placeholder {
|
.mat-input-placeholder {
|
||||||
|
@@ -7,6 +7,10 @@
|
|||||||
|
|
||||||
&-people-widget {
|
&-people-widget {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|
||||||
|
.mat-form-field-label-wrapper {
|
||||||
|
top: 10px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&-people-widget-list {
|
&-people-widget-list {
|
||||||
|
@@ -16,6 +16,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.adf-new-task-layout-card {
|
.adf-new-task-layout-card {
|
||||||
|
|
||||||
width: 66%;
|
width: 66%;
|
||||||
margin: 10px auto;
|
margin: 10px auto;
|
||||||
|
|
||||||
@@ -74,6 +75,14 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
adf-start-task {
|
adf-start-task {
|
||||||
|
|
||||||
|
people-widget {
|
||||||
|
width: 100%;
|
||||||
|
.mat-form-field-label-wrapper {
|
||||||
|
top: -14px !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.adf {
|
.adf {
|
||||||
|
|
||||||
&-new-task-footer {
|
&-new-task-footer {
|
||||||
|
Reference in New Issue
Block a user