Skip to content
Snippets Groups Projects
Commit dc4589ae authored by Xiao Gui's avatar Xiao Gui
Browse files

bugfix: fix display multiple region bug

bugfix: top level flattree does not collapse (#117)
chore: chevron wrong orientation
chore: restore reset region selected
chore: reordered template parcellation selected
parent 7a288596
No related branches found
No related tags found
No related merge requests found
<div *ngFor = "let flattenedItems of (inputItem | flattenTreePipe : findChildren | filterRowsByVisbilityPipe : findChildren : searchFilter | appendSiblingFlagPipe | clusteringPipe : clusterNumber ); let index = index" clusterContainer>
<div *ngFor="let flattenedItems of (inputItem | flattenTreePipe : findChildren | filterRowsByVisbilityPipe : findChildren : searchFilter | appendSiblingFlagPipe | clusteringPipe : clusterNumber ); let index = index" clusterContainer>
<div [attr.clusterindex] = "index" flatTreeStart #flatTreeStart>
<div
class="pe-none"
[attr.clusterindex]="index"
flatTreeStart
#flatTreeStart>
</div>
<div *ngIf = "showCluster(index)">
<div *ngIf="showCluster(index)">
<div
*ngFor = "let flattenedItem of flattenedItems"
[ngClass] = "getClass(flattenedItem.flattenedTreeLevel)"
[attr.flattenedtreelevel] = "flattenedItem.flattenedTreeLevel"
[attr.collapsed] = "flattenedItem.collapsed ? flattenedItem.collapsed : false"
[attr.lvlId] = "flattenedItem.lvlId"
[hidden] = "collapseRow(flattenedItem) "
*ngFor="let flattenedItem of flattenedItems"
[ngClass]="getClass(flattenedItem.flattenedTreeLevel)"
class="text-nowrap"
[attr.flattenedtreelevel]="flattenedItem.flattenedTreeLevel"
[attr.collapsed]="flattenedItem.collapsed ? flattenedItem.collapsed : false"
[attr.lvlId]="flattenedItem.lvlId"
[hidden]="collapseRow(flattenedItem) "
renderNode>
<span class = "padding-block-container">
<span class="padding-block-container">
<span
*ngFor = "let block of flattenedItem.siblingFlags"
[attr.hidemargin] = "block"
class = "padding-block">
*ngFor="let block of flattenedItem.siblingFlags"
[attr.hidemargin]="block"
class="padding-block">
</span>
</span>
<span
*ngIf = "findChildren(flattenedItem).length > 0; else noChildren"
(click) = "$event.stopPropagation(); toggleCollapse(flattenedItem)" >
<i [ngClass] = "isCollapsed(flattenedItem) ? '' : 'r-270'" class="fas fa-chevron-down"></i>
class="test"
*ngIf="findChildren(flattenedItem).length > 0; else noChildren"
(click)="$event.stopPropagation(); toggleCollapse(flattenedItem)" >
<i [ngClass]="isCollapsed(flattenedItem) ? 'r-270' : ''" class="fas fa-chevron-down"></i>
</span>
<span
(click) = "treeNodeClick.emit({event:$event,inputItem:flattenedItem})"
class = "render-node-text"
[innerHtml] = "flattenedItem | renderPipe : renderNode ">
(click)="treeNodeClick.emit({event:$event,inputItem:flattenedItem})"
class="render-node-text"
[innerHtml]="flattenedItem | renderPipe : renderNode ">
</span>
</div>
</div>
<div [attr.clusterindex] = "index" flatTreeEnd #flatTreeEnd>
<div [attr.clusterindex]="index" flatTreeEnd #flatTreeEnd>
</div>
</div>
......
......@@ -314,4 +314,9 @@ markdown-dom pre code
.h-0
{
height: 0px;
}
.pe-none
{
pointer-events: none;
}
\ No newline at end of file
......@@ -17,18 +17,18 @@
hideScrollbarContainer>
<div treeContainer #treeContainer>
<div *ngIf="false" treeHeader>
<div treeHeader>
<span>{{ selectedRegions.length }} {{ selectedRegions.length > 1 ? 'regions' : 'region' }} selected</span>
<span (click)="clearRegions($event)" *ngIf="selectedRegions.length > 0" class="btn btn-link">clear all</span>
</div>
<ng-container *ngIf="selectedParcellation && selectedParcellation.regions as regions">
<!-- TODO deprecate flat tree component, opt for material cdk infinit scroll component -->
<flat-tree-component
*ngFor="let region of regions"
[flatTreeViewPort]="treeContainer"
(treeNodeClick)="handleClickRegion($event)"
[inputItem]="aggregatedRegionTree"
[inputItem]="region"
[renderNode]="displayTreeNode.bind(this)"
[searchFilter]="filterTreeBySearch.bind(this)">
......
<ng-container *ngIf="selectedTemplate$ | async as selectedTemplate">
<region-hierarchy
[selectedRegions]="selectedRegions$ | async | filterNull"
(singleClickRegion)="handleRegionClick({ mode: 'single', region: $event })"
(doubleClickRegion)="handleRegionClick({ mode: 'double', region: $event })"
*ngIf="selectedParcellation$ | async as selectedParcellation"
[selectedParcellation]="selectedParcellation">
<dropdown-component
*ngIf="!isMobile"
(itemSelected)="changeTemplate($event)"
[activeDisplay]="displayActiveTemplate"
[selectedItem]="selectedTemplate$ | async"
[inputArray]="loadedTemplates$ | async | filterNull">
</region-hierarchy>
</dropdown-component>
<ng-container *ngIf="selectedTemplate$ | async as selectedTemplate">
<dropdown-component
*ngIf="selectedParcellation$ | async as selectedParcellation"
(itemSelected)="changeParcellation($event)"
......@@ -15,16 +16,15 @@
[inputArray]="selectedTemplate.parcellations">
</dropdown-component>
</ng-container>
<dropdown-component
*ngIf="!isMobile"
(itemSelected)="changeTemplate($event)"
[activeDisplay]="displayActiveTemplate"
[selectedItem]="selectedTemplate$ | async"
[inputArray]="loadedTemplates$ | async | filterNull">
<region-hierarchy
[selectedRegions]="selectedRegions$ | async | filterNull"
(singleClickRegion)="handleRegionClick({ mode: 'single', region: $event })"
(doubleClickRegion)="handleRegionClick({ mode: 'double', region: $event })"
*ngIf="selectedParcellation$ | async as selectedParcellation"
[selectedParcellation]="selectedParcellation">
</dropdown-component>
</region-hierarchy>
</ng-container>
<!-- help btn -->
<div
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment