diff options
Diffstat (limited to 'frontend')
6 files changed, 51 insertions, 17 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 3256ffee..8a4164f1 100644 --- a/frontend/src/app/_elements/column-table/column-table.component.html +++ b/frontend/src/app/_elements/column-table/column-table.component.html @@ -46,7 +46,7 @@ </table> <div class="mb-3"> <button mat-button (click)="goBack()"><mat-icon>keyboard_arrow_left</mat-icon></button> - <div style="display: inline;">{{(this.begin/10)+1}}</div> + <div style="display: inline;">{{(this.begin/10)+1}}...{{getPage()}}</div> <button mat-button (click)="goForward()"><mat-icon>keyboard_arrow_right</mat-icon></button> </div> 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 a3469d90..ed2f0380 100644 --- a/frontend/src/app/_elements/column-table/column-table.component.ts +++ b/frontend/src/app/_elements/column-table/column-table.component.ts @@ -54,16 +54,28 @@ export class ColumnTableComponent implements AfterViewInit { this.begin=0; } goBack(){ - if(this.begin-10<=0) + if(this.begin-10<0) this.begin=0; else + { this.begin-=10; - this.loadData(); + this.loadData(); + } } goForward(){ + if(this.dataset!=undefined){ this.begin+=10; - this.loadData(); + if(this.dataset.rowCount<this.begin) + this.begin-=10; + else + this.loadData(); + } + } + getPage(){ + if(this.dataset!=undefined) + return Math.ceil(this.dataset.rowCount/this.step); + return 0; } 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 9f8e9e6f..6736367e 100644 --- a/frontend/src/app/_elements/form-dataset/form-dataset.component.html +++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.html @@ -49,7 +49,7 @@ <div class="mt-5 datatable"> <div [ngClass]="{'hidden': (!existingFlag)}" class="text-center"> <button mat-button (click)="goBack()"><mat-icon>keyboard_arrow_left</mat-icon></button> - <div style="display: inline;">{{(this.begin/10)+1}}</div> + <div style="display: inline;">{{(this.begin/10)+1}}...{{getPage()}}</div> <button mat-button (click)="goForward()"><mat-icon>keyboard_arrow_right</mat-icon></button> </div> <app-datatable [tableData]="tableData"></app-datatable> 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 d801b5fb..19c0083c 100644 --- a/frontend/src/app/_elements/form-dataset/form-dataset.component.ts +++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.ts @@ -47,20 +47,28 @@ export class FormDatasetComponent { this.begin=0; } goBack(){ - if(this.begin-10<=0) + if(this.begin-10<0) this.begin=0; else + { this.begin-=10; - this.loadExisting(); + this.loadExisting(); + } } goForward(){ this.begin+=10; - this.loadExisting(); + if(this.dataset.rowCount<this.begin) + this.begin-=10; + else + this.loadExisting(); } clear(){ this.tableData.hasInput = false; } + getPage(){ + return Math.ceil(this.dataset.rowCount/10) + } changeListener($event: any): void { this.files = $event.srcElement.files; diff --git a/frontend/src/app/_pages/experiment/experiment.component.html b/frontend/src/app/_pages/experiment/experiment.component.html index 20ff33d1..e521ce23 100644 --- a/frontend/src/app/_pages/experiment/experiment.component.html +++ b/frontend/src/app/_pages/experiment/experiment.component.html @@ -10,35 +10,40 @@ </div> </div> - <mat-stepper orientation="vertical" (selectionChange)="changePage($event)"> - <mat-step> + <mat-stepper orientation="vertical" (selectionChange)="changePage($event)" [linear]="true"> + <mat-step [completed]="this.step1"> <!--editable="false"--> <ng-template matStepLabel> - <span class="label" *ngIf="dataset==undefined">Izvor podataka</span> + <span class="label" *ngIf="dataset==undefined">Izvor podataka </span> <span class="label addedElement" *ngIf="dataset!=undefined">{{dataset.name}}</span> </ng-template> <ng-template matStepContent> <p class="text-left">Izaberite izvor podataka</p> </ng-template> </mat-step> - <mat-step> + <mat-step [completed]="experiment._id!=''"> <ng-template matStepLabel> - <span class="label addedElement" *ngIf="experiment.name!='exp1'">Predvideti:{{experiment.outputColumn}}</span> - <span class="label" *ngIf="experiment.name=='exp1'">Odabir kolona</span> + <span class="label addedElement" *ngIf="experiment._id!=''">Predvideti:{{experiment.outputColumn}}</span> + <span *ngIf="!this.step1" class="align-middle"><mat-icon>lock</mat-icon></span> + <span class="label" *ngIf="experiment._id==''">Odabir kolona </span> </ng-template> <ng-template matStepContent> <p class="text-left">Pripremite podatke i izaberite izlazne kolone</p> </ng-template> </mat-step> - <mat-step> + <mat-step [completed]="this.step3"> <ng-template matStepLabel> + <span *ngIf="experiment._id==''" class="align-middle"><mat-icon>lock</mat-icon></span> <span class="label addedElement" *ngIf="modelToTrain!=undefined">{{modelToTrain.name}}</span> <span class="label" *ngIf="modelToTrain==undefined">Treniranje</span> </ng-template> <p class="text-left">Odaberite parametre i trenirajte model</p> </mat-step> - <mat-step> - <ng-template matStepLabel><span class="label">Pregled rezultata<br> treniranja</span></ng-template> + <mat-step [completed]="this.step4"> + <ng-template matStepLabel> + <span *ngIf="!this.step3" class="align-middle"><mat-icon>lock</mat-icon></span> + <span class="label">Pregled rezultata<br> treniranja</span> + </ng-template> <p class="text-left">Pregledajte tok treniranja i<br> grafički prikaz rezultata</p> </mat-step> </mat-stepper> diff --git a/frontend/src/app/_pages/experiment/experiment.component.ts b/frontend/src/app/_pages/experiment/experiment.component.ts index abf4b697..ee9cca8c 100644 --- a/frontend/src/app/_pages/experiment/experiment.component.ts +++ b/frontend/src/app/_pages/experiment/experiment.component.ts @@ -32,6 +32,12 @@ export class ExperimentComponent implements AfterViewInit { @ViewChild("folderModel") folderModel!: FolderComponent; @ViewChild("metricView") metricView!: MetricViewComponent; + step1:boolean=false; + //step2:boolean=false; + step3:boolean=false; + step4:boolean=false; + + constructor(private experimentsService: ExperimentsService, private modelsService: ModelsService, private signalRService: SignalRService) { this.experiment = new Experiment("exp1"); } @@ -49,6 +55,7 @@ export class ExperimentComponent implements AfterViewInit { Shared.openDialog('Greška', 'Morate odabrati konfiguraciju neuronske mreže'); } else { this.modelsService.trainModel(this.modelToTrain._id, this.experiment._id).subscribe(() => { console.log("pocelo treniranje") }); + this.step4=true; } } @@ -157,6 +164,7 @@ export class ExperimentComponent implements AfterViewInit { this.dataset = d; this.columnTable.loadDataset(this.dataset); + this.step1=true; } @@ -165,5 +173,6 @@ export class ExperimentComponent implements AfterViewInit { setModel(model: FolderFile) { const m = <Model>model; this.modelToTrain = m; + this.step3=true; } } |