diff options
| -rw-r--r-- | frontend/src/app/_elements/folder/folder.component.ts | 17 | ||||
| -rw-r--r-- | frontend/src/app/_elements/form-dataset/form-dataset.component.html | 9 |
2 files changed, 17 insertions, 9 deletions
diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts index 4bf964b6..23a982fb 100644 --- a/frontend/src/app/_elements/folder/folder.component.ts +++ b/frontend/src/app/_elements/folder/folder.component.ts @@ -2,6 +2,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import Dataset from 'src/app/_data/Dataset'; import { FolderFile, FolderType } from 'src/app/_data/FolderFile'; import Model from 'src/app/_data/Model'; +import { DatasetsService } from 'src/app/_services/datasets.service'; @Component({ selector: 'app-folder', @@ -31,13 +32,17 @@ export class FolderComponent implements OnInit { searchTerm: string = ''; - constructor() { + myDatasets : Dataset[] = []; + + constructor(private datasets: DatasetsService) { //PLACEHOLDER - this.files = [ - new Dataset('Titanik'), - new Dataset('Dijamanti'), - new Dataset('Filmovi'), - ] + + this.datasets.getMyDatasets().subscribe((datasets) => { + this.myDatasets = datasets; + }); + + this.files = this.myDatasets; + this.filteredFiles.length = 0; this.filteredFiles.push(...this.files); 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 e0c7f288..ab1b417e 100644 --- a/frontend/src/app/_elements/form-dataset/form-dataset.component.html +++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.html @@ -30,7 +30,7 @@ <div class="row"> <mat-form-field class="example-full-width" appearance="fill"> <mat-label>Naziv</mat-label> - <input type="text" matInput value="titanik.csv"> + <input type="text" matInput value="{{filename.slice(0, this.filename.length - 4)}}"> <!--[formControl]="nameFormControl"--> <mat-error *ngIf="nameFormControl.hasError('required')"> @@ -47,9 +47,12 @@ </div> <div class="col-sm"> + + <mat-form-field appearance="fill"> - <mat-select id="delimiterOptions" [(ngModel)]="dataset.delimiter" (change)="update()"> - <mat-option *ngFor="let option of delimiterOptions"> + <mat-label>Delimiter</mat-label> + <mat-select id="delimiterOptions" [(ngModel)]="dataset.delimiter" (change)="update()" value=","> + <mat-option *ngFor="let option of delimiterOptions" [value]="option"> {{ option }} </mat-option> </mat-select> |