From afc1b9a63f56d6a44a21a5c5ebf59350cd26d757 Mon Sep 17 00:00:00 2001
From: ge54hev <m.oubounyt@tum.de>
Date: Mon, 6 Apr 2020 11:38:55 +0200
Subject: [PATCH] default data
---
.../select-dataset/select-dataset.component.html | 4 ++--
.../components/select-dataset/select-dataset.component.ts | 8 ++++++--
src/app/pages/explorer-page/explorer-page.component.html | 6 ++++--
src/app/pages/explorer-page/explorer-page.component.ts | 6 +++++-
4 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/app/components/select-dataset/select-dataset.component.html b/src/app/components/select-dataset/select-dataset.component.html
index e6615bfd..9c0a7789 100644
--- a/src/app/components/select-dataset/select-dataset.component.html
+++ b/src/app/components/select-dataset/select-dataset.component.html
@@ -1,6 +1,6 @@
<div class="content">
- <ng-select [items]="datasetItems" bindLabel="label" bindValue="data" [virtualScroll]="true" class="custom"
- placeholder="Select..." (change)="select($event)">
+ <ng-select [items]="datasetItems" bindLabel="label" [virtualScroll]="true" class="custom"
+ placeholder="Select..." [ngModel]="selectedDataset" (ngModelChange)="select($event)">
<ng-template ng-option-tmp let-item="item">
{{item.label}} <br/>
<small>{{item.datasets}}</small>
diff --git a/src/app/components/select-dataset/select-dataset.component.ts b/src/app/components/select-dataset/select-dataset.component.ts
index 28223fbd..4b669c79 100644
--- a/src/app/components/select-dataset/select-dataset.component.ts
+++ b/src/app/components/select-dataset/select-dataset.component.ts
@@ -8,12 +8,16 @@ import {Component, EventEmitter, Input, Output} from '@angular/core';
export class SelectDatasetComponent {
- @Output() selectDataset: EventEmitter<any> = new EventEmitter();
+ @Input() selectedDataset;
+ @Output() selectedDatasetChange: EventEmitter<any> = new EventEmitter();
@Input() datasetItems: Array<{label: string, datasets: string, data: Array<[string, string]>}>;
public select(selectionItem) {
- this.selectDataset.emit(selectionItem.data);
+ // console.log(selectionItem);
+ this.selectedDataset = selectionItem;
+ this.selectedDatasetChange.emit(selectionItem);
+
}
}
diff --git a/src/app/pages/explorer-page/explorer-page.component.html b/src/app/pages/explorer-page/explorer-page.component.html
index 39c166ba..28279da8 100644
--- a/src/app/pages/explorer-page/explorer-page.component.html
+++ b/src/app/pages/explorer-page/explorer-page.component.html
@@ -15,8 +15,10 @@
</p>
</header>
<div class="card-content">
- <app-select-dataset [datasetItems]="datasetItems"
- (selectDataset)="createNetwork($event)"></app-select-dataset>
+ <app-select-dataset [datasetItems]="datasetItems" [selectedDataset]="selectedDataset"
+ (selectedDatasetChange)="selectedDataset = $event; createNetwork($event.data)">
+ </app-select-dataset>
+
</div>
</div>
diff --git a/src/app/pages/explorer-page/explorer-page.component.ts b/src/app/pages/explorer-page/explorer-page.component.ts
index 90f6ee12..60195ced 100644
--- a/src/app/pages/explorer-page/explorer-page.component.ts
+++ b/src/app/pages/explorer-page/explorer-page.component.ts
@@ -57,6 +57,9 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
{label: 'CoV2', datasets: 'Krogan', data: [['Krogan', 'SARS-CoV2']]},
{label: 'CoV2', datasets: 'TUM', data: [['TUM', 'SARS-CoV2']]}];
+ public selectedDataset = this.datasetItems[0];
+
+
@ViewChild('network', {static: false}) networkEl: ElementRef;
constructor(private http: HttpClient,
@@ -121,7 +124,8 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
async ngAfterViewInit() {
if (!this.network) {
- await this.createNetwork(this.datasetItems[0].data);
+ this.selectedDataset = this.datasetItems[4];
+ await this.createNetwork(this.datasetItems[4].data);
}
}
--
GitLab