@@ -50,7 +50,7 @@ $GLOBALS['TL_DCA']['tl_vr_wa_slotassistant'] =

                                     'label' => $GLOBALS['TL_LANG']['tl_vr_wa_slotassistant']['date_start'],

                                     'inputType' => 'text',

                                     'eval' => [

-                                        'style' => 'width:350px',

+                                        'style' => 'width:150px',

                                         'mandatory' => true,

                                         'rgxp' =>'datim',

                                         'datepicker' => true

@@ -61,7 +61,7 @@ $GLOBALS['TL_DCA']['tl_vr_wa_slotassistant'] =

                                     'label' => $GLOBALS['TL_LANG']['tl_vr_wa_slotassistant']['date_end'],

                                     'inputType' => 'text',

                                     'eval' => [

-                                        'style' => 'width:350px',

+                                        'style' => 'width:150px',

                                         'mandatory' => true,

                                         'rgxp' =>'datim',

                                         'datepicker' => true

@@ -86,7 +86,7 @@ $GLOBALS['TL_DCA']['tl_vr_wa_slottypes'] = array

     // Palettes

     'palettes' => array

     (

-        'default' => '{title_legend},title;{config_legend},containers,units'

+        'default' => '{title_legend},title;{config_legend},duration,containers,units'

     ),

     // Subpalettes

@@ -124,6 +124,21 @@ $GLOBALS['TL_DCA']['tl_vr_wa_slottypes'] = array

             ),

             'sql'                     => "varchar(64) NOT NULL default ''"

         ),

+        'duration' => array

+        (

+            'exclude'                 => true,

+            'inputType'               => 'text',

+            'eval'                    => array

+            (

+                'mandatory' => true,

+                'maxlength' => 4,

+                'maxval'    => 1440,

+                'minval'    => 1,

+                'rgxp'      => 'natural',

+                'tl_class' => 'w50'

+            ),

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

+        ),

         'containers' => array

         (

             'exclude'                 => true,

@@ -44,7 +44,7 @@ $GLOBALS['TL_DCA']['tl_vr_wa_standort'] = array

         ),

         'global_operations' => array

         (

-            'rebsorte' => array

+            /*'rebsorte' => array

             (

                 'href'                => 'table=tl_vr_wa_rebsorte',

                 'class'               => 'header_rebsorte',

@@ -58,7 +58,7 @@ $GLOBALS['TL_DCA']['tl_vr_wa_standort'] = array

             (

                 'href'                => 'table=tl_vr_wa_lage',

                 'class'               => 'header_lage',

-            ),

+            ),*/

             'all' => array

             (

                 'href'                => 'act=select',

@@ -76,7 +76,7 @@ $GLOBALS['TL_DCA']['tl_vr_wa_standort'] = array

             'slottypes' => array

             (

                 'href'                => 'table=tl_vr_wa_slottypes',

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

+                'icon'                => '/bundles/vonrotenbergweinanlieferung/images/icons/stack.svg',

             ),

             'editheader' => array

             (

@@ -10,6 +10,12 @@

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

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

+$GLOBALS['TL_LANG']['MSC']['wa_container'] = 'Behälter';

+$GLOBALS['TL_LANG']['MSC']['wa_duration'] = 'Dauer';

+$GLOBALS['TL_LANG']['MSC']['wa_duration_minute'] = 'Minute';

+$GLOBALS['TL_LANG']['MSC']['wa_duration_minutes'] = 'Minuten';

+$GLOBALS['TL_LANG']['MSC']['wa_duration_hour'] = 'Stunde';

+$GLOBALS['TL_LANG']['MSC']['wa_duration_hours'] = 'Stunden';

 $GLOBALS['TL_LANG']['REF']['wa_ernteart'] = [

     'handlese' => 'Handlese',

new file mode 100644

@@ -0,0 +1,47 @@

+<?xml version="1.0" ?>

+<xliff version="1.1">

+    <file datatype="php" original="contao/languages/en/tl_vr_wa_slottypes.xlf" source-language="en" target-language="de">

+        <body>

+            <trans-unit id="tl_vr_wa_slottypes.title.0">

+                <source>Title</source>

+                <target>Titel</target>

+            </trans-unit>

+            <trans-unit id="tl_vr_wa_slottypes.title.1">

+                <source>The designation of the slot type.</source>

+                <target>Die Bezeichnung des Slottyps.</target>

+            </trans-unit>

+            <trans-unit id="tl_vr_wa_slottypes.duration.0">

+                <source>Duration in min.</source>

+                <target>Dauer in min.</target>

+            </trans-unit>

+            <trans-unit id="tl_vr_wa_slottypes.duration.1">

+                <source>The duration of the slot.</source>

+                <target>Die Dauer des Slots.</target>

+            </trans-unit>

+            <trans-unit id="tl_vr_wa_slottypes.containers.0">

+                <source>Processable containers</source>

+                <target>Verarbeitbare Containermenge</target>

+            </trans-unit>

+            <trans-unit id="tl_vr_wa_slottypes.containers.1">

+                <source>The amount of processable containers within the slot duration.</source>

+                <target>Die Anzahl der verarbeitbaren Container innerhalb der Slotdauer.</target>

+            </trans-unit>

+            <trans-unit id="tl_vr_wa_slottypes.units.0">

+                <source>Additional container units</source>

+                <target>Zusätzliche Container-Einheiten</target>

+            </trans-unit>

+            <trans-unit id="tl_vr_wa_slottypes.units.1">

+                <source>Additional selectable container units for slot booking.</source>

+                <target>Zusätzlich wählbare Behältereinheiten für die Slotbuchung.</target>

+            </trans-unit>

+            <trans-unit id="tl_vr_wa_slottypes.title_legend">

+                <source>Title settings</source>

+                <target>Titel-Einstellungen</target>

+            </trans-unit>

+            <trans-unit id="tl_vr_wa_slottypes.config_legend">

+                <source>Slot configuration</source>

+                <target>Slot-Konfiguration</target>

+            </trans-unit>

+        </body>

+    </file>

+</xliff>

@@ -15,5 +15,5 @@ $GLOBALS['TL_LANG']['tl_vr_wa_units']['description'][1] = 'DIe Bezeichnung wird

 $GLOBALS['TL_LANG']['tl_vr_wa_units']['containers'][0] = 'Behälter';

 $GLOBALS['TL_LANG']['tl_vr_wa_units']['containers'][1] = 'Die Anzahl an Behälter, die dieser Einheit entsprechen.';

-$GLOBALS['TL_LANG']['tl_vr_wa_standort']['title_legend'] = 'Bezeichnung';

-$GLOBALS['TL_LANG']['tl_vr_wa_standort']['unit_legend'] = 'Einheit-Konfiguration';

+$GLOBALS['TL_LANG']['tl_vr_wa_units']['title_legend'] = 'Bezeichnung';

+$GLOBALS['TL_LANG']['tl_vr_wa_units']['unit_legend'] = 'Einheit-Konfiguration';

new file mode 100644

@@ -0,0 +1 @@

+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-layers"><polygon points="12 2 2 7 12 12 22 7 12 2"></polygon><polyline points="2 17 12 22 22 17"></polyline><polyline points="2 12 12 17 22 12"></polyline></svg>

\ No newline at end of file

new file mode 100644

@@ -0,0 +1 @@

+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="#259232" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-layers"><polygon points="12 2 2 7 12 12 22 7 12 2"></polygon><polyline points="2 17 12 22 22 17"></polyline><polyline points="2 12 12 17 22 12"></polyline></svg>

\ No newline at end of file

@@ -128,11 +128,8 @@ class WeinanlieferungSlotAssistantController extends AbstractController

                     'widget' => new SelectMenu([

                         'name'      => 'slotType',

                         'mandatory' => true,

-                        'options'   => [

-                            ['value' => 'eins', 'label' => 'eins'],

-                            ['value' => 'zwei', 'label' => 'zwei']

-                        ],

-                        'label'     => 'Zeitslot-Typ'

+                        'options'   => $this->getSlottypeOptions(),

+                        'label'     => 'Zeitslot-Typ',

                     ])

                 ],

                 [

@@ -171,9 +168,10 @@ class WeinanlieferungSlotAssistantController extends AbstractController

                 ],*/

                 [

                     'class'  => 'clr',

-                    'help' => 'blah',

+                    'help' => 'Die Zeiträume, für die neue Slots angelegt werden sollen.',

                     'widget' => new MultiColumnWizard([

                         'name'       => 'timeframe',

+                        'label'      => 'Zeiträume',

                         'minCount' => 1,

                         'columnFields' =>

                             [

@@ -182,7 +180,7 @@ class WeinanlieferungSlotAssistantController extends AbstractController

                                         'label' => $GLOBALS['TL_LANG']['tl_vr_wa_slotassistant']['date_start'],

                                         'inputType' => 'text',

                                         'eval' => [

-                                            'style' => 'width:350px',

+                                            'style' => 'width:150px',

                                             'mandatory' => true,

                                             'rgxp' =>'datim',

                                             'datepicker' => true

@@ -193,7 +191,7 @@ class WeinanlieferungSlotAssistantController extends AbstractController

                                         'label' => $GLOBALS['TL_LANG']['tl_vr_wa_slotassistant']['date_end'],

                                         'inputType' => 'text',

                                         'eval' => [

-                                            'style' => 'width:350px',

+                                            'style' => 'width:150px',

                                             'mandatory' => true,

                                             'rgxp' =>'datim',

                                             'datepicker' => true

@@ -354,4 +352,23 @@ class WeinanlieferungSlotAssistantController extends AbstractController

         $this->fields = $arrWidgets;

         return $this->fields;

     }

+

+    protected function getSlottypeOptions()

+    {

+        $arrOptions = [['value'=>'','label'=>'-']];

+        $Slottypes = $this->db->prepare("SELECT t.id, t.title, s.title as 'standort' FROM tl_vr_wa_slottypes t INNER JOIN tl_vr_wa_standort s ON s.id = t.pid ORDER BY title")->executeQuery();

+

+        if ($Slottypes->rowCount() > 0)

+        {

+            foreach ($Slottypes->fetchAllAssociative() as $option)

+            {

+                $arrOptions[] = [

+                    'value' => $option['id'],

+                    'label' => $option['title'].' ['.$option['standort'].']'

+                ];

+            }

+        }

+

+        return $arrOptions;

+    }

 }

@@ -15,10 +15,12 @@ namespace vonRotenberg\WeinanlieferungBundle\EventListener\Backend;

 use Contao\CoreBundle\Event\MenuEvent;

+use Knp\Menu\Util\MenuManipulator;

 use Symfony\Component\HttpFoundation\RequestStack;

 use Symfony\Component\Routing\RouterInterface;

 use Terminal42\ServiceAnnotationBundle\Annotation\ServiceTag;

 use vonRotenberg\WeinanlieferungBundle\Controller\Backend\WeinanlieferungBookingsController;

+use vonRotenberg\WeinanlieferungBundle\Controller\Backend\WeinanlieferungSlotAssistantController;

 /**

  * @ServiceTag("kernel.event_listener", event="contao.backend_menu_build", priority=-255)

@@ -59,5 +61,19 @@ use vonRotenberg\WeinanlieferungBundle\Controller\Backend\WeinanlieferungBooking

          ;

          $contentNode->addChild($node);

+

+         $node = $factory

+             ->createItem('slot-assistant')

+             ->setUri($this->router->generate(WeinanlieferungSlotAssistantController::class,['ref'=>$ref]))

+             ->setLabel('Slot-Assistent')

+             ->setLinkAttribute('title', 'Assistent zur Massenalage von Zeitslots für Standorte')

+             ->setLinkAttribute('class', 'navigation wa-slot-assistant')

+             ->setCurrent($this->requestStack->getCurrentRequest()->get('_controller') === WeinanlieferungSlotAssistantController::class)

+         ;

+

+         $contentNode->addChild($node);

+

+         $manipulator = new MenuManipulator();

+         $manipulator->moveToPosition($contentNode['slot-assistant'],1);

      }

 }

new file mode 100644

@@ -0,0 +1,66 @@

+<?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\ServiceAnnotation\Callback;

+use Contao\DataContainer;

+use Doctrine\DBAL\Connection;

+use Symfony\Contracts\Translation\TranslatorInterface;

+

+class WeinanlieferungSlottypesContainerListener

+{

+    /** @var Connection */

+    protected $db;

+

+    private TranslatorInterface $translator;

+

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

+    {

+        $this->db = $db;

+        $this->translator = $translator;

+    }

+

+    /**

+     * @Callback(table="tl_vr_wa_slottypes", target="list.sorting.child_record")

+     */

+    public function onChildRecordCallback(array $row): string

+    {

+        $strRow = '<div class="tl_content_left">%s</div>';

+        $label = $row['title'];

+        $label .= ' <span style="color:#999;padding-left:3px">['.$this->translator->trans('MSC.wa_container', [], 'contao_tl_vr_wa_units').': '.$row['containers'].']</span>';

+        $label .= ' <span style="color:#999;padding-left:3px">['.$this->translator->trans('MSC.wa_duration', [], 'contao_tl_vr_wa_units').': '.$row['duration'].' '.($row['duration'] == 1 ? $this->translator->trans('MSC.wa_duration_minute', [], 'contao_tl_vr_wa_units') : $this->translator->trans('MSC.wa_duration_minutes', [], 'contao_tl_vr_wa_units')).']</span>';

+

+        return sprintf($strRow,$label);

+    }

+

+    /**

+     * @Callback(table="tl_vr_wa_slottypes", target="fields.units.options")

+     */

+    public function onUnitsOptionsCallback(?DataContainer $dc): array

+    {

+        $arrOptions = [];

+

+        $Units = $this->db->prepare("SELECT id, title, description, containers FROM tl_vr_wa_units ORDER BY title")

+                          ->executeQuery();

+

+        if ($Units->rowCount() > 0)

+        {

+            foreach ($Units->fetchAllAssociative() as $option)

+            {

+                $arrOptions[$option['id']] = $option['description'] ?: $option['title'].' ['.$option['containers'].' '.$this->translator->trans('MSC.wa_container', [], 'contao_tl_vr_wa_units').']';

+            }

+        }

+

+        return $arrOptions;

+    }

+}