diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result.component.html index 73a4f5ecf28582a26586bed9eb2f36928ad14635..bee8c2f986198851575179003c6878828a99b2e6 100644 --- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result.component.html +++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result.component.html @@ -1,85 +1,90 @@ <section - class="w-full overflow-auto rounded-xl bg-background-100" + class="flex w-full flex-col justify-between overflow-auto rounded-xl bg-background-100 p-4" *ngIf="{ activeStep: activeStep$ | async, sendByManual: sendByManual$ | async, isPostfachConfigured: isPostfachConfigured$ | async } as wizardData" > - <div class="p-4 text-base font-bold text-primary-600">Bescheid</div> - <div class="p-4" data-test-id="bescheid-status-text"> - <alfa-vorgang-detail-bescheiden-result-status - *ngIf=" - wizardData.activeStep === 1 || (wizardData.activeStep === 3 && wizardData.sendByManual) - " - data-test-id="bescheid-status" - [bescheid]="bescheid$ | async" - ></alfa-vorgang-detail-bescheiden-result-status> - </div> + <div class="flex-1"> + <div class="p-4 text-base font-bold text-primary-600">Bescheid</div> + <div class="p-4" data-test-id="bescheid-status-text"> + <alfa-vorgang-detail-bescheiden-result-status + *ngIf=" + wizardData.activeStep === 1 || (wizardData.activeStep === 3 && wizardData.sendByManual) + " + data-test-id="bescheid-status" + [bescheid]="bescheid$ | async" + ></alfa-vorgang-detail-bescheiden-result-status> + </div> - <div class="p-4"> - <alfa-vorgang-detail-bescheiden-result-nachricht - *ngIf=" - !wizardData.sendByManual && wizardData.activeStep === 3 && wizardData.isPostfachConfigured - " - [bescheidDocumentStateResource]="bescheidDocument$ | async" - data-test-id="bescheid-nachricht-an-antragsteller" - ></alfa-vorgang-detail-bescheiden-result-nachricht> - </div> + <div class="p-4"> + <alfa-vorgang-detail-bescheiden-result-nachricht + *ngIf=" + !wizardData.sendByManual && wizardData.activeStep === 3 && wizardData.isPostfachConfigured + " + [bescheidDocumentStateResource]="bescheidDocument$ | async" + data-test-id="bescheid-nachricht-an-antragsteller" + ></alfa-vorgang-detail-bescheiden-result-nachricht> + </div> - <div class="p-4" data-test-id="bescheid-status-dokument"> - <alfa-vorgang-detail-bescheiden-result-dokument - *ngIf=" - wizardData.activeStep === 2 || - (wizardData.activeStep === 3 && - (wizardData.sendByManual || wizardData.isPostfachConfigured)) - " - data-test-id="bescheid-document" - [bescheidDraftStateResource]="bescheidDraftStateResource$ | async" - [uploadBescheidDocumentInProgress]="uploadBescheidDocumentInProgress$ | async" - [createBescheidDocumentInProgress]="createBescheidDocumentInProgress$ | async" - [bescheidDocumentFile]="bescheidDocumentFile$ | async" - (deleteFile)="deleteBescheidDocument()" - ></alfa-vorgang-detail-bescheiden-result-dokument> - </div> + <div class="p-4" data-test-id="bescheid-status-dokument"> + <alfa-vorgang-detail-bescheiden-result-dokument + *ngIf=" + wizardData.activeStep === 2 || + (wizardData.activeStep === 3 && + (wizardData.sendByManual || wizardData.isPostfachConfigured)) + " + data-test-id="bescheid-document" + [bescheidDraftStateResource]="bescheidDraftStateResource$ | async" + [uploadBescheidDocumentInProgress]="uploadBescheidDocumentInProgress$ | async" + [createBescheidDocumentInProgress]="createBescheidDocumentInProgress$ | async" + [bescheidDocumentFile]="bescheidDocumentFile$ | async" + (deleteFile)="deleteBescheidDocument()" + ></alfa-vorgang-detail-bescheiden-result-dokument> + </div> - <div class="p-4" data-test-id="bescheid-status-attachments"> - <alfa-vorgang-detail-bescheiden-result-attachments - *ngIf=" - wizardData.activeStep === 2 || - (wizardData.activeStep === 3 && - (wizardData.sendByManual || wizardData.isPostfachConfigured)) - " - data-test-id="bescheid-attachments" - ></alfa-vorgang-detail-bescheiden-result-attachments> + <div class="p-4" data-test-id="bescheid-status-attachments"> + <alfa-vorgang-detail-bescheiden-result-attachments + *ngIf=" + wizardData.activeStep === 2 || + (wizardData.activeStep === 3 && + (wizardData.sendByManual || wizardData.isPostfachConfigured)) + " + data-test-id="bescheid-attachments" + ></alfa-vorgang-detail-bescheiden-result-attachments> + </div> </div> + <div class="flex-none"> + <div class="flex flex-col align-bottom"> + <ng-container *ngIf="wizardData.sendByManual && wizardData.activeStep === 3"> + <span>Der Bescheid muss manuell versendet werden.</span> - <div *ngIf="wizardData.sendByManual && wizardData.activeStep === 3"> - <span>Der Bescheid muss manuell versendet werden.</span> - - <!-- REPLACEME: Durch UI/UX Componenten ersetzen --> - <ng-container *ngIf="bescheidDraftStateResource$ | async as bescheidDraftStateResource"> - <ozgcloud-button-with-spinner - data-test-id="save-and-send-button" - [stateResource]="saveAndSendInProgress$ | async" - text="Antrag bescheiden und speichern" - (clickEmitter)="saveAndSendManually(bescheidDraftStateResource.resource)" - ></ozgcloud-button-with-spinner> - </ng-container> - <!-- --> + <!-- REPLACEME: Durch UI/UX Componenten ersetzen --> + <ng-container *ngIf="bescheidDraftStateResource$ | async as bescheidDraftStateResource"> + <ozgcloud-button-with-spinner + data-test-id="save-and-send-button" + [stateResource]="saveAndSendInProgress$ | async" + text="Antrag bescheiden und speichern" + (clickEmitter)="saveAndSendManually(bescheidDraftStateResource.resource)" + ></ozgcloud-button-with-spinner> + </ng-container> + <!-- --> + </ng-container> + <ng-container + *ngIf=" + wizardData.activeStep === 3 && !wizardData.sendByManual && wizardData.isPostfachConfigured + " + > + <ng-container *ngIf="bescheidDraftStateResource$ | async as bescheidDraftStateResource"> + <ozgcloud-button-with-spinner + data-test-id="send-button" + [stateResource]="saveAndSendInProgress$ | async" + text="Bescheid senden" + (clickEmitter)="saveAndSendWithNachricht(bescheidDraftStateResource.resource)" + ></ozgcloud-button-with-spinner> + </ng-container> + </ng-container> + </div> </div> - <ng-container - *ngIf=" - wizardData.activeStep === 3 && !wizardData.sendByManual && wizardData.isPostfachConfigured - " - > - <ng-container *ngIf="bescheidDraftStateResource$ | async as bescheidDraftStateResource"> - <ozgcloud-button-with-spinner - data-test-id="send-button" - [stateResource]="saveAndSendInProgress$ | async" - text="Bescheid senden" - (clickEmitter)="saveAndSendWithNachricht(bescheidDraftStateResource.resource)" - ></ozgcloud-button-with-spinner> - </ng-container> - </ng-container> </section>