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

1 files changed, 11 insertions, 3 deletions

diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.ts b/frontend/src/app/_elements/form-dataset/form-dataset.component.ts
index d801b5fb..19c0083c 100644
--- a/frontend/src/app/_elements/form-dataset/form-dataset.component.ts
+++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.ts
@@ -47,20 +47,28 @@ export class FormDatasetComponent {
     this.begin=0;
   }
   goBack(){
-    if(this.begin-10<=0)
+    if(this.begin-10<0)
       this.begin=0;
     else
+    {
       this.begin-=10;
-    this.loadExisting();
+      this.loadExisting();
+    }
 
   }
   goForward(){
     this.begin+=10;
-    this.loadExisting();
+    if(this.dataset.rowCount<this.begin)
+      this.begin-=10;
+    else
+      this.loadExisting();
   }
   clear(){
     this.tableData.hasInput = false;
   }
+  getPage(){
+    return Math.ceil(this.dataset.rowCount/10)
+  }
 
   changeListener($event: any): void {
     this.files = $event.srcElement.files;