From cac17c1840514b2dbb09b82db94dc772e09e88dc Mon Sep 17 00:00:00 2001 From: Danijel Anđelković Date: Tue, 3 May 2022 19:01:06 +0200 Subject: Dodao neke nedostajuce pakete. --- .../column-table/column-table.component.html | 1 - .../src/app/_elements/folder/folder.component.html | 3 +-- .../_pages/experiment/experiment.component.html | 4 +-- .../app/_pages/experiment/experiment.component.ts | 15 ++++++----- frontend/src/app/_services/csv-parse.service.ts | 30 +++++++++++----------- 5 files changed, 26 insertions(+), 27 deletions(-) (limited to 'frontend/src/app') 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}}
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}}
@@ -64,7 +63,7 @@
- +
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 @@
- +
@@ -41,7 +41,7 @@
-
+
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((this.folderModel.selectedFile)._id, this.experiment._id).subscribe(()=>{console.log("pocelo treniranje")}) + trainModel() { + this.modelsService.trainModel((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 -- cgit v1.2.3