From 11d83e1ea6c25a851b3eb7559ee85061d77337c9 Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Sun, 15 May 2022 23:45:29 +0200
Subject: Dodati dugmici za napred i nazad. Napravljen api upit.

---
 frontend/src/app/_services/datasets.service.ts | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/frontend/src/app/_services/datasets.service.ts b/frontend/src/app/_services/datasets.service.ts
index 2211996f..6d0e06db 100644
--- a/frontend/src/app/_services/datasets.service.ts
+++ b/frontend/src/app/_services/datasets.service.ts
@@ -27,6 +27,9 @@ export class DatasetsService {
   getDatasetFile(fileId: any): any {
     return this.http.get(`${Configuration.settings.apiURL}/file/csvRead/${fileId}/-1/11`, { headers: this.authService.authHeader(), responseType: 'text' });
   }
+  getDatasetFilePaging(fileId:any,begin:any,end:any){
+    return this.http.get(`${Configuration.settings.apiURL}/file/csvRead/${fileId}/${begin}/${end}`, { headers: this.authService.authHeader(), responseType: 'text' });
+  }
   getDatasetFilePartial(fileId: any, startRow: number, rowNum: number): Observable<any> {
     return this.http.get(`${Configuration.settings.apiURL}/file/csvRead/${fileId}/${startRow}/${rowNum}`, { headers: this.authService.authHeader(), responseType: 'text' });
   }
-- 
cgit v1.2.3


From 49d213824ee6dda9eaf9ba75041bb059075a30e5 Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Mon, 16 May 2022 00:30:15 +0200
Subject: Napravljen zahtev koji trazi header Dataseta od api-ja. Dodato da se
 prikazuje header na stranama posle prve.

---
 .../app/_elements/form-dataset/form-dataset.component.html |  2 +-
 .../app/_elements/form-dataset/form-dataset.component.ts   | 14 ++++++++------
 frontend/src/app/_services/datasets.service.ts             |  3 +++
 3 files changed, 12 insertions(+), 7 deletions(-)

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

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 1f91405b..e7084c6d 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+1)/10)+1}}</div>
+                    <div style="display: inline;">{{(this.begin/10)+1}}</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 99583437..aa3745d0 100644
--- a/frontend/src/app/_elements/form-dataset/form-dataset.component.ts
+++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.ts
@@ -24,8 +24,8 @@ export class FormDatasetComponent {
   files: File[] = [];
   rowsNumber: number = 0;
   colsNumber: number = 0;
-  begin:number=-1;
-  end:number=11;
+  begin:number=0;
+  end:number=10;
   existingFlag:boolean=false;
 
   @Input() dataset: Dataset; //dodaj ! potencijalno
@@ -44,11 +44,11 @@ export class FormDatasetComponent {
 
   //@ViewChild('fileImportInput', { static: false }) fileImportInput: any; cemu je ovo sluzilo?
   resetPagging(){
-    this.begin=-1;
+    this.begin=0;
   }
   goBack(){
     if(this.begin-10<=0)
-      this.begin=-1;
+      this.begin=0;
     else
       this.begin-=10;
     this.loadExisting();
@@ -113,16 +113,18 @@ export class FormDatasetComponent {
 
     this.tableData.hasInput = true;
     this.tableData.loaded = false;
-
+    this.datasetsService.getDatasetHeader(this.dataset.fileId).subscribe((header: string | undefined)=>{
+    
     this.datasetsService.getDatasetFilePaging(this.dataset.fileId,this.begin,this.end).subscribe((file: string | undefined) => {
       if (file) {
         this.tableData.loaded = true;
         this.tableData.numRows = this.dataset.rowCount;
         this.tableData.numCols = this.dataset.columnInfo.length;
-        this.tableData.data = this.csv.csvToArray(file, (this.dataset.delimiter == "razmak") ? " " : (this.dataset.delimiter == "novi red") ? "\t" : this.dataset.delimiter);
+        this.tableData.data = this.csv.csvToArray(header+'\n'+file, (this.dataset.delimiter == "razmak") ? " " : (this.dataset.delimiter == "novi red") ? "\t" : this.dataset.delimiter);
 
       }
     });
+  });
 
     
   }
diff --git a/frontend/src/app/_services/datasets.service.ts b/frontend/src/app/_services/datasets.service.ts
index 6d0e06db..f5677097 100644
--- a/frontend/src/app/_services/datasets.service.ts
+++ b/frontend/src/app/_services/datasets.service.ts
@@ -30,6 +30,9 @@ export class DatasetsService {
   getDatasetFilePaging(fileId:any,begin:any,end:any){
     return this.http.get(`${Configuration.settings.apiURL}/file/csvRead/${fileId}/${begin}/${end}`, { headers: this.authService.authHeader(), responseType: 'text' });
   }
+  getDatasetHeader(fileId:any){
+    return this.http.get(`${Configuration.settings.apiURL}/file/csvRead/${fileId}/-1/1`, { headers: this.authService.authHeader(), responseType: 'text' });
+  }
   getDatasetFilePartial(fileId: any, startRow: number, rowNum: number): Observable<any> {
     return this.http.get(`${Configuration.settings.apiURL}/file/csvRead/${fileId}/${startRow}/${rowNum}`, { headers: this.authService.authHeader(), responseType: 'text' });
   }
-- 
cgit v1.2.3