diff options
Diffstat (limited to 'frontend/src/app/_elements/form-dataset')
3 files changed, 22 insertions, 28 deletions
diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.css b/frontend/src/app/_elements/form-dataset/form-dataset.component.css index 953daa0c..079711d0 100644 --- a/frontend/src/app/_elements/form-dataset/form-dataset.component.css +++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.css @@ -5,25 +5,27 @@ } .topBar { + display: table; width: 100%; - margin: 1rem; - align-items: flex-start; + height: 100px; + margin-left: 1.5%; + margin-top: 1.5% ; +} +.kolona{ + float: left; + margin-left: 20px; } - .topBar label{ font-size: 30px; } .topBar mat-form-field{ width: 250px; + margin: 0; } -.toptop{ - margin-left: 1.5%; - width: 50%; -} - -.fileButton{ - margin-top: 10px; +.fileButton button{ + height: 51px; + width: 250px; } .file-container { 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 281f9c05..b96276bd 100644 --- a/frontend/src/app/_elements/form-dataset/form-dataset.component.html +++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.html @@ -1,18 +1,16 @@ <div class="folderBox" *ngIf="dataset"> - <div class="row" style="margin-right: 0;"> + <div class="topBar"> - <div class="row toptop"> - <div class="col-sm mb-3"> + <div class="kolona mb-3"> <div class="fileButton"> <button type="button" mat-raised-button (click)="fileInput.click()">Dodaj izvor podataka</button> </div> </div> - <div class="col-sm"> + <div class="kolona"> <div role="group"> - <div class="row"> <mat-form-field class="example-full-width" appearance="fill"> <mat-label>Naziv</mat-label> <input type="text" matInput value="{{dataset?.name}}" [(ngModel)]="dataset.name"> @@ -22,30 +20,24 @@ Naziv je <strong>obavezan</strong> </mat-error> </mat-form-field> - </div> </div> </div> - <div class="col-sm"> + <div class="kolona"> <mat-form-field appearance="fill"> <mat-label>Delimiter</mat-label> - <mat-select id="delimiterOptions" [(ngModel)]="dataset.delimiter" (change)="update()" value=","> + <mat-select id="delimiterOptions" [(ngModel)]="dataset.delimiter" (selectionChange)="update()" value=","> <mat-option *ngFor="let option of delimiterOptions" [value]="option"> {{ option }} </mat-option> </mat-select> </mat-form-field> </div> - <div class="col-sm"> - - </div> - </div> - <div class="row" *ngIf="firstInput"> - <label class=" mt-5">{{filename}}</label> - - </div> </div> - </div> + + <div class="row" *ngIf="firstInput"> + <label class=" mt-5">{{filename}}</label> + </div> <div class="row" style="margin-right: 0;"> <div class="file-container" [ngClass]="{'dottedClass': !tableData.hasInput}"> 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 1eed2cdc..94ef9905 100644 --- a/frontend/src/app/_elements/form-dataset/form-dataset.component.ts +++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.ts @@ -101,7 +101,7 @@ export class FormDatasetComponent { this.tableData.loaded = true; this.tableData.numRows = this.dataset.rowCount; this.tableData.numCols = this.dataset.columnInfo.length; - this.tableData.data = this.csv.csvToArray(file, (this.dataset.delimiter == "razmak") ? " " : (this.dataset.delimiter == "") ? "," : this.dataset.delimiter); + this.tableData.data = this.csv.csvToArray(file, (this.dataset.delimiter == "razmak") ? " " : (this.dataset.delimiter == "novi red") ? "\t" : this.dataset.delimiter); } }); |