inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AAE-3638] - update priority option (#6423)

Browse Source
This commit is contained in:
Silviu Popa
2020-12-04 19:42:34 +02:00
committed by GitHub
parent 31bac2da24
commit f39997b98b
8 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/core/assets/images/dynamic_feed-24px.svg
View File

@@ -12,3 +12,4 @@
</g>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 775 B

After

Width:  |  Height:  |  Size: 776 B

2
lib/process-services-cloud/src/lib/i18n/en.json
View File

@@ -95,7 +95,7 @@
"JSON_CELL": "Json",
"COMPLETED_BY": "Completed By",
"PRIORITY_VALUES": {
"NOT_SET": "Not set",
"NONE": "None",
"LOW": "Low",
"NORMAL": "Normal",
"HIGH": "High"

2
lib/process-services-cloud/src/lib/task/models/task.model.ts
View File

@@ -27,7 +27,7 @@ export interface TaskPriorityOption {
}
export const DEFAULT_TASK_PRIORITIES: TaskPriorityOption[] = [
{ label: 'ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.NOT_SET', value: '0', key: '0' },
{ label: 'ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.NONE', value: '0', key: '0' },
{ label: 'ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.LOW', value: '1', key: '1' },
{ label: 'ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.NORMAL', value: '2', key: '2' },
{ label: 'ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.HIGH', value: '3', key: '3' }

3
lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/base-edit-task-filter-cloud.component.html
View File

@@ -95,7 +95,8 @@
</mat-checkbox>
</div>
<adf-cloud-date-range-filter *ngIf="taskFilterProperty.type === 'date-range'"
<adf-cloud-date-range-filter #dateRange
*ngIf="taskFilterProperty.type === 'date-range'"
[processFilterProperty]="taskFilterProperty"
[options]="taskFilterProperty.dateFilterOptions"
(dateTypeChange)="onDateTypeChange($event, taskFilterProperty)"

2
lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.spec.ts
View File

@@ -135,7 +135,7 @@ describe('TaskHeaderCloudComponent', () => {
fixture.detectChanges();
const options: any = fixture.debugElement.queryAll(By.css('mat-option'));
expect(options[0].nativeElement.innerText).toEqual('ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.NOT_SET');
expect(options[0].nativeElement.innerText).toEqual('ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.NONE');
expect(options[1].nativeElement.innerText).toEqual('ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.LOW');
expect(options[2].nativeElement.innerText).toEqual('ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.NORMAL');
expect(options[3].nativeElement.innerText).toEqual('ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.HIGH');

4
lib/testing/src/lib/core/pages/data-table-component.page.ts
View File

@@ -187,12 +187,12 @@ export class DataTableComponentPage {
return 0;
}
if (a.toLocaleLowerCase() === 'not set') {
if (a.toLocaleLowerCase() === 'none') {
return -1;
}
if (a.toLocaleLowerCase() === 'low') {
if (b === 'not set') {
if (b === 'none') {
return 1;
} else {
return -1;