diff options
| -rw-r--r-- | backend/api/api/.config/dotnet-tools.json | 12 | ||||
| -rw-r--r-- | frontend/src/app/_elements/column-table/column-table.component.html | 4 | ||||
| -rw-r--r-- | frontend/src/app/_elements/folder/folder.component.ts | 30 |
3 files changed, 43 insertions, 3 deletions
diff --git a/backend/api/api/.config/dotnet-tools.json b/backend/api/api/.config/dotnet-tools.json new file mode 100644 index 00000000..e80b80ff --- /dev/null +++ b/backend/api/api/.config/dotnet-tools.json @@ -0,0 +1,12 @@ +{ + "version": 1, + "isRoot": true, + "tools": { + "dotnet-ef": { + "version": "6.0.5", + "commands": [ + "dotnet-ef" + ] + } + } +}
\ No newline at end of file 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 e6a781be..26770c41 100644 --- a/frontend/src/app/_elements/column-table/column-table.component.html +++ b/frontend/src/app/_elements/column-table/column-table.component.html @@ -141,8 +141,8 @@ </div> </td> </tr> - <tr style="padding: 0"> - <th class="brighter cell-align long" (click)="openEncodingDialog()"> + <tr style="padding: 0;"> + <th style="background-color: var(--ns-primary);" (click)="openEncodingDialog()"> <span class="verticalAlign">Enkodiranje</span> <span class="material-icons-round verticalAlign rotate">settings</span> </th> diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts index c9252caa..93ef9043 100644 --- a/frontend/src/app/_elements/folder/folder.component.ts +++ b/frontend/src/app/_elements/folder/folder.component.ts @@ -336,22 +336,41 @@ export class FolderComponent implements AfterViewInit { case FolderType.Dataset: const dataset = <Dataset>file; Shared.openYesNoDialog("Obriši izvor podataka", "Eksperimenti i trenirani modeli nad ovim izvorom podataka će takođe biti obrisani, da li ste sigurni da želite da obrišete izvor: " + dataset.name + "?", () => { + if(this.selectedTab==TabType.MyDatasets){ this.filteredFiles.splice(this.filteredFiles.indexOf(file), 1); this.files.splice(this.files.indexOf(file), 1); + } this.loadingAction = true; this.datasetsService.deleteDataset(dataset).subscribe((response) => { this.loadingAction = false; + if(this.selectedTab==TabType.File){ + this.refreshDatasets(null); + this.selectedFile=undefined!; + setTimeout(() => { + this.selectTab(TabType.MyDatasets); + }); + } + }); }) break; case FolderType.Model: const model = <Model>file; Shared.openYesNoDialog("Obriši konfiguraciju neuronske mreže", "Trenirani modeli za ovu konfiguraciju će takođe biti obrisani, da li ste sigurni da želite da obrišete konfiguraciju: " + model.name + "?", () => { + if(this.selectedTab==TabType.MyModels){ this.filteredFiles.splice(this.filteredFiles.indexOf(file), 1); this.files.splice(this.files.indexOf(file), 1); + } this.loadingAction = true; this.modelsService.deleteModel(<Model>file).subscribe((response) => { this.loadingAction = false; + if(this.selectedTab==TabType.File){ + this.refreshModels(null); + this.selectedFile=undefined!; + setTimeout(() => { + this.selectTab(TabType.MyModels); + }); + } }); }) @@ -370,11 +389,20 @@ export class FolderComponent implements AfterViewInit { } else { const experiment = <Experiment>file; Shared.openYesNoDialog("Obriši eksperiment", "Trenirani modeli za ovaj eksperiment će takođe biti obrisani, da li ste sigurni da želite da obrišete eksperiment: " + experiment.name + "?", () => { + if(this.selectedTab==TabType.MyExperiments){ this.filteredFiles.splice(this.filteredFiles.indexOf(file), 1); this.files.splice(this.files.indexOf(file), 1); + } this.loadingAction = true; this.experimentsService.deleteExperiment(experiment).subscribe((response) => { - this.loadingAction = false; + this.loadingAction = false; + if(this.selectedTab==TabType.File){ + this.refreshExperiments(); + this.selectedFile=undefined!; + setTimeout(() => { + this.selectTab(TabType.MyExperiments); + }); + } }); }); } |