Commit 7f5401e7731316b5ec79849643df24ec12463516
1 parent
fc597f2c
Improvements view and add support txt file in import Entity
Showing
3 changed files
with
6 additions
and
4 deletions
@@ -38,8 +38,8 @@ | @@ -38,8 +38,8 @@ | ||
38 | <tb-file-input formControlName="importData" | 38 | <tb-file-input formControlName="importData" |
39 | required | 39 | required |
40 | label="{{importFileLabel | translate}}" | 40 | label="{{importFileLabel | translate}}" |
41 | - [allowedExtensions]="'csv'" | ||
42 | - [accept]="'.csv,application/csv,text/csv'" | 41 | + [allowedExtensions]="'csv,txt'" |
42 | + [accept]="'.csv,application/csv,text/csv,.txt,text/plain'" | ||
43 | dropLabel="{{'import.drop-file-csv' | translate}}"> | 43 | dropLabel="{{'import.drop-file-csv' | translate}}"> |
44 | </tb-file-input> | 44 | </tb-file-input> |
45 | </fieldset> | 45 | </fieldset> |
@@ -23,13 +23,13 @@ | @@ -23,13 +23,13 @@ | ||
23 | </mat-cell> | 23 | </mat-cell> |
24 | </ng-container> | 24 | </ng-container> |
25 | <ng-container matColumnDef="sampleData"> | 25 | <ng-container matColumnDef="sampleData"> |
26 | - <mat-header-cell *matHeaderCellDef style="flex: 0 0 30%;"> {{ 'import.column-example' | translate }} </mat-header-cell> | 26 | + <mat-header-cell *matHeaderCellDef style="flex: 0 0 30%;" class="mat-column-sampleData"> {{ 'import.column-example' | translate }} </mat-header-cell> |
27 | <mat-cell *matCellDef="let column"> | 27 | <mat-cell *matCellDef="let column"> |
28 | {{column.sampleData}} | 28 | {{column.sampleData}} |
29 | </mat-cell> | 29 | </mat-cell> |
30 | </ng-container> | 30 | </ng-container> |
31 | <ng-container matColumnDef="type"> | 31 | <ng-container matColumnDef="type"> |
32 | - <mat-header-cell *matHeaderCellDef style="flex: 0 0 40%"> {{ 'import.column-type.column-type' | translate }} </mat-header-cell> | 32 | + <mat-header-cell *matHeaderCellDef style="flex: 0 0 40%" class="mat-column-type"> {{ 'import.column-type.column-type' | translate }} </mat-header-cell> |
33 | <mat-cell *matCellDef="let column"> | 33 | <mat-cell *matCellDef="let column"> |
34 | <mat-select matInput [(ngModel)]="column.type" (ngModelChange)="columnsUpdated()"> | 34 | <mat-select matInput [(ngModel)]="column.type" (ngModelChange)="columnsUpdated()"> |
35 | <mat-option *ngFor="let type of columnTypes" [value]="type.value" [disabled]="type.disabled"> | 35 | <mat-option *ngFor="let type of columnTypes" [value]="type.value" [disabled]="type.disabled"> |
@@ -19,8 +19,10 @@ | @@ -19,8 +19,10 @@ | ||
19 | } | 19 | } |
20 | .mat-column-sampleData { | 20 | .mat-column-sampleData { |
21 | flex: 0 0 120px; | 21 | flex: 0 0 120px; |
22 | + min-width: 120px; | ||
22 | } | 23 | } |
23 | .mat-column-type { | 24 | .mat-column-type { |
24 | flex: 0 0 120px; | 25 | flex: 0 0 120px; |
26 | + min-width: 120px; | ||
25 | } | 27 | } |
26 | } | 28 | } |