aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOgnjen Cirkovic <ciraboxkg@gmail.com>2022-05-16 00:20:07 +0200
committerOgnjen Cirkovic <ciraboxkg@gmail.com>2022-05-16 00:20:07 +0200
commit717ed39075bc89aa00741cfdb6a48c27bf34c992 (patch)
treeab0c73b5eb16d637189b1f5e501622b1e8ea7f76
parentc69f7ee7d2acbe17766f5b0f0f3cc764354cd151 (diff)
Pozicionirano na sredinu u arhivi. Sredjen bug kada ostane zapamcena strana na kojoj se nalazimo ako promenimo dataset.
-rw-r--r--frontend/src/app/_elements/folder/folder.component.ts4
-rw-r--r--frontend/src/app/_elements/form-dataset/form-dataset.component.html2
-rw-r--r--frontend/src/app/_elements/form-dataset/form-dataset.component.ts3
3 files changed, 7 insertions, 2 deletions
diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts
index e426e2a0..654d5510 100644
--- a/frontend/src/app/_elements/folder/folder.component.ts
+++ b/frontend/src/app/_elements/folder/folder.component.ts
@@ -95,11 +95,13 @@ export class FolderComponent implements AfterViewInit {
this.newFileSelected = true;
this.listView = false;
this.displayFile();
- if (this.type == FolderType.Dataset)
+ if (this.type == FolderType.Dataset){
this.formDataset.clear();
+ }
}
selectFile(file?: FolderFile) {
+ this.formDataset.resetPagging();
this.selectedFile = file;
this.fileToDisplay = file;
if (this.type == FolderType.Experiment && file) {
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 8965d451..1f91405b 100644
--- a/frontend/src/app/_elements/form-dataset/form-dataset.component.html
+++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.html
@@ -47,7 +47,7 @@
<input class="file" id="file-upload" (change)="changeListener($event)" #fileInput type="file" accept=".csv">
<div class="mt-5 datatable">
- <div [ngClass]="{'hidden': (!existingFlag)}">
+ <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>
<button mat-button (click)="goForward()"><mat-icon>keyboard_arrow_right</mat-icon></button>
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 03564939..99583437 100644
--- a/frontend/src/app/_elements/form-dataset/form-dataset.component.ts
+++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.ts
@@ -43,6 +43,9 @@ export class FormDatasetComponent {
}
//@ViewChild('fileImportInput', { static: false }) fileImportInput: any; cemu je ovo sluzilo?
+ resetPagging(){
+ this.begin=-1;
+ }
goBack(){
if(this.begin-10<=0)
this.begin=-1;