diff options
Diffstat (limited to 'frontend/src/app')
4 files changed, 53 insertions, 6 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 f65d7c3d..060fcc05 100644 --- a/frontend/src/app/_elements/column-table/column-table.component.css +++ b/frontend/src/app/_elements/column-table/column-table.component.css @@ -2,4 +2,13 @@ table { display: block; overflow-x: auto; white-space: nowrap; +} +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 e6d9442c..5d605fb1 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> @@ -98,4 +98,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 603de591..c0c8d6f0 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'; @@ -21,7 +22,7 @@ export class ColumnTableComponent implements OnInit { Object = Object; Encoding = Encoding; NullValueOptions = NullValueOptions; - + testSetDistribution:number=70; constructor(private datasetService: DatasetsService, public dialog: MatDialog) { //ovo mi nece trebati jer primam dataset iz druge komponente this.datasetService.getMyDatasets().subscribe((datasets) => { @@ -109,6 +110,10 @@ export class ColumnTableComponent implements OnInit { this.resetMissingValuesTreatment(selectedMissingValuesOption); }); } + updateTestSet(event:MatSliderChange){ + this.testSetDistribution=event.value!; + } + MissValsDeleteClicked(event: Event, replacementType: NullValueOptions) { if (this.experiment != undefined) { diff --git a/frontend/src/app/_pages/experiment/experiment.component.html b/frontend/src/app/_pages/experiment/experiment.component.html index c988a50a..6200270c 100644 --- a/frontend/src/app/_pages/experiment/experiment.component.html +++ b/frontend/src/app/_pages/experiment/experiment.component.html @@ -25,7 +25,9 @@ <app-folder (okPressed)="goToPage(1)"></app-folder> </div> <div #steps id="step_2" class="step-content"> - <div class="text-offwhite" style="height: 100px;width: 100px;background-color: red;top:50%;left: 50%;position: absolute;">Insert odabir kolona</div> + <div class="mx-3" style="overflow-x: auto;"> + <app-column-table></app-column-table> + </div> </div> <div #steps id="step_3" class="step-content"> |