Skip to content
Snippets Groups Projects
Commit d79587c5 authored by Michael Hartung's avatar Michael Hartung
Browse files

fix network footer 5px overlap on right; groupName in selection

parent 8e486c8b
No related branches found
No related tags found
No related merge requests found
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<span class="is-capitalized"> {{ wrapper.data.groupName }}</span> <span class="is-capitalized"> {{ wrapper.data.groupName }}</span>
</p> </p>
<p *ngIf="wrapper.data.uniprotAc" [ngClass]="{'text-normal':smallStyle}"> <p *ngIf="wrapper.data.uniprotAc" [ngClass]="{'text-normal':smallStyle}">
<b><span>Access:</span></b> <b><span>Uniprot:</span></b>
<a href="https://www.uniprot.org/uniprot/{{ wrapper.data.uniprotAc }}" target="_blank"> <a href="https://www.uniprot.org/uniprot/{{ wrapper.data.uniprotAc }}" target="_blank">
<span class="is-capitalized"> {{ wrapper.data.uniprotAc }}</span> <span class="is-capitalized"> {{ wrapper.data.uniprotAc }}</span>
</a> </a>
......
...@@ -641,17 +641,23 @@ ...@@ -641,17 +641,23 @@
class="seed-selection" class="seed-selection"
[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 class="table selection-table" *ngIf="analysis.getCount() > 0">
<thead> <thead>
<tr> <tr>
<td>Label</td> <td>Label</td>
<td>Group</td>
<td *ngIf="myConfig.identifier !== 'symbol'">Symbol</td>
<td *ngIf="myConfig.identifier !== 'uniprot'">Uniprot</td>
<td>Actions</td> <td>Actions</td>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr *ngFor="let p of analysis.getSelection()"> <tr *ngFor="let p of analysis.getSelection()">
<td><p class="is-capitalized">{{p.data.label}}</p></td> <td><p class="is-capitalized">{{p.data.label}}</p></td>
<td><p>{{myConfig.nodeGroups[p.data.group]['groupName']}}</p></td>
<td *ngIf="myConfig.identifier !== 'symbol'"><p>{{p.data.symbol}}</p></td>
<td *ngIf="myConfig.identifier !== 'uniprot'"><p>{{p.data.uniprotAc}}</p></td>
<td> <td>
<button (click)="analysis.removeItems([p])" class="button is-small is-danger is-outlined has-tooltip" <button (click)="analysis.removeItems([p])" class="button is-small is-danger is-outlined has-tooltip"
tooltipPosition="top" pTooltip="Remove from selection."> tooltipPosition="top" pTooltip="Remove from selection.">
...@@ -662,11 +668,11 @@ ...@@ -662,11 +668,11 @@
</tbody> </tbody>
</table> </table>
<i *ngIf="analysis.getCount() === 0"> <i *ngIf="analysis.getCount() === 0">
Double-click on a protein to select it for the analysis. Double-click on a node to select it for the analysis.
</i> </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.">
...@@ -732,7 +738,7 @@ ...@@ -732,7 +738,7 @@
</a> </a>
</footer> --> </footer> -->
<!-- </div> --> <!-- </div> -->
<!-- </div> --> <!-- </div> -->
</div> </div>
</div> </div>
......
...@@ -366,6 +366,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit { ...@@ -366,6 +366,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
this.proteinData.linkNodes(); this.proteinData.linkNodes();
const {nodes, edges} = this.proteinData.mapDataToNetworkInput(this.myConfig); const {nodes, edges} = this.proteinData.mapDataToNetworkInput(this.myConfig);
console.log('first item nodes', nodes[0])
this.nodeData.nodes = new vis.DataSet(nodes); this.nodeData.nodes = new vis.DataSet(nodes);
this.nodeData.edges = new vis.DataSet(edges); this.nodeData.edges = new vis.DataSet(edges);
...@@ -373,6 +374,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit { ...@@ -373,6 +374,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
const options = NetworkSettings.getOptions('main'); const options = NetworkSettings.getOptions('main');
this.networkInternal = new vis.Network(container, this.nodeData, options); this.networkInternal = new vis.Network(container, this.nodeData, options);
this.networkInternal.on('doubleClick', (properties) => { this.networkInternal.on('doubleClick', (properties) => {
const nodeIds: Array<string> = properties.nodes; const nodeIds: Array<string> = properties.nodes;
if (nodeIds.length > 0) { if (nodeIds.length > 0) {
...@@ -382,6 +384,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit { ...@@ -382,6 +384,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
// skip if node is not a protein mapped to backend // skip if node is not a protein mapped to backend
return; return;
} }
console.log(node)
const wrapper = getWrapperFromNode(node); const wrapper = getWrapperFromNode(node);
if (this.analysis.inSelection(node)) { if (this.analysis.inSelection(node)) {
this.analysis.removeItems([wrapper]); this.analysis.removeItems([wrapper]);
......
...@@ -222,7 +222,6 @@ div.field.has-addons.add-remove-toggle { ...@@ -222,7 +222,6 @@ div.field.has-addons.add-remove-toggle {
} }
.toolbar { .toolbar {
padding: 5px;
border-top: 2px solid #d0d0d0; border-top: 2px solid #d0d0d0;
.field { .field {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment