Commit 41006bf3fcaf88af20d6385607030dea6a57bd24

Authored by Vladyslav_Prykhodko
1 parent 3ebe0e98

UI: Fixed show in Safari browser dashboard filter

@@ -27,10 +27,10 @@ @@ -27,10 +27,10 @@
27 </mat-toolbar> 27 </mat-toolbar>
28 <div mat-dialog-content> 28 <div mat-dialog-content>
29 <fieldset [disabled]="isLoading$ | async" fxLayout="column"> 29 <fieldset [disabled]="isLoading$ | async" fxLayout="column">
30 - <mat-checkbox fxFlex formControlName="editable" style="margin-bottom: 16px;"> 30 + <mat-checkbox formControlName="editable" style="margin-bottom: 16px;">
31 {{ 'filter.editable' | translate }} 31 {{ 'filter.editable' | translate }}
32 </mat-checkbox> 32 </mat-checkbox>
33 - <div fxFlex fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px"> 33 + <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
34 <mat-form-field fxFlex class="mat-block"> 34 <mat-form-field fxFlex class="mat-block">
35 <mat-label translate>filter.display-label</mat-label> 35 <mat-label translate>filter.display-label</mat-label>
36 <input matInput formControlName="label"> 36 <input matInput formControlName="label">
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
39 {{ 'filter.autogenerated-label' | translate }} 39 {{ 'filter.autogenerated-label' | translate }}
40 </mat-checkbox> 40 </mat-checkbox>
41 </div> 41 </div>
42 - <mat-form-field fxFlex class="mat-block"> 42 + <mat-form-field class="mat-block">
43 <mat-label translate>filter.order-priority</mat-label> 43 <mat-label translate>filter.order-priority</mat-label>
44 <input matInput type="number" formControlName="order"> 44 <input matInput type="number" formControlName="order">
45 </mat-form-field> 45 </mat-form-field>
@@ -16,8 +16,8 @@ @@ -16,8 +16,8 @@
16 16
17 --> 17 -->
18 <div fxLayout="column" class="mat-content mat-padding"> 18 <div fxLayout="column" class="mat-content mat-padding">
19 - <div fxLayout="column" *ngFor="let filter of filtersInfo | keyvalue; let last = last">  
20 - <div fxFlex fxLayout="row" fxLayoutAlign="start center"> 19 + <div *ngFor="let filter of filtersInfo | keyvalue; let last = last">
  20 + <div fxLayout="row" fxLayoutAlign="start center">
21 <mat-label fxFlex>{{filter.value.filter}}</mat-label> 21 <mat-label fxFlex>{{filter.value.filter}}</mat-label>
22 <button mat-icon-button color="primary" 22 <button mat-icon-button color="primary"
23 style="min-width: 40px;" 23 style="min-width: 40px;"
@@ -29,37 +29,33 @@ @@ -29,37 +29,33 @@
29 </mat-progress-bar> 29 </mat-progress-bar>
30 <div mat-dialog-content> 30 <div mat-dialog-content>
31 <fieldset [disabled]="isLoading$ | async"> 31 <fieldset [disabled]="isLoading$ | async">
32 - <div fxFlex fxLayout="column">  
33 - <div fxFlex fxLayout="row" fxLayoutAlign="start center"  
34 - formArrayName="userInputs"  
35 - *ngFor="let userInputControl of userInputsFormArray().controls; let $index = index">  
36 - <div fxFlex fxLayout="column"  
37 - [ngSwitch]="userInputControl.get('valueType').value">  
38 - <ng-template [ngSwitchCase]="valueTypeEnum.STRING">  
39 - <mat-form-field fxFlex class="mat-block">  
40 - <mat-label>{{ userInputControl.get('label').value }}</mat-label>  
41 - <input matInput [formControl]="userInputControl.get('value')">  
42 - </mat-form-field>  
43 - </ng-template>  
44 - <ng-template [ngSwitchCase]="valueTypeEnum.NUMERIC">  
45 - <mat-form-field fxFlex class="mat-block">  
46 - <mat-label>{{ userInputControl.get('label').value }}</mat-label>  
47 - <input required type="number" matInput [formControl]="userInputControl.get('value')">  
48 - </mat-form-field>  
49 - </ng-template>  
50 - <ng-template [ngSwitchCase]="valueTypeEnum.DATE_TIME">  
51 - <label class="tb-title no-padding tb-required">{{ userInputControl.get('label').value }}</label>  
52 - <tb-datetime fxFlex [formControl]="userInputControl.get('value')"  
53 - dateText="filter.date"  
54 - timeText="filter.time"  
55 - required [showLabel]="false"></tb-datetime>  
56 - </ng-template>  
57 - <ng-template [ngSwitchCase]="valueTypeEnum.BOOLEAN">  
58 - <mat-checkbox labelPosition="before" fxFlex [formControl]="userInputControl.get('value')">  
59 - {{ userInputControl.get('label').value }}  
60 - </mat-checkbox>  
61 - </ng-template>  
62 - </div> 32 + <div formArrayName="userInputs"
  33 + *ngFor="let userInputControl of userInputsFormArray().controls; let $index = index">
  34 + <div [ngSwitch]="userInputControl.get('valueType').value">
  35 + <ng-template [ngSwitchCase]="valueTypeEnum.STRING">
  36 + <mat-form-field class="mat-block">
  37 + <mat-label>{{ userInputControl.get('label').value }}</mat-label>
  38 + <input matInput [formControl]="userInputControl.get('value')">
  39 + </mat-form-field>
  40 + </ng-template>
  41 + <ng-template [ngSwitchCase]="valueTypeEnum.NUMERIC">
  42 + <mat-form-field class="mat-block">
  43 + <mat-label>{{ userInputControl.get('label').value }}</mat-label>
  44 + <input required type="number" matInput [formControl]="userInputControl.get('value')">
  45 + </mat-form-field>
  46 + </ng-template>
  47 + <ng-template [ngSwitchCase]="valueTypeEnum.DATE_TIME">
  48 + <label class="tb-title no-padding tb-required">{{ userInputControl.get('label').value }}</label>
  49 + <tb-datetime [formControl]="userInputControl.get('value')"
  50 + dateText="filter.date"
  51 + timeText="filter.time"
  52 + required [showLabel]="false"></tb-datetime>
  53 + </ng-template>
  54 + <ng-template [ngSwitchCase]="valueTypeEnum.BOOLEAN">
  55 + <mat-checkbox labelPosition="before" [formControl]="userInputControl.get('value')">
  56 + {{ userInputControl.get('label').value }}
  57 + </mat-checkbox>
  58 + </ng-template>
63 </div> 59 </div>
64 </div> 60 </div>
65 </fieldset> 61 </fieldset>