diff --git a/alfa-client/apps/admin/src/styles.scss b/alfa-client/apps/admin/src/styles.scss index 9a4448d0f9c72e50e1aac1b190f36cf3118d060a..96c11f976ff90e09cd3bfd7a1bbfeee02560a841 100644 --- a/alfa-client/apps/admin/src/styles.scss +++ b/alfa-client/apps/admin/src/styles.scss @@ -6,10 +6,17 @@ @import 'libs/design-system/src/lib/tailwind-preset/root.css'; @import 'libs/ui/src/lib/font/font_material'; +@import 'variables'; @include mat.all-component-typographies(); @include mat.core(); +@include mat.all-component-themes($alfaTheme); + +body.dark { + @include mat.all-component-colors($alfaDarkTheme); +} + .heading-1 { @apply text-3xl font-medium text-text; } diff --git a/alfa-client/libs/admin/settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-list/organisationseinheit-list.component.html b/alfa-client/libs/admin/settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-list/organisationseinheit-list.component.html index a42709e0e2447833b65c7c6b658cbd2bc56b6b15..0887f0c89c94d726f6f0c2056c437977f5e2e6f9 100644 --- a/alfa-client/libs/admin/settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-list/organisationseinheit-list.component.html +++ b/alfa-client/libs/admin/settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-list/organisationseinheit-list.component.html @@ -2,7 +2,10 @@ <ods-list-item *ngFor="let organisationsEinheitResource of organisationsEinheitResources" [routerLink]="getEncodedSelfLink(organisationsEinheitResource)" - [class.text-red-500]="syncResultIsNotOk(organisationsEinheitResource)" + [class.text-red-500]=" + organisationsEinheitResource.syncResult === AdminOrganisationsEinheitSyncResult.NOT_FOUND_IN_PVOG || + organisationsEinheitResource.syncResult === AdminOrganisationsEinheitSyncResult.ORGANISATIONSEINHEIT_ID_NOT_UNIQUE + " data-test-id="organisations-einheit-list-item" > <dl class="flex-1 basis-3/4 font-semibold" [class.pl-4]="organisationsEinheitResource.isChild"> @@ -19,10 +22,16 @@ <dt class="sr-only">Synchronisationsergebnis</dt> <dd class="mt-1"> <ods-exclamation-icon - *ngIf="syncResultIsNotOk(organisationsEinheitResource)" + *ngIf="organisationsEinheitResource.syncResult === AdminOrganisationsEinheitSyncResult.NOT_FOUND_IN_PVOG" matTooltip="Organisationseinheit wurde nicht in den PVOG-Daten gefunden." size="small" /> + <ods-exclamation-icon + *ngIf=" + organisationsEinheitResource.syncResult === AdminOrganisationsEinheitSyncResult.ORGANISATIONSEINHEIT_ID_NOT_UNIQUE + " + size="small" + /> </dd> </dl> </ods-list-item> diff --git a/alfa-client/libs/admin/settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-list/organisationseinheit-list.component.spec.ts b/alfa-client/libs/admin/settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-list/organisationseinheit-list.component.spec.ts index fa4d2943bd5e3e46e03c4d532379ac3a077290c9..e39d5d9c2c40866380db9bf83538d04b5d7feace 100644 --- a/alfa-client/libs/admin/settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-list/organisationseinheit-list.component.spec.ts +++ b/alfa-client/libs/admin/settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-list/organisationseinheit-list.component.spec.ts @@ -48,7 +48,7 @@ describe('OrganisationsEinheitListComponent', () => { describe('input', () => { describe('organisationsEinheitResources', () => { const organisationsEinheitResource: AdminOrganisationsEinheitResource = createAdminOrganisationsEinheitResource( - AdminOrganisationsEinheitSyncResult.NAME_MISMATCH, + AdminOrganisationsEinheitSyncResult.NOT_FOUND_IN_PVOG, ); beforeEach(() => { @@ -107,26 +107,6 @@ describe('OrganisationsEinheitListComponent', () => { expect(component.organisationsEinheitResources[2].isChild).toBeTruthy(); }); }); - describe('syncResultIsNotOk', () => { - it('should return true', () => { - const organisationsEinheitResource: AdminOrganisationsEinheitResource = createAdminOrganisationsEinheitResource( - AdminOrganisationsEinheitSyncResult.NAME_MISMATCH, - ); - const result: boolean = component.syncResultIsNotOk(organisationsEinheitResource); - - expect(result).toBeTruthy(); - }); - - it('should return false', () => { - const organisationsEinheitResource: AdminOrganisationsEinheitResource = createAdminOrganisationsEinheitResource( - AdminOrganisationsEinheitSyncResult.OK, - ); - const result: boolean = component.syncResultIsNotOk(organisationsEinheitResource); - - expect(result).toBeFalsy(); - }); - }); - describe('getEncodedSelfLink', () => { it('should return encoded self link', () => { const organisationsEinheitResource: AdminOrganisationsEinheitResource = createAdminOrganisationsEinheitResource(); diff --git a/alfa-client/libs/admin/settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-list/organisationseinheit-list.component.ts b/alfa-client/libs/admin/settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-list/organisationseinheit-list.component.ts index aab7414ed051b840b30523baa114828fba2a4fc6..9faaabdd00916cb80761e1833a2d9fbe03375add 100644 --- a/alfa-client/libs/admin/settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-list/organisationseinheit-list.component.ts +++ b/alfa-client/libs/admin/settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-list/organisationseinheit-list.component.ts @@ -20,6 +20,8 @@ export class OrganisationsEinheitListComponent { this.moveChildrenIntoParentLevel(list); } + public readonly AdminOrganisationsEinheitSyncResult = AdminOrganisationsEinheitSyncResult; + moveChildrenIntoParentLevel(list: AdminOrganisationsEinheitResource[]): void { list.forEach((parent) => { this._organisationsEinheitResources.push(parent); @@ -33,10 +35,6 @@ export class OrganisationsEinheitListComponent { }); } - syncResultIsNotOk(organisationsEinheitResource: AdminOrganisationsEinheitResource): boolean { - return organisationsEinheitResource.syncResult !== AdminOrganisationsEinheitSyncResult.OK; - } - getEncodedSelfLink(organisationsEinheitResource: AdminOrganisationsEinheitResource): ResourceUri { const resourceUri: ResourceUri = getLink(organisationsEinheitResource, OrganisationsEinheitLinkRel.SELF).href; return encodeUrlForEmbedding(resourceUri);