diff options
author | Danijel Anđelković <adanijel99@gmail.com> | 2022-05-03 19:39:47 +0200 |
---|---|---|
committer | Danijel Anđelković <adanijel99@gmail.com> | 2022-05-03 19:39:47 +0200 |
commit | 49200b7ead7c637f56bac9b0cad461115543b54f (patch) | |
tree | a2105ac3851f57e25d2aa51cfcca1f9e8130f30e /frontend/src/app/_pages/experiment/experiment.component.html | |
parent | ec1235f53500181bb4476d86062c33e1175507dd (diff) | |
parent | cac17c1840514b2dbb09b82db94dc772e09e88dc (diff) |
Merge branch 'redesign-exp-fixed' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into redesign
# Conflicts:
# frontend/package-lock.json
# frontend/src/app/_elements/folder/folder.component.html
# frontend/src/app/_elements/form-dataset/form-dataset.component.html
# frontend/src/app/_pages/experiment/experiment.component.html
Diffstat (limited to 'frontend/src/app/_pages/experiment/experiment.component.html')
-rw-r--r-- | frontend/src/app/_pages/experiment/experiment.component.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/frontend/src/app/_pages/experiment/experiment.component.html b/frontend/src/app/_pages/experiment/experiment.component.html index 2124d84a..4b75c929 100644 --- a/frontend/src/app/_pages/experiment/experiment.component.html +++ b/frontend/src/app/_pages/experiment/experiment.component.html @@ -27,17 +27,17 @@ <div #stepsContainer class="steps-container"> <div #steps id="step_1" class="step-content"> <div class="step-content-inside"> - <app-folder [type]="FolderType.Dataset" [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)"></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()"></app-column-table> + <app-column-table (okPressed)="goToPage(2)" (columnTableChanged)="columnTableChangedEvent()" [experiment]="experiment"></app-column-table> </div> </div> <div #steps id="step_3" class="step-content"> <div class="step-content-inside"> - <app-folder [type]="FolderType.Model" [startingTab]="TabType.NewFile" [tabsToShow]="[TabType.MyModels, TabType.PublicModels]" (okPressed)="goToPage(3)"></app-folder> + <app-folder #folderModel [type]="FolderType.Model" [forExperiment]="experiment" [startingTab]="TabType.NewFile" [tabsToShow]="[TabType.MyModels, TabType.PublicModels]" (okPressed)="goToPage(3)"></app-folder> </div> </div> <div #steps id="step_4" class="step-content"> |