diff --git a/libs/angular-accelerator/assets/i18n/de.json b/libs/angular-accelerator/assets/i18n/de.json index b5dc43c7..9edd8df3 100644 --- a/libs/angular-accelerator/assets/i18n/de.json +++ b/libs/angular-accelerator/assets/i18n/de.json @@ -1,6 +1,6 @@ { "OCX_CUSTOM_GROUP_COLUMN_SELECTOR": { - "DROPDOWN_LABEL": "Spalten", + "DROPDOWN_LABEL": "Spaltengruppe", "OPEN_BUTTON_DETAIL": "Dialog zur Auswahl einer benutzerdefinierten Gruppe öffnen", "ACTIVE_COLUMNS_LABEL": "Aktive Spalten", "INACTIVE_COLUMNS_LABEL": "Inaktive Spalten", diff --git a/libs/angular-accelerator/assets/i18n/en.json b/libs/angular-accelerator/assets/i18n/en.json index a9929e5d..b8bce00e 100644 --- a/libs/angular-accelerator/assets/i18n/en.json +++ b/libs/angular-accelerator/assets/i18n/en.json @@ -1,6 +1,6 @@ { "OCX_CUSTOM_GROUP_COLUMN_SELECTOR": { - "DROPDOWN_LABEL": "Columns", + "DROPDOWN_LABEL": "Column group", "OPEN_BUTTON_DETAIL": "Open custom group selection dialog", "ACTIVE_COLUMNS_LABEL": "Active columns", "INACTIVE_COLUMNS_LABEL": "Inactive columns", diff --git a/libs/angular-accelerator/src/lib/components/interactive-data-view/interactive-data-view.component.html b/libs/angular-accelerator/src/lib/components/interactive-data-view/interactive-data-view.component.html index e46079c1..4b7a3afe 100644 --- a/libs/angular-accelerator/src/lib/components/interactive-data-view/interactive-data-view.component.html +++ b/libs/angular-accelerator/src/lib/components/interactive-data-view/interactive-data-view.component.html @@ -22,14 +22,11 @@
- + () @Output() displayedColumnsChange = new EventEmitter() @Output() selectionChanged: EventEmitter = new EventEmitter() + groupSelectionChanged = new EventEmitter<{ activeColumns: DataTableColumn[]; groupKey: string }>() @Output() pageChanged: EventEmitter = new EventEmitter() selectedGroupKey = '' @@ -174,6 +179,14 @@ export class InteractiveDataViewComponent implements OnInit { this._data = value } + constructor() { + this.groupSelectionChanged.subscribe((event: { activeColumns: DataTableColumn[]; groupKey: string }) => { + this.displayedColumns = event.activeColumns + this.selectedGroupKey = event.groupKey + this.displayedColumnsChange.emit(this.displayedColumns) + }) + } + ngOnInit(): void { this.selectedGroupKey = this.defaultGroupKey this.displayedColumns = this.columns @@ -233,12 +246,6 @@ export class InteractiveDataViewComponent implements OnInit { this.sorted.emit({ sortColumn: this.sortField, sortDirection: this.sortDirection }) } - onColumnGroupSelectionChange(event: GroupSelectionChangedEvent) { - this.displayedColumns = event.activeColumns - this.selectedGroupKey = event.groupKey - this.displayedColumnsChange.emit(this.displayedColumns) - } - registerEventListenerForDataView() { if (this.deleteItem.observed) { this.isDeleteItemObserved = true diff --git a/libs/angular-accelerator/src/lib/components/search-header/search-header.component.html b/libs/angular-accelerator/src/lib/components/search-header/search-header.component.html index 179c7d37..89fc2c6a 100644 --- a/libs/angular-accelerator/src/lib/components/search-header/search-header.component.html +++ b/libs/angular-accelerator/src/lib/components/search-header/search-header.component.html @@ -7,7 +7,7 @@ column.id) } @Output() searched: EventEmitter = new EventEmitter() diff --git a/libs/angular-integration-interface/mocks/index.ts b/libs/angular-integration-interface/mocks/index.ts index 1f89a426..8b444f7b 100644 --- a/libs/angular-integration-interface/mocks/index.ts +++ b/libs/angular-integration-interface/mocks/index.ts @@ -1,2 +1,3 @@ export * from './mock-user-service' export * from './app-state-service-mock' +export * from './fake-topic'