Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev

# Conflicts:
#	frontend/src/app/app.module.ts

9 files changed, 74 insertions, 15 deletions

diff --git a/frontend/src/app/_elements/dataset-load/dataset-load.component.html b/frontend/src/app/_elements/dataset-load/dataset-load.component.html
index 3ac43f73..76e46092 100644
--- a/frontend/src/app/_elements/dataset-load/dataset-load.component.html
+++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.html
@@ -33,7 +33,7 @@
       </datalist>
 
       <label for="type" class="form-check-label my-5">Da li .csv ima header?
-        <input class="mx-3 form-check-input" type="checkbox" (input)="update()" [(ngModel)]="hasHeader" type="checkbox"
+        <input class="mx-3 form-check-input" type="checkbox" (input)="update()" [(ngModel)]="dataset.hasHeader" type="checkbox"
           value="" id="checkboxHeader" checked>
       </label>
       <br>
diff --git a/frontend/src/app/_elements/dataset-load/dataset-load.component.ts b/frontend/src/app/_elements/dataset-load/dataset-load.component.ts
index e7b19f9a..f9343117 100644
--- a/frontend/src/app/_elements/dataset-load/dataset-load.component.ts
+++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.ts
@@ -13,7 +13,7 @@ export class DatasetLoadComponent {
 
   delimiterOptions: Array<string> = [",", ";", "\t", "razmak", "|"]; //podrazumevano ","
 
-  hasHeader: boolean = true;
+  //hasHeader: boolean = true;
   hasInput: boolean = false;
 
   csvRecords: any[] = [];
@@ -21,7 +21,7 @@ export class DatasetLoadComponent {
   rowsNumber: number = 0;
   colsNumber: number = 0;
 
-  dataset: Dataset;
+  dataset: Dataset; //dodaj ! potencijalno
 
   constructor(private ngxCsvParser: NgxCsvParser) {
     this.dataset = new Dataset();
@@ -54,13 +54,14 @@ export class DatasetLoadComponent {
         console.log('Result', result);
         if (result.constructor === Array) {
           this.csvRecords = result;
-          if (this.hasHeader)
+          if (this.dataset.hasHeader)
             this.rowsNumber = this.csvRecords.length - 1;
           else
             this.rowsNumber = this.csvRecords.length;
           this.colsNumber = this.csvRecords[0].length;
 
-          this.dataset.header = this.csvRecords[0];
+          if (this.dataset.hasHeader) //kasnije dodati opciju kada nema header da korisnik rucno unosi header-e
+            this.dataset.header = this.csvRecords[0];
 
           this.loaded.emit("loaded");
         }
diff --git a/frontend/src/app/_elements/datatable/datatable.component.html b/frontend/src/app/_elements/datatable/datatable.component.html
index 2c469ecc..bd9e7a13 100644
--- a/frontend/src/app/_elements/datatable/datatable.component.html
+++ b/frontend/src/app/_elements/datatable/datatable.component.html
@@ -1,21 +1,21 @@
 <div *ngIf="data">
-    <div class="table-responsive">
-        <table *ngIf="hasHeader" class="table table-bordered table-light mt-4">
+    <div class="table-responsive" style="max-height: 50vh; max-width: 100%; overflow: scroll;">
+        <table *ngIf="hasHeader" class="table table-bordered table-light">
             <thead>
                 <tr>
                     <th *ngFor="let item of data[0]; let i = index">{{item}}</th>
                 </tr>
             </thead>
             <tbody>
-                <tr *ngFor="let row of data | slice:1:11">
+                <tr *ngFor="let row of data | slice:1">
                     <td *ngFor="let col of row">{{col}}</td>
                 </tr>
             </tbody>
         </table>
 
-        <table *ngIf="data.length > 0 && !hasHeader" class="table table-bordered table-light mt-4">
+        <table *ngIf="data.length > 0 && !hasHeader" class="table table-bordered table-light">
             <tbody>
-                <tr *ngFor="let row of data | slice:0:10">
+                <tr *ngFor="let row of data">
                     <td *ngFor="let col of row">{{col}}</td>
                 </tr>
             </tbody>
@@ -23,7 +23,8 @@
     </div>
 
     <div id="info">
-        . . . <br>
-        {{data.length}} x {{data[0].length}}
+        <br>
+        <span *ngIf="hasHeader">{{data.length - 1}} x {{data[0].length}}</span>
+        <span *ngIf="!hasHeader">{{data.length}} x {{data[0].length}}</span>
     </div>
 </div>
\ No newline at end of file
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 46840cdd..8751fce5 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,7 @@
         </p>
         <table class="table table-bordered table-sm">
             <thead>
-                <th scope="col" *ngFor="let column of dataset.header">{{column}}</th>
+                <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/item-model/item-model.component.css b/frontend/src/app/_elements/item-model/item-model.component.css
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/frontend/src/app/_elements/item-model/item-model.component.css
diff --git a/frontend/src/app/_elements/item-model/item-model.component.html b/frontend/src/app/_elements/item-model/item-model.component.html
new file mode 100644
index 00000000..9466da01
--- /dev/null
+++ b/frontend/src/app/_elements/item-model/item-model.component.html
@@ -0,0 +1,14 @@
+
+<div class="card" style="min-width: 12rem;">
+    <div class="card-header">
+        {{model.name}}
+    </div>
+    <div class="card-body overflow-hidden">
+        <p class="card-text">
+            {{"Opis: "+ model.description}}<br>
+            {{"Datum kreiranja:" + model.dateCreated}}<br>
+            {{"Poslednje ažuriranje:" + model.lastUpdated}}<br>
+        </p>
+        
+    </div>
+</div>
\ No newline at end of file
diff --git a/frontend/src/app/_elements/item-model/item-model.component.spec.ts b/frontend/src/app/_elements/item-model/item-model.component.spec.ts
new file mode 100644
index 00000000..f696a160
--- /dev/null
+++ b/frontend/src/app/_elements/item-model/item-model.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ItemModelComponent } from './item-model.component';
+
+describe('ItemModelComponent', () => {
+  let component: ItemModelComponent;
+  let fixture: ComponentFixture<ItemModelComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ ItemModelComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ItemModelComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/_elements/item-model/item-model.component.ts b/frontend/src/app/_elements/item-model/item-model.component.ts
new file mode 100644
index 00000000..7f85f43f
--- /dev/null
+++ b/frontend/src/app/_elements/item-model/item-model.component.ts
@@ -0,0 +1,18 @@
+import { Component, Input, OnInit } from '@angular/core';
+import Model from 'src/app/_data/Model';
+
+@Component({
+  selector: 'app-item-model',
+  templateUrl: './item-model.component.html',
+  styleUrls: ['./item-model.component.css']
+})
+export class ItemModelComponent implements OnInit {
+
+  @Input() model: Model = new Model();
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}
diff --git a/frontend/src/app/_elements/reactive-background/reactive-background.component.ts b/frontend/src/app/_elements/reactive-background/reactive-background.component.ts
index 58670d32..95b61b1b 100644
--- a/frontend/src/app/_elements/reactive-background/reactive-background.component.ts
+++ b/frontend/src/app/_elements/reactive-background/reactive-background.component.ts
@@ -33,8 +33,8 @@ export class ReactiveBackgroundComponent implements OnInit {
   ngOnInit(): void {
 
     document.addEventListener('mousemove', (e) => {
-      this.mouseX = e.pageX / this.width;
-      this.mouseY = e.pageY / this.height;
+      this.mouseX = e.clientX / this.width;
+      this.mouseY = e.clientY / this.height;
     })
 
     this.canvas = (<HTMLCanvasElement>document.getElementById('bgCanvas'));