diff --git a/web/ngx-translate-lint.json b/web/ngx-translate-lint.json index a8d094c..916862a 100755 --- a/web/ngx-translate-lint.json +++ b/web/ngx-translate-lint.json @@ -9,7 +9,10 @@ "misprintCoefficient": "0.9", "ignoredKeys": [ "permissions.*", - "permission_descriptions.*" + "permission_descriptions.*", + "event.participants.attendance_states.*", + "event.participants.payment_*", + "primeng.*" ], "ignoredMisprintKeys": [], "customRegExpToFindKeys": [ diff --git a/web/src/app/modules/admin/domains/history/history.component.spec.ts b/web/src/app/modules/admin/domains/history/history.component.spec.ts index c0679d0..1245f2e 100644 --- a/web/src/app/modules/admin/domains/history/history.component.spec.ts +++ b/web/src/app/modules/admin/domains/history/history.component.spec.ts @@ -11,10 +11,10 @@ import { ConfirmationService, MessageService } from 'primeng/api'; import { ActivatedRoute } from '@angular/router'; import { of } from 'rxjs'; import { PageDataService } from 'src/app/core/base/page.data.service'; -import { IpListDataService } from 'src/app/modules/admin/tools/ip-list/ip-list.data.service'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { PageColumns } from 'src/app/core/base/page.columns'; import { MockPageColumns } from 'src/app/modules/shared/test/page.columns.mock'; +import { DomainsDataService } from 'src/app/modules/admin/domains/domains.data.service'; describe('HistoryComponent', () => { let component: HistoryComponent; @@ -43,7 +43,7 @@ describe('HistoryComponent', () => { }, { provide: PageDataService, - useClass: IpListDataService, + useClass: DomainsDataService, }, { provide: PageColumns, diff --git a/web/src/app/modules/admin/groups/groups.data.service.ts b/web/src/app/modules/admin/groups/groups.data.service.ts index 2aabf70..ba84fa3 100644 --- a/web/src/app/modules/admin/groups/groups.data.service.ts +++ b/web/src/app/modules/admin/groups/groups.data.service.ts @@ -23,7 +23,6 @@ import { GroupUpdateInput, } from 'src/app/model/entities/group'; import { PageWithHistoryDataService } from 'src/app/core/base/page-with-history.data.service'; -import { Domain } from 'src/app/model/entities/domain'; @Injectable() export class GroupsDataService diff --git a/web/src/app/modules/admin/groups/groups.page.spec.ts b/web/src/app/modules/admin/groups/groups.page.spec.ts index f1ba746..efbb09f 100644 --- a/web/src/app/modules/admin/groups/groups.page.spec.ts +++ b/web/src/app/modules/admin/groups/groups.page.spec.ts @@ -1,18 +1,18 @@ -import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { ApiKeysPage } from "src/app/modules/admin/administration/api-keys/api-keys.page"; -import { SharedModule } from "src/app/modules/shared/shared.module"; -import { TranslateModule } from "@ngx-translate/core"; -import { AuthService } from "src/app/service/auth.service"; -import { KeycloakService } from "keycloak-angular"; -import { ErrorHandlingService } from "src/app/service/error-handling.service"; -import { ToastService } from "src/app/service/toast.service"; -import { ConfirmationService, MessageService } from "primeng/api"; -import { ActivatedRoute } from "@angular/router"; -import { of } from "rxjs"; -import { PageDataService } from "src/app/core/base/page.data.service"; -import { ApiKeysDataService } from "src/app/modules/admin/administration/api-keys/api-keys.data.service"; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ApiKeysPage } from 'src/app/modules/admin/administration/api-keys/api-keys.page'; +import { SharedModule } from 'src/app/modules/shared/shared.module'; +import { TranslateModule } from '@ngx-translate/core'; +import { AuthService } from 'src/app/service/auth.service'; +import { KeycloakService } from 'keycloak-angular'; +import { ErrorHandlingService } from 'src/app/service/error-handling.service'; +import { ToastService } from 'src/app/service/toast.service'; +import { ConfirmationService, MessageService } from 'primeng/api'; +import { ActivatedRoute } from '@angular/router'; +import { of } from 'rxjs'; +import { PageDataService } from 'src/app/core/base/page.data.service'; +import { GroupsDataService } from 'src/app/modules/admin/groups/groups.data.service'; -describe("ApiKeysComponent", () => { +describe('ApiKeysComponent', () => { let component: ApiKeysPage; let fixture: ComponentFixture; @@ -35,7 +35,7 @@ describe("ApiKeysComponent", () => { }, { provide: PageDataService, - useClass: ApiKeysDataService, + useClass: GroupsDataService, }, ], }).compileComponents(); @@ -45,7 +45,7 @@ describe("ApiKeysComponent", () => { fixture.detectChanges(); }); - it("should create", () => { + it('should create', () => { expect(component).toBeTruthy(); }); }); diff --git a/web/src/app/modules/admin/groups/history/history.component.spec.ts b/web/src/app/modules/admin/groups/history/history.component.spec.ts index c0679d0..58a09e0 100644 --- a/web/src/app/modules/admin/groups/history/history.component.spec.ts +++ b/web/src/app/modules/admin/groups/history/history.component.spec.ts @@ -11,10 +11,10 @@ import { ConfirmationService, MessageService } from 'primeng/api'; import { ActivatedRoute } from '@angular/router'; import { of } from 'rxjs'; import { PageDataService } from 'src/app/core/base/page.data.service'; -import { IpListDataService } from 'src/app/modules/admin/tools/ip-list/ip-list.data.service'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { PageColumns } from 'src/app/core/base/page.columns'; import { MockPageColumns } from 'src/app/modules/shared/test/page.columns.mock'; +import { GroupsDataService } from 'src/app/modules/admin/groups/groups.data.service'; describe('HistoryComponent', () => { let component: HistoryComponent; @@ -43,7 +43,7 @@ describe('HistoryComponent', () => { }, { provide: PageDataService, - useClass: IpListDataService, + useClass: GroupsDataService, }, { provide: PageColumns, diff --git a/web/src/app/modules/admin/short-urls/history/history.component.spec.ts b/web/src/app/modules/admin/short-urls/history/history.component.spec.ts index c0679d0..42560dc 100644 --- a/web/src/app/modules/admin/short-urls/history/history.component.spec.ts +++ b/web/src/app/modules/admin/short-urls/history/history.component.spec.ts @@ -11,10 +11,10 @@ import { ConfirmationService, MessageService } from 'primeng/api'; import { ActivatedRoute } from '@angular/router'; import { of } from 'rxjs'; import { PageDataService } from 'src/app/core/base/page.data.service'; -import { IpListDataService } from 'src/app/modules/admin/tools/ip-list/ip-list.data.service'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { PageColumns } from 'src/app/core/base/page.columns'; import { MockPageColumns } from 'src/app/modules/shared/test/page.columns.mock'; +import { ShortUrlsDataService } from 'src/app/modules/admin/short-urls/short-urls.data.service'; describe('HistoryComponent', () => { let component: HistoryComponent; @@ -43,7 +43,7 @@ describe('HistoryComponent', () => { }, { provide: PageDataService, - useClass: IpListDataService, + useClass: ShortUrlsDataService, }, { provide: PageColumns, diff --git a/web/src/app/modules/admin/short-urls/short-urls.page.ts b/web/src/app/modules/admin/short-urls/short-urls.page.ts index cea66bb..460c05e 100644 --- a/web/src/app/modules/admin/short-urls/short-urls.page.ts +++ b/web/src/app/modules/admin/short-urls/short-urls.page.ts @@ -11,10 +11,7 @@ import { Filter } from 'src/app/model/graphql/filter/filter.model'; import QrCodeWithLogo from 'qrcode-with-logos'; import { FileUpload, FileUploadHandlerEvent } from 'primeng/fileupload'; import { ConfigService } from 'src/app/service/config.service'; -import { - ResolvedTableColumn, - TableColumn, -} from 'src/app/modules/shared/components/table/table.model'; +import { ResolvedTableColumn } from 'src/app/modules/shared/components/table/table.model'; @Component({ selector: 'app-short-urls', diff --git a/web/src/app/modules/shared/components/table/table.component.html b/web/src/app/modules/shared/components/table/table.component.html index 931ff10..306a5b7 100644 --- a/web/src/app/modules/shared/components/table/table.component.html +++ b/web/src/app/modules/shared/components/table/table.component.html @@ -74,7 +74,7 @@ + *ngIf="column.sortable !== false"> diff --git a/web/src/assets/i18n/de.json b/web/src/assets/i18n/de.json index abff6b2..839c5ad 100644 --- a/web/src/assets/i18n/de.json +++ b/web/src/assets/i18n/de.json @@ -78,6 +78,9 @@ "header": { "logout": "Ausloggen" }, + "history": { + "header": "Historie" + }, "permission_descriptions": { "short_urls": "Alle URLs sehen", "short_urls.by_assignment": "Alle Kurz-URLs anzeigen, die einer Gruppe nach Rolle zugewiesen sind", @@ -117,6 +120,97 @@ "users.delete": "Löschen", "users.update": "Bearbeiten" }, + "primeng": { + "accept": "Ja", + "addRule": "Regel hinzufügen", + "after": "Nachher", + "apply": "Anwenden", + "before": "Vorher", + "cancel": "Abbrechen", + "choose": "Wählen", + "clear": "Zurücksetzen", + "contains": "Enthält", + "dayNames": [ + "Sonntag", + "Montag", + "Dienstag", + "Mittwoch", + "Donnerstag", + "Freitag", + "Samstag" + ], + "dayNamesMin": [ + "So", + "Mo", + "Di", + "Mi", + "Do", + "Fr", + "Sa" + ], + "dayNamesShort": [ + "Son", + "Mon", + "Die", + "Mit", + "Don", + "Fre", + "Sam" + ], + "emptyFilterMessage": "Keine Ergebnisse gefunden", + "emptyMessage": "Keine Ergebnisse gefunden", + "endsWith": "Ended mit", + "equals": "Gleich", + "gt": "Größer als", + "gte": "Größer als oder gleich", + "is": "Ist", + "isNot": "Ist nicht", + "lt": "Kleiner als", + "lte": "Kleiner als oder gleich", + "matchAll": "Passend zu allem", + "matchAny": "Passend zu jedem", + "medium": "Mittel", + "monthNames": [ + "Januar", + "Februar", + "März", + "April", + "Mai", + "Juni", + "Juli", + "August", + "September", + "Oktober", + "November", + "Dezember" + ], + "monthNamesShort": [ + "Jan", + "Feb", + "Mär", + "Apr", + "Mai", + "Jun", + "Jul", + "Aug", + "Sep", + "Okt", + "Nov", + "Dez" + ], + "noFilter": "Kein Filter", + "notContains": "Enthält nicht", + "notEquals": "Ungleich", + "passwordPrompt": "Passwort eingeben", + "reject": "Nein", + "removeRule": "Regel entfernen", + "startsWith": "Beginnt mit", + "strong": "Stark", + "today": "Heute", + "upload": "Hochladen", + "weak": "Woche", + "weekHeader": "Wk" + }, "role": { "count_header": "Rolle(n)" }, @@ -142,20 +236,24 @@ "create": "Erstellen", "delete": "Löschen", "hide_deleted": "Gelöschte verbergen", + "history": "Historie", "no_entries_found": "Keine Einträge gefunden", "of": "von", "reset_filters": "Filter zurücksetzen", "reset_sort": "Sortierung zurücksetzen", "restore": "Wiederherstellen", + "search": "Suchen", "select_columns": "Spalten auswählen", "show_deleted": "Gelöschte anzeigen", "to": "bis", "update": "Bearbeiten" }, + "technical_demo_banner": "Diese Seite ist eine technische Vorschau. Funktionalität steht derzeit über Design – es kann zu Unvollständigkeiten oder visuellen Inkonsistenzen kommen.", "user": { "assign_roles": "Rollen zuweisen", "count_header": "Benutzer", "email": "E-Mail", + "keycloak_id": "Keycloak Id", "user": "Benutzer", "username": "Benutzername" } diff --git a/web/src/assets/i18n/en.json b/web/src/assets/i18n/en.json index d8bfea7..bc91320 100644 --- a/web/src/assets/i18n/en.json +++ b/web/src/assets/i18n/en.json @@ -78,6 +78,9 @@ "header": { "logout": "Logout" }, + "history": { + "header": "History" + }, "permission_descriptions": { "short_urls": "See all URLs", "short_urls.by_assignment": "See all short urls assigned to a group by role", @@ -117,6 +120,97 @@ "users.delete": "Delete", "users.update": "Update" }, + "primeng": { + "accept": "Yes", + "addRule": "Add Rule", + "after": "After", + "apply": "Apply", + "before": "Before", + "cancel": "Cancel", + "choose": "Choose", + "clear": "Clear", + "contains": "Contains", + "dayNames": [ + "Sunday", + "Monday", + "Tuesday", + "Wednesday", + "Thursday", + "Friday", + "Saturday" + ], + "dayNamesMin": [ + "Su", + "Mo", + "Tu", + "We", + "Th", + "Fr", + "Sa" + ], + "dayNamesShort": [ + "Sun", + "Mon", + "Tue", + "Wed", + "Thu", + "Fri", + "Sat" + ], + "emptyFilterMessage": "No results found", + "emptyMessage": "No results found", + "endsWith": "Ends with", + "equals": "Equals", + "gt": "Greater than", + "gte": "Great then or equals", + "is": "Is", + "isNot": "Is not", + "lt": "Less than", + "lte": "Less than or equal to", + "matchAll": "Match All", + "matchAny": "Match Any", + "medium": "Medium", + "monthNames": [ + "January", + "February", + "March", + "April", + "May", + "June", + "July", + "August", + "September", + "October", + "November", + "December" + ], + "monthNamesShort": [ + "Jan", + "Feb", + "Mar", + "Apr", + "May", + "Jun", + "Jul", + "Aug", + "Sep", + "Oct", + "Nov", + "Dec" + ], + "noFilter": "No Filter", + "notContains": "Not contains", + "notEquals": "Not equals", + "passwordPrompt": "Enter a password", + "reject": "No", + "removeRule": "Remove Rule", + "startsWith": "Starts with", + "strong": "Strong", + "today": "Today", + "upload": "Upload", + "weak": "Weak", + "weekHeader": "Wk" + }, "role": { "count_header": "Role(s)" }, @@ -142,20 +236,24 @@ "create": "Create", "delete": "Delete", "hide_deleted": "Hide deleted", + "history": "History", "no_entries_found": "No entries found", "of": "of", "reset_filters": "Reset filters", "reset_sort": "Reset sort", "restore": "Restore", + "search": "Search", "select_columns": "Select columns", "show_deleted": "Show deleted", "to": "to", "update": "Update" }, + "technical_demo_banner": "This page is a technical preview. Functionality currently takes precedence over design - there may be incompleteness or visual inconsistencies.", "user": { "assign_roles": "Assign roles", "count_header": "User(s)", "email": "E-Mail", + "keycloak_id": "Keycloak Id", "user": "User", "username": "Username" }