From 208394ff08cba0880746d9c7841be08e127f66d6 Mon Sep 17 00:00:00 2001
From: Ivan Ljubisavljevic <ivan996sk@gmail.com>
Date: Mon, 18 Apr 2022 01:14:31 +0200
Subject: Izmena na frontu i ml-u(username -> userId) #71

---
 .../src/app/_pages/filter-datasets/filter-datasets.component.ts   | 2 +-
 frontend/src/app/_pages/my-models/my-models.component.html        | 2 +-
 frontend/src/app/_pages/my-models/my-models.component.ts          | 8 +++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'frontend/src/app/_pages')

diff --git a/frontend/src/app/_pages/filter-datasets/filter-datasets.component.ts b/frontend/src/app/_pages/filter-datasets/filter-datasets.component.ts
index c83bf208..66b3755e 100644
--- a/frontend/src/app/_pages/filter-datasets/filter-datasets.component.ts
+++ b/frontend/src/app/_pages/filter-datasets/filter-datasets.component.ts
@@ -33,7 +33,7 @@ export class FilterDatasetsComponent implements OnInit {
     newDataset._id = "";
     newDataset.isPublic = false;
     newDataset.lastUpdated = new Date();
-    newDataset.username = decodedToken.name;
+    newDataset.uploaderId = decodedToken.uploaderId;
     let name=prompt("Unesite naziv dataset-a",newDataset.name);
     newDataset.name=name as string;
     if(name!=null && name!="")
diff --git a/frontend/src/app/_pages/my-models/my-models.component.html b/frontend/src/app/_pages/my-models/my-models.component.html
index b0e9c4ef..9b281239 100644
--- a/frontend/src/app/_pages/my-models/my-models.component.html
+++ b/frontend/src/app/_pages/my-models/my-models.component.html
@@ -15,7 +15,7 @@
                 <div class="panel-footer row"><!-- panel-footer -->
                     <div class="col-xs-6 text-center">
                         <div>
-                            <button type="button" class="btn btn-default btn-lg"style="min-width: 7rem;float: left;" (click)="deleteThisModel(model)" mat-raised-button color="primary">Koristi
+                            <button type="button" class="btn btn-default btn-lg"style="min-width: 7rem;float: left;" (click)="useThisModel(model)" mat-raised-button color="primary">Koristi
                                 <span class="glyphicon glyphicon-search"></span>
                             </button>
                             <button (click)="deleteThisModel(model)" mat-raised-button color="warn" style="min-width: 7rem;float: right" ><mat-icon>delete</mat-icon></button>
diff --git a/frontend/src/app/_pages/my-models/my-models.component.ts b/frontend/src/app/_pages/my-models/my-models.component.ts
index 92d3fbaa..d379fa69 100644
--- a/frontend/src/app/_pages/my-models/my-models.component.ts
+++ b/frontend/src/app/_pages/my-models/my-models.component.ts
@@ -1,4 +1,5 @@
 import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
 import shared from 'src/app/Shared';
 import Model from 'src/app/_data/Model';
 import { ModelsService } from 'src/app/_services/models.service';
@@ -12,7 +13,7 @@ export class MyModelsComponent implements OnInit {
   myModels: Model[] = [];
   //myModel: Model;
 
-  constructor(private modelsS : ModelsService) {
+  constructor(private modelsS : ModelsService, private router : Router) {
 
     
 
@@ -44,6 +45,11 @@ deleteThisModel(model: Model): void{
 }
 
 
+useThisModel(model: Model): void{
+
+  this.router.navigate(['/training'])
+  
+}
   getAllMyModels(): void{
     this.modelsS.getMyModels().subscribe(m => {
       this.myModels = m;
-- 
cgit v1.2.3