diff options
Diffstat (limited to 'frontend')
6 files changed, 32 insertions, 24 deletions
diff --git a/frontend/src/app/Shared.ts b/frontend/src/app/Shared.ts index a069ff8b..7be29cbf 100644 --- a/frontend/src/app/Shared.ts +++ b/frontend/src/app/Shared.ts @@ -15,12 +15,10 @@ class Shared { openDialog(title: string, message: string): void { - console.log("USAO U OPEN DIALOG 1"); if (this.dialog) { - console.log("USAO U OPEN DIALOG 2"); const dialogRef = this.dialog.open(AlertDialogComponent, { - //width: '250px', + width: '350px', data: { title: title, message: message } }); dialogRef.afterClosed().subscribe(res => { diff --git a/frontend/src/app/_data/Experiment.ts b/frontend/src/app/_data/Experiment.ts index 10320ab6..aba9bb6e 100644 --- a/frontend/src/app/_data/Experiment.ts +++ b/frontend/src/app/_data/Experiment.ts @@ -1,5 +1,6 @@ export default class Experiment { _id: string = ''; + uploaderId: string = ''; constructor( public name: string = 'Novi experiment', public description: string = '', diff --git a/frontend/src/app/_elements/add-new-dataset/add-new-dataset.component.ts b/frontend/src/app/_elements/add-new-dataset/add-new-dataset.component.ts index 6087b6a5..7421fbcf 100644 --- a/frontend/src/app/_elements/add-new-dataset/add-new-dataset.component.ts +++ b/frontend/src/app/_elements/add-new-dataset/add-new-dataset.component.ts @@ -89,25 +89,25 @@ export class AddNewDatasetComponent { } uploadDataset() { - this.modelsService.uploadData(this.files[0]).subscribe((file) => { - //console.log('ADD MODEL: STEP 2 - ADD DATASET WITH FILE ID ' + file._id); - this.dataset.fileId = file._id; - this.dataset.username = shared.username; - - this.datasetsService.addDataset(this.dataset).subscribe((dataset) => { - - this.newDatasetAdded.emit("added"); - //this.refreshMyDatasetList(); refreshuj dataset listu u ds-load i selektuj taj ds - //this.showMyDatasets = true; - //this.selectThisDataset(dataset); - - shared.openDialog("Obaveštenje", "Uspešno ste dodali novi izvor podataka u kolekciju. Molimo sačekajte par trenutaka da se procesira."); - }, (error) => { - shared.openDialog("Neuspeo pokušaj!", "Dataset sa unetim nazivom već postoji u Vašoj kolekciji. Izmenite naziv ili iskoristite postojeći dataset."); - }); //kraj addDataset subscribe + if (this.files[0] == undefined) { + shared.openDialog("Greška", "Niste izabrali fajl za učitavanje."); + return; + } + + this.modelsService.uploadData(this.files[0]).subscribe((file) => { + //console.log('ADD MODEL: STEP 2 - ADD DATASET WITH FILE ID ' + file._id); + this.dataset.fileId = file._id; + this.dataset.username = shared.username; + + this.datasetsService.addDataset(this.dataset).subscribe((dataset) => { + this.newDatasetAdded.emit("added"); + shared.openDialog("Obaveštenje", "Uspešno ste dodali novi izvor podataka u kolekciju. Molimo sačekajte par trenutaka da se procesira."); }, (error) => { - - }); //kraj uploadData subscribe + shared.openDialog("Neuspeo pokušaj!", "Izvor podataka sa unetim nazivom već postoji u Vašoj kolekciji. Izmenite naziv ili iskoristite postojeći dataset."); + }); //kraj addDataset subscribe + }, (error) => { + + }); //kraj uploadData subscribe } } diff --git a/frontend/src/app/_elements/dataset-load/dataset-load.component.ts b/frontend/src/app/_elements/dataset-load/dataset-load.component.ts index 0148ac3a..6a5734e5 100644 --- a/frontend/src/app/_elements/dataset-load/dataset-load.component.ts +++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.ts @@ -51,6 +51,14 @@ export class DatasetLoadComponent { //this.resetCbsAndRbs(); //TREBA DA SE DESI } + refreshMyDatasets() { + this.datasets.getMyDatasets().subscribe((datasets) => { + this.myDatasets = datasets; + this.viewMyDatasetsForm(); + //this. + }); + } + selectThisDataset(dataset: Dataset) { this.selectedDataset = dataset; this.selectedDatasetLoaded = false; @@ -66,7 +74,7 @@ export class DatasetLoadComponent { else break; //nema potrebe dalje }*/ - //console.log(this.datasetFile); + console.log(this.datasetFile); //this.resetCbsAndRbs(); //TREBA DA SE DESI //this.refreshThreeNullValueRadioOptions(); //TREBA DA SE DESI this.selectedDatasetLoaded = true; diff --git a/frontend/src/app/experiment/experiment.component.html b/frontend/src/app/experiment/experiment.component.html index a7b9d7cb..1c38e103 100644 --- a/frontend/src/app/experiment/experiment.component.html +++ b/frontend/src/app/experiment/experiment.component.html @@ -10,7 +10,7 @@ <h2>2. Preprocesiranje</h2> - <h3>Biranje ulaznih i izlaznih kolona:</h3> + <h3 class="mt-3">Biranje ulaznih i izlaznih kolona:</h3> <div *ngIf="selectedDataset"> <div class="row"> <div class="col d-flex justify-content-center"> @@ -44,6 +44,7 @@ </div> </div> </div> + <br> <h3>Popunjavanje nedostajućih vrednosti:</h3> <div class="form-check" *ngIf="selectedDataset"> <input type="radio" [(ngModel)]="experiment.nullValues" [value]="NullValueOptions.DeleteRows" diff --git a/frontend/src/app/experiment/experiment.component.ts b/frontend/src/app/experiment/experiment.component.ts index e4f7826d..9e8f6881 100644 --- a/frontend/src/app/experiment/experiment.component.ts +++ b/frontend/src/app/experiment/experiment.component.ts @@ -154,7 +154,7 @@ export class ExperimentComponent implements OnInit { trainModel() { this.trainingResult = undefined; - console.log('Training model...', this.selectedModel); + //console.log('Training model...', this.selectedModel); if (!this.selectedDataset) { Shared.openDialog('Greška', 'Izvor podataka nije izabran!'); return; |