Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: column group floating label displayed #148

Merged
merged 1 commit into from
Feb 28, 2024
+18 −13
Merged

feat: column group floating label displayed #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions libs/portal-integration-angular/assets/i18n/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"OCX_CUSTOM_GROUP_COLUMN_SELECTOR": {
"DROPDOWN_LABEL": "Spalten",
"OPEN_BUTTON_TITLE": "Dialog zur Auswahl einer benutzerdefinierten Gruppe öffnen",
"ACTIVE_COLUMNS_LABEL": "Aktive Spalten",
"INACTIVE_COLUMNS_LABEL": "Inaktive Spalten",
Expand Down
1 change: 1 addition & 0 deletions libs/portal-integration-angular/assets/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"OCX_CUSTOM_GROUP_COLUMN_SELECTOR": {
"DROPDOWN_LABEL": "Columns",
"OPEN_BUTTON_TITLE": "Open custom group selection dialog",
"ACTIVE_COLUMNS_LABEL": "Active columns",
"INACTIVE_COLUMNS_LABEL": "Inactive columns",
Expand Down
29 changes: 16 additions & 13 deletions ...ular/src/lib/core/components/column-group-selection/column-group-selection.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
<p-dropdown
id="columnGroupSelectionDropdown"
*ngIf="(allGroupKeys$ | async)?.length"
(onClear)="clearGroupSelection()"
(onChange)="changeGroupSelection($event)"
[options]="(allGroupKeys$ | async) || []"
[placeholder]="placeholderKey | translate"
[showClear]="selectedGroupKey !== defaultGroupKey"
[(ngModel)]="selectedGroupKey"
>
<ng-template let-item pTemplate="item"> {{ item ? (item | translate) : ''}} </ng-template>
<ng-template let-item pTemplate="selectedItem"> {{ item ? (item | translate) : ''}} </ng-template>
</p-dropdown>
<span class="p-float-label">
<p-dropdown
id="columnGroupSelectionDropdown"
*ngIf="(allGroupKeys$ | async)?.length"
(onClear)="clearGroupSelection()"
(onChange)="changeGroupSelection($event)"
[options]="(allGroupKeys$ | async) || []"
[placeholder]="placeholderKey | translate"
[showClear]="selectedGroupKey !== defaultGroupKey"
[(ngModel)]="selectedGroupKey"
>
<ng-template let-item pTemplate="item"> {{ item ? (item | translate) : ''}} </ng-template>
<ng-template let-item pTemplate="selectedItem"> {{ item ? (item | translate) : ''}} </ng-template>
</p-dropdown>
<label for="columnGroupSelectionDropdown">{{ ("OCX_CUSTOM_GROUP_COLUMN_SELECTOR.DROPDOWN_LABEL" | translate) }}</label>
</span>
Loading