diff options
| author | Ognjen Cirkovic <ciraboxkg@gmail.com> | 2022-03-22 15:04:36 +0000 |
|---|---|---|
| committer | Ognjen Cirkovic <ciraboxkg@gmail.com> | 2022-03-22 15:04:36 +0000 |
| commit | 012fb19a54f4d55a6e4cc73227f738f64539cf04 (patch) | |
| tree | 57b3de84ad41037e8c7b1403dba4a5bad24a4752 /frontend/src/app/_elements/dataset-load | |
| parent | b4f0cd025a86c68a5c35a58e62c22b7cedf3d8b5 (diff) | |
| parent | 31642f68564e67175301235546b74baf56ac5882 (diff) | |
Merge branch 'dev' into 'Privremeno-cuvanje-podataka'
# Conflicts:
# backend/api/api/Controllers/ModelController.cs
Diffstat (limited to 'frontend/src/app/_elements/dataset-load')
| -rw-r--r-- | frontend/src/app/_elements/dataset-load/dataset-load.component.html | 4 | ||||
| -rw-r--r-- | frontend/src/app/_elements/dataset-load/dataset-load.component.ts | 11 |
2 files changed, 12 insertions, 3 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 fcec6ec3..76fc40e2 100644 --- a/frontend/src/app/_elements/dataset-load/dataset-load.component.html +++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.html @@ -30,7 +30,7 @@ </div> </div> - <div class="table-responsive"> + <div class="table-responsive" *ngIf="hasInput"> <table *ngIf="csvRecords.length > 0 && hasHeader" class="table table-bordered table-light mt-4"> <thead> <tr> @@ -53,7 +53,7 @@ </table> </div> - <div *ngIf="csvRecords.length > 0" id="info"> + <div *ngIf="csvRecords.length > 0 && hasInput" id="info"> . . . <br> {{rowsNumber}} x {{colsNumber}} </div> 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 913592eb..bccf13b7 100644 --- a/frontend/src/app/_elements/dataset-load/dataset-load.component.ts +++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.ts @@ -16,7 +16,7 @@ export class DatasetLoadComponent { hasHeader: boolean = true; - slice: string = ""; + hasInput: boolean = false; csvRecords: any[] = []; files: File[] = []; @@ -33,6 +33,15 @@ export class DatasetLoadComponent { changeListener($event: any): void { this.files = $event.srcElement.files; + if (this.files.length == 0 || this.files[0] == null) { + //console.log("NEMA FAJLA"); + //this.loaded.emit("not loaded"); + this.hasInput = false; + return; + } + else + this.hasInput = true; + console.log(this.files); this.update(); } |