From 0a5d881355a1011568f1ed3cb9b3b87f4e8dee14 Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Tue, 17 May 2022 21:41:42 +0200
Subject: Dodat broj stranica. Api poziv se odvija samo ako se prelazi na
 validnu stranu.

---
 .../_elements/column-table/column-table.component.html |  2 +-
 .../_elements/column-table/column-table.component.ts   | 18 +++++++++++++++---
 .../_elements/form-dataset/form-dataset.component.html |  2 +-
 .../_elements/form-dataset/form-dataset.component.ts   | 14 +++++++++++---
 4 files changed, 28 insertions(+), 8 deletions(-)

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

diff --git a/frontend/src/app/_elements/column-table/column-table.component.html b/frontend/src/app/_elements/column-table/column-table.component.html
index 3256ffee..8a4164f1 100644
--- a/frontend/src/app/_elements/column-table/column-table.component.html
+++ b/frontend/src/app/_elements/column-table/column-table.component.html
@@ -46,7 +46,7 @@
                 </table>
                 <div class="mb-3">
                     <button mat-button  (click)="goBack()"><mat-icon>keyboard_arrow_left</mat-icon></button>
-                    <div style="display: inline;">{{(this.begin/10)+1}}</div>
+                    <div style="display: inline;">{{(this.begin/10)+1}}...{{getPage()}}</div>
                     <button mat-button (click)="goForward()"><mat-icon>keyboard_arrow_right</mat-icon></button>
                 
                 </div>
diff --git a/frontend/src/app/_elements/column-table/column-table.component.ts b/frontend/src/app/_elements/column-table/column-table.component.ts
index a3469d90..ed2f0380 100644
--- a/frontend/src/app/_elements/column-table/column-table.component.ts
+++ b/frontend/src/app/_elements/column-table/column-table.component.ts
@@ -54,16 +54,28 @@ export class ColumnTableComponent implements AfterViewInit {
     this.begin=0;
   }
   goBack(){
-    if(this.begin-10<=0)
+    if(this.begin-10<0)
       this.begin=0;
     else
+    {
       this.begin-=10;
-    this.loadData();
+      this.loadData();
+    }
 
   }
   goForward(){
+    if(this.dataset!=undefined){
     this.begin+=10;
-    this.loadData();
+    if(this.dataset.rowCount<this.begin)
+      this.begin-=10;
+    else
+      this.loadData();
+    }
+  }
+  getPage(){
+    if(this.dataset!=undefined)
+      return Math.ceil(this.dataset.rowCount/this.step);
+    return 0;
   }
 
 
diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.html b/frontend/src/app/_elements/form-dataset/form-dataset.component.html
index 9f8e9e6f..6736367e 100644
--- a/frontend/src/app/_elements/form-dataset/form-dataset.component.html
+++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.html
@@ -49,7 +49,7 @@
             <div class="mt-5 datatable">
                 <div [ngClass]="{'hidden': (!existingFlag)}" class="text-center">
                     <button mat-button  (click)="goBack()"><mat-icon>keyboard_arrow_left</mat-icon></button>
-                    <div style="display: inline;">{{(this.begin/10)+1}}</div>
+                    <div style="display: inline;">{{(this.begin/10)+1}}...{{getPage()}}</div>
                     <button mat-button (click)="goForward()"><mat-icon>keyboard_arrow_right</mat-icon></button>
                 </div>
                 <app-datatable [tableData]="tableData"></app-datatable>
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;
-- 
cgit v1.2.3