@@ -20,7 +20,8 @@

         "symfony/config": "^5.4",

         "symfony/dependency-injection": "^5.4",

         "symfony/http-kernel": "^5.4",

-        "vonrotenberg/htmx-bundle": "^1.0"

+        "vonrotenberg/htmx-bundle": "^1.0",

+        "menatwork/contao-multicolumnwizard-bundle": "^3.6"

     },

     "require-dev": {

         "bamarni/composer-bin-plugin": "^1.5",

@@ -9,17 +9,19 @@

  */

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungRebsorteModel;

+use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungLeseartModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungReservationModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungSlotsModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungStandortModel;

 $GLOBALS['BE_MOD']['content']['weinanlieferung'] = array

 (

-    'tables'     => array('tl_vr_wa_standort', 'tl_vr_wa_slot', 'tl_vr_wa_rebsorte'),

+    'tables'     => array('tl_vr_wa_standort', 'tl_vr_wa_slot', 'tl_vr_wa_rebsorte','tl_vr_wa_leseart'),

     'stylesheet' => array('bundles/vonrotenbergweinanlieferung/css/backend.css')

 );

 $GLOBALS['TL_MODELS']['tl_vr_wa_slot'] = WeinanlieferungSlotsModel::class;

 $GLOBALS['TL_MODELS']['tl_vr_wa_standort'] = WeinanlieferungStandortModel::class;

 $GLOBALS['TL_MODELS']['tl_vr_wa_rebsorte'] = WeinanlieferungRebsorteModel::class;

+$GLOBALS['TL_MODELS']['tl_vr_wa_leseart'] = WeinanlieferungLeseartModel::class;

 $GLOBALS['TL_MODELS']['tl_vr_wa_reservation'] = WeinanlieferungReservationModel::class;

new file mode 100644

@@ -0,0 +1,124 @@

+<?php

+

+/**

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

+ *

+ * (c) vonRotenberg

+ *

+ * @license commercial

+ */

+

+use Contao\DC_Table;

+use Contao\DataContainer;

+

+$GLOBALS['TL_DCA']['tl_vr_wa_leseart'] = array

+(

+    // Config

+    'config' => array

+    (

+        'dataContainer'    => DC_Table::class,

+        'enableVersioning' => true,

+        'sql'              => array

+        (

+            'keys' => array

+            (

+                'id'  => 'primary'

+            )

+        )

+    ),

+

+    // List

+    'list' => array

+    (

+        'sorting' => array

+        (

+            'mode'                    => DataContainer::MODE_SORTED,

+            'fields'                  => array('title'),

+            'flag'                    => DataContainer::SORT_INITIAL_LETTER_ASC,

+            'panelLayout'             => 'limit'

+        ),

+        'label' => array(

+            'fields'                  => array('title'),

+            'format'                  => '%s'

+        ),

+        'global_operations' => array

+        (

+            'back' => array

+            (

+                'href'                => 'table=tl_vr_wa_standort',

+                'class'               => 'header_back',

+            ),

+            'all' => array

+            (

+                'href'                => 'act=select',

+                'class'               => 'header_edit_all',

+                'attributes'          => 'onclick="Backend.getScrollOffset()" accesskey="e"'

+            )

+        ),

+        'operations' => array

+        (

+            'edit' => array

+            (

+                'href'                => 'act=edit',

+                'icon'                => 'edit.gif',

+            ),

+            'copy' => array

+            (

+                'href'                => 'act=paste&mode=copy',

+                'icon'                => 'copy.svg'

+            ),

+            'cut' => array

+            (

+                'href'                => 'act=paste&mode=cut',

+                'icon'                => 'cut.svg',

+                'attributes'          => 'onclick="Backend.getScrollOffset()"'

+            ),

+            'delete' => array

+            (

+                'href'                => 'act=delete',

+                'icon'                => 'delete.gif',

+            ),

+            'show' => array

+            (

+                'icon'                => 'show.gif',

+            ),

+        )

+    ),

+

+    // Palettes

+    'palettes' => array

+    (

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

+    ),

+

+    // Subpalettes

+    'subpalettes' => array

+    (

+    ),

+

+    // Fields

+    'fields' => array

+    (

+        'id' => array

+        (

+            'sql'                     => "int(10) unsigned NOT NULL auto_increment"

+        ),

+        'tstamp' => array

+        (

+            'sql'                     => "int(10) unsigned NOT NULL default 0"

+        ),

+        'title' => array

+        (

+            'exclude'                 => true,

+            'sorting'                 => true,

+            'flag'                    => DataContainer::SORT_INITIAL_LETTER_ASC,

+            'inputType'               => 'text',

+            'eval'                    => array

+            (

+                'mandatory' => true,

+                'maxlength' => 255

+            ),

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

+        )

+    )

+);

@@ -56,7 +56,7 @@ $GLOBALS['TL_DCA']['tl_vr_wa_reservation'] = array

         'sorten'       => array

         (

             'foreignKey'   => 'tl_vr_wa_rebsorte.title',

-            'eval'  => array('multiple'=>true, 'csv'=>','),

+            'eval'  => array('multiple'=>true, 'csv'=>';'),

             'sql'       => "blob NULL",

             'relation'   => array('type' => 'hasMany', 'load' => 'lazy')

         ),

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

     'palettes' => array

     (

         '__selector__' => array('addEnclosure'),

-        'default' => '{time_legend},date,time;{type_legend},behaelter,leseart,sorte;{info_legend},anmerkungen,addEnclosure;{booking_legend},buchbar,buchbar_bis'

+        'default' => '{time_legend},date,time;{type_legend},behaelter,sorten;{info_legend},anmerkungen,addEnclosure;{booking_legend},buchbar,buchbar_bis'

     ),

     // Subpalettes

@@ -149,23 +149,32 @@ $GLOBALS['TL_DCA']['tl_vr_wa_slot'] = array

             'eval'      => array('rgxp' => 'natural', 'mandatory' => true, 'includeBlankOption' => true, 'tl_class' => 'w50'),

             'sql'       => "smallint(3) unsigned NOT NULL default 0"

         ),

-        'leseart'     => array

+        'sorten'       => array

         (

             'exclude'   => true,

-            'inputType' => 'select',

-            'options'   => [],

-            'reference' => &$GLOBALS['TL_LANG']['MSC']['leseart'],

-            'eval'      => array('rgxp' => 'natural', 'mandatory' => false, 'includeBlankOption' => true, 'tl_class' => 'clr w50'),

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

-        ),

-        'sorte'       => array

-        (

-            'exclude'   => true,

-            'inputType' => 'select',

-            'foreignKey'   => 'tl_vr_wa_rebsorte.title',

-            'eval'      => array('rgxp' => 'natural', 'mandatory' => false, 'multiple'=>true,'chosen'=>true,'includeBlankOption' => true, 'tl_class' => 'w50','csv'=>','),

+            'inputType' => 'multiColumnWizard',

+            'eval'      => array(

+                'minCount' => 1,

+                'tl_class' => 'clr',

+                'columnFields' => array

+                (

+                    'sorte' => array

+                    (

+                        'label' => $GLOBALS['TL_LANG']['MSC']['wa_sorte'],

+                        'inputType' => 'select',

+                        'foreignKey'   => 'tl_vr_wa_rebsorte.title',

+                        'eval' => array('style' => 'width:350px','mandatory' => true,'chosen'=>true,'includeBlankOption' => true)

+                    ),

+                    'leseart' => array

+                    (

+                        'label' => $GLOBALS['TL_LANG']['MSC']['wa_leseart'],

+                        'inputType' => 'select',

+                        'foreignKey'   => 'tl_vr_wa_leseart.title',

+                        'eval' => array('style' => 'width:350px','mandatory' => true,'chosen'=>true,'includeBlankOption' => true)

+                    )

+                )

+            ),

             'sql'       => "blob NULL",

-            'relation'   => array('type' => 'hasMany', 'load' => 'lazy')

         ),

         'anmerkungen' => array

         (

@@ -49,6 +49,11 @@ $GLOBALS['TL_DCA']['tl_vr_wa_standort'] = array

                 'href'                => 'table=tl_vr_wa_rebsorte',

                 'class'               => 'header_rebsorte',

             ),

+            'leseart' => array

+            (

+                'href'                => 'table=tl_vr_wa_leseart',

+                'class'               => 'header_leseart',

+            ),

             'all' => array

             (

                 'href'                => 'act=select',

new file mode 100644

@@ -0,0 +1,12 @@

+<?php

+

+/**

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

+ *

+ * (c) vonRotenberg

+ *

+ * @license commercial

+ */

+

+$GLOBALS['TL_LANG']['MSC']['wa_sorte'] = 'Rebsorte';

+$GLOBALS['TL_LANG']['MSC']['wa_leseart'] = 'Leseart';

@@ -14,6 +14,7 @@ use vonRotenberg\WeinanlieferungBundle\Controller\Frontend\Module\Weinanlieferun

 $GLOBALS['TL_LANG']['MOD']['weinanlieferung'][0] = 'Weinanlieferung';

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

 $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';

 $GLOBALS['TL_LANG']['FMD'][WeinanlieferungSlotsListModuleController::TYPE][0] = 'Weinanlieferung-Zeitslotliste';

@@ -16,8 +16,8 @@ $GLOBALS['TL_LANG']['tl_vr_wa_slot']['behaelter'][0] = 'Behälter';

 $GLOBALS['TL_LANG']['tl_vr_wa_slot']['behaelter'][1] = 'Anzahl der Behälter, die verarbeitet werden können.';

 $GLOBALS['TL_LANG']['tl_vr_wa_slot']['leseart'][0] = 'Leseart';

 $GLOBALS['TL_LANG']['tl_vr_wa_slot']['leseart'][1] = 'Die verwendete Leseart.';

-$GLOBALS['TL_LANG']['tl_vr_wa_slot']['sorte'][0] = 'Rebsorten';

-$GLOBALS['TL_LANG']['tl_vr_wa_slot']['sorte'][1] = 'Die Rebsorten, die in diesem Zeitslot verarbeitet werden.';

+$GLOBALS['TL_LANG']['tl_vr_wa_slot']['sorten'][0] = 'Rebsorten';

+$GLOBALS['TL_LANG']['tl_vr_wa_slot']['sorten'][1] = 'Die Rebsorten, die in diesem Zeitslot verarbeitet werden.';

 $GLOBALS['TL_LANG']['tl_vr_wa_slot']['anmerkungen'][0] = 'Anmerkungen';

 $GLOBALS['TL_LANG']['tl_vr_wa_slot']['anmerkungen'][1] = 'Ergänzende Hinweise zu diesem Zeitslot.';

 $GLOBALS['TL_LANG']['tl_vr_wa_slot']['addEnclosure'][0] = 'Anhänge';

@@ -14,3 +14,4 @@ $GLOBALS['TL_LANG']['tl_vr_wa_standort']['title'][1] = 'Der Name des Anlieferung

 $GLOBALS['TL_LANG']['tl_vr_wa_standort']['title_legend'] = 'Standort';

 $GLOBALS['TL_LANG']['tl_vr_wa_standort']['rebsorte'] = 'Rebsorten';

+$GLOBALS['TL_LANG']['tl_vr_wa_standort']['leseart'] = 'Leseart';

@@ -27,7 +27,6 @@

         <div class="divider m-0 mb-2"></div>

         <div class="frame__body">

-

             <h3>Reservierung ändern</h3>

             <form hx-post="/_ajax/vr_wa/v1/slot?do=updateReservation">

                 <input type="hidden" name="id" value="{{ id }}">

@@ -23,7 +23,7 @@

                                     </div>

                                     <div class="col u-text-right action">

                                         <a hx-get="/_ajax/vr_wa/v1/slot?do=booking&id={{ booking.id }}" hx-target="body" hx-swap="beforeend" href="javascript:;" class="btn btn--xs m-0">Anzeigen</a>

-                                        <a hx-get="/_ajax/vr_wa/v1/slot?do=delete&id={{ booking.id }}" hx-target="body" hx-swap="beforeend" href="javascript:;" class="btn btn--xs btn-danger m-0">Löschen</a>

+                                        <a hx-get="/_ajax/vr_wa/v1/slot?do=delete&id={{ booking.id }}" hx-target="body" hx-swap="beforeend" hx-confirm="Sind Sie sicher, dass Sie diese Reservierung löschen möchten?" href="javascript:;" class="btn btn--xs btn-danger m-0">Löschen</a>

                                     </div>

                                 </div>

                             {% endfor %}

@@ -1,4 +1,5 @@

-.header_rebsorte {

+.header_rebsorte,

+.header_leseart {

   padding:3px 0 3px 21px;

   background-position:left center;

   background-repeat:no-repeat;

@@ -7,3 +8,6 @@

 .header_rebsorte {

   background-image:url("/bundles/vonrotenbergweinanlieferung/images/icons/reben.svg");

 }

+.header_leseart {

+  background-image:url("/bundles/vonrotenbergweinanlieferung/images/icons/schere.svg");

+}

@@ -1 +1 @@

-<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="16px" height="16px" viewBox="0 0 600 600" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><g><g><path d="M128.043,160.998c21.826,3.314 36.857,23.724 33.543,45.551c-3.314,21.827 -23.724,36.857 -45.551,33.543c-21.826,-3.313 -36.856,-23.724 -33.543,-45.551c3.314,-21.826 23.724,-36.856 45.551,-33.543Z" style="fill:#462592;"/><path d="M129.244,153.089c26.191,3.976 44.228,28.469 40.251,54.661c-3.976,26.192 -28.469,44.228 -54.66,40.251c-26.192,-3.976 -44.228,-28.468 -40.252,-54.66c3.976,-26.192 28.469,-44.228 54.661,-40.252Z" style="fill:#462592;"/><path d="M173.554,260.962c26.192,3.976 44.228,28.469 40.252,54.661c-3.976,26.191 -28.469,44.228 -54.661,40.251c-26.191,-3.976 -44.228,-28.469 -40.251,-54.66c3.976,-26.192 28.469,-44.228 54.66,-40.252Z" style="fill:#462592;"/><path d="M217.865,368.835c26.192,3.976 44.228,28.469 40.252,54.66c-3.976,26.192 -28.469,44.228 -54.661,40.252c-26.191,-3.976 -44.228,-28.469 -40.251,-54.661c3.976,-26.191 28.469,-44.228 54.66,-40.251Z" style="fill:#462592;"/><path d="M336.506,386.846c26.192,3.976 44.228,28.469 40.252,54.661c-3.977,26.192 -28.469,44.228 -54.661,40.251c-26.192,-3.976 -44.228,-28.469 -40.252,-54.66c3.976,-26.192 28.469,-44.228 54.661,-40.252Z" style="fill:#462592;"/><path d="M262.176,476.707c26.192,3.977 44.228,28.469 40.252,54.661c-3.976,26.192 -28.469,44.228 -54.661,40.252c-26.192,-3.976 -44.228,-28.469 -40.252,-54.661c3.977,-26.192 28.469,-44.228 54.661,-40.252Z" style="fill:#462592;"/><path d="M247.884,171.1c26.192,3.977 44.228,28.469 40.252,54.661c-3.976,26.192 -28.469,44.228 -54.661,40.252c-26.192,-3.977 -44.228,-28.469 -40.252,-54.661c3.977,-26.192 28.469,-44.228 54.661,-40.252Z" style="fill:#462592;"/><path d="M292.195,278.973c26.192,3.976 44.228,28.469 40.252,54.661c-3.976,26.192 -28.469,44.228 -54.661,40.252c-26.192,-3.977 -44.228,-28.469 -40.252,-54.661c3.977,-26.192 28.469,-44.228 54.661,-40.252Z" style="fill:#462592;"/><path d="M410.836,296.984c26.192,3.977 44.228,28.469 40.251,54.661c-3.976,26.192 -28.469,44.228 -54.66,40.252c-26.192,-3.976 -44.228,-28.469 -40.252,-54.661c3.976,-26.192 28.469,-44.228 54.661,-40.252Z" style="fill:#462592;"/><path d="M366.525,189.112c26.192,3.976 44.228,28.469 40.252,54.66c-3.977,26.192 -28.469,44.228 -54.661,40.252c-26.192,-3.976 -44.228,-28.469 -40.252,-54.661c3.976,-26.191 28.469,-44.228 54.661,-40.251Z" style="fill:#462592;"/><path d="M485.165,207.123c26.192,3.976 44.228,28.469 40.252,54.661c-3.976,26.191 -28.469,44.228 -54.661,40.251c-26.191,-3.976 -44.228,-28.469 -40.251,-54.66c3.976,-26.192 28.469,-44.228 54.66,-40.252Z" style="fill:#462592;"/></g><path d="M301.146,167.049c0,-0 25.368,-112.94 68.42,-131.217l39.547,6.003c-0,0 -39.5,19.327 -88.762,128.129l-19.205,-2.915Z" style="fill:#259232;"/></g></svg>

\ No newline at end of file

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="16px" height="16px" viewBox="0 0 600 600" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><g><g><path d="M127.578,156.518c24.702,3.75 41.711,26.849 37.961,51.55c-3.75,24.701 -26.848,41.711 -51.55,37.961c-24.701,-3.75 -41.71,-26.849 -37.961,-51.55c3.75,-24.701 26.849,-41.711 51.55,-37.961Z" style="fill:#462592;"/><path d="M174.53,246.999c34.3,5.207 57.919,37.282 52.712,71.582c-5.207,34.3 -37.282,57.92 -71.582,52.712c-34.3,-5.207 -57.92,-37.282 -52.712,-71.581c5.207,-34.3 37.282,-57.92 71.582,-52.713Z" style="fill:#462592;"/><path d="M225.829,374.71c23.351,3.545 39.431,25.381 35.886,48.732c-3.545,23.351 -25.381,39.431 -48.732,35.886c-23.352,-3.545 -39.432,-25.381 -35.887,-48.732c3.545,-23.351 25.382,-39.431 48.733,-35.886Z" style="fill:#462592;"/><path d="M342.957,422.684c17.852,2.71 30.146,19.405 27.436,37.257c-2.711,17.853 -19.405,30.146 -37.257,27.436c-17.853,-2.71 -30.146,-19.405 -27.436,-37.257c2.71,-17.853 19.404,-30.146 37.257,-27.436Z" style="fill:#462592;"/><path d="M260.921,477.436c26.192,3.976 44.228,28.469 40.252,54.661c-3.977,26.191 -28.469,44.228 -54.661,40.251c-26.192,-3.976 -44.228,-28.469 -40.252,-54.661c3.977,-26.191 28.469,-44.228 54.661,-40.251Z" style="fill:#462592;"/><path d="M245.895,166.666c23.521,3.571 39.719,25.567 36.148,49.089c-3.571,23.522 -25.567,39.719 -49.089,36.148c-23.521,-3.571 -39.719,-25.567 -36.148,-49.088c3.571,-23.522 25.567,-39.72 49.089,-36.149Z" style="fill:#462592;"/><path d="M300.796,280.648c25.67,3.897 43.346,27.901 39.449,53.57c-3.897,25.67 -27.901,43.346 -53.57,39.449c-25.67,-3.897 -43.346,-27.901 -39.449,-53.57c3.897,-25.67 27.901,-43.346 53.57,-39.449Z" style="fill:#462592;"/><path d="M398.518,314.709c22.331,3.39 37.708,24.272 34.317,46.602c-3.39,22.33 -24.271,37.708 -46.601,34.317c-22.331,-3.39 -37.708,-24.271 -34.318,-46.601c3.391,-22.331 24.272,-37.708 46.602,-34.318Z" style="fill:#462592;"/><path d="M363.102,204.117c18.312,2.78 30.922,19.904 28.142,38.216c-2.78,18.312 -19.904,30.922 -38.216,28.142c-18.312,-2.78 -30.922,-19.904 -28.142,-38.216c2.78,-18.312 19.904,-30.922 38.216,-28.142Z" style="fill:#462592;"/><path d="M484.777,202.139c29.345,4.455 49.552,31.896 45.097,61.24c-4.455,29.345 -31.896,49.552 -61.24,45.097c-29.344,-4.455 -49.552,-31.896 -45.097,-61.24c4.455,-29.345 31.896,-49.552 61.24,-45.097Z" style="fill:#462592;"/></g><path d="M301.146,167.049c0,-0 25.368,-112.94 68.42,-131.217l39.547,6.003c-0,0 -39.5,19.327 -88.762,128.129l-19.205,-2.915Z" style="fill:#259232;"/></g></svg>

\ No newline at end of file

new file mode 100644

@@ -0,0 +1 @@

+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="16px" height="16px" viewBox="0 0 600 600" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><g><path d="M339.851,268.552l-41.185,20.628l-15.669,-31.276l41.192,-20.641l15.662,31.289Z" style="fill:#585858;fill-rule:nonzero;"/><path d="M381.328,317.165l-0.994,-46.062l-34.982,0.765l0.997,46.051l34.979,-0.754Z" style="fill:#585858;fill-rule:nonzero;"/><path d="M434.823,17.328c36.356,21.909 37.361,83.346 6.034,135.316c-32.157,53.355 -86.977,79.343 -122.509,57.928l116.475,-193.244Z" style="fill:#3b3b3b;fill-rule:nonzero;"/><path d="M320.409,207.207c14.396,-23.864 45.395,-31.558 69.256,-17.173c23.872,14.388 31.558,45.394 17.17,69.266c-14.381,23.86 -45.382,31.545 -69.258,17.163c-23.866,-14.384 -31.552,-45.39 -17.168,-69.256Z" style="fill:#585858;fill-rule:nonzero;"/><path d="M62.816,411.922l40.125,47.985l194.647,-162.455c10.483,-5.437 15.577,-17.595 12.151,-28.912c-4.099,-13.509 -18.656,-20.754 -31.937,-16.009l-214.986,159.391Z" style="fill:#9f3330;fill-rule:nonzero;"/><path d="M346.134,582.672l-61.764,-10.361l53.321,-250.689c-0.089,-11.809 8.282,-21.991 19.894,-24.249c13.846,-2.693 27.059,6.803 29.068,20.768l-40.519,264.531Z" style="fill:#9f3330;fill-rule:nonzero;"/><path d="M489.563,50.321c121.816,73.42 -12.415,310.3 -151.998,226.176l52.122,-86.479c33.649,20.29 81.83,11.759 103.949,-33.404l8.312,-23.876c7.448,-34.427 -5.818,-63.6 -12.385,-82.417Z" style="fill:#585858;fill-rule:nonzero;"/><path d="M370.883,221.206c6.656,4.01 8.799,12.656 4.793,19.312c-4.01,6.653 -12.66,8.797 -19.313,4.787c-6.66,-4.014 -8.797,-12.657 -4.787,-19.313c4.015,-6.654 12.653,-8.798 19.307,-4.786Z" style="fill-rule:nonzero;"/></g></svg>

\ No newline at end of file

@@ -18,12 +18,15 @@ use Contao\CoreBundle\Framework\ContaoFramework;

 use Contao\CoreBundle\Security\Authentication\Token\TokenChecker;

 use Contao\FrontendUser;

 use Contao\Input;

+use Contao\StringUtil;

 use Contao\System;

 use Doctrine\DBAL\Connection;

 use Symfony\Component\HttpFoundation\Request;

 use Symfony\Component\HttpFoundation\Response;

 use Symfony\Component\Routing\Annotation\Route;

 use Symfony\Contracts\Translation\TranslatorInterface;

+use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungLeseartModel;

+use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungRebsorteModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungReservationModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungSlotsModel;

@@ -83,7 +86,6 @@ class SlotAjaxController extends AbstractController

         }

         return new Response('',500);

-        return new Response(null,203);

     }

     protected function renderDetails(bool $blnModal=true)

@@ -106,10 +108,18 @@ class SlotAjaxController extends AbstractController

             foreach ($Reservations as $reservation)

             {

                 $arrSortenBooked = [];

-                if (($Sorten = $reservation->getRelated('sorten')) !== null)

+                $SortenLeseart = explode(';',$reservation->sorten);

+                foreach($SortenLeseart as $sorteLeseart)

                 {

-                    $arrSortenBooked = $Sorten->fetchEach('title');

+                    list($sorte,$leseart) = explode(',',$sorteLeseart);

+                    $objSorte = WeinanlieferungRebsorteModel::findByPk($sorte);

+                    $objLeseart = WeinanlieferungLeseartModel::findByPk($leseart);

+                    $arrSortenBooked[$objSorte->id.','.$objLeseart->id] = ($objSorte !== null  ? $objSorte->title : '') . ' ' . ($objLeseart !== null  ? $objLeseart->title : '');

                 }

+                /*if (($Sorten = $reservation->getRelated('sorten')) !== null)

+                {

+                    $arrSortenBooked = $Sorten->fetchEach('title');

+                }*/

                 $arrReservations[] = array_merge($reservation->row(),[

                     'sorten' => $arrSortenBooked

                 ]);

@@ -118,10 +128,17 @@ class SlotAjaxController extends AbstractController

         // Build data

         $arrSorten = [];

-        if (($Sorten = $Slot->getRelated('sorte')) !== null)

+        $Sorten = StringUtil::deserialize($Slot->sorten,true);

+        foreach($Sorten as $sorte)

         {

-            $arrSorten = array_combine($Sorten->fetchEach('id'),$Sorten->fetchEach('title'));

+            $objSorte = WeinanlieferungRebsorteModel::findByPk($sorte['sorte']);

+            $objLeseart = WeinanlieferungLeseartModel::findByPk($sorte['leseart']);

+            $arrSorten[$objSorte->id.','.$objLeseart->id] = ($objSorte !== null  ? $objSorte->title : '') . ' ' . ($objLeseart !== null  ? $objLeseart->title : '');

         }

+        /*if (($Sorten = $Slot->getRelated('sorte')) !== null)

+        {

+            $arrSorten = array_combine($Sorten->fetchEach('id'),$Sorten->fetchEach('title'));

+        }*/

         $intAvailableBehaelter = $Slot->getAvailableBehaelter();

@@ -158,14 +175,21 @@ class SlotAjaxController extends AbstractController

         }

         $arrSortenAvailable = [];

-        if (($Sorten = $Slot->getRelated('sorte')) !== null)

+        $Sorten = StringUtil::deserialize($Slot->sorten,true);

+        foreach($Sorten as $sorte)

         {

-            $arrSortenAvailable = array_combine($Sorten->fetchEach('id'),$Sorten->fetchEach('title'));

+            $objSorte = WeinanlieferungRebsorteModel::findByPk($sorte['sorte']);

+            $objLeseart = WeinanlieferungLeseartModel::findByPk($sorte['leseart']);

+            $arrSortenAvailable[$objSorte->id.','.$objLeseart->id] = ($objSorte !== null  ? $objSorte->title : '') . ' ' . ($objLeseart !== null  ? $objLeseart->title : '');

         }

         $arrSortenBooked = [];

-        if (($Sorten = $Booking->getRelated('sorten')) !== null)

+        $SortenLeseart = explode(';',$Booking->sorten);

+        foreach($SortenLeseart as $sorteLeseart)

         {

-            $arrSortenBooked = array_combine($Sorten->fetchEach('id'),$Sorten->fetchEach('title'));

+            list($sorte,$leseart) = explode(',',$sorteLeseart);

+            $objSorte = WeinanlieferungRebsorteModel::findByPk($sorte);

+            $objLeseart = WeinanlieferungLeseartModel::findByPk($leseart);

+            $arrSortenBooked[$objSorte->id.','.$objLeseart->id] = ($objSorte !== null  ? $objSorte->title : '') . ' ' . ($objLeseart !== null  ? $objLeseart->title : '');

         }

         $intAvailableBehaelter = $Slot->getAvailableBehaelter();

@@ -203,7 +227,7 @@ class SlotAjaxController extends AbstractController

         {

             $arrSorten[] = Input::post('sorten');

         } else {

-            $arrSorten = implode(',', Input::post('sorten'));

+            $arrSorten = implode(';', Input::post('sorten'));

         }

         $Reservation = new WeinanlieferungReservationModel();

@@ -21,9 +21,11 @@ use Contao\Date;

 use Contao\FrontendUser;

 use Contao\ModuleModel;

 use Contao\StringUtil;

+use Contao\System;

 use Contao\Template;

 use Symfony\Component\HttpFoundation\Request;

 use Symfony\Component\HttpFoundation\Response;

+use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungLeseartModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungRebsorteModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungReservationModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungSlotsModel;

@@ -58,9 +60,13 @@ class WeinanlieferungBookedListModuleController extends AbstractFrontendModuleCo

                     $day = new Date($Slot->date);

                     $arrSorten = [];

-                    if (($Sorten = $booking->getRelated('sorten')) !== null)

+                    $SortenLeseart = explode(';',$booking->sorten);

+                    foreach($SortenLeseart as $sorteLeseart)

                     {

-                        $arrSorten = $Sorten->fetchEach('title');

+                        list($sorte,$leseart) = explode(',',$sorteLeseart);

+                        $objSorte = WeinanlieferungRebsorteModel::findByPk($sorte);

+                        $objLeseart = WeinanlieferungLeseartModel::findByPk($leseart);

+                        $arrSorten[$objSorte->id.','.$objLeseart->id] = ($objSorte !== null  ? $objSorte->title : '') . ' ' . ($objLeseart !== null  ? $objLeseart->title : '');

                     }

                     $arrData['days'][$day->dayBegin][] = array_merge($booking->row(), [

@@ -21,9 +21,11 @@ use Contao\Date;

 use Contao\FrontendUser;

 use Contao\ModuleModel;

 use Contao\StringUtil;

+use Contao\System;

 use Contao\Template;

 use Symfony\Component\HttpFoundation\Request;

 use Symfony\Component\HttpFoundation\Response;

+use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungLeseartModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungRebsorteModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungReservationModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungSlotsModel;

@@ -59,8 +61,9 @@ class WeinanlieferungSlotsListModuleController extends AbstractFrontendModuleCon

         if (!empty($_GET['filter_sorte']))

         {

             $arrData['filter']['sorte']['selected'] = $_GET['filter_sorte'];

-            $arrOptions['column'][] = 'FIND_IN_SET(?,sorte)';

-            $arrOptions['value'][] = $_GET['filter_sorte'];

+//            $arrOptions['column'][] = 'FIND_IN_SET(?,sorte)';

+            $arrOptions['column'][] = "REGEXP_LIKE(sorten,'\"sorte\";s:[0-9]+:\"" . intval($_GET['filter_sorte']) . "\"')";

+//            $arrOptions['value'][] = $_GET['filter_sorte'];

         }

         $arrData['filter']['kapazitaet']['options'] = range(1,30);

@@ -79,10 +82,17 @@ class WeinanlieferungSlotsListModuleController extends AbstractFrontendModuleCon

                 $arrSorten = [];

                 $intAvailableBehaelter = $slot->getAvailableBehaelter();

-                if (($Sorten = $slot->getRelated('sorte')) !== null)

+                $Sorten = StringUtil::deserialize($slot->sorten,true);

+                foreach($Sorten as $sorte)

                 {

-                    $arrSorten = $Sorten->fetchEach('title');

+                    $objSorte = WeinanlieferungRebsorteModel::findByPk($sorte['sorte']);

+                    $objLeseart = WeinanlieferungLeseartModel::findByPk($sorte['leseart']);

+                    $arrSorten[] = ($objSorte !== null  ? $objSorte->title : '') . ' ' . ($objLeseart !== null  ? $objLeseart->title : '');

                 }

+                /*if (($Sorten = $slot->getRelated('sorte')) !== null)

+                {

+                    $arrSorten = $Sorten->fetchEach('title');

+                }*/

                 $arrData['days'][$day->dayBegin][] = array_merge($slot->row(),[

                     'sorte' => $arrSorten,

new file mode 100644

@@ -0,0 +1,24 @@

+<?php

+

+declare(strict_types=1);

+

+/*

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

+ *

+ * (c) vonRotenberg

+ *

+ * @license commercial

+ */

+

+namespace vonRotenberg\WeinanlieferungBundle\Model;

+

+use Contao\Model;

+

+class WeinanlieferungLeseartModel extends Model

+{

+    /**

+     * Table name

+     * @var string

+     */

+    protected static $strTable = 'tl_vr_wa_leseart';

+}