diff --git a/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-container.component.html b/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-container.component.html index 28523fbf877b1bfd9eeb103ae56606effeb766d8..1fd0441a39d71372d0c65fd84d0ce5386ac52fd2 100644 --- a/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-container.component.html +++ b/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-container.component.html @@ -24,7 +24,7 @@ --> <h1 class="heading-1" data-test-id="statistik-header-text">Statistik</h1> -<div class="mt-4"> +<div class="mt-4 w-fit"> <ods-routing-button [linkPath]="ROUTES.STATISTIK_NEU" text="Weitere Felder auswerten" diff --git a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/admin-statistik-fields-form.component.html b/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/admin-statistik-fields-form.component.html index 0fe5541738292ac951153c232ac594e8ebf67865..8251c9067a3a2bbf07363cc9a1f8e167fbf6de1a 100644 --- a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/admin-statistik-fields-form.component.html +++ b/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/admin-statistik-fields-form.component.html @@ -1,8 +1,8 @@ <h2 class="heading-2" data-test-id="statistik-fields-form-header-text">Felder zur Auswertung hinzufügen</h2> <div class="flex max-w-4xl flex-col gap-4"> - <form class="form flex-col" [formGroup]="formService.form"> - <div [formGroupName]="StatistikFieldsFormService.FIELD_FORM_IDENTIFIER"> + <form class="form flex-col" [formGroup]="formService.form" class="flex flex-col gap-4"> + <div [formGroupName]="StatistikFieldsFormService.FIELD_FORM_IDENTIFIER" class="flex flex-col gap-4"> <ods-text-editor [formControlName]="StatistikFieldsFormService.FIELD_FORM_ENGINE_NAME" label="Formengine" @@ -18,18 +18,28 @@ </div> <div [formArrayName]="StatistikFieldsFormService.FIELD_MAPPINGS"> - <div *ngFor="let mappingControl of formService.mappings.controls; let i = index" [formGroupName]="i"> + <div + *ngFor="let mappingControl of formService.mappings.controls; let i = index" + [formGroupName]="i" + class="flex w-full gap-2" + > <ods-text-editor + class="flex-1" formControlName="sourcePath" label="Pfad des Datenfeldes" placeholder="Tragen Sie hier den gesamten Pfad des Datenfeldes ein, das Sie auswerten möchten." [attr.data-test-id]="'mapping-field-' + i" ></ods-text-editor> <ods-button - text="-" + class="self-end" + variant="ghost" + size="fit" + destructive="true" (clickEmitter)="formService.removeMapping(i)" [dataTestId]="'remove-mapping-button-' + i" - ></ods-button> + > + <ods-delete-icon icon /> + </ods-button> </div> </div> </form> diff --git a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/admin-statistik-fields-form.component.ts b/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/admin-statistik-fields-form.component.ts index 546bcb9f46f707ea39c85bab80d16da8ee9d140c..91dfb6c42cd7c8880635dd394043e8d005df021c 100644 --- a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/admin-statistik-fields-form.component.ts +++ b/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/admin-statistik-fields-form.component.ts @@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common'; import { Component, inject } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { TextEditorComponent } from '@ods/component'; -import { ButtonComponent, PlusIconComponent } from '@ods/system'; +import { ButtonComponent, DeleteIconComponent, PlusIconComponent } from '@ods/system'; import { StatistikFieldsFormService } from './statistik-fields.formservice'; @Component({ @@ -16,6 +16,7 @@ import { StatistikFieldsFormService } from './statistik-fields.formservice'; PlusIconComponent, ReactiveFormsModule, TextEditorComponent, + DeleteIconComponent, AdminSaveButtonComponent, AdminCancelButtonComponent, ], diff --git a/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user-list.component.html b/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user-list.component.html index bffb14da6bda5e9ae083f25f445a12b3d6854ae5..153e3e19deecd0653b83ae9fc7e516f85b6a8716 100644 --- a/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user-list.component.html +++ b/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user-list.component.html @@ -24,9 +24,9 @@ --> <h1 class="heading-1 mb-4">Benutzer & Rollen</h1> -<ods-routing-button [linkPath]="ROUTES.BENUTZER_NEU" text="Benutzer hinzufügen" class="mb-4" dataTestId="add-user-button" /> +<ods-routing-button [linkPath]="ROUTES.BENUTZER_NEU" text="Benutzer hinzufügen" class="mb-4 w-fit" dataTestId="add-user-button" /> <ods-list> @for (user of usersStateResource.resource; track $index) { <admin-user [user]="user" class="block w-full" /> } -</ods-list> \ No newline at end of file +</ods-list>