diff options
Diffstat (limited to 'frontend/src/app/_elements/dataset-load')
| -rw-r--r-- | frontend/src/app/_elements/dataset-load/dataset-load.component.html | 14 | ||||
| -rw-r--r-- | frontend/src/app/_elements/dataset-load/dataset-load.component.ts | 7 |
2 files changed, 13 insertions, 8 deletions
diff --git a/frontend/src/app/_elements/dataset-load/dataset-load.component.html b/frontend/src/app/_elements/dataset-load/dataset-load.component.html index 2052c9b5..09487b3b 100644 --- a/frontend/src/app/_elements/dataset-load/dataset-load.component.html +++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.html @@ -19,8 +19,8 @@ <input *ngIf="showMyDatasets" type="text" class="form-control" placeholder="Pretraga" [(ngModel)]="term"> </div> - <div class="px-5"> - <div *ngIf="showMyDatasets" class="overflow-auto" style="max-height: 500px;"> + <div class="px-5" *ngIf="showMyDatasets"> + <div class="overflow-auto" style="max-height: 500px;"> <ul class="list-group"> <li class="list-group-item p-3" *ngFor="let dataset of myDatasets|filter:term" [ngClass]="{'selectedDatasetClass': this.selectedDataset == dataset}"> @@ -28,14 +28,14 @@ (click)="selectThisDataset(dataset);"></app-item-dataset> </li> </ul> - <div class="px-5 mt-5"> - <app-datatable [data]="datasetFile" [hasHeader]="datasetHasHeader"></app-datatable> - </div> - </div> + </div> + <div class="px-5 mt-5"> + <app-datatable [data]="datasetFile" [hasHeader]="datasetHasHeader"></app-datatable> + </div> </div> <app-add-new-dataset [style]="(showMyDatasets)?'display:none;visibility:hidden;':''" id="dataset" - (newDatasetAdded)="showMyDatasets = true"> + (newDatasetAdded)="refreshMyDatasets()"> </app-add-new-dataset> </div>
\ No newline at end of file diff --git a/frontend/src/app/_elements/dataset-load/dataset-load.component.ts b/frontend/src/app/_elements/dataset-load/dataset-load.component.ts index 6a5734e5..7329033c 100644 --- a/frontend/src/app/_elements/dataset-load/dataset-load.component.ts +++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.ts @@ -54,7 +54,7 @@ export class DatasetLoadComponent { refreshMyDatasets() { this.datasets.getMyDatasets().subscribe((datasets) => { this.myDatasets = datasets; - this.viewMyDatasetsForm(); + this.showMyDatasets = true; //this. }); } @@ -67,6 +67,9 @@ export class DatasetLoadComponent { this.datasets.getDatasetFile(dataset.fileId).subscribe((file: string | undefined) => { if (file) { + console.log(file); + this.datatable!.hasInput = true; + this.datatable!.loaded = true; this.datasetFile = this.csv.csvToArray(file, (dataset.delimiter == "razmak") ? " " : (dataset.delimiter == "") ? "," : dataset.delimiter); /*for (let i = this.datasetFile.length - 1; i >= 0; i--) { //moguce da je vise redova na kraju fajla prazno i sl. if (this.datasetFile[i].length != this.datasetFile[0].length) @@ -74,7 +77,9 @@ export class DatasetLoadComponent { else break; //nema potrebe dalje }*/ + console.log(this.datatable!.data); console.log(this.datasetFile); + console.log(this.datatable!.hasInput); //this.resetCbsAndRbs(); //TREBA DA SE DESI //this.refreshThreeNullValueRadioOptions(); //TREBA DA SE DESI this.selectedDatasetLoaded = true; |