aboutsummaryrefslogtreecommitdiff
path: root/frontend/src/app/_elements/folder
diff options
context:
space:
mode:
authorDanijel Anđelković <adanijel99@gmail.com>2022-04-29 00:44:09 +0200
committerDanijel Anđelković <adanijel99@gmail.com>2022-04-29 00:44:09 +0200
commit9d73bc044eaea6176556935a81db8e654476e6f1 (patch)
treee7a5b8f2ff85d14933df73c1a30ef47ac2a13973 /frontend/src/app/_elements/folder
parent1b9e3a2470d1123b362ad47725bd76b2eb7b39eb (diff)
Promenio liniju u grafu modela na bezier krivu, dodao ispis ulazne kolone / aktivacione funkcije sloja na hoveru preko cvora.
Diffstat (limited to 'frontend/src/app/_elements/folder')
-rw-r--r--frontend/src/app/_elements/folder/folder.component.html2
-rw-r--r--frontend/src/app/_elements/folder/folder.component.ts9
2 files changed, 8 insertions, 3 deletions
diff --git a/frontend/src/app/_elements/folder/folder.component.html b/frontend/src/app/_elements/folder/folder.component.html
index b4e90e56..763a82a1 100644
--- a/frontend/src/app/_elements/folder/folder.component.html
+++ b/frontend/src/app/_elements/folder/folder.component.html
@@ -59,7 +59,7 @@
<mat-icon>zoom_out_map</mat-icon>
</button>
</div>
- <app-form-model [model]="fileToDisplay" *ngSwitchCase="FolderType.Model"></app-form-model>
+ <app-form-model [model]="fileToDisplay" [forExperiment]="forExperiment" *ngSwitchCase="FolderType.Model"></app-form-model>
<app-form-dataset *ngSwitchCase="FolderType.Dataset"></app-form-dataset>
</div>
<div *ngSwitchCase="true" class="list-view">
diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts
index 23a982fb..eb1b9b98 100644
--- a/frontend/src/app/_elements/folder/folder.component.ts
+++ b/frontend/src/app/_elements/folder/folder.component.ts
@@ -1,5 +1,6 @@
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import Dataset from 'src/app/_data/Dataset';
+import Dataset, { ColumnInfo } from 'src/app/_data/Dataset';
+import Experiment from 'src/app/_data/Experiment';
import { FolderFile, FolderType } from 'src/app/_data/FolderFile';
import Model from 'src/app/_data/Model';
import { DatasetsService } from 'src/app/_services/datasets.service';
@@ -19,6 +20,8 @@ export class FolderComponent implements OnInit {
@Input() type: FolderType = FolderType.Dataset;
+ @Input() forExperiment?: Experiment;
+
newFileSelected: boolean = true;
selectedFileIndex: number = -1;
@@ -32,10 +35,12 @@ export class FolderComponent implements OnInit {
searchTerm: string = '';
- myDatasets : Dataset[] = [];
+ myDatasets: Dataset[] = [];
constructor(private datasets: DatasetsService) {
//PLACEHOLDER
+ this.forExperiment = new Experiment();
+ this.forExperiment.inputColumns = ['kolona1', 'kol2', '???', 'test'];
this.datasets.getMyDatasets().subscribe((datasets) => {
this.myDatasets = datasets;