Dodao neke nedostajuce pakete.

5 files changed, 26 insertions, 27 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 050f9644..42c43138 100644
--- a/frontend/src/app/_elements/column-table/column-table.component.html
+++ b/frontend/src/app/_elements/column-table/column-table.component.html
@@ -1,4 +1,3 @@
-{{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 404ba302..54c7a3d7 100644
--- a/frontend/src/app/_elements/folder/folder.component.html
+++ b/frontend/src/app/_elements/folder/folder.component.html
@@ -1,4 +1,3 @@
-{{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}">
@@ -64,7 +63,7 @@
                     </button>
                 </div>
                 <app-form-model [forExperiment]="forExperiment" [model]="fileToDisplay" *ngSwitchCase="FolderType.Model"></app-form-model>
-                <app-form-dataset *ngSwitchCase="FolderType.Dataset" ></app-form-dataset>
+                <app-form-dataset *ngSwitchCase="FolderType.Dataset"></app-form-dataset>
             </div>
             <div *ngSwitchCase="true" class="list-view">
                 <div *ngFor="let file of filteredFiles; let i = index" class="list-item">
diff --git a/frontend/src/app/_pages/experiment/experiment.component.html b/frontend/src/app/_pages/experiment/experiment.component.html
index ee14c782..25eb98b7 100644
--- a/frontend/src/app/_pages/experiment/experiment.component.html
+++ b/frontend/src/app/_pages/experiment/experiment.component.html
@@ -32,7 +32,7 @@
         </div>
         <div #steps id="step_2" class="step-content">
             <div class="step-content-inside">
-                <app-column-table (okPressed)="goToPage(2)" [forExperiment]="experiment"></app-column-table>
+                <app-column-table (okPressed)="goToPage(2)" [experiment]="experiment"></app-column-table>
             </div>
         </div>
         <div #steps id="step_3" class="step-content">
@@ -41,7 +41,7 @@
             </div>
         </div>
         <div #steps id="step_4" class="step-content">
-            <div class="step-content-inside" >
+            <div class="step-content-inside">
                 <app-metric-view></app-metric-view>
             </div>
         </div>
diff --git a/frontend/src/app/_pages/experiment/experiment.component.ts b/frontend/src/app/_pages/experiment/experiment.component.ts
index 8485ded6..bfa42702 100644
--- a/frontend/src/app/_pages/experiment/experiment.component.ts
+++ b/frontend/src/app/_pages/experiment/experiment.component.ts
@@ -7,6 +7,7 @@ import { FolderComponent, TabType } from 'src/app/_elements/folder/folder.compon
 import Experiment from 'src/app/_data/Experiment';
 import { ExperimentsService } from 'src/app/_services/experiments.service';
 import { ModelsService } from 'src/app/_services/models.service';
+import Model from 'src/app/_data/Model';
 
 @Component({
   selector: 'app-experiment',
@@ -20,9 +21,9 @@ export class ExperimentComponent implements AfterViewInit {
   @ViewChildren('steps') steps!: ElementRef[];
 
   event: number = 0;
-  @Input() experiment: Experiment; 
-  @ViewChild("folderDataset") folderDataset?: FolderComponent;
-  @ViewChild("folderModel") folderModel?: FolderComponent;
+  @Input() experiment: Experiment;
+  @ViewChild("folderDataset") folderDataset!: FolderComponent;
+  @ViewChild("folderModel") folderModel!: FolderComponent;
 
   constructor(private experimentsService: ExperimentsService, private modelsService: ModelsService) {
     this.experiment = new Experiment("exp1");
@@ -32,12 +33,12 @@ export class ExperimentComponent implements AfterViewInit {
 
   }*/
 
-  addNewExperiment(){
-    this.experimentsService.addExperiment(this.experiment).subscribe(()=>{console.log("new Experiment")});
+  addNewExperiment() {
+    this.experimentsService.addExperiment(this.experiment).subscribe(() => { console.log("new Experiment") });
   }
 
-  trainModel(){
-    this.modelsService.trainModel((<Model>this.folderModel.selectedFile)._id, this.experiment._id).subscribe(()=>{console.log("pocelo treniranje")})
+  trainModel() {
+    this.modelsService.trainModel((<Model>this.folderModel.selectedFile)._id, this.experiment._id).subscribe(() => { console.log("pocelo treniranje") })
   }
 
   stepHeight = this.calcStepHeight();
diff --git a/frontend/src/app/_services/csv-parse.service.ts b/frontend/src/app/_services/csv-parse.service.ts
index 6d2fd8d8..aae10193 100644
--- a/frontend/src/app/_services/csv-parse.service.ts
+++ b/frontend/src/app/_services/csv-parse.service.ts
@@ -53,42 +53,42 @@ export class CsvParseService {
 
       if (strMatchedValue.length > 0)
         arrData[arrData.length - 1].push(strMatchedValue);
-      else 
+      else
         arrData[arrData.length - 1].push(null);
     }
 
     return (arrData);
   }
 
-  ConvertJSONToCSV(objArray, headerList) {
+  ConvertJSONToCSV(objArray: string, headerList: { [x: string]: any; }) {
     let array = typeof objArray != 'object' ? JSON.parse(objArray) : objArray;
     let str = '';
     let row = 'S.No,';
     for (let index in headerList) {
-     row += headerList[index] + ',';
+      row += headerList[index] + ',';
     }
     row = row.slice(0, -1);
     str += row + '\r\n';
     for (let i = 0; i < array.length; i++) {
-     let line = (i+1)+'';
-     for (let index in headerList) {
-      let head = headerList[index];
-      line += ',' + array[i][head];
-     }
-     str += line + '\r\n';
+      let line = (i + 1) + '';
+      for (let index in headerList) {
+        let head = headerList[index];
+        line += ',' + array[i][head];
+      }
+      str += line + '\r\n';
     }
     return str;
-   }
+  }
 
-  public exportAsExcelFile(json: any[], excelFileName: string): void { 
+  public exportAsExcelFile(json: any[], excelFileName: string): void {
     const worksheet: XLSX.WorkSheet = XLSX.utils.json_to_sheet(json);
-    const workbook: XLSX.WorkBook = { Sheets: { 'data': worksheet }, SheetNames: ['data'] }; 
+    const workbook: XLSX.WorkBook = { Sheets: { 'data': worksheet }, SheetNames: ['data'] };
     const excelBuffer: any = XLSX.write(workbook, { bookType: 'xlsx', type: 'array' });
     this.saveAsExcelFile(excelBuffer, excelFileName);
   }
 
   private saveAsExcelFile(buffer: any, fileName: string): void {
-    const data: Blob = new Blob([buffer], {type: EXCEL_TYPE});  
-    FileSaver.saveAs(data, fileName + '_export_' + new  Date().getTime() + EXCEL_EXTENSION);
- }
+    const data: Blob = new Blob([buffer], { type: EXCEL_TYPE });
+    FileSaver.saveAs(data, fileName + '_export_' + new Date().getTime() + EXCEL_EXTENSION);
+  }
 }
\ No newline at end of file