diff options
| author | Ognjen Cirkovic <ciraboxkg@gmail.com> | 2022-04-26 23:54:04 +0200 |
|---|---|---|
| committer | Ognjen Cirkovic <ciraboxkg@gmail.com> | 2022-04-26 23:54:04 +0200 |
| commit | aa254b6c3075805b000d774a98421aecbcb975a8 (patch) | |
| tree | 6e32a720d2bfb57726d0c72bd6428b94dd14d891 /frontend/src/app/_elements/column-table/column-table.component.html | |
| parent | 247c5f6ec45c7ceb4a2dcfbe633a76928fb10a82 (diff) | |
| parent | 6196023a54bcf0ac5a81c64aff0bcf55f22e0ef8 (diff) | |
Merge branch 'redesign' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into Redesign
Diffstat (limited to 'frontend/src/app/_elements/column-table/column-table.component.html')
| -rw-r--r-- | frontend/src/app/_elements/column-table/column-table.component.html | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/frontend/src/app/_elements/column-table/column-table.component.html b/frontend/src/app/_elements/column-table/column-table.component.html index 1a5a5e81..8551f710 100644 --- a/frontend/src/app/_elements/column-table/column-table.component.html +++ b/frontend/src/app/_elements/column-table/column-table.component.html @@ -23,9 +23,8 @@ <tr> <th>Grafik</th> <td *ngFor="let colInfo of dataset.columnInfo; let i = index"> - <!-- <app-box-plot *ngIf="colInfo.isNumber"></app-box-plot> - TODO: dodati [data] - <app-pie-chart *ngIf="!colInfo.isNumber"></app-pie-chart> --> + <app-box-plot *ngIf="colInfo.isNumber"></app-box-plot> + <app-pie-chart *ngIf="!colInfo.isNumber"></app-pie-chart> </td> </tr> <tr> @@ -48,8 +47,8 @@ </span> </td> </tr> - <tr> - <th class="brighter" (click)="openEncodingDialog()">Enkoding + <tr style="padding: 0"> + <th class="brighter" (click)="openEncodingDialog()">Enkoding <span class="material-icons-round">settings</span> </th> <td *ngFor="let colInfo of dataset.columnInfo; let i = index"> @@ -99,24 +98,28 @@ </td> </tr> - <tr *ngFor="let element of [1, 2]; let i = index"> - <th *ngIf="i == 0" rowspan="2">Vrednosti</th> + <tr *ngFor="let row of tableData; let i = index"> + <th *ngIf="i == 0" [attr.rowspan]="tableData!.length">Vrednosti</th> + - <td *ngFor="let colInfo of dataset.columnInfo; let j = index"> - <!--<app-datatable [data]=""></app-datatable>-->ok + <td *ngFor="let col of row; let j = index"> + <div style="overflow: auto"> + {{col}} + </div> </td> </tr> </tbody> </table> <div class="container text-offwhite belowColumn"> - <div class="row " > + <div class="row "> <div class="col-sm slider rounded"> <div class="text-center pt-3 pb-0 mb-0"><b>{{testSetDistribution}}%</b> : <b>{{100-testSetDistribution}}%</b></div> - <div class="text-center pt-0 mt-0">Trening<mat-slider min="10" max="90" step="10" [(ngModel)]="testSetDistribution" (input)="updateTestSet($event)"></mat-slider>Test</div> - + <div class="text-center pt-0 mt-0">Trening + <mat-slider min="10" max="90" step="10" [(ngModel)]="testSetDistribution" (input)="updateTestSet($event)"></mat-slider>Test</div> + </div> - + <div class="col-sm-3 d-flex pt-3"> <mat-form-field appearance="fill" style="width: 270px;"> <mat-label>Tip problema</mat-label> @@ -128,7 +131,7 @@ </mat-form-field> </div> <div class="col-sm-3 d-flex pt-3"> - <mat-form-field appearance="fill" > + <mat-form-field appearance="fill"> <mat-label>Izlazna kolona</mat-label> <mat-select> <mat-option *ngFor="let item of dataset?.columnInfo" [value]="item.columnName">{{item.columnName}}</mat-option> |