diff options
| author | Danijel Andjelkovic <adanijel99@gmail.com> | 2022-03-27 05:13:29 +0200 |
|---|---|---|
| committer | Danijel Andjelkovic <adanijel99@gmail.com> | 2022-03-27 05:13:29 +0200 |
| commit | cab50e2c5272c1599e3b3e30522985b912a19ab7 (patch) | |
| tree | d28ffc8f1e385a1427f004691b74960c6444ecf1 /frontend/src/app/_pages/add-model | |
| parent | 982a04c28dcb401fa722cb48976379a1cf6298d8 (diff) | |
| parent | a315d3c0bc44c091d7c85697c9c8135b314ebc06 (diff) | |
Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev
# Conflicts:
# frontend/src/app/app.module.ts
Diffstat (limited to 'frontend/src/app/_pages/add-model')
| -rw-r--r-- | frontend/src/app/_pages/add-model/add-model.component.html | 6 | ||||
| -rw-r--r-- | frontend/src/app/_pages/add-model/add-model.component.ts | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/frontend/src/app/_pages/add-model/add-model.component.html b/frontend/src/app/_pages/add-model/add-model.component.html index 7e944a19..09a11e37 100644 --- a/frontend/src/app/_pages/add-model/add-model.component.html +++ b/frontend/src/app/_pages/add-model/add-model.component.html @@ -54,9 +54,11 @@ </div> <app-dataset-load *ngIf="!showMyDatasets" id="dataset" - (loaded)="datasetLoaded = true; selectedDataset = datasetLoadComponent?.dataset; datasetFile = datasetLoadComponent?.csvRecords; datasetHasHeader = datasetLoadComponent?.hasHeader"> + (loaded)="datasetLoaded = true; selectedDataset = datasetLoadComponent?.dataset; datasetFile = datasetLoadComponent?.csvRecords; datasetHasHeader = datasetLoadComponent?.dataset!.hasHeader"> </app-dataset-load> - <app-datatable [data]="datasetFile" [hasHeader]="datasetHasHeader"></app-datatable> + <div class="px-5 mt-5"> + <app-datatable [data]="datasetFile" [hasHeader]="datasetHasHeader"></app-datatable> + </div> </div> <!-- ULAZNE/IZLAZNE KOLONE --> diff --git a/frontend/src/app/_pages/add-model/add-model.component.ts b/frontend/src/app/_pages/add-model/add-model.component.ts index fcc8ea70..995aaa87 100644 --- a/frontend/src/app/_pages/add-model/add-model.component.ts +++ b/frontend/src/app/_pages/add-model/add-model.component.ts @@ -209,6 +209,7 @@ export class AddModelComponent implements OnInit { selectThisDataset(dataset: Dataset) { this.selectedDataset = dataset; this.existingDatasetSelected = true; + this.datasetHasHeader = this.selectedDataset.hasHeader; /*let datasets = document.getElementsByClassName("usersDataset") as HTMLCollection; for (let i = 0; i < datasets.length; i++) { @@ -220,9 +221,11 @@ export class AddModelComponent implements OnInit { this.datasets.getDatasetFile(dataset.fileId).subscribe((file: string | undefined) => { if (file) { this.datasetFile = this.csv.csvToArray(file, (dataset.delimiter == "razmak") ? " " : (dataset.delimiter == "") ? "," : dataset.delimiter); + this.datasetFile.length = this.datasetFile.length - 1; + console.log(this.datasetFile); } }); - this.datasetHasHeader = false; + //this.datasetHasHeader = false; this.resetCbsAndRbs(); } |