Skip to content
Snippets Groups Projects
Commit 74e7ba16 authored by Julian Matschinske's avatar Julian Matschinske
Browse files

Merge branch 'post-fixes' into 'master'

No not normalize for network proximity

See merge request covid-19/frontend!147
parents ba8e4941 7464ed69
No related branches found
No related tags found
No related merge requests found
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
</footer> </footer>
</div> </div>
<div class="content tab-content scrollable" *ngIf="task && task.info.done" [class.is-visible]="tab === 'table'"> <div class="content tab-content scrollable" *ngIf="task && task.info.done" [class.is-visible]="tab === 'table'">
<div class="field has-addons" *ngIf="tableHasScores"> <div class="field has-addons" *ngIf="tableHasScores && task.info.algorithm !== 'proximity'">
<p class="control"> <p class="control">
<button class="button is-rounded has-tooltip" data-tooltip="Normalize the scores" <button class="button is-rounded has-tooltip" data-tooltip="Normalize the scores"
[class.is-primary]="tableNormalize" (click)="toggleNormalization(true)"> [class.is-primary]="tableNormalize" (click)="toggleNormalization(true)">
......
...@@ -194,7 +194,11 @@ export class AnalysisPanelComponent implements OnInit, OnChanges { ...@@ -194,7 +194,11 @@ export class AnalysisPanelComponent implements OnInit, OnChanges {
this.tableHasScores = ['trustrank', 'closeness', 'degree', 'proximity', 'betweenness', 'quick', 'super'] this.tableHasScores = ['trustrank', 'closeness', 'degree', 'proximity', 'betweenness', 'quick', 'super']
.indexOf(this.task.info.algorithm) !== -1; .indexOf(this.task.info.algorithm) !== -1;
if (this.tableHasScores) { if (this.tableHasScores) {
if (this.task.info.algorithm !== 'proximity') {
this.toggleNormalization(true); this.toggleNormalization(true);
} else {
this.toggleNormalization(false);
}
} }
this.network.on('deselectNode', (properties) => { this.network.on('deselectNode', (properties) => {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment