@@ -16,6 +16,7 @@

     "require": {

         "php": "^7.4 || ^8.0",

         "contao/core-bundle": "^4.13",

+        "contao/calendar-bundle": "^4.13",

         "symfony/config": "^5.4",

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

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

@@ -10,5 +10,5 @@

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

 (

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

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

 );

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_rebsorte'] = 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 ''"

+        )

+    )

+);

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

             'mode' => DataContainer::MODE_PARENT,

             'fields' => array('time'),

             'headerFields' => array('title'),

-            'disableGrouping' => true,

+//            'disableGrouping' => true,

             'panelLayout' => 'filter;sort,limit',

         ),

         'global_operations' => array

@@ -72,6 +72,12 @@ $GLOBALS['TL_DCA']['tl_vr_wa_slot'] = array

                 'href'                => 'act=delete',

                 'icon'                => 'delete.gif',

             ),

+            'toggle' => array

+            (

+                'href'                => 'act=toggle&field=buchbar',

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

+                'showInHeader'        => true

+            ),

             'show' => array

             (

                 'icon'                => 'show.gif',

@@ -82,45 +88,121 @@ $GLOBALS['TL_DCA']['tl_vr_wa_slot'] = array

     // Palettes

     'palettes' => array

     (

-        'default' => '{time_legend},date,time'

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

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

     ),

     // Subpalettes

     'subpalettes' => array

-    (),

+    (

+        'addEnclosure' => 'enclosure'

+    ),

     // Fields

     'fields' => array

     (

-        'id' => array

+        'id'          => array

         (

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

         ),

-        'pid' => array

+        'pid'         => array

         (

             'foreignKey' => 'tl_vr_wa_standort.title',

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

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

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

+            'relation'   => array('type' => 'belongsTo', 'load' => 'lazy')

         ),

-        'tstamp' => array

+        'tstamp'      => array

         (

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

         ),

-        'date' => array

+        'date'        => array

+        (

+            'exclude'   => true,

+            'inputType' => 'text',

+            'eval'      => array('rgxp' => 'date', 'mandatory' => true, 'datepicker' => true, 'tl_class' => 'w50 wizard'),

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

+        ),

+        'time'        => array

         (

-            'inputType'               => 'text',

-            'eval'                    => array('rgxp'=>'date', 'mandatory'=>true, 'doNotCopy'=>true, 'datepicker'=>true, 'tl_class'=>'w50 wizard'),

-            'sql'                     => "int(10) unsigned NULL"

+            'exclude'   => true,

+            'default'   => time(),

+            'filter'    => true,

+            'sorting'   => true,

+            'flag'      => DataContainer::SORT_MONTH_DESC,

+            'inputType' => 'text',

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

+            'sql'       => "int(10) NULL"

         ),

-        'time' => array

-        (

-            'default'                 => time(),

-            'filter'                  => true,

-            'sorting'                 => true,

-            'flag'                    => DataContainer::SORT_MONTH_DESC,

-            'inputType'               => 'text',

-            'eval'                    => array('rgxp'=>'time', 'mandatory'=>true, 'doNotCopy'=>true, 'tl_class'=>'w50'),

-            'sql'                     => "int(10) NULL"

+        'behaelter'   => array

+        (

+            'exclude'   => true,

+            'inputType' => 'select',

+            'options_callback'   => function () {

+                $range = [];

+                for ($i = 1; $i <= 30; $i++)

+                {

+                    $range[] = $i;

+                }

+                return $range;

+            },

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

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

+        ),

+        'leseart'     => 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'=>','),

+            'sql'       => "blob NULL"

+        ),

+        'anmerkungen' => array

+        (

+            'exclude'                 => true,

+            'search'                  => true,

+            'inputType'               => 'textarea',

+            'eval'                    => array('rte'=>'tinyMCE', 'tl_class'=>'clr'),

+            'sql'                     => "text NULL"

+        ),

+        'addEnclosure' => array

+        (

+            'exclude'                 => true,

+            'inputType'               => 'checkbox',

+            'eval'                    => array('submitOnChange'=>true),

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

+        ),

+        'enclosure' => array

+        (

+            'exclude'                 => true,

+            'inputType'               => 'fileTree',

+            'eval'                    => array('multiple'=>true, 'fieldType'=>'checkbox', 'filesOnly'=>true, 'isDownloads'=>true, 'extensions'=>Config::get('allowedDownload'), 'mandatory'=>true, 'isSortable'=>true),

+            'sql'                     => "blob NULL"

+        ),

+        'buchbar'     => array

+        (

+            'exclude'   => true,

+            'toggle'    => true,

+            'filter'    => true,

+            'flag'      => DataContainer::SORT_INITIAL_LETTER_DESC,

+            'inputType' => 'checkbox',

+            'eval'      => array('doNotCopy' => true),

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

+        ),

+        'buchbar_bis' => array

+        (

+            'exclude'   => true,

+            'inputType' => 'text',

+            'eval'      => array('rgxp' => 'datim', 'mandatory' => true, 'datepicker' => true, 'tl_class' => 'clr w50 wizard'),

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

         ),

     )

 );

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

         ),

         'global_operations' => array

         (

+            'rebsorte' => array

+            (

+                'href'                => 'table=tl_vr_wa_rebsorte',

+                'class'               => 'header_rebsorte',

+            ),

             'all' => array

             (

                 'href'                => 'act=select',

new file mode 100644

@@ -0,0 +1,14 @@

+<?php

+

+/**

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

+ *

+ * (c) vonRotenberg

+ *

+ * @license commercial

+ */

+

+$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_slot'] = 'Zeitslots';

new file mode 100644

@@ -0,0 +1,16 @@

+<?php

+

+/**

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

+ *

+ * (c) vonRotenberg

+ *

+ * @license commercial

+ */

+

+$GLOBALS['TL_LANG']['tl_vr_wa_rebsorte']['title'][0] = 'Name';

+$GLOBALS['TL_LANG']['tl_vr_wa_rebsorte']['title'][1] = 'Der Name der Rebsorte.';

+

+$GLOBALS['TL_LANG']['tl_vr_wa_rebsorte']['title_legend'] = 'Rebsorte';

+

+$GLOBALS['TL_LANG']['tl_vr_wa_rebsorte']['back'] = 'Zurück';

new file mode 100644

@@ -0,0 +1,37 @@

+<?php

+

+/**

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

+ *

+ * (c) vonRotenberg

+ *

+ * @license commercial

+ */

+

+$GLOBALS['TL_LANG']['tl_vr_wa_slot']['date'][0] = 'Datum';

+$GLOBALS['TL_LANG']['tl_vr_wa_slot']['date'][1] = 'Der Tag der Anlieferung.';

+$GLOBALS['TL_LANG']['tl_vr_wa_slot']['time'][0] = 'Uhrzeit';

+$GLOBALS['TL_LANG']['tl_vr_wa_slot']['time'][1] = 'Uhrzeit dieses Anlieferungsslots.';

+$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']['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';

+$GLOBALS['TL_LANG']['tl_vr_wa_slot']['addEnclosure'][1] = 'Dateianhänge zum Download.';

+$GLOBALS['TL_LANG']['tl_vr_wa_slot']['enclosure'][0] = 'Dateien';

+$GLOBALS['TL_LANG']['tl_vr_wa_slot']['enclosure'][1] = 'Bitte die downloadbaren Dateien auswählen.';

+$GLOBALS['TL_LANG']['tl_vr_wa_slot']['buchbar'][0] = 'Buchbar';

+$GLOBALS['TL_LANG']['tl_vr_wa_slot']['buchbar'][1] = 'Steuert die Buchbarkeit dieses Zeitslots.';

+$GLOBALS['TL_LANG']['tl_vr_wa_slot']['buchbar_bis'][0] = 'Buchbar bis';

+$GLOBALS['TL_LANG']['tl_vr_wa_slot']['buchbar_bis'][1] = 'Zeitpunkt, bis wann der Slot spätestens gebucht werden kann.';

+

+$GLOBALS['TL_LANG']['tl_vr_wa_slot']['time_legend'] = 'Zeit';

+$GLOBALS['TL_LANG']['tl_vr_wa_slot']['type_legend'] = 'Verarbeitungs-Einstellungen';

+$GLOBALS['TL_LANG']['tl_vr_wa_slot']['info_legend'] = 'Zusätzliche Informationen';

+$GLOBALS['TL_LANG']['tl_vr_wa_slot']['booking_legend'] = 'Buchbarkeits-Einstellungen';

+

+$GLOBALS['TL_LANG']['tl_vr_wa_slot']['back'] = 'Zurück';

new file mode 100644

@@ -0,0 +1,16 @@

+<?php

+

+/**

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

+ *

+ * (c) vonRotenberg

+ *

+ * @license commercial

+ */

+

+$GLOBALS['TL_LANG']['tl_vr_wa_standort']['title'][0] = 'Titel';

+$GLOBALS['TL_LANG']['tl_vr_wa_standort']['title'][1] = 'Der Name des Anlieferungs-Standorts.';

+

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

+

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

deleted file mode 100644

@@ -1,27 +0,0 @@

-<?php

-

-declare(strict_types=1);

-

-/*

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

- *

- * (c) vonRotenberg

- *

- * @license commercial

- */

-

-namespace vonRotenberg\WeinanlieferungBundle\DependencyInjection;

-

-use Symfony\Component\Config\FileLocator;

-use Symfony\Component\DependencyInjection\ContainerBuilder;

-use Symfony\Component\DependencyInjection\Extension\Extension;

-use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;

-

-class ContaoSkeletonExtension extends Extension

-{

-    public function load(array $configs, ContainerBuilder $container): void

-    {

-        $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));

-        $loader->load('services.yml');

-    }

-}

new file mode 100644

@@ -0,0 +1,27 @@

+<?php

+

+declare(strict_types=1);

+

+/*

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

+ *

+ * (c) vonRotenberg

+ *

+ * @license commercial

+ */

+

+namespace vonRotenberg\WeinanlieferungBundle\DependencyInjection;

+

+use Symfony\Component\Config\FileLocator;

+use Symfony\Component\DependencyInjection\ContainerBuilder;

+use Symfony\Component\DependencyInjection\Extension\Extension;

+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;

+

+class VonrotenbergWeinanlieferungExtension extends Extension

+{

+    public function load(array $configs, ContainerBuilder $container): void

+    {

+        $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../../config'));

+        $loader->load('services.yml');

+    }

+}

@@ -13,14 +13,42 @@ declare(strict_types=1);

 namespace vonRotenberg\WeinanlieferungBundle\EventListener\DataContainer;

 use Contao\CoreBundle\ServiceAnnotation\Callback;

+use Contao\DataContainer;

+use Contao\Date;

+use Doctrine\DBAL\Connection;

 class WeinanlieferungSlotContainerListener

 {

+    /** @var Connection */

+    protected $db;

+

+    public function __construct(Connection $db)

+    {

+        $this->db = $db;

+    }

+

+

     /**

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

      */

     public function onChildRecordCallback(array $row)

     {

-        return sprintf('%s %s',$row['date'],$row['time']);

+        return sprintf('<div class="tl_content_left">%s %s</div>',Date::parse(Date::getNumericDateFormat(),$row['date']), Date::parse(Date::getNumericTimeFormat(),$row['time']));

+    }

+

+    /**

+     * @Callback(table="tl_vr_wa_slot", target="config.onsubmit")

+     */

+    public function adjustTime(DataContainer $dc)

+    {

+        // Return if there is no active record (override all) or no start date has been set yet

+        if (!$dc->activeRecord || empty($dc->activeRecord->date))

+        {

+            return;

+        }

+

+        $arrSet['time'] = strtotime(date('Y-m-d', $dc->activeRecord->date) . ' ' . date('H:i:s', $dc->activeRecord->time));

+

+        $this->db->update("tl_vr_wa_slot",$arrSet,['id' => $dc->id]);

     }

 }