diff options
Diffstat (limited to 'frontend/src/app/_elements/form-dataset/form-dataset.component.ts')
| -rw-r--r-- | frontend/src/app/_elements/form-dataset/form-dataset.component.ts | 14 |
1 files changed, 8 insertions, 6 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 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); } }); + }); } |