Skip to content
Snippets Groups Projects
Commit 913ec864 authored by Oliver Schmidt's avatar Oliver Schmidt
Browse files

OZG-6185 optimize bescheid layout and buttons

parent 7329eacb
No related branches found
No related tags found
1 merge request!43Bescheid refactoring Schritte 2 und 3
Showing
with 17 additions and 9 deletions
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<div class="fixed inset-0 z-10 w-screen overflow-y-auto"> <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="flex h-full items-center justify-center p-8">
<div <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; @let bescheidStateResource = bescheidDraftStateResource$ | async;
<ods-button <ods-button
......
...@@ -27,12 +27,19 @@ import { VorgangWithEingangResource } from '@alfa-client/vorgang-shared'; ...@@ -27,12 +27,19 @@ import { VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
import { DialogRef } from '@angular/cdk/dialog'; import { DialogRef } from '@angular/cdk/dialog';
import { Component, EventEmitter, inject, Input, Output, ViewContainerRef } from '@angular/core'; import { Component, EventEmitter, inject, Input, Output, ViewContainerRef } from '@angular/core';
import { filter } from 'rxjs'; import { filter } from 'rxjs';
import { isDialogSuccessfullyCompleted, OzgcloudDialogCommandResult, } from '../../../../../../../ui/src/lib/ui/ozgcloud-dialog/ozgcloud-dialog.result'; import {
import { AbschliessenDialogData, BescheidWizardAbschliessenDialogContainerComponent, } from '../abschliessen-dialog-container/bescheid-wizard-abschliessen-dialog-container.component'; 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({ @Component({
selector: 'alfa-bescheid-wizard-abschliessen-button', selector: 'alfa-bescheid-wizard-abschliessen-button',
templateUrl: './bescheid-wizard-abschliessen-button.component.html', templateUrl: './bescheid-wizard-abschliessen-button.component.html',
styles: [':host {@apply flex-1 flex items-end}'],
}) })
export class BescheidWizardAbschliessenButtonComponent { export class BescheidWizardAbschliessenButtonComponent {
@Input() vorgangWithEingangResource: VorgangWithEingangResource; @Input() vorgangWithEingangResource: VorgangWithEingangResource;
......
@if (bescheidResource | hasLink: BescheidLinkRel.CREATE_DOCUMENT) { @if (bescheidResource | hasLink: BescheidLinkRel.CREATE_DOCUMENT) {
<ods-button-card <ods-button-card
class="w-72" class="w-full max-w-72"
[isLoading]="bescheidDocument.create.loading" [isLoading]="bescheidDocument.create.loading"
(click)="clickEmitter.emit()" (click)="clickEmitter.emit()"
text="Bescheiddokument" text="Bescheiddokument"
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
unter der Lizenz sind dem Lizenztext zu entnehmen. 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 <alfa-bescheid-wizard-create-document-button-container
[bescheidResource]="bescheidResource" [bescheidResource]="bescheidResource"
data-test-id="create-document-button" data-test-id="create-document-button"
......
<div [formGroup]="formService.form"> <div [formGroup]="formService.form" class="w-full">
<ods-single-file-upload-editor <ods-single-file-upload-editor
*ngIf="bescheidResource | hasLink: bescheidLinkRel.UPLOAD_BESCHEID_FILE" *ngIf="bescheidResource | hasLink: bescheidLinkRel.UPLOAD_BESCHEID_FILE"
[uploadInProgress]="upload.loading" [uploadInProgress]="upload.loading"
......
...@@ -11,6 +11,7 @@ import { BescheidFormService } from '../../../bescheid.formservice'; ...@@ -11,6 +11,7 @@ import { BescheidFormService } from '../../../bescheid.formservice';
@Component({ @Component({
selector: 'alfa-bescheid-wizard-upload-document-button', selector: 'alfa-bescheid-wizard-upload-document-button',
templateUrl: './bescheid-wizard-upload-document-button.component.html', templateUrl: './bescheid-wizard-upload-document-button.component.html',
styles: [':host {@apply flex grow}'],
}) })
export class BescheidWizardUploadDocumentButtonComponent { export class BescheidWizardUploadDocumentButtonComponent {
@Input() bescheidResource: BescheidResource; @Input() bescheidResource: BescheidResource;
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
[accept]="accept" [accept]="accept"
[attr.data-test-id]="(label | convertForDataTest) + '-file-upload-button'" [attr.data-test-id]="(label | convertForDataTest) + '-file-upload-button'"
[isLoading]="uploadInProgress.loading" [isLoading]="uploadInProgress.loading"
class="relative w-72" class="relative w-full max-w-72"
> >
<ods-spinner-icon spinner size="medium" /> <ods-spinner-icon spinner size="medium" />
<ods-attachment-icon icon size="medium" /> <ods-attachment-icon icon size="medium" />
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
--> -->
<ods-file-upload-button <ods-file-upload-button
class="w-72" class="w-full max-w-72"
[id]="uploadFileId" [id]="uploadFileId"
[isLoading]="uploadInProgress" [isLoading]="uploadInProgress"
[accept]="accept" [accept]="accept"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment