From 9233e6f193f68a0477e2900ac7a82928ab7f4adc Mon Sep 17 00:00:00 2001
From: Sonja Galovic <galovicsonja@gmail.com>
Date: Wed, 18 May 2022 13:52:29 +0200
Subject: 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

---
 .../src/app/_elements/column-table/column-table.component.html    | 4 ++--
 frontend/src/app/_elements/column-table/column-table.component.ts | 3 +--
 frontend/src/app/_elements/folder/folder.component.html           | 6 +++---
 frontend/src/app/_elements/folder/folder.component.ts             | 8 +++++++-
 4 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'frontend/src/app/_elements')

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 3256ffee..8af56c43 100644
--- a/frontend/src/app/_elements/column-table/column-table.component.html
+++ b/frontend/src/app/_elements/column-table/column-table.component.html
@@ -45,10 +45,10 @@
                     </tbody>
                 </table>
                 <div class="mb-3">
-                    <button mat-button  (click)="goBack()"><mat-icon>keyboard_arrow_left</mat-icon></button>
+                    <button mat-button (click)="goBack()"><mat-icon>keyboard_arrow_left</mat-icon></button>
                     <div style="display: inline;">{{(this.begin/10)+1}}</div>
                     <button mat-button (click)="goForward()"><mat-icon>keyboard_arrow_right</mat-icon></button>
-                
+
                 </div>
             </div>
 
diff --git a/frontend/src/app/_elements/column-table/column-table.component.ts b/frontend/src/app/_elements/column-table/column-table.component.ts
index a3469d90..7c2f8cef 100644
--- a/frontend/src/app/_elements/column-table/column-table.component.ts
+++ b/frontend/src/app/_elements/column-table/column-table.component.ts
@@ -41,14 +41,12 @@ export class ColumnTableComponent implements AfterViewInit {
   columnsChecked: boolean[] = []; //niz svih kolona
   loaded: boolean = false;
 
-
   begin:number=0;
   step:number=10;
 
 
 
   constructor(private datasetService: DatasetsService, private experimentService: ExperimentsService, public csvParseService: CsvParseService, public dialog: MatDialog) {
-    //ovo mi nece trebati jer primam dataset iz druge komponente
   }
   resetPagging(){
     this.begin=0;
@@ -98,6 +96,7 @@ export class ColumnTableComponent implements AfterViewInit {
     this.dataset = dataset;
     this.setColumnTypeInitial();
 
+    this.columnsChecked = [];
     this.dataset.columnInfo.forEach(column => {
       this.columnsChecked.push(true);
     });
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) {
-- 
cgit v1.2.3