Skip to content
Snippets Groups Projects
Commit f1c4dde5 authored by AndiMajore's avatar AndiMajore
Browse files

Merge branch 'master' of gitlab.lrz.de:netex/frontend

parents 0d7f63e3 b02883e9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/app/pages/explorer-page/explorer-page.component.html
+ 67
− 43
View file @ f1c4dde5
...@@ -651,37 +651,58 @@ ...@@ -651,37 +651,58 @@
[ngClass]="{ 'text-normal': 'smallStyle' }" [ngClass]="{ 'text-normal': 'smallStyle' }"
> >
<div class="card-content overflow"> <div class="card-content overflow">
<table class="table selection-table" *ngIf="analysis.getCount() > 0"> <table
<thead> class="table selection-table"
<tr> *ngIf="analysis.getCount() > 0"
<td>Label</td> >
<td>Group</td> <thead>
<td *ngIf="myConfig.identifier !== 'symbol'">Symbol</td> <tr>
<td *ngIf="myConfig.identifier !== 'uniprot'">Uniprot</td> <td>Label</td>
<td>Actions</td> <td>Group</td>
</tr> <td *ngIf="myConfig.identifier !== 'symbol'">Symbol</td>
</thead> <td *ngIf="myConfig.identifier !== 'uniprot'">Uniprot</td>
<tbody> <td>Actions</td>
<tr *ngFor="let p of analysis.getSelection()"> </tr>
<td><p class="is-capitalized">{{p.data.label}}</p></td> </thead>
<td><p>{{myConfig.nodeGroups[p.data.group]['groupName']}}</p></td> <tbody>
<td *ngIf="myConfig.identifier !== 'symbol'"><p>{{p.data.symbol}}</p></td> <tr *ngFor="let p of analysis.getSelection()">
<td *ngIf="myConfig.identifier !== 'uniprot'"><p>{{p.data.uniprotAc}}</p></td> <td>
<td> <p class="is-capitalized">{{ p.data.label }}</p>
<button (click)="analysis.removeItems([p])" class="button is-small is-danger is-outlined has-tooltip" </td>
tooltipPosition="top" pTooltip="Remove from selection."> <td>
<i class="fa fa-trash"></i> <p>
</button> {{ myConfig.nodeGroups[p.data.group]["groupName"] }}
</td> </p>
</tr> </td>
</tbody> <td *ngIf="myConfig.identifier !== 'symbol'">
</table> <p>{{ p.data.symbol }}</p>
<i *ngIf="analysis.getCount() === 0"> </td>
Double-click on a node to select it for the analysis. <td *ngIf="myConfig.identifier !== 'uniprot'">
</i> <p>{{ p.data.uniprotAc }}</p>
</td>
<td>
<button
(click)="analysis.removeItems([p])"
class="
button
is-small is-danger is-outlined
has-tooltip
"
tooltipPosition="top"
pTooltip="Remove from selection."
>
<i class="fa fa-trash"></i>
</button>
</td>
</tr>
</tbody>
</table>
<i *ngIf="analysis.getCount() === 0">
Double-click on a node to select it for the analysis.
</i>
</div> </div>
<!-- <footer class="card-footer" *ngIf="selectedAnalysisToken"> <!-- <footer class="card-footer" *ngIf="selectedAnalysisToken">
<a (click)="analysis.addSeeds(currentViewNodes)" <a (click)="analysis.addSeeds(currentViewNodes)"
class="card-footer-item has-text-success" tooltipPosition="top" pTooltip="Add all visible seeds."> class="card-footer-item has-text-success" tooltipPosition="top" pTooltip="Add all visible seeds.">
...@@ -726,8 +747,8 @@ ...@@ -726,8 +747,8 @@
</a> </a>
</footer> --> </footer> -->
<!-- <footer class="card-footer"> <footer class="card-footer">
<a (click)="analysis.invertSelection(currentViewNodes)" class="card-footer-item text-primary" <!-- <a (click)="analysis.invertSelection(currentViewNodes)" class="card-footer-item text-primary"
tooltipPosition="top" pTooltip="Invert the current selection."> tooltipPosition="top" pTooltip="Invert the current selection.">
<span class="icon"> <span class="icon">
<i class="fa fa-sync"></i> <i class="fa fa-sync"></i>
...@@ -735,19 +756,22 @@ ...@@ -735,19 +756,22 @@
<span> <span>
Invert Invert
</span> </span>
</a> </a> -->
<a (click)="analysis.resetSelection()" class="card-footer-item text-danger" <a
tooltipPosition="top" pTooltip="Remove all entries from the selection."> *ngIf="analysis.getSelection().length"
<span class="icon"> (click)="analysis.resetSelection()"
<i class="fa fa-broom"></i> class="card-footer-item text-danger"
</span> tooltipPosition="top"
<span> pTooltip="Remove all entries from the selection."
Reset >
</span> <span class="icon">
</a> <i class="fa fa-broom"></i>
</footer> --> </span>
<span> Reset </span>
</a>
</footer>
<!-- </div> --> <!-- </div> -->
<!-- </div> --> <!-- </div> -->
</div> </div>
</div> </div>
......
src/app/services/analysis/analysis.service.ts
+ 1
− 1
View file @ f1c4dde5
...@@ -209,8 +209,8 @@ export class AnalysisService { ...@@ -209,8 +209,8 @@ export class AnalysisService {
}*/ }*/
resetSelection() { resetSelection() {
this.selectListSubject.next({items: Array.from(this.selectedItems.values()), selected: false});
this.selectedItems.clear(); this.selectedItems.clear();
this.selectListSubject.next({items: [], selected: null});
} }
idInSelection(nodeId: string): boolean { idInSelection(nodeId: string): boolean {
......
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