@@ -92,15 +92,7 @@ $GLOBALS['TL_DCA']['tl_vr_wa_attribute'] = array

     // Palettes

     'palettes' => array

     (

-        '__selector__'                => array('type'),

-        'default'                     => '{title_legend},title,description;{type_legend},type'

-    ),

-

-    // Subpalettes

-    'subpalettes' => array

-    (

-        'type_text'                   => '',

-        'type_option'                 => ''

+        'default'                     => '{title_legend},title'

     ),

     // Fields

@@ -136,15 +128,5 @@ $GLOBALS['TL_DCA']['tl_vr_wa_attribute'] = array

             'eval'                    => array('tl_class'=>'clr'),

             'sql'                     => "text NULL"

         ),

-        'type' => array

-        (

-            'exclude'                 => true,

-            'filter'                  => true,

-            'inputType'               => 'select',

-            'options'                 => array('text', 'option'),

-            'reference'               => &$GLOBALS['TL_LANG']['tl_vr_wa_attribute']['type_options'],

-            'eval'                    => array('mandatory'=>true, 'submitOnChange'=>true, 'tl_class'=>'w50'),

-            'sql'                     => "varchar(32) NOT NULL default 'text'"

-        ),

     )

 );

@@ -89,7 +89,15 @@ $GLOBALS['TL_DCA']['tl_vr_wa_attribute_group'] = array

     // Palettes

     'palettes' => array

     (

-        'default'                     => '{title_legend},title,description;{config_legend},multiple,required'

+        '__selector__'                => array('type'),

+        'default'                     => '{title_legend},title,description;{type_legend},type'

+    ),

+

+    // Subpalettes

+    'subpalettes' => array

+    (

+        'type_text'                   => 'required',

+        'type_option'                 => 'multiple,required'

     ),

     // Fields

@@ -130,6 +138,16 @@ $GLOBALS['TL_DCA']['tl_vr_wa_attribute_group'] = array

             'inputType'               => 'checkbox',

             'eval'                    => array('tl_class'=>'w50 m12'),

             'sql'                     => "char(1) NOT NULL default ''"

+        ),

+        'type' => array

+        (

+            'exclude'                 => true,

+            'filter'                  => true,

+            'inputType'               => 'select',

+            'options'                 => array('text', 'option'),

+            'reference'               => &$GLOBALS['TL_LANG']['tl_vr_wa_attribute']['type_options'],

+            'eval'                    => array('mandatory'=>true, 'submitOnChange'=>true, 'tl_class'=>'w50'),

+            'sql'                     => "varchar(32) NOT NULL default 'text'"

         )

     )

 );

@@ -15,6 +15,8 @@ $GLOBALS['TL_LANG']['MOD']['weinanlieferung'][0] = 'Weinanlieferung';

 $GLOBALS['TL_LANG']['MOD']['weinanlieferung'][1] = 'Buchungstool zur Weinanlieferung';

 $GLOBALS['TL_LANG']['MOD']['wa_units'][0] = 'Botticheinheiten';

 $GLOBALS['TL_LANG']['MOD']['wa_units'][1] = 'Ermöglicht es auf Bottichmengen basierende Einheiten zu definieren.';

+$GLOBALS['TL_LANG']['MOD']['wa_attributes'][0] = 'Attribute';

+$GLOBALS['TL_LANG']['MOD']['wa_attributes'][1] = 'Verwalten von Attributen für Anlieferungs-Zeitslots.';

 $GLOBALS['TL_LANG']['MOD']['tl_vr_wa_rebsorte'] = 'Rebsorten';

 $GLOBALS['TL_LANG']['MOD']['tl_vr_wa_leseart'] = 'Leseart';

 $GLOBALS['TL_LANG']['MOD']['tl_vr_wa_slot'] = 'Zeitslots';

@@ -13,6 +13,7 @@ $GLOBALS['TL_LANG']['tl_vr_wa_attribute_group']['config_legend'] = 'Konfiguratio

 $GLOBALS['TL_LANG']['tl_vr_wa_attribute_group']['title'] = ['Titel', 'Bitte geben Sie den Titel der Attributgruppe ein.'];

 $GLOBALS['TL_LANG']['tl_vr_wa_attribute_group']['description'] = ['Beschreibung', 'Bitte geben Sie eine Beschreibung der Attributgruppe ein.'];

+$GLOBALS['TL_LANG']['tl_vr_wa_attribute_group']['type'] = ['Attributstyp', 'Legt den Typ der Attribute fest.'];

 $GLOBALS['TL_LANG']['tl_vr_wa_attribute_group']['multiple'] = ['Mehrfachauswahl', 'Erlaubt die Auswahl mehrerer Attribute aus dieser Gruppe.'];

 $GLOBALS['TL_LANG']['tl_vr_wa_attribute_group']['required'] = ['Pflichtfeld', 'Die Auswahl eines Attributs aus dieser Gruppe ist erforderlich.'];

@@ -87,13 +87,13 @@

                             {% for attribute in group.attributes %}

                                 <div class="attribute-item">

-                                    {% if attribute.type == 'text' %}

+                                    {% if group.type == 'text' %}

                                         <label for="attribute_{{ attribute.id }}">{{ attribute.title }}</label>

                                         <input type="text" id="attribute_{{ attribute.id }}" name="attribute_{{ attribute.id }}" class="form-control" value="{{ attribute.value }}">

                                         {% if attribute.description %}

                                             <div class="description">{{ attribute.description }}</div>

                                         {% endif %}

-                                    {% elseif attribute.type == 'option' %}

+                                    {% elseif group.type == 'option' %}

                                         <div class="checkbox">

                                             <label>

                                                 <input type="checkbox" id="attribute_{{ attribute.id }}" name="attribute_{{ attribute.id }}" value="1" {% if attribute.value %}checked{% endif %}>

@@ -114,28 +114,23 @@

                         {% if attribute_groups is defined and attribute_groups|length > 0 %}

                             {% for group in attribute_groups %}

                                 <fieldset>

-                                    <legend><strong>{{ group.title }}{% if group.required %}<sup class="text-danger">*</sup>{% endif %}</strong></legend>

+                                    <h5 class="legend">{{ group.title }}{% if group.required %}<sup class="text-danger">*</sup>{% endif %}</h5>

                                     {% if group.description %}

-                                        <div class="description">{{ group.description }}</div>

+                                        <div class="fieldset-description"><span class="info">{{ group.description }}</span></div>

                                     {% endif %}

                                     {% for attribute in group.attributes %}

                                         <div class="attribute-item">

-                                            {% if attribute.type == 'text' %}

-                                                <label for="attribute_{{ attribute.id }}">{{ attribute.title }}</label>

+                                            {% if group.type == 'text' %}

+                                                <label for="attribute_{{ attribute.id }}"><strong>{{ attribute.title }}</strong></label>

                                                 <input type="text" id="attribute_{{ attribute.id }}" name="attribute_{{ attribute.id }}" class="form-control">

                                                 {% if attribute.description %}

-                                                    <div class="description">{{ attribute.description }}</div>

+                                                    <div class="fieldset-description"><span class="info">{{ attribute.description }}</span></div>

                                                 {% endif %}

-                                            {% elseif attribute.type == 'option' %}

-                                                <div class="checkbox">

-                                                    <label>

-                                                        <input type="checkbox" id="attribute_{{ attribute.id }}" name="attribute_{{ attribute.id }}" value="1">

-                                                        {{ attribute.title }}

-                                                    </label>

-                                                    {% if attribute.description %}

-                                                        <div class="description">{{ attribute.description }}</div>

-                                                    {% endif %}

+                                            {% elseif group.type == 'option' %}

+                                                <div class="checkbox form-ext-control form-ext-{{ group.multiple ? 'checkbox' : 'radio' }}">

+                                                    <input class="form-ext-input" type="{{ group.multiple ? 'checkbox' : 'radio' }}" id="attribute_{{ attribute.id }}" name="{{ group.multiple ? 'attribute_'~attribute.id : 'group_'~group.id }}" value="1">

+                                                    <label class="form-ext-label" for="attribute_{{ attribute.id }}">{{ attribute.title }}</label>

                                                 </div>

                                             {% endif %}

                                         </div>

@@ -10,6 +10,10 @@ article, blockquote, p {

   line-height: 1.5;

 }

+h5.legend {

+  font-size: 1.3125rem;

+}

+

 .list {

   .slots > * ,

   .bookings > * {

@@ -211,3 +215,7 @@ ul {

 .ml-auto {

   margin-left: auto;

 }

+

+.fieldset-description {

+  margin-bottom: .5rem;

+}

@@ -157,7 +157,7 @@ class SlotAjaxController extends AbstractController

         // Get selected attributes

         $selectedAttributeIds = [];

         if ($Slot->attributes) {

-            $selectedAttributeIds = StringUtil::deserialize($Slot->attributes, true);

+            $selectedAttributeIds = array_map('trim', explode(',', $Slot->attributes));

         }

         // If no attributes are selected, don't show any

@@ -183,8 +183,7 @@ class SlotAjaxController extends AbstractController

                     $attributesByGroup[$groupId][] = [

                         'id' => $attribute->id,

                         'title' => $attribute->title,

-                        'description' => $attribute->description,

-                        'type' => $attribute->type

+                        'description' => $attribute->description

                     ];

                 }

@@ -203,6 +202,7 @@ class SlotAjaxController extends AbstractController

                                     'id' => $group->id,

                                     'title' => $group->title,

                                     'description' => $group->description,

+                                    'type' => $group->type,

                                     'multiple' => (bool)$group->multiple,

                                     'required' => (bool)$group->required,

                                     'attributes' => $attributesByGroup[$group->id]

@@ -408,7 +408,7 @@ class SlotAjaxController extends AbstractController

         // Get selected attributes

         $selectedAttributeIds = [];

         if ($Slot->attributes) {

-            $selectedAttributeIds = StringUtil::deserialize($Slot->attributes, true);

+            $selectedAttributeIds = array_map('trim', explode(',', $Slot->attributes));

         }

         // If no attributes are selected, don't show any

@@ -435,7 +435,6 @@ class SlotAjaxController extends AbstractController

                         'id' => $attribute->id,

                         'title' => $attribute->title,

                         'description' => $attribute->description,

-                        'type' => $attribute->type,

                         'value' => $attributeValues[$attribute->id] ?? null

                     ];

                 }

@@ -455,6 +454,7 @@ class SlotAjaxController extends AbstractController

                                     'id' => $group->id,

                                     'title' => $group->title,

                                     'description' => $group->description,

+                                    'type' => $group->type,

                                     'multiple' => (bool)$group->multiple,

                                     'required' => (bool)$group->required,

                                     'attributes' => $attributesByGroup[$group->id]

@@ -573,7 +573,7 @@ class SlotAjaxController extends AbstractController

         // Get selected attributes

         $selectedAttributeIds = [];

         if ($Slot->attributes) {

-            $selectedAttributeIds = StringUtil::deserialize($Slot->attributes, true);

+            $selectedAttributeIds = array_map('trim', explode(',', $Slot->attributes));

         }

         // If no attributes are selected, skip attribute processing

@@ -599,12 +599,14 @@ class SlotAjaxController extends AbstractController

                     $groups = WeinanlieferungAttributeGroupModel::findMultipleByIds($groupIds);

                     if ($groups !== null) {

-                        // Create maps for attribute-to-group and group-required status

+                        // Create maps for attribute-to-group, group-required status, and group-type

                         $attributeToGroupMap = [];

                         $groupRequiredMap = [];

+                        $groupTypeMap = [];

                         foreach ($groups as $group) {

                             $groupRequiredMap[$group->id] = (bool)$group->required;

+                            $groupTypeMap[$group->id] = $group->type;

                         }

                         foreach ($selectedAttributes as $attribute) {

@@ -618,14 +620,15 @@ class SlotAjaxController extends AbstractController

                         foreach ($selectedAttributes as $attribute) {

                             $attributeKey = 'attribute_' . $attribute->id;

                             $groupId = $attributeToGroupMap[$attribute->id];

+                            $groupType = $groupTypeMap[$groupId];

-                            if ($attribute->type === 'text') {

+                            if ($groupType === 'text') {

                                 // For text attributes, store the text value

                                 if (!empty(Input::post($attributeKey))) {

                                     $attributeValues[$attribute->id] = Input::post($attributeKey);

                                     $groupHasValue[$groupId] = true;

                                 }

-                            } else if ($attribute->type === 'option') {

+                            } else if ($groupType === 'option') {

                                 // For option attributes, store true if selected

                                 if (Input::post($attributeKey)) {

                                     $attributeValues[$attribute->id] = true;

@@ -752,7 +755,7 @@ class SlotAjaxController extends AbstractController

         // Get selected attributes

         $selectedAttributeIds = [];

         if ($Slot->attributes) {

-            $selectedAttributeIds = StringUtil::deserialize($Slot->attributes, true);

+            $selectedAttributeIds = array_map('trim', explode(',', $Slot->attributes));

         }

         // If no attributes are selected, skip attribute processing

@@ -778,12 +781,14 @@ class SlotAjaxController extends AbstractController

                     $groups = WeinanlieferungAttributeGroupModel::findMultipleByIds($groupIds);

                     if ($groups !== null) {

-                        // Create maps for attribute-to-group and group-required status

+                        // Create maps for attribute-to-group, group-required status, and group-type

                         $attributeToGroupMap = [];

                         $groupRequiredMap = [];

+                        $groupTypeMap = [];

                         foreach ($groups as $group) {

                             $groupRequiredMap[$group->id] = (bool)$group->required;

+                            $groupTypeMap[$group->id] = $group->type;

                         }

                         foreach ($selectedAttributes as $attribute) {

@@ -797,14 +802,15 @@ class SlotAjaxController extends AbstractController

                         foreach ($selectedAttributes as $attribute) {

                             $attributeKey = 'attribute_' . $attribute->id;

                             $groupId = $attributeToGroupMap[$attribute->id];

+                            $groupType = $groupTypeMap[$groupId];

-                            if ($attribute->type === 'text') {

+                            if ($groupType === 'text') {

                                 // For text attributes, store the text value

                                 if (!empty(Input::post($attributeKey))) {

                                     $attributeValues[$attribute->id] = Input::post($attributeKey);

                                     $groupHasValue[$groupId] = true;

                                 }

-                            } else if ($attribute->type === 'option') {

+                            } else if ($groupType === 'option') {

                                 // For option attributes, store true if selected

                                 if (Input::post($attributeKey)) {

                                     $attributeValues[$attribute->id] = true;

new file mode 100644

@@ -0,0 +1,64 @@

+<?php

+

+declare(strict_types=1);

+

+/*

+ * This file is part of contao-weinanlieferung-bundle.

+ *

+ * (c) vonRotenberg

+ *

+ * @license commercial

+ */

+

+namespace vonRotenberg\WeinanlieferungBundle\EventListener\DataContainer;

+

+use Contao\CoreBundle\DataContainer\PaletteManipulator;

+use Contao\CoreBundle\ServiceAnnotation\Callback;

+use Contao\DataContainer;

+use Doctrine\DBAL\Connection;

+use Symfony\Component\HttpFoundation\RequestStack;

+use Symfony\Contracts\Translation\TranslatorInterface;

+use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungAttributeGroupModel;

+use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungAttributeModel;

+

+class WeinanlieferungAttributeContainerListener

+{

+    /** @var Connection */

+    protected $db;

+

+    /** @var TranslatorInterface */

+    protected $translator;

+

+    /** @var RequestStack */

+    protected $requestStack;

+

+    public function __construct(Connection $db, TranslatorInterface $translator, RequestStack $requestStack)

+    {

+        $this->db = $db;

+        $this->translator = $translator;

+        $this->requestStack = $requestStack;

+    }

+

+

+    /**

+     * @Callback(table="tl_vr_wa_attribute", target="config.onload")

+     */

+    public function onLoadCallback(DataContainer $dc)

+    {

+        if (null === $dc || !$dc->id || 'edit' !== $this->requestStack->getCurrentRequest()->query->get('act')) {

+            return;

+        }

+

+        if (($attribute = WeinanlieferungAttributeModel::findByPk($dc->id)) === null || ($group = $attribute->getRelated('pid')) === null)

+        {

+            return;

+        }

+

+        if ($group->type == 'text')

+        {

+            PaletteManipulator::create()

+                ->addField('description','title')

+                ->applyToPalette('default', 'tl_vr_wa_attribute');

+        }

+    }

+}

@@ -189,12 +189,13 @@ class WeinanlieferungSlotContainerListener

             // Add attributes to the options array

             $groupAttributes = [];

             foreach ($attributes as $attribute) {

-                $groupAttributes[$attribute->id] = $attribute->title . ' <span style="color:#999;padding-left:3px">[' . $GLOBALS['TL_LANG']['tl_vr_wa_attribute']['type_options'][$attribute->type] . ']</span>';

+                $groupAttributes[$attribute->id] = $attribute->title;

             }

             // Add the group to the options array if it has attributes

             if (!empty($groupAttributes)) {

-                $options[$group->title] = $groupAttributes;

+                $groupTitle = $group->title . ' <span style="color:#999;padding-left:3px">[' . $GLOBALS['TL_LANG']['tl_vr_wa_attribute']['type_options'][$group->type] . ']</span>';

+                $options[$groupTitle] = $groupAttributes;

             }

         }