From 513f487dc2ced342d4a881f144c9a7bcee38c1cf Mon Sep 17 00:00:00 2001 From: Nevena Bojovic Date: Wed, 6 Apr 2022 17:55:52 +0200 Subject: Korekcija stranice my-datasets. --- .../app/_pages/my-datasets/my-datasets.component.ts | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'frontend/src/app/_pages/my-datasets/my-datasets.component.ts') diff --git a/frontend/src/app/_pages/my-datasets/my-datasets.component.ts b/frontend/src/app/_pages/my-datasets/my-datasets.component.ts index eb5e32f8..5775cacb 100644 --- a/frontend/src/app/_pages/my-datasets/my-datasets.component.ts +++ b/frontend/src/app/_pages/my-datasets/my-datasets.component.ts @@ -4,6 +4,7 @@ import { DatasetsService } from 'src/app/_services/datasets.service'; import Dataset from 'src/app/_data/Dataset'; import { JwtHelperService } from '@auth0/angular-jwt'; import { CookieService } from 'ngx-cookie-service'; +import shared from 'src/app/Shared'; @Component({ selector: 'app-my-datasets', @@ -19,10 +20,23 @@ export class MyDatasetsComponent implements OnInit { } - ngOnInit(): void { - this.datasetsS.getMyDatasets(); + ngOnInit(): void { - } + this.datasetsS.getMyDatasets().subscribe((response) => { + + this.myDatasets = response; + + }, (error: HttpErrorResponse) => { + + if (error.error == "Model with") { + + shared.openDialog("Greska", "Niste dobro uneli nesto"); + + } + + }); + + /* editModel(): void{ this.modelsS.editModel().subscribe(m => { -- cgit v1.2.3 From 7137f50a7521f14f3827a828f61dfaa184891f72 Mon Sep 17 00:00:00 2001 From: Sonja Galovic Date: Wed, 6 Apr 2022 18:06:21 +0200 Subject: Ispravljena kompajlerska greska u aplikaciji. --- frontend/src/app/_pages/my-datasets/my-datasets.component.ts | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'frontend/src/app/_pages/my-datasets/my-datasets.component.ts') diff --git a/frontend/src/app/_pages/my-datasets/my-datasets.component.ts b/frontend/src/app/_pages/my-datasets/my-datasets.component.ts index 5775cacb..1551a3c8 100644 --- a/frontend/src/app/_pages/my-datasets/my-datasets.component.ts +++ b/frontend/src/app/_pages/my-datasets/my-datasets.component.ts @@ -23,19 +23,13 @@ export class MyDatasetsComponent implements OnInit { ngOnInit(): void { this.datasetsS.getMyDatasets().subscribe((response) => { - this.myDatasets = response; - - }, (error: HttpErrorResponse) => { - - if (error.error == "Model with") { - + }, (error) => { + if (error.error == "Dataset with...") { shared.openDialog("Greska", "Niste dobro uneli nesto"); - } - }); - + } /* editModel(): void{ -- cgit v1.2.3