diff options
| author | TAMARA JERINIC <tamara.jerinic@gmail.com> | 2022-04-18 00:21:57 +0200 | 
|---|---|---|
| committer | TAMARA JERINIC <tamara.jerinic@gmail.com> | 2022-04-18 00:26:32 +0200 | 
| commit | 1509314a97c1a122a50173382e976307f5ec9d40 (patch) | |
| tree | 3e230f65422d6206a4eea1c44110b374916aeeb1 /frontend/src/app/experiment | |
| parent | fbf1a64ae46148754a2ca76170591b243fb8426e (diff) | |
Dodat tip problema u eksperiment
Diffstat (limited to 'frontend/src/app/experiment')
| -rw-r--r-- | frontend/src/app/experiment/experiment.component.html | 34 | ||||
| -rw-r--r-- | frontend/src/app/experiment/experiment.component.ts | 4 | 
2 files changed, 29 insertions, 9 deletions
| diff --git a/frontend/src/app/experiment/experiment.component.html b/frontend/src/app/experiment/experiment.component.html index 5b3b2c43..35124b98 100644 --- a/frontend/src/app/experiment/experiment.component.html +++ b/frontend/src/app/experiment/experiment.component.html @@ -214,13 +214,33 @@                              <label for="name" class="col-form-label">Naziv eksperimenta:</label>                              <input type="text" class="form-control mb-3" name="name" placeholder="Naziv..." [(ngModel)]="experiment.name"> -                            <label for="desc" class="col-sm-2 col-form-label">Opis:</label> -                            <div> -                                <textarea class="form-control" name="desc" rows="3" [(ngModel)]="experiment.description"></textarea> -                            </div> -                            <div class="form-group row mt-5 mb-3"> -                                <div class="col"></div> -                                <button class="btn btn-lg col-4" style="background-color:#003459; color:white;" (click)="saveExperiment();">Sačuvaj +            <div class="carousel-item mt-2"> +                <h2 class="mb-4">3. Dodaj eskperiment</h2> + +                <div class="row"> +                    <div class="col"></div> +                    <div class="col-8"> +                        <label for="name" class="col-form-label">Naziv eksperimenta:</label> +                        <input type="text" class="form-control mb-3" name="name" placeholder="Naziv..." [(ngModel)]="experiment.name"> +         +                        <label for="desc" class="col-sm-2 col-form-label">Opis:</label> +                        <div> +                            <textarea class="form-control" name="desc" rows="3" [(ngModel)]="experiment.description"></textarea> +                        </div> +                        <label for="desc" class="col-sm-2 col-form-label">Tip problema:</label> +                        <div class="col-2"> +                            <select id=typeOptions class="form-select" name="type" [(ngModel)]="experiment.type"> +                                +                                <option +                                    *ngFor="let option of Object.keys(ProblemType); let optionName of Object.values(ProblemType)" +                                    [value]="option"> +                                    {{ optionName }} +                                </option> +                            </select> +                        </div> +                        <div class="form-group row mt-5 mb-3"> +                            <div class="col"></div> +                            <button class="btn btn-lg col-4" style="background-color:#003459; color:white;" (click)="saveExperiment();">Sačuvaj                                  eksperiment</button>                                  <div class="col"></div>                              </div> diff --git a/frontend/src/app/experiment/experiment.component.ts b/frontend/src/app/experiment/experiment.component.ts index 036db326..71679243 100644 --- a/frontend/src/app/experiment/experiment.component.ts +++ b/frontend/src/app/experiment/experiment.component.ts @@ -1,6 +1,6 @@  import { Component, OnInit } from '@angular/core';  import Experiment, { NullValReplacer, NullValueOptions, ReplaceWith, Encoding } from '../_data/Experiment'; -import Model from '../_data/Model'; +import Model,{ProblemType} from '../_data/Model';  import Dataset, { ColumnInfo } from '../_data/Dataset';  import { ModelsService } from '../_services/models.service';  import Shared from '../Shared'; @@ -24,7 +24,7 @@ export class ExperimentComponent implements OnInit {    Encoding = Encoding;    ColumnEncoding = ColumnEncoding;    Object = Object; - +  ProblemType=ProblemType;    selectedColumnsInfoArray: ColumnInfo[] = [];    selectedNotNullColumnsArray: string[] = []; | 
