diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/collaboration-request-form.component.html b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/collaboration-request-form.component.html index f15efcdd5674959ec1c8a7778851068ba491a31b..d2cb5eb2d470b1275c22300d5440f78d5465c5ed 100644 --- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/collaboration-request-form.component.html +++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/collaboration-request-form.component.html @@ -2,7 +2,7 @@ [fieldControl]="formService.form.controls.organisationseinheit" ></alfa-organisations-einheit-container> -<form [formGroup]="formService.form" class="flex flex-col gap-2"> +<form [formGroup]="formService.form" class="mt-4 flex flex-col gap-2"> <ods-text-editor label="Titel" [formControlName]="formServiceClass.FIELD_TITLE" @@ -15,7 +15,7 @@ ></ods-textarea-editor> </form> -<div class="flex items-center gap-6"> +<div class="mt-4 flex items-center gap-6"> <ods-button text="Zuarbeit anfragen" dataTestId="collaboration-request-send-button" diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit-container.component.html b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit-container.component.html index 5b9d6a0bf087f6f846a3c283d11db44a04cb89a6..66d554560ddfc5b1b8331c115917dc6851c7493c 100644 --- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit-container.component.html +++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit-container.component.html @@ -1,9 +1,11 @@ -<ods-search-icon /> <ng-container *ngIf="organisationsEinheitResource; else searchButton"> - <alfa-organisations-einheit - data-test-id="organisations-einheit-in-collaboration" - [organisationsEinheitResource]="organisationsEinheitResource" - ></alfa-organisations-einheit> + <div class="flex items-center gap-3"> + <ods-search-icon class="flex-none" /> + <alfa-organisations-einheit + data-test-id="organisations-einheit-in-collaboration" + [organisationsEinheitResource]="organisationsEinheitResource" + ></alfa-organisations-einheit> + </div> </ng-container> <ng-template #searchButton> <div class="flex items-center gap-3"> diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit-container.component.ts b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit-container.component.ts index 0fadb4dff575d15ecdc1eb77b684c3ca73d54440..872efeefb5fb60b6f26fae4c2800bea525b4149c 100644 --- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit-container.component.ts +++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit-container.component.ts @@ -3,13 +3,17 @@ import { OrganisationsEinheitService, } from '@alfa-client/collaboration-shared'; import { OzgcloudDialogService } from '@alfa-client/ui'; -import { DialogRef } from '@angular/cdk/dialog'; +import { DialogConfig, DialogRef } from '@angular/cdk/dialog'; import { Component, Input, ViewContainerRef } from '@angular/core'; import { FormControl } from '@angular/forms'; import { ResourceUri, getUrl } from '@ngxp/rest'; import { first } from 'rxjs'; import { SearchOrganisationsEinheitContainerComponent } from '../../../search-organisations-einheit-container/search-organisations-einheit-container.component'; +const DIALOG_CONFIG: DialogConfig = { + backdropClass: ['backdrop-blur-1', 'bg-greybackdrop'], +}; + @Component({ selector: 'alfa-organisations-einheit-container', templateUrl: './organisations-einheit-container.component.html', @@ -32,6 +36,8 @@ export class OrganisationsEinheitContainerComponent { this.dialogService.openInCallingComponentContext<SearchOrganisationsEinheitContainerComponent>( SearchOrganisationsEinheitContainerComponent, this.viewContainerRef, + null, + DIALOG_CONFIG, ); this.listenToDialogClose(); } diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit/organisations-einheit.component.html b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit/organisations-einheit.component.html index 4d97b76b03d4110bf86e0d7a198095e24a94644b..57d9280a6f6c3909e5d5c4494a245a803517d7a3 100644 --- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit/organisations-einheit.component.html +++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit/organisations-einheit.component.html @@ -1,2 +1,2 @@ -<p>{{ name }}</p> +<p class="font-bold">{{ name }}</p> <p>{{ address }}</p> diff --git a/alfa-client/libs/collaboration/src/lib/collaboration.module.ts b/alfa-client/libs/collaboration/src/lib/collaboration.module.ts index 756603f0f9f8ba2ec2a979a5ea677afb7d1bd583..94daf75f687d8eaec6deef4506d9225e174934b2 100644 --- a/alfa-client/libs/collaboration/src/lib/collaboration.module.ts +++ b/alfa-client/libs/collaboration/src/lib/collaboration.module.ts @@ -10,8 +10,8 @@ import { CollaborationIconComponent, InstantSearchComponent, SaveIconComponent, + SearchIconComponent, } from '@ods/system'; -import { SearchIconComponent } from 'libs/design-system/src/lib/icons/search-icon/search-icon.component'; import { CollaborationInVorgangContainerComponent } from './collaboration-in-vorgang-container/collaboration-in-vorgang-container.component'; import { CollaborationRequestFormComponent } from './collaboration-in-vorgang-container/collaboration-request-form/collaboration-request-form.component'; import { OrganisationsEinheitContainerComponent } from './collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit-container.component'; diff --git a/alfa-client/libs/collaboration/src/lib/search-organisations-einheit-container/search-organisations-einheit-form/search-organisations-einheit-form.component.ts b/alfa-client/libs/collaboration/src/lib/search-organisations-einheit-container/search-organisations-einheit-form/search-organisations-einheit-form.component.ts index aeb0eac486bf69940afb9f119a695b00ca8c61d4..2e49ca660d004820de961dd252ef7ed156040a1a 100644 --- a/alfa-client/libs/collaboration/src/lib/search-organisations-einheit-container/search-organisations-einheit-form/search-organisations-einheit-form.component.ts +++ b/alfa-client/libs/collaboration/src/lib/search-organisations-einheit-container/search-organisations-einheit-form/search-organisations-einheit-form.component.ts @@ -1,6 +1,6 @@ import { OrganisationsEinheitResource } from '@alfa-client/collaboration-shared'; import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { InstantSearchResult } from 'libs/design-system/src/lib/instant-search/instant-search/instant-search.model'; +import { InstantSearchResult } from '@ods/system'; import { SearchOrganisationsEinheitFormService } from '../search-organisations-einheit.formservice'; @Component({ diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts index 9a59b13cbc25c6174275daa3727bdd8388fb0dc4..f70af207f2b3cacf15ecef89b3728dd830f6bc64 100644 --- a/alfa-client/libs/design-system/src/index.ts +++ b/alfa-client/libs/design-system/src/index.ts @@ -19,8 +19,10 @@ export * from './lib/icons/exclamation-icon/exclamation-icon.component'; export * from './lib/icons/file-icon/file-icon.component'; export * from './lib/icons/iconVariants'; export * from './lib/icons/save-icon/save-icon.component'; +export * from './lib/icons/search-icon/search-icon.component'; export * from './lib/icons/send-icon/send-icon.component'; export * from './lib/icons/spinner-icon/spinner-icon.component'; export * from './lib/icons/stamp-icon/stamp-icon.component'; export * from './lib/instant-search/instant-search/instant-search.component'; +export * from './lib/instant-search/instant-search/instant-search.model'; export * from './lib/testbtn/testbtn.component'; 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 1c7b298d5afa17aae60ab57b36b9152cec514121..2fe29cc4a320a6a10b8dec75884f5f423b549e1d 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 @@ -100,6 +100,12 @@ module.exports = { error: 'hsl(var(--color-error))', focus: 'hsl(var(--color-focus))', }, + backgroundColor: { + greybackdrop: 'rgb(229, 229, 229, 0.95)', + }, + backdropBlur: { + 1: '1px', + }, }, }, plugins: [],