From 09a33e72501affb6d07507e396151f02d16daf9a Mon Sep 17 00:00:00 2001 From: Danijel Anđelković Date: Mon, 6 Jun 2022 02:45:47 +0200 Subject: Dodao deljenje datasetova i modela, dialog za podesavanje opcija za deljenje (isPublic accessibleByLink), sa mogucnoscu kopiranja linka za deljenje. Dodao stranice za prikaz javnih datasetova / modela. --- frontend/src/app/_pages/page-model/page-model.component.html | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 frontend/src/app/_pages/page-model/page-model.component.html (limited to 'frontend/src/app/_pages/page-model/page-model.component.html') diff --git a/frontend/src/app/_pages/page-model/page-model.component.html b/frontend/src/app/_pages/page-model/page-model.component.html new file mode 100644 index 00000000..e494542f --- /dev/null +++ b/frontend/src/app/_pages/page-model/page-model.component.html @@ -0,0 +1,4 @@ +
+ + +
\ No newline at end of file -- cgit v1.2.3 From 0b356a0892d9630d5eaf325f3ef5b1b087500141 Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Mon, 6 Jun 2022 05:22:28 +0200 Subject: Ispravke. --- .../_elements/column-table/column-table.component.html | 2 +- frontend/src/app/_elements/folder/folder.component.ts | 3 ++- .../src/app/_pages/experiment/experiment.component.html | 4 ++-- .../src/app/_pages/experiment/experiment.component.ts | 17 ++++++++++++----- .../src/app/_pages/page-model/page-model.component.html | 4 +++- .../src/app/_pages/page-model/page-model.component.ts | 14 +++++++------- 6 files changed, 27 insertions(+), 17 deletions(-) (limited to 'frontend/src/app/_pages/page-model/page-model.component.html') 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 d5273d59..27e0f3bf 100644 --- a/frontend/src/app/_elements/column-table/column-table.component.html +++ b/frontend/src/app/_elements/column-table/column-table.component.html @@ -147,7 +147,7 @@ - + Enkodiranje  settings diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts index 418b5a7f..9dfabdb3 100644 --- a/frontend/src/app/_elements/folder/folder.component.ts +++ b/frontend/src/app/_elements/folder/folder.component.ts @@ -63,6 +63,7 @@ export class FolderComponent implements AfterViewInit { this.signalRService.hubConnection.on("NotifyDataset", (dName: string, dId: string) => { if (this.type == FolderType.Dataset) { this.refreshFiles(dId); + this.okPressed.emit(); } this.saveDisabled = false; console.log("Notify dataset ", this.saveDisabled); @@ -298,7 +299,7 @@ export class FolderComponent implements AfterViewInit { this.formNewDataset!.uploadDataset((dataset: Dataset) => { this.newFile = undefined; this.loadingAction = false; - this.okPressed.emit(); + //this.okPressed.emit(); //Shared.openDialog("Obaveštenje", "Uspešno ste dodali novi izvor podataka u kolekciju. Molimo sačekajte par trenutaka da se obradi."); this.refreshFiles(); this.createNewFile(); diff --git a/frontend/src/app/_pages/experiment/experiment.component.html b/frontend/src/app/_pages/experiment/experiment.component.html index 6bd921fd..3176f58c 100644 --- a/frontend/src/app/_pages/experiment/experiment.component.html +++ b/frontend/src/app/_pages/experiment/experiment.component.html @@ -67,8 +67,8 @@
- - +
diff --git a/frontend/src/app/_pages/experiment/experiment.component.ts b/frontend/src/app/_pages/experiment/experiment.component.ts index 20a3afb0..e4d444b2 100644 --- a/frontend/src/app/_pages/experiment/experiment.component.ts +++ b/frontend/src/app/_pages/experiment/experiment.component.ts @@ -75,7 +75,10 @@ export class ExperimentComponent implements AfterViewInit { Shared.openDialog('Greška', 'Morate odabrati konfiguraciju neuronske mreže'); } else { this.modelsService.trainModel(this.modelToTrain._id, this.experiment._id).subscribe(() => { console.log("pocelo treniranje") }); - this.step4 = true; + this.step3 = true; + setTimeout(() => { + this.goToPage(3); + }); } } @@ -84,7 +87,10 @@ export class ExperimentComponent implements AfterViewInit { Shared.openDialog('Greška', 'Morate odabrati konfiguraciju neuronske mreže'); } else { this.modelsService.trainModel(this.modelToTrainCmp._id, this.experiment._id).subscribe(() => { console.log("pocelo treniranje") }); - this.step4 = true; + this.step3 = true; + setTimeout(() => { + this.goToPage(3); + }); } } @@ -268,10 +274,11 @@ export class ExperimentComponent implements AfterViewInit { } setDataset(dataset: FolderFile | null) { - if (dataset == null) { + if (dataset == null ||dataset==undefined) { this.columnTable.loaded = false; this.dataset = undefined; this.experiment.datasetId = ''; + this.step1=false; return; } const d = dataset; @@ -291,12 +298,12 @@ export class ExperimentComponent implements AfterViewInit { setModel(model: FolderFile) { const m = model; this.modelToTrain = m; - this.step3 = true; + //this.step3 = true; } setModelCmp(model: FolderFile) { const m = model; this.modelToTrainCmp = m; - this.step3 = true; + //this.step3 = true; } } diff --git a/frontend/src/app/_pages/page-model/page-model.component.html b/frontend/src/app/_pages/page-model/page-model.component.html index e494542f..0ac8aaae 100644 --- a/frontend/src/app/_pages/page-model/page-model.component.html +++ b/frontend/src/app/_pages/page-model/page-model.component.html @@ -1,4 +1,6 @@
- +
+ {{JSON.stringify(model)}} +
\ No newline at end of file diff --git a/frontend/src/app/_pages/page-model/page-model.component.ts b/frontend/src/app/_pages/page-model/page-model.component.ts index f988ef0d..0ccd0f9a 100644 --- a/frontend/src/app/_pages/page-model/page-model.component.ts +++ b/frontend/src/app/_pages/page-model/page-model.component.ts @@ -1,6 +1,7 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import Shared from 'src/app/Shared'; +import Experiment from 'src/app/_data/Experiment'; import Model from 'src/app/_data/Model'; import { FormModelComponent } from 'src/app/_elements/form-model/form-model.component'; import { ModelsService } from 'src/app/_services/models.service'; @@ -12,16 +13,14 @@ import { ModelsService } from 'src/app/_services/models.service'; }) export class PageModelComponent implements OnInit { - @ViewChild(FormModelComponent) formModel!: FormModelComponent; - constructor(private route: ActivatedRoute, private router: Router, private modelsService: ModelsService) { } - + model!:Model; ngOnInit(): void { this.route.queryParams.subscribe(params => { let id = this.route.snapshot.paramMap.get("id"); if (id) { this.modelsService.getModelById(id).subscribe((model) => { - this.formModel.newModel = model; + this.model = model; }); } else { this.router.navigate(['']); @@ -30,12 +29,13 @@ export class PageModelComponent implements OnInit { } import() { - this.formModel.newModel._id = ""; - this.formModel.newModel.isPublic = false; - this.modelsService.stealModel(this.formModel.newModel).subscribe((response) => { + this.model._id = ""; + this.model.isPublic = false; + this.modelsService.stealModel(this.model).subscribe((response) => { Shared.openDialog("Obaveštenje", "Uspešno ste dodali javnu konfiguraciju neuronske mreže u vašu kolekciju."); }, (error: any) => { Shared.openDialog("Obaveštenje", "Konfiguracija neuronske mreže sa ovim imenom postoji u vašoj kolekciji."); }); } + JSON=JSON; } -- cgit v1.2.3