diff options
Diffstat (limited to 'frontend/src/app/_elements/column-table')
3 files changed, 53 insertions, 4 deletions
diff --git a/frontend/src/app/_elements/column-table/column-table.component.css b/frontend/src/app/_elements/column-table/column-table.component.css index 6b62dd56..0db50cdb 100644 --- a/frontend/src/app/_elements/column-table/column-table.component.css +++ b/frontend/src/app/_elements/column-table/column-table.component.css @@ -28,4 +28,16 @@ table.fixed th:first-child { .brighter { background-color: var(--ns-primary) !important; +} + +mat-slider { + width: 300px; +} + +.belowColumn { + background-color: var(--ns-bg-dark-50); +} + +.slider { + background-color: var(--ns-bg-dark-100); }
\ No newline at end of file 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 2b2fd537..1a5a5e81 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,9 @@ <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> + TODO: dodati [data] + <app-pie-chart *ngIf="!colInfo.isNumber"></app-pie-chart> --> </td> </tr> <tr> @@ -107,4 +107,35 @@ </td> </tr> </tbody> -</table>
\ No newline at end of file +</table> + +<div class="container text-offwhite belowColumn"> + <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> + + <div class="col-sm-3 d-flex pt-3"> + <mat-form-field appearance="fill" style="width: 270px;"> + <mat-label>Tip problema</mat-label> + <mat-select value="ToDo1"> + <mat-option value="ToDo1">Regresioni</mat-option> + <mat-option value="ToDo2">Binarni-Klasifikacioni</mat-option> + <mat-option value="ToDo3">Multi-Klasifikacioni</mat-option> + </mat-select> + </mat-form-field> + </div> + <div class="col-sm-3 d-flex pt-3"> + <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> + </mat-select> + </mat-form-field> + </div> + + </div> + +</div>
\ No newline at end of file diff --git a/frontend/src/app/_elements/column-table/column-table.component.ts b/frontend/src/app/_elements/column-table/column-table.component.ts index caacf63e..f3aedd1b 100644 --- a/frontend/src/app/_elements/column-table/column-table.component.ts +++ b/frontend/src/app/_elements/column-table/column-table.component.ts @@ -5,6 +5,7 @@ import { DatasetsService } from 'src/app/_services/datasets.service'; import { EncodingDialogComponent } from 'src/app/_modals/encoding-dialog/encoding-dialog.component'; import { MatDialog } from '@angular/material/dialog'; import { MissingvaluesDialogComponent } from 'src/app/_modals/missingvalues-dialog/missingvalues-dialog.component'; +import { MatSliderChange } from '@angular/material/slider'; import { MatCheckboxChange } from '@angular/material/checkbox'; import { MatMenuItem, MatMenuTrigger } from '@angular/material/menu'; @@ -24,6 +25,7 @@ export class ColumnTableComponent implements AfterViewInit { NullValueOptions = NullValueOptions; tableData?: any[][]; + testSetDistribution:number=70; constructor(private datasetService: DatasetsService, public dialog: MatDialog) { //ovo mi nece trebati jer primam dataset iz druge komponente } @@ -143,6 +145,10 @@ export class ColumnTableComponent implements AfterViewInit { this.resetMissingValuesTreatment(selectedMissingValuesOption); }); } + updateTestSet(event:MatSliderChange){ + this.testSetDistribution=event.value!; + } + MissValsDeleteClicked(event: Event, replacementType: NullValueOptions) { if (this.experiment != undefined) { |