Merge pull request 'OZG-6311 OZG-6534 Add styling' (#740) from OZG-6311-styling into master

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/alfa/pulls/740


Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>

alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/collaboration-in-vorgang.component.html

@@ -26,6 +26,13 @@
 </ng-container>
 <ng-container *ngIf="collaboration">
   <div data-test-id="collaboration-request-result">
-    Result: {{ collaboration | json }} OrganisationsEinheit: {{ organisationsEinheit | json }}
+    <div class="flex items-center gap-3">
+      <ods-office-icon size="large" class="fill-text" />
+      <alfa-organisations-einheit
+        [organisationsEinheitResource]="organisationsEinheit"
+      ></alfa-organisations-einheit>
+    </div>
+    <h4 class="my-6 text-xl font-medium">{{ collaboration.titel }}</h4>
+    <p class="text-base">{{ collaboration.anfrage }}</p>
   </div>
 </ng-container>

alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/collaboration-in-vorgang.component.spec.ts

@@ -13,7 +13,7 @@ import {
   triggerEvent,
 } from '@alfa-client/test-utils';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { ButtonComponent, CollaborationIconComponent } from '@ods/system';
+import { ButtonComponent, CollaborationIconComponent, OfficeIconComponent } from '@ods/system';
 import {
   createCollaboration,
   createCollaborationListResource,
@@ -21,6 +21,7 @@ import {
 import { getDataTestIdAttributeOf, getDataTestIdOf } from 'libs/tech-shared/test/data-test';
 import { MockComponent } from 'ng-mocks';
 import { CollaborationRequestFormComponent } from '../collaboration-request-form/collaboration-request-form.component';
+import { OrganisationsEinheitComponent } from '../collaboration-request-form/organisations-einheit-container/organisations-einheit/organisations-einheit.component';
 import { CollaborationInVorgangComponent } from './collaboration-in-vorgang.component';
 
 describe('CollaborationInVorgangComponent', () => {
@@ -41,6 +42,8 @@ describe('CollaborationInVorgangComponent', () => {
         MockComponent(ButtonComponent),
         MockComponent(CollaborationRequestFormComponent),
         MockComponent(CollaborationIconComponent),
+        MockComponent(OfficeIconComponent),
+        MockComponent(OrganisationsEinheitComponent),
       ],
     }).compileComponents();
 

alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit-container.component.html

@@ -2,7 +2,7 @@
   *ngIf="organisationsEinheitResource$ | async as organisationsEinheitResource; else searchButton"
 >
   <div class="flex items-center gap-3">
-    <ods-office-icon size="large" class="flex-none" />
+    <ods-office-icon size="large" class="fill-text" />
     <alfa-organisations-einheit
       data-test-id="organisations-einheit-in-collaboration"
       [organisationsEinheitResource]="organisationsEinheitResource"