diff options
| author | Danijel Andjelkovic <adanijel99@gmail.com> | 2022-04-06 21:07:18 +0200 |
|---|---|---|
| committer | Danijel Andjelkovic <adanijel99@gmail.com> | 2022-04-06 21:07:18 +0200 |
| commit | 861c4927bca41aa130c4143f62b7b37d4ac38fbf (patch) | |
| tree | d89fe2aeddfb24932342dfd943e8ce7df8188ab8 /frontend/src/app/_pages | |
| parent | 093c0d2eeefa6e1a55524727d301753412486284 (diff) | |
| parent | 364e0c668dc6cd2a2ace7ed90adbc543c5128716 (diff) | |
Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev
Diffstat (limited to 'frontend/src/app/_pages')
| -rw-r--r-- | frontend/src/app/_pages/my-datasets/my-datasets.component.html | 23 | ||||
| -rw-r--r-- | frontend/src/app/_pages/my-datasets/my-datasets.component.ts | 14 |
2 files changed, 21 insertions, 16 deletions
diff --git a/frontend/src/app/_pages/my-datasets/my-datasets.component.html b/frontend/src/app/_pages/my-datasets/my-datasets.component.html index 2e17201d..d996bf31 100644 --- a/frontend/src/app/_pages/my-datasets/my-datasets.component.html +++ b/frontend/src/app/_pages/my-datasets/my-datasets.component.html @@ -7,20 +7,17 @@ <div class="row"> <div class="col-sm-4" style="margin-bottom: 10px;" *ngFor="let dataset of myDatasets"> - <app-item-dataset [dataset]="dataset"></app-item-dataset> - - <div class="panel-footer row"><!-- panel-footer --> - <div class="col-xs-6 text-center"> - <div> - <button type="button" class="btn btn-default btn-lg" mat-raised-button color="primary" (click)="deleteThisDataset(dataset)">Obriši - <span class="glyphicon glyphicon-chevron-right"></span> - </button> + <app-item-dataset [dataset]="dataset"></app-item-dataset> + + <div class="panel-footer row"><!-- panel-footer --> + <div class="col-xs-6 text-center"> + <div> + <button type="button" class="btn btn-default btn-lg" mat-raised-button color="primary" (click)="deleteThisDataset(dataset)">Obriši + <span class="glyphicon glyphicon-chevron-right"></span> + </button> + </div> </div> - </div> - </div><!-- end panel-footer --> - - - + </div><!-- end panel-footer --> </div> </div> <div class="text-center" *ngIf="this.myDatasets.length == 0" > 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..1551a3c8 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,17 @@ export class MyDatasetsComponent implements OnInit { } - ngOnInit(): void { - this.datasetsS.getMyDatasets(); + ngOnInit(): void { - } + this.datasetsS.getMyDatasets().subscribe((response) => { + this.myDatasets = response; + }, (error) => { + if (error.error == "Dataset with...") { + shared.openDialog("Greska", "Niste dobro uneli nesto"); + } + }); + } + /* editModel(): void{ this.modelsS.editModel().subscribe(m => { |