diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index f4d5282..240b573 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -10,12 +10,6 @@ {{key.id}} - -
diff --git a/src/app/home/home.component.scss b/src/app/home/home.component.scss index 4ae35d4..c53dfa5 100644 --- a/src/app/home/home.component.scss +++ b/src/app/home/home.component.scss @@ -6,3 +6,7 @@ app-login { width: 70%; float: right; } + +rb-form-multi-select { + width: 20%; +} diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index 792bf95..84117b1 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -120,7 +120,8 @@ export class HomeComponent implements OnInit { label: 'Number of samples per group', data: data.data, backgroundColor: fillPattern, - borderWidth: 2 + pointRadius: 4, + pointHoverRadius: 7 }] }, options: { diff --git a/src/app/samples/samples.component.html b/src/app/samples/samples.component.html index 61088e3..f1cfeb4 100644 --- a/src/app/samples/samples.component.html +++ b/src/app/samples/samples.component.html @@ -3,9 +3,9 @@ New sample - + class="validation-close" iconOnly> + {{sampleSelect === 2 ? 'Validate' : 'Validation'}}
@@ -19,23 +19,22 @@
+ [disabled]="!filters.status.new && !filters.status.deleted" (ngModelChange)="loadSamples({firstPage: true})"> validated + [disabled]="!filters.status.validated && !filters.status.deleted" + (ngModelChange)="loadSamples({firstPage: true})"> new + [disabled]="!filters.status.validated && !filters.status.new" (ngModelChange)="loadSamples({firstPage: true})" + *ngIf="login.isLevel.dev"> deleted
+ (ngModelChange)="loadSamples({firstPage: true})" #pageSizeSelection> @@ -45,10 +44,13 @@ - - {{item.label}} - +
+ + {{item.label}} + +
Reset to default @@ -59,7 +61,7 @@ + (ngModelChange)="updateFilterFields(filter.field)"> @@ -73,29 +75,25 @@
- + + [name]="'filter-' + filter.field + item.i" [index]="item.i" [label]="filter.label" + [(ngModel)]="item.value" [disabled]="filter.mode === 'null'"> + [name]="'filter-' + filter.field + item.i" [index]="item.i" [label]="filter.label" + [(ngModel)]="item.value" [disabled]="filter.mode === 'null'"> + [name]="'filter-' + filter.field + item.i" [index]="item.i" [label]="filter.label" + [(ngModel)]="item.value" [rbDebounceTime]="0" (keydown)="preventDefault($event, 'Enter')" + [rbFormInputAutocomplete]="autocomplete.bind(this, filter.autocomplete)" + [disabled]="filter.mode === 'null'" ngModel> + [name]="'filter-' + filter.field + item.i" [index]="item.i" [label]="filter.label" + [(ngModel)]="item.value"> @@ -119,7 +117,6 @@ -
@@ -137,7 +134,7 @@