Add Boolean presenter for checkbox

app/Form/Data/FieldCollection.php

@@ -62,7 +62,10 @@ class FieldCollection extends Collection
      */
     public static function fromRequest(Form $form, array $input): self
     {
-        return $form->getFields()->each(fn ($field) => $field->value = array_key_exists($field->key, $input) ? $input[$field->key] : $field->default());
+        return $form->getFields()->map(function ($field) use ($input) {
+            $field->value = array_key_exists($field->key, $input) ? $input[$field->key] : $field->default();
+            return $field;
+        });
     }
 
     public function find(Field $givenField): ?Field

app/Form/Fields/CheckboxField.php

@@ -4,6 +4,8 @@ namespace App\Form\Fields;
 
 use App\Form\Models\Form;
 use App\Form\Models\Participant;
+use App\Form\Presenters\BooleanPresenter;
+use App\Form\Presenters\Presenter;
 use Faker\Generator;
 use Illuminate\Validation\Rule;
 
@@ -21,7 +23,7 @@ class CheckboxField extends Field
     {
         return [
             ['key' => 'description', 'default' => '', 'rules' => ['description' => 'required|string'], 'label' => 'Beschreibung'],
-            ['key' => 'required', 'default' => false, 'rules' => ['required' => 'present|boolean'], 'label' => 'Erforderlich'],
+            ['key' => 'required', 'default' => true, 'rules' => ['required' => 'present|boolean'], 'label' => 'Erforderlich'],
         ];
     }
 
@@ -72,4 +74,9 @@ class CheckboxField extends Field
     public function afterRegistration(Form $form, Participant $participant, array $input): void
     {
     }
+
+    public function getPresenter(): Presenter
+    {
+        return app(BooleanPresenter::class);
+    }
 }

app/Form/Fields/DateField.php

@@ -24,7 +24,7 @@ class DateField extends Field
     public static function meta(): array
     {
         return [
-            ['key' => 'required', 'default' => false, 'rules' => ['required' => 'present|boolean'], 'label' => 'Erforderlich'],
+            ['key' => 'required', 'default' => true, 'rules' => ['required' => 'present|boolean'], 'label' => 'Erforderlich'],
             ['key' => 'max_today', 'default' => false, 'rules' => ['required' => 'present|boolean'], 'label' => 'Nur daten bis heute erlauben'],
         ];
     }

app/Form/Fields/DropdownField.php

@@ -22,7 +22,7 @@ class DropdownField extends Field
     {
         return [
             ['key' => 'options', 'default' => [], 'rules' => ['options' => 'present|array', 'options.*' => 'string'], 'label' => 'Optionen'],
-            ['key' => 'required', 'default' => false, 'rules' => ['required' => 'present|boolean'], 'label' => 'Erforderlich'],
+            ['key' => 'required', 'default' => true, 'rules' => ['required' => 'present|boolean'], 'label' => 'Erforderlich'],
         ];
     }
 

app/Form/Fields/Field.php

@@ -147,7 +147,6 @@ abstract class Field extends Data
                 'type' => static::type(),
                 'columns' => ['mobile' => 2, 'tablet' => 4, 'desktop' => 6],
                 'value' => static::default(),
-                'required' => false,
                 'nami_type' => null,
                 'for_members' => true,
                 'special_type' => null,

app/Form/Fields/GroupField.php

@@ -25,7 +25,7 @@ class GroupField extends Field
     public static function meta(): array
     {
         return [
-            ['key' => 'required', 'default' => false, 'rules' => ['required' => 'present|boolean'], 'label' => 'Erforderlich'],
+            ['key' => 'required', 'default' => true, 'rules' => ['required' => 'present|boolean'], 'label' => 'Erforderlich'],
             ['key' => 'parent_field', 'default' => null, 'rules' => ['parent_field' => 'present|nullable|string'], 'label' => 'Übergeordnetes Feld'],
             ['key' => 'parent_group', 'default' => null, 'rules' => ['parent_group' => ['present', 'nullable', Rule::in(Group::pluck('id')->toArray())]], 'label' => 'Übergeordnete Gruppierung'],
         ];

app/Form/Fields/RadioField.php

@@ -23,7 +23,7 @@ class RadioField extends Field
     {
         return [
             ['key' => 'options', 'default' => [], 'rules' => ['options' => 'present|array', 'options.*' => 'required|string'], 'label' => 'Optionen'],
-            ['key' => 'required', 'default' => false, 'rules' => ['required' => 'present|boolean'], 'label' => 'Erforderlich'],
+            ['key' => 'required', 'default' => true, 'rules' => ['required' => 'present|boolean'], 'label' => 'Erforderlich'],
         ];
     }
 

app/Form/Fields/TextField.php

@@ -19,7 +19,7 @@ class TextField extends Field
     public static function meta(): array
     {
         return [
-            ['key' => 'required', 'default' => false, 'rules' => ['required' => 'present|boolean'], 'label' => 'Erforderlich'],
+            ['key' => 'required', 'default' => true, 'rules' => ['required' => 'present|boolean'], 'label' => 'Erforderlich'],
         ];
     }
 

app/Form/Fields/TextareaField.php

@@ -20,7 +20,7 @@ class TextareaField extends Field
     {
         return [
             ['key' => 'rows', 'default' => 5, 'rules' => ['rows' => 'present|integer|gt:0'], 'label' => 'Zeilen'],
-            ['key' => 'required', 'default' => false, 'rules' => ['required' => 'present|boolean'], 'label' => 'Erforderlich'],
+            ['key' => 'required', 'default' => true, 'rules' => ['required' => 'present|boolean'], 'label' => 'Erforderlich'],
         ];
     }
 

app/Form/Presenters/BooleanPresenter.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Form\Presenters;
+
+class BooleanPresenter extends Presenter
+{
+
+    /**
+     * @param mixed $value
+     */
+    public function present($value): string
+    {
+        return $value ? 'Ja' : 'Nein';
+    }
+}

packages/adrema-form

@@ -1 +1 @@
-Subproject commit 7ae37c224e7579978874117436ce78c447d6ef52
+Subproject commit bc45e0cdf792158372b0f12db8739c19beda1a4f

tests/Feature/Form/FormtemplateIndexActionTest.php

@@ -38,12 +38,12 @@ class FormtemplateIndexActionTest extends TestCase
                     'type' => 'DropdownField',
                     'columns' => ['mobile' => 2, 'tablet' => 4, 'desktop' => 6],
                     'value' => null,
-                    'required' => false,
                     'nami_type' => null,
                     'for_members' => true,
                     'special_type' => null,
                     'hint' => '',
                     'options' => [],
+                    'required' => true,
                 ]
             ])
             ->assertInertiaPath('data.meta.fields.7', [
@@ -54,11 +54,11 @@ class FormtemplateIndexActionTest extends TestCase
                     'type' => 'TextField',
                     'columns' => ['mobile' => 2, 'tablet' => 4, 'desktop' => 6],
                     'value' => '',
-                    'required' => false,
                     'nami_type' => null,
                     'for_members' => true,
                     'special_type' => null,
                     'hint' => '',
+                    'required' => true,
                 ]
             ])
             ->assertInertiaPath('data.meta.fields.8', [
@@ -69,12 +69,12 @@ class FormtemplateIndexActionTest extends TestCase
                     'type' => 'TextareaField',
                     'columns' => ['mobile' => 2, 'tablet' => 4, 'desktop' => 6],
                     'value' => '',
-                    'required' => false,
                     'nami_type' => null,
                     'for_members' => true,
                     'special_type' => null,
                     'hint' => '',
                     'rows' => 5,
+                    'required' => true,
                 ]
             ])
             ->assertInertiaPath('data.meta.default', [