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

     'palettes' => array

     (

         '__selector__' => array(),

-        'default' => 'pid,behaelter,upload,uid,sorten'

+        'default' => 'pid,uid,behaelter,sorten,upload'

     ),

     // Subpalettes

@@ -128,27 +128,27 @@ $GLOBALS['TL_DCA']['tl_vr_wa_reservation'] = array

         (

             'inputType' => 'select',

             'foreignKey' => 'tl_member.username',

-            'eval'       => array('mandatory'=>true,'chosen'=>true,'includeBlankOption'=>true),

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

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

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

         ),

         'behaelter'         => array

         (

             'inputType'               => 'text',

-            'eval'       => array('rgxp'=>'natural'),

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

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

         ),

         'sorten'       => array

         (

             'inputType'               => 'checkbox',

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

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

             'sql'       => "blob NULL",

         ),

         'upload' => array

         (

             'exclude'                 => true,

             'inputType'               => 'fileTree',

-            'eval'                    => array('filesOnly'=>true, 'fieldType'=>'radio', 'tl_class'=>'clr', 'extensions'=>Config::get('allowedDownload')),

+            'eval'                    => array('filesOnly'=>true, 'fieldType'=>'radio', 'tl_class'=>'w50', 'extensions'=>Config::get('allowedDownload')),

             'sql'                     => "binary(16) NULL"

         ),

         'filename' => array

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_leseart']['title'][0] = 'Leseart';

+$GLOBALS['TL_LANG']['tl_vr_wa_leseart']['title'][1] = 'Die Bezeichnung der Leseart.';

+

+$GLOBALS['TL_LANG']['tl_vr_wa_leseart']['title_legend'] = 'Leseart';

+

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

new file mode 100644

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

+<?php

+

+/**

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

+ *

+ * (c) vonRotenberg

+ *

+ * @license commercial

+ */

+

+$GLOBALS['TL_LANG']['tl_vr_wa_reservation']['pid'][0] = 'Zeitslot';

+$GLOBALS['TL_LANG']['tl_vr_wa_reservation']['pid'][1] = 'Der gebuchte Zeitslot.';

+$GLOBALS['TL_LANG']['tl_vr_wa_reservation']['behaelter'][0] = 'Behälteranzahl';

+$GLOBALS['TL_LANG']['tl_vr_wa_reservation']['behaelter'][1] = 'Die Anzahl an Behälter, die der Winzer anliefert.';

+$GLOBALS['TL_LANG']['tl_vr_wa_reservation']['sorten'][0] = 'Sorten';

+$GLOBALS['TL_LANG']['tl_vr_wa_reservation']['sorten'][1] = 'Die Sorten, die der Winzer anliefert.';

+$GLOBALS['TL_LANG']['tl_vr_wa_reservation']['uid'][0] = 'Winzer';

+$GLOBALS['TL_LANG']['tl_vr_wa_reservation']['uid'][1] = 'Zuordnung des anliefernden Winzers.';

+$GLOBALS['TL_LANG']['tl_vr_wa_reservation']['upload'][0] = 'Datei';

+$GLOBALS['TL_LANG']['tl_vr_wa_reservation']['upload'][1] = 'Die hochgeladene Datei des Winzers.';

+

+$GLOBALS['TL_LANG']['tl_vr_wa_reservation']['title_legend'] = 'Leseart';

+

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

@@ -68,7 +68,36 @@ class WeinanlieferungReservationContainerListener

         $arrData = [];

         foreach ($Slots as $slot)

         {

-            $arrData[$slot->id] = Date::parse(Date::getNumericDatimFormat(),$slot->time);

+            $arrSorten = [];

+            $intAvailableBehaelter = $slot->getAvailableBehaelter();

+

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

+            foreach($Sorten as $sorte)

+            {

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

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

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

+            }

+            $arrData[$slot->id] = Date::parse(Date::getNumericDatimFormat(),$slot->time) . ' - (' . implode(', ',$arrSorten) . ') [Verfügbare Behälter: ' . $intAvailableBehaelter . '/' . $slot->behaelter . ']';

+        }

+

+        return $arrData;

+    }

+

+    /**

+     * @Callback(table="tl_vr_wa_reservation", target="fields.uid.options")

+     */

+    public function onUidOptionsCallback(DataContainer $dc)

+    {

+        if (($Members = \MemberModel::findAll()) === null)

+        {

+            return [];

+        }

+

+        $arrData = [];

+        foreach ($Members as $member)

+        {

+            $arrData[$member->id] = ($member->memberno !== null && $member->memberno ? $member->memberno.' ' : '') . $member->firstname . ' ' . $member->lastname . ' [' . $member->email . ']';

         }

         return $arrData;

@@ -103,6 +103,11 @@ class WeinanlieferungSlotsModel extends Model

         $t = static::$strTable;

         $time = Date::floorToMinute();

+        if (!isset($arrOptions['order']))

+        {

+            $arrOptions['order'] = "$t.time ASC";

+        }

+

         return static::findBy(array("$t.time >= ?","$t.tstamp!=0","$t.buchbar='1' AND $t.buchbar_bis > ?"), [$time,$time], $arrOptions);

     }