Merge pull request #4846 from tsiegleauq/subcat-filter-and-ui
Enhance subcategories
This commit is contained in:
Sean
GitHub
commit
bb7b702e05
@ -36,6 +36,7 @@ export interface OsFilterOption {
|
||||
label: string;
|
||||
condition: OsFilterOptionCondition;
|
||||
isActive?: boolean;
|
||||
isChild?: boolean;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -46,6 +47,14 @@ export interface OsFilterIndicator {
|
||||
option: OsFilterOption;
|
||||
}
|
||||
|
||||
/**
|
||||
* Extends the BaseViewModel with a parent
|
||||
* Required to represent parent-child relationships in the filter
|
||||
*/
|
||||
interface HierarchyModel extends BaseViewModel {
|
||||
parent: BaseViewModel;
|
||||
}
|
||||
|
||||
/**
|
||||
* Define the type of a filter condition
|
||||
*/
|
||||
@ -266,10 +275,11 @@ export abstract class BaseFilterListService<V extends BaseViewModel> {
|
||||
|
||||
filterProperties = viewModel
|
||||
.filter(model => (excludeIds && excludeIds.length ? !excludeIds.includes(model.id) : true))
|
||||
.map(model => {
|
||||
.map((model: HierarchyModel) => {
|
||||
return {
|
||||
condition: model.id,
|
||||
label: model.getTitle()
|
||||
label: model.getTitle(),
|
||||
isChild: !!model.parent
|
||||
};
|
||||
});
|
||||
|
||||
|
||||
@ -37,5 +37,6 @@ os-icon-container {
|
||||
margin: auto 5px;
|
||||
text-overflow: ellipsis;
|
||||
overflow: hidden;
|
||||
white-space: pre-line;
|
||||
}
|
||||
}
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
<div *ngFor="let option of filter.options">
|
||||
<div *ngIf="isFilter(option)">
|
||||
<mat-checkbox
|
||||
class="filter-title"
|
||||
[ngClass]="option.isChild ? 'filter-child' : ''"
|
||||
[checked]="option.isActive"
|
||||
(change)="service.toggleFilterOption(filter.property, option)"
|
||||
>
|
||||
|
||||
@ -28,6 +28,10 @@ mat-divider {
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
.filter-child {
|
||||
margin-left: 20px;
|
||||
}
|
||||
|
||||
// adds breaks to mat-checkboxes with long labels
|
||||
::ng-deep .mat-checkbox-layout {
|
||||
white-space: normal !important;
|
||||
|
||||
@ -64,6 +64,17 @@ export class ViewCategory extends BaseViewModel<Category> implements CategoryTit
|
||||
return name;
|
||||
}
|
||||
|
||||
/**
|
||||
* Shows the (direct) parent above the current category
|
||||
*/
|
||||
public get nameWithParentAbove(): string {
|
||||
if (this.parent) {
|
||||
return `${this.parent.toString()}\n${this.toString()}`;
|
||||
} else {
|
||||
return this.toString();
|
||||
}
|
||||
}
|
||||
|
||||
public constructor(category: Category, parent?: ViewCategory) {
|
||||
super(Category.COLLECTIONSTRING, category);
|
||||
this._parent = parent;
|
||||
|
||||
@ -152,9 +152,7 @@
|
||||
|
||||
<!-- Sequential number -->
|
||||
<span class="main-nav-color title-font">
|
||||
<span *ngIf="showSequential">
|
||||
<span translate>Sequential number</span> {{ motion.id }}
|
||||
</span>
|
||||
<span *ngIf="showSequential"> <span translate>Sequential number</span> {{ motion.id }} </span>
|
||||
<span *ngIf="showSequential && motion.parent_id">· </span>
|
||||
<span *ngIf="motion.parent_id">
|
||||
<span>
|
||||
@ -345,10 +343,18 @@
|
||||
<mat-basic-chip
|
||||
*ngIf="perms.isAllowed('change_metadata', motion)"
|
||||
[matMenuTriggerFor]="categoryMenu"
|
||||
class="grey"
|
||||
class="grey multi-line-chip"
|
||||
disableRipple
|
||||
>
|
||||
{{ motion.category ? motion.category.prefixedNameWithParents : '–' }}
|
||||
<div *ngIf="motion.category">
|
||||
<div *ngIf="motion.category.parent">
|
||||
{{ motion.category.parent }}
|
||||
</div>
|
||||
<span *ngIf="motion.category.parent">{{ 'Subcategory' | translate }}:</span>
|
||||
{{ motion.category }}
|
||||
</div>
|
||||
|
||||
<span *ngIf="!motion.category">-</span>
|
||||
</mat-basic-chip>
|
||||
<mat-basic-chip
|
||||
*ngIf="!perms.isAllowed('change_metadata', motion) && motion.category"
|
||||
|
||||
@ -104,35 +104,6 @@
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<!-- state column -->
|
||||
<ng-container matColumnDef="state">
|
||||
<mat-header-cell *matHeaderCellDef mat-sort-header>State</mat-header-cell>
|
||||
<mat-cell (click)="openEditInfo(motion, $event)" *matCellDef="let motion">
|
||||
<div class="fill">
|
||||
<div class="innerTable state-column">
|
||||
<div class="ellipsis-overflow" *ngIf="motion.category">
|
||||
<os-icon-container icon="device_hub">
|
||||
{{ motion.category.prefixedNameWithParents }}
|
||||
</os-icon-container>
|
||||
</div>
|
||||
<div class="ellipsis-overflow spacer-top-5" *ngIf="motion.motion_block">
|
||||
<os-icon-container icon="widgets">
|
||||
{{ motion.motion_block.title }}
|
||||
</os-icon-container>
|
||||
</div>
|
||||
<div class="ellipsis-overflow spacer-top-5" *ngIf="motion.tags && motion.tags.length">
|
||||
<os-icon-container icon="local_offer">
|
||||
<span *ngFor="let tag of motion.tags; let last = last">
|
||||
{{ tag.getTitle() }}
|
||||
<span *ngIf="!last">, </span>
|
||||
</span>
|
||||
</os-icon-container>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</mat-cell>
|
||||
</ng-container>
|
||||
|
||||
<!-- Workflow state -->
|
||||
<div class="ellipsis-overflow white">
|
||||
<mat-basic-chip *ngIf="motion.state" [ngClass]="motion.stateCssColor" [disabled]="true">
|
||||
@ -163,7 +134,7 @@
|
||||
<!-- Category -->
|
||||
<div class="ellipsis-overflow" *ngIf="motion.category">
|
||||
<os-icon-container icon="device_hub">
|
||||
{{ motion.category.prefixedNameWithParents }}
|
||||
{{ motion.category.nameWithParentAbove }}
|
||||
</os-icon-container>
|
||||
</div>
|
||||
|
||||
|
||||
@ -310,13 +310,21 @@ export class MotionPdfService {
|
||||
|
||||
// category
|
||||
if (motion.category && (!infoToExport || infoToExport.includes('category'))) {
|
||||
let categoryText = '';
|
||||
if (!!motion.category.parent) {
|
||||
categoryText = `${motion.category.parent.toString()}\n${this.translate.instant(
|
||||
'Subcategory'
|
||||
)}: ${motion.category.toString()}`;
|
||||
} else {
|
||||
categoryText = motion.category.toString();
|
||||
}
|
||||
metaTableBody.push([
|
||||
{
|
||||
text: `${this.translate.instant('Category')}:`,
|
||||
style: 'boldText'
|
||||
},
|
||||
{
|
||||
text: motion.category.prefixedNameWithParents
|
||||
text: categoryText
|
||||
}
|
||||
]);
|
||||
}
|
||||
|
||||
@ -732,6 +732,10 @@ button.mat-menu-item.selected {
|
||||
color: rgba(0, 0, 0, 0.87) !important;
|
||||
}
|
||||
|
||||
.multi-line-chip {
|
||||
white-space: pre-line
|
||||
}
|
||||
|
||||
/* TODO: move to site.component.scss-theme.scss (does not work currently) */
|
||||
|
||||
/* make the .user-menu expansion panel look like the nav-toolbar above */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user