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/apps/alfa-e2e/src/e2e/main-tests/vorgang-zusammenarbeit/vorgang-zusammenarbeit-anfragen.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-zusammenarbeit/vorgang-zusammenarbeit-anfragen.cy.ts
index ff47d4f57c44947ca091adfd2b7075fa92013942..325b7e256a1d99dc658fd348654578aba928e480 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-zusammenarbeit/vorgang-zusammenarbeit-anfragen.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-zusammenarbeit/vorgang-zusammenarbeit-anfragen.cy.ts
@@ -15,13 +15,12 @@ import { buildVorgang, initVorgaenge, objectIds } from '../../../support/vorgang
registerLocaleData(localeDe, 'de', localeDeExtra);
-describe('Vorgang Zusammenarbeit anfragen', () => {
+describe.skip('Vorgang Zusammenarbeit anfragen', () => {
const mainPage: MainPage = new MainPage();
const vorgangList: VorgangListE2EComponent = mainPage.getVorgangList();
const vorgangPage: VorgangPage = new VorgangPage();
- const zusammenarbeitContainer: VorgangZusammenarbeitE2EComponent =
- vorgangPage.getZusammenarbeitContainer();
+ const zusammenarbeitContainer: VorgangZusammenarbeitE2EComponent = vorgangPage.getZusammenarbeitContainer();
const zusammenarbeitVorgang: VorgangE2E = {
...buildVorgang(objectIds[0], 'Zusammenarbeit Vorgang'),
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 0f4f360223fb5106df140d3cc0de2d0df9b8abe7..3a7d8487416e4ca5319f29e07a2a93ec71400371 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
@@ -49,7 +49,7 @@ describe('OrganisationsEinheitListComponent', () => {
describe('input', () => {
describe('organisationsEinheitResources', () => {
- organisationsEinheitResource.syncResult = AdminOrganisationsEinheitSyncResult.NAME_MISMATCH;
+ organisationsEinheitResource.syncResult = AdminOrganisationsEinheitSyncResult.NOT_FOUND_IN_PVOG;
let listItemElement: HTMLElement;
let nameElement: Element;
@@ -108,23 +108,6 @@ describe('OrganisationsEinheitListComponent', () => {
expect(component.organisationsEinheitResources[2].isChild).toBeTruthy();
});
});
- describe('syncResultIsNotOk', () => {
- it('should return true', () => {
- organisationsEinheitResource.syncResult = AdminOrganisationsEinheitSyncResult.NAME_MISMATCH;
-
- const result: boolean = component.syncResultIsNotOk(organisationsEinheitResource);
-
- expect(result).toBeTruthy();
- });
-
- it('should return false', () => {
- organisationsEinheitResource.syncResult = AdminOrganisationsEinheitSyncResult.OK;
-
- const result: boolean = component.syncResultIsNotOk(organisationsEinheitResource);
-
- expect(result).toBeFalsy();
- });
- });
describe('getEncodedSelfLink', () => {
it('should return encoded self link', () => {
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 2c9ff178c8452d1abc875a83a15507c8e8480790..0c532ac0041273d0ffbe8476e455eaea4fe62a1c 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 = toResourceUri(organisationsEinheitResource, OrganisationsEinheitLinkRel.SELF);
return encodeUrlForEmbedding(resourceUri);
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/collaboration-in-vorgang.component.html b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/collaboration-in-vorgang.component.html
index 3cc496b52ac25e9d57bd7e6c5ea642ab79353817..dc9ab9a02ccaaa690f1fe6c3d20eb27246766cdd 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/collaboration-in-vorgang.component.html
+++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/collaboration-in-vorgang.component.html
@@ -5,12 +5,14 @@
}"
>
<alfa-organisations-einheit-container
+ class="flex flex-1 flex-col"
*ngIf="showOrganisationsEinheitAnfrageButton"
data-test-id="organisations-einheit-container"
[vorgang]="vorgang"
[collaborationListResource]="collaborationStateListResource.resource"
></alfa-organisations-einheit-container>
<alfa-externe-fachstelle-container
+ class="flex flex-1 flex-col"
*ngIf="showExterneFachstelleAnfrageButton"
data-test-id="externe-fachstelle-container"
[vorgang]="vorgang"
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.html b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.html
index f97b38f009433d90a0f84a07482faf148b615b29..6cba5c87759822517c618a393d7534359027e339 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.html
+++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.html
@@ -11,12 +11,11 @@
></alfa-collaboration-request-form>
</ng-container>
<ng-template #anfrageErstellenButton>
- <div class="flex w-111 justify-between bg-background-100 p-4 shadow-md">
+ <div class="flex flex-1 gap-3 border border-grayborder bg-background-100 p-4 shadow shadow-grayborder">
<ods-external-unit-icon />
- <div class="flex w-44 flex-col text-base">
+ <div class="flex flex-1 flex-col text-base">
<p class="text-primary">Externe Fachstelle</p>
- <p class="text-text">Private Organisation,</p>
- <p class="text-text">Verein, Schule</p>
+ <p class="text-text">Private Organisation, Verein, Schule</p>
</div>
<alfa-anfrage-erstellen-button data-test-id="externe-fachstelle-anfrage-erstellen-button" (clickEmitter)="showForm()" />
</div>
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/organisations-einheit-container/organisations-einheit-container.component.html b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/organisations-einheit-container/organisations-einheit-container.component.html
index 85b5867ac43b95ec7909eefc849be1aa28f9a0cf..c0fbb4fd42809f2ab44f3b3ceb4a6bfdfd89bacd 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/organisations-einheit-container/organisations-einheit-container.component.html
+++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/organisations-einheit-container/organisations-einheit-container.component.html
@@ -11,12 +11,11 @@
></alfa-collaboration-request-form>
</ng-container>
<ng-template #anfrageErstellenButton>
- <div class="flex w-111 justify-between bg-background-100 p-4 shadow-md">
+ <div class="flex flex-1 gap-3 border border-grayborder bg-background-100 bg-background-100 p-4 p-4 shadow shadow-grayborder">
<ods-public-administration-icon />
- <div class="flex w-44 flex-col text-base">
+ <div class="flex flex-1 flex-col text-base">
<p class="text-primary">Öffentliche Verwaltung</p>
- <p class="text-text">Kommune, Amt,</p>
- <p class="text-text">Ministerium</p>
+ <p class="text-text">Kommune, Amt, Ministerium</p>
</div>
<alfa-anfrage-erstellen-button data-test-id="organisations-einheit-anfrage-erstellen-button" (clickEmitter)="showForm()" />
</div>
diff --git a/alfa-client/libs/design-system/src/lib/tailwind-preset/tailwind.config.js b/alfa-client/libs/design-system/src/lib/tailwind-preset/tailwind.config.js
index c95f46b8f1d743ae68a353fa87d645f7f36edc6e..88f03501ec468c7aea37ab033a35ce86c7d57280 100644
--- a/alfa-client/libs/design-system/src/lib/tailwind-preset/tailwind.config.js
+++ b/alfa-client/libs/design-system/src/lib/tailwind-preset/tailwind.config.js
@@ -45,9 +45,6 @@ module.exports = {
maxHeight: {
120: '480px',
},
- width: {
- 111: '444px',
- },
colors: {
ozgblue: {
50: 'hsl(200, 100%, 96%)',