Skip to content
Snippets Groups Projects
Verified Commit 9fdf95eb authored by Sebastian Bergandy's avatar Sebastian Bergandy :keyboard:
Browse files

Merge branch 'main' into OZG-7473-save-statistic-fields

parents e92580c3 2a40d65b
No related branches found
No related tags found
1 merge request!104Administration: Neu hinzugefügte Felder für Statistik speichern
<p class="flex flex-col gap-2 text-text"> <p class="flex flex-col gap-0.5 text-text">
<span class="font-medium">Benutzername</span> <span class="font-medium">Benutzername</span>
<span>{{ userName }}</span> <span>{{ userName }}</span>
</p> </p>
<h2 class="heading-2 mt-4">Rollen für OZG-Cloud</h2> <h2 class="heading-2 mt-4">Rollen für OZG-Cloud</h2>
<div [formGroup]="formGroupParent"> <div [formGroup]="formGroupParent">
<div [formGroupName]="UserFormService.CLIENT_ROLES" class="mb-8 flex gap-56"> <div [formGroupName]="UserFormService.CLIENT_ROLES" class="mb-8 flex flex-col gap-4 md:flex-row">
<div [formGroupName]="UserFormService.ADMINISTRATION_GROUP" class="flex flex-col gap-2"> <div [formGroupName]="UserFormService.ADMINISTRATION_GROUP" class="flex flex-1 flex-col gap-2">
<h3 class="text-md block font-medium text-text">Administration</h3> <h3 class="text-md block font-medium text-text">Administration</h3>
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
<ods-checkbox-editor [formControlName]="UserFormService.ADMIN" label="Admin" inputId="admin" /> <ods-checkbox-editor [formControlName]="UserFormService.ADMIN" label="Admin" inputId="admin" />
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</button> </button>
</div> </div>
</div> </div>
<div [formGroupName]="UserFormService.ALFA_GROUP" class="flex flex-col gap-2"> <div [formGroupName]="UserFormService.ALFA_GROUP" class="flex flex-1 flex-col gap-2">
<h3 class="text-md block font-medium text-text">Alfa</h3> <h3 class="text-md block font-medium text-text">Alfa</h3>
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
<ods-checkbox-editor [formControlName]="UserFormService.LOESCHEN" label="Löschen" inputId="delete" /> <ods-checkbox-editor [formControlName]="UserFormService.LOESCHEN" label="Löschen" inputId="delete" />
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
[formGroupParent]="formService.form" [formGroupParent]="formService.form"
[formGroupOrganisationsEinheiten]="formService.getOrganisationsEinheitenGroup()" [formGroupOrganisationsEinheiten]="formService.getOrganisationsEinheitenGroup()"
/> />
<div class="flex justify-between"> <div class="mb-6 flex justify-between">
<admin-user-form-save-button /> <admin-user-form-save-button />
@if (isPatch) { @if (isPatch) {
<admin-delete-open-dialog-button data-test-id="delete-button-container" /> <admin-delete-open-dialog-button data-test-id="delete-button-container" />
......
...@@ -64,12 +64,15 @@ export abstract class FormControlEditorAbstractComponent implements ControlValue ...@@ -64,12 +64,15 @@ export abstract class FormControlEditorAbstractComponent implements ControlValue
this.fieldControl.setValue(text); this.fieldControl.setValue(text);
this.setErrors(); this.setErrors();
} }
registerOnChange(fn: (text: string | Date) => {}): void { registerOnChange(fn: (text: string | Date) => {}): void {
this.onChange = fn; this.onChange = fn;
} }
registerOnTouched(fn: () => {}): void { registerOnTouched(fn: () => {}): void {
this.onTouched = fn; this.onTouched = fn;
} }
setDisabledState?(isDisabled: boolean): void { setDisabledState?(isDisabled: boolean): void {
this.disabled = isDisabled; this.disabled = isDisabled;
} }
...@@ -83,9 +86,9 @@ export abstract class FormControlEditorAbstractComponent implements ControlValue ...@@ -83,9 +86,9 @@ export abstract class FormControlEditorAbstractComponent implements ControlValue
if (this.control) { if (this.control) {
this.fieldControl.setErrors(this.control.errors); this.fieldControl.setErrors(this.control.errors);
if (this.control.invalid) { if (this.control.invalid) {
this._updateInvalidParams();
this.fieldControl.markAsTouched(); this.fieldControl.markAsTouched();
} }
this._updateInvalidParams();
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment