diff --git a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/envelope-table/envelope-table.component.html b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/envelope-table/envelope-table.component.html index f9ceda7d..f327f57f 100644 --- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/envelope-table/envelope-table.component.html +++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/envelope-table/envelope-table.component.html @@ -5,7 +5,6 @@ [paging]="paging" [sorting]="sorting" [searching]="searching" -[summaries]="summaries" [infoPanel]="infoPanel" [localization]="localization" > diff --git a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/envelope-table/envelope-table.component.ts b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/envelope-table/envelope-table.component.ts index a4c448b2..86137d0f 100644 --- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/envelope-table/envelope-table.component.ts +++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/envelope-table/envelope-table.component.ts @@ -1,6 +1,5 @@ import { Component } from '@angular/core'; import { EnvelopeReceiverService } from '../../services/envelope-receiver.service'; -import { NgModule } from '@angular/core'; import { GuiColumn, GuiColumnMenu, GuiGridModule, GuiInfoPanel, GuiLocalization, GuiPaging, GuiPagingDisplay, GuiSearching, GuiSorting, GuiSummaries } from '@generic-ui/ngx-grid'; @Component({ @@ -23,42 +22,38 @@ export class EnvelopeTableComponent { multiSorting: true }; - paging: GuiPaging = { - enabled: true, - page: 1, - pageSize: 10, - pageSizes: [10, 25, 50], - pagerTop: true, - pagerBottom: true, - display: GuiPagingDisplay.ADVANCED - }; + paging: GuiPaging = { + enabled: true, + page: 1, + pageSize: 10, + pageSizes: [10, 25, 50], + pagerTop: true, + pagerBottom: true, + display: GuiPagingDisplay.ADVANCED + }; - searching: GuiSearching = { - enabled: true - }; + searching: GuiSearching = { + enabled: true + }; summaries: GuiSummaries = { enabled: true }; - infoPanel: GuiInfoPanel = { - enabled:true, - infoDialog:false, - columnsManager:false, - schemaManager: true - }; + infoPanel: GuiInfoPanel = { + enabled: true, + infoDialog: false, + columnsManager: true, + schemaManager: true + }; - localization: GuiLocalization = { - translationResolver: (key: string, value: string) => { - return '[de-DE]'; - } - }; + localization: GuiLocalization = { + translationResolver: (key: string, value: string) => EnvelopeTableComponent.Translation[key] ?? value + }; source: Array = [] - constructor(private erService: EnvelopeReceiverService) { - - } + constructor(private erService: EnvelopeReceiverService) { } ngOnInit() { this.erService.getEnvelopeReceiver().subscribe({ @@ -88,4 +83,51 @@ export class EnvelopeTableComponent { header: 'AddedWhen', field: 'addedWhen' }]; + + static readonly Translation: { [key: string]: string } = { + "sourceEmpty": "There are no items to show.", + "pagingItemsPerPage": "Items per page:", + "pagingOf": "of", + "pagingNextPage": "Next", + "pagingPrevPage": "Prev", + "pagingNoItems": "There is no items.", + "infoPanelShowing": "Showing", + "infoPanelItems": "items", + "infoPanelOutOf": "out of", + "infoPanelThemeMangerTooltipText": "Theme manager", + "infoPanelColumnManagerTooltipText": "Column manager", + "infoPanelInfoTooltipText": "info", + "themeManagerModalTitle": "Theme manager", + "themeManagerModalTheme": "Theme:", + "themeManagerModalRowColoring": "Row coloring:", + "themeManagerModalVerticalGrid": "Vertical grid", + "themeManagerModalHorizontalGrid": "HorizontalGrid", + "columnManagerModalTitle": "Manage columns", + "headerMenuMainTab": "Menu", + "headerMenuMainTabColumnSort": "Column sort", + "headerMenuMainTabHideColumn": "Hide column", + "headerMenuMainTabHighlightColumn": "Highlight", + "headerMenuMainTabMoveLeft": "Move left", + "headerMenuMainTabMoveRight": "Move right", + "headerMenuMainTabColumnSortAscending": "Ascending", + "headerMenuMainTabColumnSortDescending": "Descending", + "headerMenuMainTabColumnSortNone": "None", + "headerMenuFilterTab": "Filter", + "headerMenuColumnsTab": "Columns", + "summariesCount": "Count", + "summariesDist": "Dist", + "summariesSum": "Sum", + "summariesAvg": "Avg", + "summariesMin": "Min", + "summariesMax": "Max", + "summariesMed": "Med", + "summariesTruthy": "Truthy", + "summariesFalsy": "Falsy", + "summariesDistinctValuesTooltip": "Distinct values", + "summariesAverageTooltip": "Average", + "summariesMinTooltip": "Min", + "summariesMaxTooltip": "Max", + "summariesMedTooltip": "Median", + "summariesCountTooltip": "Number of items in the grid" + } } \ No newline at end of file diff --git a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/guards/auth.guard.ts b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/guards/auth.guard.ts index e3a485e0..271e8025 100644 --- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/guards/auth.guard.ts +++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/guards/auth.guard.ts @@ -7,9 +7,7 @@ import { map } from 'rxjs/operators'; export const authGuard: CanActivateFn = (route, state) => { const authService = inject(AuthService); const router = inject(Router); - - authService.isAuthenticated().subscribe({next: res => console.log(res)}) - + return authService.isAuthenticated().pipe( map(isAuthenticated => { if (!isAuthenticated) { diff --git a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/pages/envelope/envelope.component.html b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/pages/envelope/envelope.component.html index 75e91683..64eb00dc 100644 --- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/pages/envelope/envelope.component.html +++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/pages/envelope/envelope.component.html @@ -1,8 +1,8 @@ - + - + \ No newline at end of file