diff options
Diffstat (limited to 'frontend/src/app/_elements')
3 files changed, 3 insertions, 15 deletions
diff --git a/frontend/src/app/_elements/column-table/column-table.component.html b/frontend/src/app/_elements/column-table/column-table.component.html index 42c43138..050f9644 100644 --- a/frontend/src/app/_elements/column-table/column-table.component.html +++ b/frontend/src/app/_elements/column-table/column-table.component.html @@ -1,3 +1,4 @@ +{{forExperiment.name}} <div id="tabs"> <div class="folder-tab p-1 rounded-top" *ngFor="let tab of tabs; let i = index" [style]="'z-index:' + calcZIndex(i) + ' ;'" [ngClass]="{'selected-tab' : selectedTab.index == i, 'hover-tab' : hoveringOverTab?.index == i}"> <a class="m-1 stretched-link tab-link" (click)="selectTab(i)" (mouseenter)="hoverOverTab(i)" (mouseleave)="hoverOverTab(-1)"> diff --git a/frontend/src/app/_elements/folder/folder.component.html b/frontend/src/app/_elements/folder/folder.component.html index 36f70c97..404ba302 100644 --- a/frontend/src/app/_elements/folder/folder.component.html +++ b/frontend/src/app/_elements/folder/folder.component.html @@ -1,3 +1,4 @@ +{{forExperiment.name}} <div id="folder"> <div id="tabs"> <div id="new-file-tab" class="folder-tab p-1 rounded-top" [style]="'z-index:' + (selectedTab == TabType.NewFile ? 11 : 10) + ' ;'" [ngClass]="{'selected-tab' : selectedTab == TabType.NewFile, 'hover-tab' : hoverTab == TabType.NewFile}"> diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts index eae99725..a1cd6075 100644 --- a/frontend/src/app/_elements/folder/folder.component.ts +++ b/frontend/src/app/_elements/folder/folder.component.ts @@ -9,7 +9,6 @@ import { FormDatasetComponent } from '../form-dataset/form-dataset.component'; import Experiment from 'src/app/_data/Experiment'; import { ExperimentsService } from 'src/app/_services/experiments.service'; import { PredictorsService } from 'src/app/_services/predictors.service'; -import { ExperimentComponent } from 'src/app/_pages/experiment/experiment.component'; @Component({ selector: 'app-folder', @@ -20,7 +19,7 @@ export class FolderComponent implements OnInit { @ViewChild(FormDatasetComponent) formDataset?: FormDatasetComponent; - @ViewChild(ExperimentComponent) formExperiment?: ExperimentComponent; + @Input() folderName: string = 'Moji podaci'; @@ -72,12 +71,6 @@ export class FolderComponent implements OnInit { this.formDataset!.dataset = <Dataset>this.fileToDisplay; } - displayExp(){ - if(this.type == FolderType.Dataset) - this.formExperiment!.experiment = <Experiment>this.fileToDisplay; - } - - hoverOverFile(i: number) { this.hoveringOverFileIndex = i; if (i != -1) { @@ -90,7 +83,6 @@ export class FolderComponent implements OnInit { } } this.displayFile(); - this.displayExp(); } selectNewFile() { @@ -103,7 +95,6 @@ export class FolderComponent implements OnInit { this.listView = false; this.selectedFileChanged.emit(this.newFile); this.displayFile(); - this.displayExp(); } selectFile(index: number) { @@ -113,7 +104,6 @@ export class FolderComponent implements OnInit { this.listView = false; this.selectedFileChanged.emit(this.selectedFile); this.displayFile(); - this.displayExp(); } createNewFile() { @@ -168,10 +158,6 @@ export class FolderComponent implements OnInit { this.formDataset!.uploadDataset(); } - saveNewExperiment() { - if(this.forExperiment == this.forExperiment) - this.formExperiment!.addNewExperiment(); - } /*calcZIndex(i: number) { let zIndex = (this.files.length - i - 1) |