Malo sredio add-model stranicu, popravio bug sa prikazom javnih datasetova na naslovnoj strani. ML socket salje poruke za epohe backendu.

6 files changed, 31 insertions, 28 deletions

diff --git a/frontend/src/app/_elements/annvisual/annvisual.component.ts b/frontend/src/app/_elements/annvisual/annvisual.component.ts
index 8588537e..53e4e2ca 100644
--- a/frontend/src/app/_elements/annvisual/annvisual.component.ts
+++ b/frontend/src/app/_elements/annvisual/annvisual.component.ts
@@ -1,6 +1,6 @@
-import { Component, OnInit,Input } from '@angular/core';
+import { Component, OnInit, Input } from '@angular/core';
 import Model from 'src/app/_data/Model';
-import { graphviz }  from 'd3-graphviz';
+import { graphviz } from 'd3-graphviz';
 
 @Component({
   selector: 'app-annvisual',
@@ -9,41 +9,37 @@ import { graphviz }  from 'd3-graphviz';
 })
 export class AnnvisualComponent implements OnInit {
   ngOnInit(): void {
-    throw new Error('Method not implemented.');
   }
 
   @Input() model: Model = new Model();
 
-  d3(){
-    let inputlayerstring:string='';
-    let hiddenlayerstring:string='';
-    let digraphstring:string='digraph {';
+  d3() {
+    let inputlayerstring: string = '';
+    let hiddenlayerstring: string = '';
+    let digraphstring: string = 'digraph {';
 
-    for(let i=0;i<this.model.inputColumns.length;i++)
-    {
-      inputlayerstring=inputlayerstring+'i'+i+',';
+    for (let i = 0; i < this.model.inputColumns.length; i++) {
+      inputlayerstring = inputlayerstring + 'i' + i + ',';
     }
-    inputlayerstring=inputlayerstring.slice(0,-1);
+    inputlayerstring = inputlayerstring.slice(0, -1);
 
-    digraphstring=digraphstring+inputlayerstring+'->';
+    digraphstring = digraphstring + inputlayerstring + '->';
 
-    for(let j=0;j<this.model.hiddenLayers;j++)
-    {
-      for(let i=0;i<this.model.hiddenLayerNeurons;i++)
-      {
-        hiddenlayerstring=hiddenlayerstring+'h'+j+'_'+i+',';
+    for (let j = 0; j < this.model.hiddenLayers; j++) {
+      for (let i = 0; i < this.model.hiddenLayerNeurons; i++) {
+        hiddenlayerstring = hiddenlayerstring + 'h' + j + '_' + i + ',';
       }
-      hiddenlayerstring=hiddenlayerstring.slice(0,-1);
-      digraphstring=digraphstring+hiddenlayerstring+'->';
-      hiddenlayerstring='';
+      hiddenlayerstring = hiddenlayerstring.slice(0, -1);
+      digraphstring = digraphstring + hiddenlayerstring + '->';
+      hiddenlayerstring = '';
     }
-    digraphstring=digraphstring+'o}';
-    
-    
+    digraphstring = digraphstring + 'o}';
+
+
     graphviz('#graph').renderDot(digraphstring);
-    }
+  }
 
-    //'digraph {i0,i1,i2->h1,h2,h3->h21,h22,h23->o}'
+  //'digraph {i0,i1,i2->h1,h2,h3->h21,h22,h23->o}'
 }
 
 
diff --git a/frontend/src/app/_elements/carousel/carousel.component.html b/frontend/src/app/_elements/carousel/carousel.component.html
index 755899a7..eb1041ce 100644
--- a/frontend/src/app/_elements/carousel/carousel.component.html
+++ b/frontend/src/app/_elements/carousel/carousel.component.html
@@ -1,6 +1,9 @@
 <div class="container">
     <div class="row d-flex align-items-stretch flex-row mx-5 align-items-stretch">
-        <div class="col my-1" *ngFor=" let item of items" [ngSwitch]="item.constructor.name">
+        <div class="col my-1" *ngFor="let item of items" [ngSwitch]="type">
+            <ng-template ngSwitchCase="Object">
+                Unknown item type
+            </ng-template>
             <ng-template ngSwitchCase="Dataset">
                 <app-item-dataset [dataset]="item">
                 </app-item-dataset>
diff --git a/frontend/src/app/_elements/carousel/carousel.component.ts b/frontend/src/app/_elements/carousel/carousel.component.ts
index ed4fa4a5..e0112121 100644
--- a/frontend/src/app/_elements/carousel/carousel.component.ts
+++ b/frontend/src/app/_elements/carousel/carousel.component.ts
@@ -8,6 +8,7 @@ import { Component, Input, OnInit } from '@angular/core';
 export class CarouselComponent {
 
   @Input() items: any[] = [];
+  @Input() type: string = "Object";
 
   constructor() { }
 
diff --git a/frontend/src/app/_elements/item-dataset/item-dataset.component.html b/frontend/src/app/_elements/item-dataset/item-dataset.component.html
index 8751fce5..dc4221f4 100644
--- a/frontend/src/app/_elements/item-dataset/item-dataset.component.html
+++ b/frontend/src/app/_elements/item-dataset/item-dataset.component.html
@@ -8,7 +8,8 @@
         </p>
         <table class="table table-bordered table-sm">
             <thead>
-                <th scope="col" *ngFor="let column of dataset.header">{{column}}</th> <!-- treba da se namesti da kad nema hedere, da korisnik unese nazive kolona pa da se taj heder prikaze  -->
+                <th scope="col" *ngFor="let column of dataset.header">{{column}}</th>
+                <!-- treba da se namesti da kad nema hedere, da korisnik unese nazive kolona pa da se taj heder prikaze  -->
             </thead>
         </table>
     </div>
diff --git a/frontend/src/app/_elements/notifications/notifications.component.html b/frontend/src/app/_elements/notifications/notifications.component.html
index 27071425..d1da41b4 100644
--- a/frontend/src/app/_elements/notifications/notifications.component.html
+++ b/frontend/src/app/_elements/notifications/notifications.component.html
@@ -1,3 +1,3 @@
-<div class="position-fixed card card-body bg-dark text-white m-3" style="bottom: 0; right: 0;">
+<div *ngIf="notifications" class="position-fixed card card-body bg-dark text-white m-3" style="bottom: 0; right: 0;">
     <h3>Notifikacije</h3>
 </div>
\ No newline at end of file
diff --git a/frontend/src/app/_elements/notifications/notifications.component.ts b/frontend/src/app/_elements/notifications/notifications.component.ts
index 7566828d..6c1d555b 100644
--- a/frontend/src/app/_elements/notifications/notifications.component.ts
+++ b/frontend/src/app/_elements/notifications/notifications.component.ts
@@ -8,6 +8,8 @@ import { WebSocketService } from 'src/app/_services/web-socket.service';
 })
 export class NotificationsComponent implements OnInit {
 
+  notifications?: any[];
+
   constructor(private wsService: WebSocketService) { }
 
   ngOnInit(): void {