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

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

1 files changed, 12 insertions, 6 deletions

diff --git a/frontend/src/app/_elements/datatable/datatable.component.ts b/frontend/src/app/_elements/datatable/datatable.component.ts
index 19fb204e..82374f4d 100644
--- a/frontend/src/app/_elements/datatable/datatable.component.ts
+++ b/frontend/src/app/_elements/datatable/datatable.component.ts
@@ -7,12 +7,7 @@ import { Component, Input, OnInit } from '@angular/core';
 })
 export class DatatableComponent implements OnInit {
 
-  @Input() hasHeader?: boolean = true;
-
-  @Input() data?: any[] = [];
-
-  hasInput = false;
-  loaded = false;
+  @Input() tableData!: TableData;
 
   constructor() { }
 
@@ -20,3 +15,14 @@ export class DatatableComponent implements OnInit {
   }
 
 }
+
+export class TableData {
+  constructor(
+    public hasHeader = true,
+    public hasInput = false,
+    public loaded = false,
+    public numRows = 0,
+    public numCols = 0,
+    public data?: any[][]
+  ) { }
+}