diff options
Diffstat (limited to 'frontend/src/app')
5 files changed, 59 insertions, 35 deletions
diff --git a/frontend/src/app/_data/Dataset.ts b/frontend/src/app/_data/Dataset.ts index 9d4b67a9..e8207718 100644 --- a/frontend/src/app/_data/Dataset.ts +++ b/frontend/src/app/_data/Dataset.ts @@ -13,7 +13,7 @@ export default class Dataset extends FolderFile { dateCreated: Date = new Date(), lastUpdated: Date = new Date(), public uploaderId: string = '', - public delimiter: string = '', + public delimiter: string = ',', public hasHeader: boolean = true, public columnInfo: ColumnInfo[] = [], diff --git a/frontend/src/app/_elements/folder/folder.component.html b/frontend/src/app/_elements/folder/folder.component.html index 3497611e..36f70c97 100644 --- a/frontend/src/app/_elements/folder/folder.component.html +++ b/frontend/src/app/_elements/folder/folder.component.html @@ -62,8 +62,8 @@ <mat-icon>zoom_out_map</mat-icon> </button> </div> - <app-form-model [model]="fileToDisplay" [forExperiment]="forExperiment" *ngSwitchCase="FolderType.Model"></app-form-model> - <app-form-dataset *ngSwitchCase="FolderType.Dataset"></app-form-dataset> + <app-form-model [forExperiment]="forExperiment" [model]="fileToDisplay" *ngSwitchCase="FolderType.Model"></app-form-model> + <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/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts index ecf26355..06b4d893 100644 --- a/frontend/src/app/_elements/folder/folder.component.ts +++ b/frontend/src/app/_elements/folder/folder.component.ts @@ -1,11 +1,13 @@ -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import Dataset, { ColumnInfo } from 'src/app/_data/Dataset'; -import Experiment from 'src/app/_data/Experiment'; +import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; +import Dataset from 'src/app/_data/Dataset'; import { FolderFile, FolderType } from 'src/app/_data/FolderFile'; import Model from 'src/app/_data/Model'; import { DatasetsService } from 'src/app/_services/datasets.service'; -import { ExperimentsService } from 'src/app/_services/experiments.service'; +import shared from 'src/app/Shared'; import { ModelsService } from 'src/app/_services/models.service'; +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'; @Component({ @@ -15,6 +17,8 @@ import { PredictorsService } from 'src/app/_services/predictors.service'; }) export class FolderComponent implements OnInit { + @ViewChild(FormDatasetComponent) formDataset?: FormDatasetComponent; + @Input() folderName: string = 'Moji podaci'; @Input() files!: FolderFile[] @@ -46,31 +50,9 @@ export class FolderComponent implements OnInit { this.folders[TabType.File] = []; this.folders[TabType.NewFile] = []; - this.datasetsService.getMyDatasets().subscribe((datasets) => { - this.folders[TabType.MyDatasets] = datasets; - }); - - this.datasetsService.getPublicDatasets().subscribe((datasets) => { - this.folders[TabType.PublicDatasets] = datasets; - }); - - this.modelsService.getMyModels().subscribe((models) => { - this.folders[TabType.MyModels] = models; - }); + this.refreshFiles(); - /*this.modelsService.getMyModels().subscribe((models) => { - this.folders[TabType.PublicModels] = models; - });*/ - this.folders[TabType.PublicModels] = []; - - this.experimentsService.getMyExperiments().subscribe((experiments) => { - this.folders[TabType.MyExperiments] = experiments; - }); - - this.files = []; - - this.filteredFiles.length = 0; - this.filteredFiles.push(...this.files); + } ngOnInit(): void { @@ -81,6 +63,11 @@ export class FolderComponent implements OnInit { } } + displayFile(){ + if(this.type == FolderType.Dataset) + this.formDataset!.dataset = <Dataset>this.fileToDisplay; + } + hoverOverFile(i: number) { this.hoveringOverFileIndex = i; if (i != -1) { @@ -92,6 +79,7 @@ export class FolderComponent implements OnInit { this.fileToDisplay = this.files[this.selectedFileIndex]; } } + this.displayFile(); } selectNewFile() { @@ -103,6 +91,7 @@ export class FolderComponent implements OnInit { this.newFileSelected = true; this.listView = false; this.selectedFileChanged.emit(this.newFile); + this.displayFile(); } selectFile(index: number) { @@ -111,6 +100,7 @@ export class FolderComponent implements OnInit { this.newFileSelected = false; this.listView = false; this.selectedFileChanged.emit(this.selectedFile); + this.displayFile(); } createNewFile() { @@ -125,8 +115,40 @@ export class FolderComponent implements OnInit { this.okPressed.emit(); } + refreshFiles(){ + this.datasetsService.getMyDatasets().subscribe((datasets) => { + this.folders[TabType.MyDatasets] = datasets; + }); + + this.datasetsService.getPublicDatasets().subscribe((datasets) => { + this.folders[TabType.PublicDatasets] = datasets; + }); + + this.modelsService.getMyModels().subscribe((models) => { + this.folders[TabType.MyModels] = models; + }); + + /*this.modelsService.getMyModels().subscribe((models) => { + this.folders[TabType.PublicModels] = models; + });*/ + this.folders[TabType.PublicModels] = []; + + this.experimentsService.getMyExperiments().subscribe((experiments) => { + this.folders[TabType.MyExperiments] = experiments; + }); + + this.files = []; + + this.filteredFiles.length = 0; + this.filteredFiles.push(...this.files); + + this.searchTermsChanged(); + + } + saveNewFile() { - // TODO + if(this.type == FolderType.Dataset) + this.formDataset!.uploadDataset(); } /*calcZIndex(i: number) { diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.html b/frontend/src/app/_elements/form-dataset/form-dataset.component.html index ab1b417e..2176b130 100644 --- a/frontend/src/app/_elements/form-dataset/form-dataset.component.html +++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.html @@ -30,7 +30,7 @@ <div class="row"> <mat-form-field class="example-full-width" appearance="fill"> <mat-label>Naziv</mat-label> - <input type="text" matInput value="{{filename.slice(0, this.filename.length - 4)}}"> + <input type="text" matInput value="{{dataset?.name}}"> <!--[formControl]="nameFormControl"--> <mat-error *ngIf="nameFormControl.hasError('required')"> diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.ts b/frontend/src/app/_elements/form-dataset/form-dataset.component.ts index 254f5fe4..63376524 100644 --- a/frontend/src/app/_elements/form-dataset/form-dataset.component.ts +++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.ts @@ -1,4 +1,4 @@ -import { Component, ElementRef, EventEmitter, Output, ViewChild } from '@angular/core'; +import { Component, ElementRef, EventEmitter, Input, Output, ViewChild } from '@angular/core'; import Dataset from 'src/app/_data/Dataset'; import { DatasetsService } from 'src/app/_services/datasets.service'; import { ModelsService } from 'src/app/_services/models.service'; @@ -25,7 +25,7 @@ export class FormDatasetComponent { rowsNumber: number = 0; colsNumber: number = 0; - dataset: Dataset; //dodaj ! potencijalno + @Input() dataset: Dataset; //dodaj ! potencijalno tableData: TableData = new TableData(); @@ -81,6 +81,8 @@ export class FormDatasetComponent { } } fileReader.readAsText(this.files[0]); + + this.dataset.name = this.filename.slice(0, this.filename.length - 4); } checkAccessible() { |