diff options
| author | Danijel Anđelković <adanijel99@gmail.com> | 2022-05-03 22:44:25 +0200 |
|---|---|---|
| committer | Danijel Anđelković <adanijel99@gmail.com> | 2022-05-03 22:44:25 +0200 |
| commit | e09ca08e9a09f4073d15a5341a746d5356da353c (patch) | |
| tree | 53d2c0aa3b4d9564f4cfaebd348af917c4e4374b /frontend/src/app/_pages/experiment/experiment.component.html | |
| parent | 8462d0080036650a9e79a379a06ae395ccacf0c8 (diff) | |
| parent | 52109040514ba5f9f20ef3e93e97571e67277eee (diff) | |
Merge branch 'redesign' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into redesign
# Conflicts:
# frontend/src/app/_elements/folder/folder.component.ts
Diffstat (limited to 'frontend/src/app/_pages/experiment/experiment.component.html')
| -rw-r--r-- | frontend/src/app/_pages/experiment/experiment.component.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/frontend/src/app/_pages/experiment/experiment.component.html b/frontend/src/app/_pages/experiment/experiment.component.html index 74c59fdf..baae864e 100644 --- a/frontend/src/app/_pages/experiment/experiment.component.html +++ b/frontend/src/app/_pages/experiment/experiment.component.html @@ -27,12 +27,12 @@ <div #stepsContainer class="steps-container"> <div #steps id="step_1" class="step-content"> <div class="step-content-inside"> - <app-folder #folderDataset [type]="FolderType.Dataset" [forExperiment]="experiment" [startingTab]="TabType.NewFile" [tabsToShow]="[TabType.MyDatasets, TabType.PublicDatasets]" (okPressed)="goToPage(1)"></app-folder> + <app-folder #folderDataset [type]="FolderType.Dataset" [forExperiment]="experiment" [startingTab]="TabType.NewFile" [tabsToShow]="[TabType.MyDatasets, TabType.PublicDatasets]" (okPressed)="goToPage(1)" (selectedFileChanged)="setDataset($event)"></app-folder> </div> </div> <div #steps id="step_2" class="step-content"> <div class="step-content-inside"> - <app-column-table (okPressed)="goToPage(2)" (columnTableChanged)="columnTableChangedEvent()" [experiment]="experiment"></app-column-table> + <app-column-table (okPressed)="goToPage(2)" (columnTableChanged)="columnTableChangedEvent()" [experiment]="experiment" [dataset]="dataset"></app-column-table> </div> </div> <div #steps id="step_3" class="step-content"> |