From 18237c587ec7082da18b907b271c9bba0304cb31 Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Thu, 23 Jan 2025 14:20:47 +0100
Subject: [PATCH] OZG-6185 Add styling to step 2
---
...zard-create-document-button.component.html | 26 ++++++------
...rd-dokumente-hochladen-form.component.html | 40 ++++++++++---------
...dokumente-hochladen-summary.component.html | 12 ++++--
...rd-upload-attachment-button.component.html | 2 +-
...scheid-wizard-weiter-button.component.html | 2 +-
.../binary-file2/binary-file2.component.html | 2 +-
.../binary-file2.component.spec.ts | 3 +-
.../binary-file2/binary-file2.component.ts | 15 +++----
8 files changed, 52 insertions(+), 50 deletions(-)
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 ccd8659d25..6b6a75340a 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,14 +1,12 @@
-<div class="mt-4">
- @if (bescheidResource | hasLink: BescheidLinkRel.CREATE_DOCUMENT) {
- <ods-button-card
- class="w-72"
- [isLoading]="bescheidDocument.create.loading"
- (click)="click.emit()"
- text="Bescheiddokument"
- subText="automatisch erstellen"
- data-test-id="create-bescheid-document-button"
- >
- <ods-bescheid-generate-icon icon/>
- </ods-button-card>
- }
-</div>
+@if (bescheidResource | hasLink: BescheidLinkRel.CREATE_DOCUMENT) {
+ <ods-button-card
+ class="w-72"
+ [isLoading]="bescheidDocument.create.loading"
+ (click)="click.emit()"
+ text="Bescheiddokument"
+ subText="automatisch erstellen"
+ data-test-id="create-bescheid-document-button"
+ >
+ <ods-bescheid-generate-icon icon />
+ </ods-button-card>
+}
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 71c48e7bb1..516004924d 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,22 +23,24 @@
unter der Lizenz sind dem Lizenztext zu entnehmen.
-->
-<alfa-bescheid-wizard-create-document-button-container
- [bescheidResource]="bescheidResource"
- data-test-id="create-document-button"
-></alfa-bescheid-wizard-create-document-button-container>
-<alfa-bescheid-wizard-upload-document-button-container
- [bescheidResource]="bescheidResource"
- data-test-id="upload-document-button"
-></alfa-bescheid-wizard-upload-document-button-container>
-<alfa-bescheid-wizard-upload-attachment-button-container
- [bescheidResource]="bescheidResource"
- data-test-id="upload-attachment-button"
-></alfa-bescheid-wizard-upload-attachment-button-container>
-@if (bescheidResource | hasLink: bescheidLinkRel.UPDATE) {
- <alfa-bescheid-wizard-weiter-button
- [submitStateResource]="submitStateResource$ | async"
- (clickEmitter)="gotoNextStep()"
- data-test-id="weiter-button"
- ></alfa-bescheid-wizard-weiter-button>
-}
+<div class="flex flex-col gap-4">
+ <alfa-bescheid-wizard-create-document-button-container
+ [bescheidResource]="bescheidResource"
+ data-test-id="create-document-button"
+ ></alfa-bescheid-wizard-create-document-button-container>
+ <alfa-bescheid-wizard-upload-document-button-container
+ [bescheidResource]="bescheidResource"
+ data-test-id="upload-document-button"
+ ></alfa-bescheid-wizard-upload-document-button-container>
+ <alfa-bescheid-wizard-upload-attachment-button-container
+ [bescheidResource]="bescheidResource"
+ data-test-id="upload-attachment-button"
+ ></alfa-bescheid-wizard-upload-attachment-button-container>
+ @if (bescheidResource | hasLink: bescheidLinkRel.UPDATE) {
+ <alfa-bescheid-wizard-weiter-button
+ [submitStateResource]="submitStateResource$ | async"
+ (clickEmitter)="gotoNextStep()"
+ data-test-id="weiter-button"
+ ></alfa-bescheid-wizard-weiter-button>
+ }
+</div>
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen-container/summary/bescheid-wizard-dokumente-hochladen-summary.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen-container/summary/bescheid-wizard-dokumente-hochladen-summary.component.html
index 0ff4f98178..b8c80fafbc 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen-container/summary/bescheid-wizard-dokumente-hochladen-summary.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen-container/summary/bescheid-wizard-dokumente-hochladen-summary.component.html
@@ -25,9 +25,15 @@
-->
@if (isBescheidDocumentMissing) {
- <p data-test-id="missing-bescheid-document-error-message" class="text-base text-error">
+ <p data-test-id="missing-bescheid-document-error-message" class="my-4 text-base text-error">
Bitte fügen Sie ein Bescheiddokument hinzu.
</p>
}
-<alfa-bescheid-wizard-document-file-container data-test-id="bescheid-document-file"></alfa-bescheid-wizard-document-file-container>
-<alfa-bescheid-wizard-attachment-files-container data-test-id="bescheid-attachment-files"></alfa-bescheid-wizard-attachment-files-container>
+<div class="my-4">
+ <alfa-bescheid-wizard-document-file-container data-test-id="bescheid-document-file">
+ </alfa-bescheid-wizard-document-file-container>
+</div>
+<div class="my-4">
+ <alfa-bescheid-wizard-attachment-files-container data-test-id="bescheid-attachment-files">
+ </alfa-bescheid-wizard-attachment-files-container>
+</div>
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-attachment-button-container/upload-attachment-button/bescheid-wizard-upload-attachment-button.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-attachment-button-container/upload-attachment-button/bescheid-wizard-upload-attachment-button.component.html
index f0492d3f57..daa2be54c0 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-attachment-button-container/upload-attachment-button/bescheid-wizard-upload-attachment-button.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-attachment-button-container/upload-attachment-button/bescheid-wizard-upload-attachment-button.component.html
@@ -1,4 +1,4 @@
-<div [formGroup]="formService.form" class="mt-4">
+<div [formGroup]="formService.form">
<ods-file-upload-editor
[parentFormArrayName]="formServiceClass.FIELD_ATTACHMENTS"
[uploadInProgress]="upload"
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/weiter-button/bescheid-wizard-weiter-button.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/weiter-button/bescheid-wizard-weiter-button.component.html
index 6800790c78..491749c3c6 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/weiter-button/bescheid-wizard-weiter-button.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/weiter-button/bescheid-wizard-weiter-button.component.html
@@ -28,7 +28,7 @@
(clickEmitter)="clickEmitter.emit()"
variant="primary"
size="medium"
- class="mt-8 flex"
+ class="mt-4 flex"
text="Weiter"
dataTestId="bescheid-weiter-button"
>
diff --git a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html b/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html
index 83e0a83f94..96927c6b04 100644
--- a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html
+++ b/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html
@@ -37,7 +37,7 @@
<button
*ngIf="deletable"
class="flex size-10 items-center justify-center rounded-md hover:border hover:border-grayborder hover:bg-background-50"
- (click)="deleteFile()"
+ (click)="deleteFile($event)"
title="Anhang löschen"
aria-label="Anhang löschen Button"
>
diff --git a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.spec.ts b/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.spec.ts
index 148cf03abf..7f114ea64b 100644
--- a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.spec.ts
+++ b/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.spec.ts
@@ -89,10 +89,11 @@ describe('BinaryFile2Component', () => {
describe('click on delete button', () => {
it('should emit delete', () => {
+ const clickEvent = new Event('');
jest.spyOn(component.startDelete, 'emit');
component.file = createBinaryFileResource();
- component.deleteFile();
+ component.deleteFile(clickEvent);
expect(component.startDelete.emit).toHaveBeenCalledWith(component.file);
});
diff --git a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.ts b/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.ts
index bcf41375a0..6b0e9946b5 100644
--- a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.ts
+++ b/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.ts
@@ -22,11 +22,7 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
import { ApiDownloadToken } from '@alfa-client/api-root-shared';
-import {
- BinaryFileIcon,
- BinaryFileLinkRel,
- BinaryFileResource,
-} from '@alfa-client/binary-file-shared';
+import { BinaryFileIcon, BinaryFileLinkRel, BinaryFileResource } from '@alfa-client/binary-file-shared';
import { StateResource, createEmptyStateResource } from '@alfa-client/tech-shared';
import { HttpParams } from '@angular/common/http';
import { Component, EventEmitter, Input, Output } from '@angular/core';
@@ -45,10 +41,8 @@ export class BinaryFile2Component {
readonly fileLinkRel = BinaryFileLinkRel;
- @Output() public startDownload: EventEmitter<BinaryFileResource> =
- new EventEmitter<BinaryFileResource>();
- @Output() public startDelete: EventEmitter<BinaryFileResource> =
- new EventEmitter<BinaryFileResource>();
+ @Output() public startDownload: EventEmitter<BinaryFileResource> = new EventEmitter<BinaryFileResource>();
+ @Output() public startDelete: EventEmitter<BinaryFileResource> = new EventEmitter<BinaryFileResource>();
@Output() public getDownloadToken: EventEmitter<void> = new EventEmitter<void>();
get isDisabled(): boolean {
@@ -71,7 +65,8 @@ export class BinaryFile2Component {
this.startDownload.emit(this.file);
}
- deleteFile(): void {
+ deleteFile(e: Event): void {
+ e.stopPropagation();
this.startDelete.emit(this.file);
}
--
GitLab