aboutsummaryrefslogtreecommitdiff
path: root/frontend/src/app/_elements/folder
diff options
context:
space:
mode:
authorSonja Galovic <galovicsonja@gmail.com>2022-05-18 13:52:29 +0200
committerSonja Galovic <galovicsonja@gmail.com>2022-05-18 13:52:29 +0200
commit9233e6f193f68a0477e2900ac7a82928ab7f4adc (patch)
treedc02cd42afc90c3a87d21e453a6bc80848aee5e8 /frontend/src/app/_elements/folder
parentf36899620a84cd1629b0d31a930f8bf8eb797d8b (diff)
Ispravljen bag: kad se izmeni dataset, refreshuje se 2. korak na eksperiment strani. Dodata ruta kako bi se eksperiment iz kolekcije otvorio na eksperiment strani. Sredjivanje otvaranja - pocetak
Diffstat (limited to 'frontend/src/app/_elements/folder')
-rw-r--r--frontend/src/app/_elements/folder/folder.component.html6
-rw-r--r--frontend/src/app/_elements/folder/folder.component.ts8
2 files changed, 10 insertions, 4 deletions
diff --git a/frontend/src/app/_elements/folder/folder.component.html b/frontend/src/app/_elements/folder/folder.component.html
index db4f28f0..84946697 100644
--- a/frontend/src/app/_elements/folder/folder.component.html
+++ b/frontend/src/app/_elements/folder/folder.component.html
@@ -78,12 +78,12 @@
<div class="mx-2 hover-show" *ngIf="selectedTab !== TabType.PublicDatasets && selectedTab !== TabType.PublicModels">
<button class="btn-clear file-button" (click)="deleteFile(file, $event)">
<mat-icon>delete</mat-icon>
- </button>
+ </button>
</div>
<div class="mx-2 hover-show" *ngIf="selectedTab == TabType.PublicDatasets || selectedTab == TabType.PublicModels">
- <button class="btn-clear file-button" (click)="addFile(file, $event)">
+ <button class="btn-clear file-button" (click)="addFile(file, $event)">
<mat-icon>note_add</mat-icon>
- </button>
+ </button>
</div>
</div>
<div *ngIf="type == FolderType.Experiment" class="list-view">
diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts
index d26ac999..4e2209a0 100644
--- a/frontend/src/app/_elements/folder/folder.component.ts
+++ b/frontend/src/app/_elements/folder/folder.component.ts
@@ -105,7 +105,7 @@ export class FolderComponent implements AfterViewInit {
this.selectedFile = file;
this.fileToDisplay = file;
if (this.type == FolderType.Experiment && file) {
- this.router.navigate(['/experiment'/*, file._id*/])
+ this.router.navigate(['/experiment/', file._id]);
}
this.newFileSelected = false;
this.listView = false;
@@ -116,6 +116,12 @@ export class FolderComponent implements AfterViewInit {
if (this.type == FolderType.Dataset)
this.formDataset.loadExisting();
}
+ /*
+ goToExperimentPage(file: FolderFile) {
+ console.log(<Experiment>file);
+ //this.router.navigate(['/experiment/', this.experiment._id]);
+ }
+ */
createNewFile() {
if (this.type == FolderType.Dataset) {