From 913ec864ff0880f53788cea037caf409d3c36c7d Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <kontakt@webkreation.de>
Date: Tue, 11 Feb 2025 20:18:24 +0100
Subject: [PATCH] OZG-6185 optimize bescheid layout and buttons
---
.../bescheid-wizard-container.component.html | 4 ++--
.../bescheid-wizard-abschliessen-button.component.ts | 11 +++++++++--
...cheid-wizard-create-document-button.component.html | 2 +-
...eid-wizard-dokumente-hochladen-form.component.html | 2 +-
...cheid-wizard-upload-document-button.component.html | 2 +-
...escheid-wizard-upload-document-button.component.ts | 1 +
.../file-upload-editor.component.html | 2 +-
.../single-file-upload-editor.component.html | 2 +-
8 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.html
index 55c594db25..d63d7046e6 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.html
@@ -27,7 +27,7 @@
<div class="fixed inset-0 z-10 w-screen overflow-y-auto">
<div class="flex h-full items-center justify-center p-8">
<div
- class="relative h-full w-full max-w-7xl transform overflow-hidden rounded-lg bg-background-200 px-6 py-10 text-left shadow-xl transition-all"
+ class="relative h-full w-full max-w-7xl transform overflow-hidden rounded-lg bg-background-200 py-9 pl-6 pr-9 text-left shadow-xl transition-all"
>
@let bescheidStateResource = bescheidDraftStateResource$ | async;
<ods-button
@@ -37,7 +37,7 @@
(clickEmitter)="cancelWizard(bescheidStateResource.resource)"
dataTestId="close-bescheid"
>
- <ods-close-icon icon/>
+ <ods-close-icon icon />
</ods-button>
<alfa-bescheid-wizard
[vorgangWithEingangResource]="vorgangWithEingangResource"
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/abschliessen-button/bescheid-wizard-abschliessen-button.component.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/abschliessen-button/bescheid-wizard-abschliessen-button.component.ts
index 00674092b0..c6622e64f1 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/abschliessen-button/bescheid-wizard-abschliessen-button.component.ts
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/abschliessen-button/bescheid-wizard-abschliessen-button.component.ts
@@ -27,12 +27,19 @@ import { VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
import { DialogRef } from '@angular/cdk/dialog';
import { Component, EventEmitter, inject, Input, Output, ViewContainerRef } from '@angular/core';
import { filter } from 'rxjs';
-import { isDialogSuccessfullyCompleted, OzgcloudDialogCommandResult, } from '../../../../../../../ui/src/lib/ui/ozgcloud-dialog/ozgcloud-dialog.result';
-import { AbschliessenDialogData, BescheidWizardAbschliessenDialogContainerComponent, } from '../abschliessen-dialog-container/bescheid-wizard-abschliessen-dialog-container.component';
+import {
+ isDialogSuccessfullyCompleted,
+ OzgcloudDialogCommandResult,
+} from '../../../../../../../ui/src/lib/ui/ozgcloud-dialog/ozgcloud-dialog.result';
+import {
+ AbschliessenDialogData,
+ BescheidWizardAbschliessenDialogContainerComponent,
+} from '../abschliessen-dialog-container/bescheid-wizard-abschliessen-dialog-container.component';
@Component({
selector: 'alfa-bescheid-wizard-abschliessen-button',
templateUrl: './bescheid-wizard-abschliessen-button.component.html',
+ styles: [':host {@apply flex-1 flex items-end}'],
})
export class BescheidWizardAbschliessenButtonComponent {
@Input() vorgangWithEingangResource: VorgangWithEingangResource;
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/create-document-button-container/create-document-button/bescheid-wizard-create-document-button.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/create-document-button-container/create-document-button/bescheid-wizard-create-document-button.component.html
index ae309b1063..db9307187e 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/create-document-button-container/create-document-button/bescheid-wizard-create-document-button.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/create-document-button-container/create-document-button/bescheid-wizard-create-document-button.component.html
@@ -1,6 +1,6 @@
@if (bescheidResource | hasLink: BescheidLinkRel.CREATE_DOCUMENT) {
<ods-button-card
- class="w-72"
+ class="w-full max-w-72"
[isLoading]="bescheidDocument.create.loading"
(click)="clickEmitter.emit()"
text="Bescheiddokument"
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen-container/form/bescheid-wizard-dokumente-hochladen-form.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen-container/form/bescheid-wizard-dokumente-hochladen-form.component.html
index 516004924d..fd2a2ab6c4 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen-container/form/bescheid-wizard-dokumente-hochladen-form.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen-container/form/bescheid-wizard-dokumente-hochladen-form.component.html
@@ -23,7 +23,7 @@
unter der Lizenz sind dem Lizenztext zu entnehmen.
-->
-<div class="flex flex-col gap-4">
+<div class="mt-4 flex flex-col gap-4">
<alfa-bescheid-wizard-create-document-button-container
[bescheidResource]="bescheidResource"
data-test-id="create-document-button"
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.html
index 2f79362b02..0b04ceb6fc 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.html
@@ -1,4 +1,4 @@
-<div [formGroup]="formService.form">
+<div [formGroup]="formService.form" class="w-full">
<ods-single-file-upload-editor
*ngIf="bescheidResource | hasLink: bescheidLinkRel.UPLOAD_BESCHEID_FILE"
[uploadInProgress]="upload.loading"
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.ts
index e21906aac5..d48f7dbde8 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.ts
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.ts
@@ -11,6 +11,7 @@ import { BescheidFormService } from '../../../bescheid.formservice';
@Component({
selector: 'alfa-bescheid-wizard-upload-document-button',
templateUrl: './bescheid-wizard-upload-document-button.component.html',
+ styles: [':host {@apply flex grow}'],
})
export class BescheidWizardUploadDocumentButtonComponent {
@Input() bescheidResource: BescheidResource;
diff --git a/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.html b/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.html
index 4a9fe0c972..ff08ce18e4 100644
--- a/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.html
+++ b/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.html
@@ -34,7 +34,7 @@
[accept]="accept"
[attr.data-test-id]="(label | convertForDataTest) + '-file-upload-button'"
[isLoading]="uploadInProgress.loading"
- class="relative w-72"
+ class="relative w-full max-w-72"
>
<ods-spinner-icon spinner size="medium" />
<ods-attachment-icon icon size="medium" />
diff --git a/alfa-client/libs/design-component/src/lib/form/single-file-upload-editor/single-file-upload-editor.component.html b/alfa-client/libs/design-component/src/lib/form/single-file-upload-editor/single-file-upload-editor.component.html
index ab4172edc1..837b069ad1 100644
--- a/alfa-client/libs/design-component/src/lib/form/single-file-upload-editor/single-file-upload-editor.component.html
+++ b/alfa-client/libs/design-component/src/lib/form/single-file-upload-editor/single-file-upload-editor.component.html
@@ -24,7 +24,7 @@
-->
<ods-file-upload-button
- class="w-72"
+ class="w-full max-w-72"
[id]="uploadFileId"
[isLoading]="uploadInProgress"
[accept]="accept"
--
GitLab