diff options
Diffstat (limited to 'frontend/src/app')
6 files changed, 12 insertions, 9 deletions
diff --git a/frontend/src/app/_data/Dataset.ts b/frontend/src/app/_data/Dataset.ts index 665df932..c5b56957 100644 --- a/frontend/src/app/_data/Dataset.ts +++ b/frontend/src/app/_data/Dataset.ts @@ -11,6 +11,7 @@ export default class Dataset { public dateCreated: Date = new Date(), public lastUpdated: Date = new Date(), public username: string = '', - public delimiter: string = '' + public delimiter: string = '', + public hasHeader: boolean = true ) { } }
\ No newline at end of file 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 3ac43f73..76e46092 100644 --- a/frontend/src/app/_elements/dataset-load/dataset-load.component.html +++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.html @@ -33,7 +33,7 @@ </datalist> <label for="type" class="form-check-label my-5">Da li .csv ima header? - <input class="mx-3 form-check-input" type="checkbox" (input)="update()" [(ngModel)]="hasHeader" type="checkbox" + <input class="mx-3 form-check-input" type="checkbox" (input)="update()" [(ngModel)]="dataset.hasHeader" type="checkbox" value="" id="checkboxHeader" checked> </label> <br> 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 e7b19f9a..f9343117 100644 --- a/frontend/src/app/_elements/dataset-load/dataset-load.component.ts +++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.ts @@ -13,7 +13,7 @@ export class DatasetLoadComponent { delimiterOptions: Array<string> = [",", ";", "\t", "razmak", "|"]; //podrazumevano "," - hasHeader: boolean = true; + //hasHeader: boolean = true; hasInput: boolean = false; csvRecords: any[] = []; @@ -21,7 +21,7 @@ export class DatasetLoadComponent { rowsNumber: number = 0; colsNumber: number = 0; - dataset: Dataset; + dataset: Dataset; //dodaj ! potencijalno constructor(private ngxCsvParser: NgxCsvParser) { this.dataset = new Dataset(); @@ -54,13 +54,14 @@ export class DatasetLoadComponent { console.log('Result', result); if (result.constructor === Array) { this.csvRecords = result; - if (this.hasHeader) + if (this.dataset.hasHeader) this.rowsNumber = this.csvRecords.length - 1; else this.rowsNumber = this.csvRecords.length; this.colsNumber = this.csvRecords[0].length; - this.dataset.header = this.csvRecords[0]; + if (this.dataset.hasHeader) //kasnije dodati opciju kada nema header da korisnik rucno unosi header-e + this.dataset.header = this.csvRecords[0]; this.loaded.emit("loaded"); } diff --git a/frontend/src/app/_elements/item-dataset/item-dataset.component.html b/frontend/src/app/_elements/item-dataset/item-dataset.component.html index 46840cdd..8751fce5 100644 --- a/frontend/src/app/_elements/item-dataset/item-dataset.component.html +++ b/frontend/src/app/_elements/item-dataset/item-dataset.component.html @@ -8,7 +8,7 @@ </p> <table class="table table-bordered table-sm"> <thead> - <th scope="col" *ngFor="let column of dataset.header">{{column}}</th> + <th scope="col" *ngFor="let column of dataset.header">{{column}}</th> <!-- treba da se namesti da kad nema hedere, da korisnik unese nazive kolona pa da se taj heder prikaze --> </thead> </table> </div> 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..f4574eab 100644 --- a/frontend/src/app/_pages/add-model/add-model.component.html +++ b/frontend/src/app/_pages/add-model/add-model.component.html @@ -54,7 +54,7 @@ </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> 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..2552f612 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++) { @@ -222,7 +223,7 @@ export class AddModelComponent implements OnInit { this.datasetFile = this.csv.csvToArray(file, (dataset.delimiter == "razmak") ? " " : (dataset.delimiter == "") ? "," : dataset.delimiter); } }); - this.datasetHasHeader = false; + //this.datasetHasHeader = false; this.resetCbsAndRbs(); } |