@@ -9,6 +9,7 @@

  */

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungRebsorteModel;

+use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungReservationModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungSlotsModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungStandortModel;

@@ -21,3 +22,4 @@ $GLOBALS['BE_MOD']['content']['weinanlieferung'] = array

 $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_reservation'] = WeinanlieferungReservationModel::class;

new file mode 100644

@@ -0,0 +1,63 @@

+<?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_reservation'] = array

+(

+

+    // Config

+    'config' => array

+    (

+        'sql'              => array

+        (

+            'keys' => array

+            (

+                'id' => 'primary',

+                'pid' => 'index'

+            )

+        )

+    ),

+

+    'fields' => array

+    (

+        'id'          => array

+        (

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

+        ),

+        'pid'         => array

+        (

+            'foreignKey' => 'tl_vr_wa_slot.time',

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

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

+        ),

+        'tstamp'      => array

+        (

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

+        ),

+        'uid'         => array

+        (

+            'foreignKey' => 'tl_member.username',

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

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

+        ),

+        'behaelter'         => array

+        (

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

+        ),

+        'sorten'       => array

+        (

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

+            'sql'       => "blob NULL",

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

+        ),

+    )

+);

@@ -5,16 +5,42 @@

             <dd>{{ slot.time|date('d.m.Y H:i') }}</dd>

             <dt>Verfügbare Behälterkapazität</dt>

-            <dd>{{ slot.behaelter }}</dd>

+            <dd>{{ slot.behaelterAvailable }}</dd>

             <dt>Verarbeitete Sorten</dt>

             <dd>{{ slot.sorte|join(', ') }}</dd>

         </dl>

-

+        <h3>Reservieren</h3>

+        {% if buchen.buchbar %}

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

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

+                <div class="dflex">

+                    <div>

+                        <label for="res-behaelter">Liefernde Behältermenge</label>

+                        <select id="res-behaelter" name="behaelter" required>

+                            <option value="">-</option>

+                            {% for option in buchen.behaelter %}

+                                <option value="{{ option }}">{{ option }}</option>

+                            {% endfor %}

+                        </select>

+                    </div>

+                    <fieldset>

+                      <legend>Anliefernde Rebsorte(n)</legend>

+                        {% for value,label in buchen.sorten %}

+                            <label><input type="checkbox" name="sorten[]" value="{{ value }}"> <span class="checkable">{{ label }}</span></label><br>

+                        {% endfor %}

+                    </fieldset>

+                    <div>

+                        <button type="submit">Reservieren</button>

+                    </div>

+                </div>

+            </form>

+        {% else %}

+          <p class="warning">Dieser Zeit-Slot ist bereits ausgebucht</p>

+        {% endif %}

     </div>

 </div>

 <script>

-

     (function ($) {

         window.modals = window.modals || []

@@ -1,26 +1,57 @@

-<div hx-get="{{ insert_tag('env::request') }}" hx-headers='{"SR-Ajax": "CommunityFriendsModule"}' hx-trigger="updateWaList from:body" class="{{ class }} content-wrapper block"{{ cssID }}{% if style is defined and style is not empty %} style="{{ style }}"{% endif %}>

+<div hx-get="{{ insert_tag('env::request') }}" hx-headers='{"VR-Ajax": "WaSlotsModule"}' hx-trigger="updateWaList from:body" class="{{ class }} content-wrapper block"{{ cssID }}{% if style is defined and style is not empty %} style="{{ style }}"{% endif %}>

+

+    {% block filter %}

+        <form hx-get="{{ insert_tag('env::request') }}" hx-headers='{"VR-Ajax": "WaSlotsModule"}' hx-trigger="change, submit" hx-target="closest .content-wrapper" class="filter">

+            <div class="flex">

+                <div class="full two-fifth-500 kapazitaet">

+                    <select name="filter_kapazitaet">

+                        <option value="">-</option>

+                        {% for option in filter.kapazitaet.options %}

+                            <option value="{{ option }}"{% if filter.kapazitaet.selected is defined and filter.kapazitaet.selected == option %} selected{% endif %}>{{ option }}</option>

+                        {% endfor %}

+                    </select>

+                </div>

+                <div class="full two-fifth-500 sorte">

+                    <select name="filter_sorte">

+                        <option value="">-</option>

+                        {% for key, option in filter.sorte.options %}

+                            <option value="{{ key }}"{% if filter.sorte.selected is defined and filter.sorte.selected == key %} selected{% endif %}>{{ option }}</option>

+                        {% endfor %}

+                    </select>

+                </div>

+                <div class="full fifth-500 submit"><button>Filter übernehmen</button></div>

+            </div>

+        </form>

+    {% endblock %}

     {% block content %}

-        {% if slots is defined and slots|length %}

+        {% if days is defined and days|length %}

             <div class="list">

-                {% for slot in slots %}

-                    <div class="row">

-                        <div class="flex align-items-center">

-                            <div class="full half-500 third-900 time">

-                                <span class="title">Tag/Uhrzeit</span>

-                                {{ slot.time|date('d.m.Y H:i') }}

-                            </div>

-                            <div class="full half-500 fourth-900 behaelter">

-                                <span class="title">Verfügbare Behälterkapazität</span>

-                                {{ slot.behaelter }}

-                            </div>

-                            <div class="full two-third-500 fourth-900 rebsorten">

-                                <span class="title">Verarbeitete Sorten</span>

-                                {{ slot.sorte }}

-                            </div>

-                            <div class="full third-500 sixth-900 align-right action">

-                                <a href="javascript:;" class="button">Anzeigen</a>

-                            </div>

+                {% for day,slots in days %}

+                    <h3 class="toggler-dis">{{ day|date('d.m.Y') }}<span class="counter">{{ slots|length }}</span></h3>

+                    <div class="accordion-dis">

+                        <div class="slots">

+                            {% for slot in slots %}

+                                <div class="row{{ not slot.buchbar ? ' error' : '' }}">

+                                    <div class="flex align-items-center">

+                                        <div class="full half-500 third-900 time">

+                                            <span class="title">Uhrzeit</span>

+                                            {{ slot.time|date('H:i') }}

+                                        </div>

+                                        <div class="full half-500 fourth-900 behaelter">

+                                            <span class="title">Verfügbare Behälterkapazität</span>

+                                            {{ slot.behaelterAvailable }}

+                                        </div>

+                                        <div class="full two-third-500 fourth-900 rebsorten">

+                                            <span class="title">Verarbeitete Sorten</span>

+                                            {{ slot.sorte|join(', ') }}

+                                        </div>

+                                        <div class="full third-500 sixth-900 align-right action">

+                                            <a hx-get="/_ajax/vr_wa/v1/slot?do=details&id={{ slot.id }}" hx-target="body" hx-swap="beforeend" href="javascript:;" class="button{{ not slot.buchbar ? ' pseudo' : '' }}">Anzeigen</a>

+                                        </div>

+                                    </div>

+                                </div>

+                            {% endfor %}

                         </div>

                     </div>

                 {% endfor %}

@@ -28,4 +59,26 @@

         {% endif %}

     {% endblock %}

+    {% block script %}

+        {#<script>

+            jQuery(function($) {

+                $(".mod_wa_slots_list").accordion({

+                    // Put custom options here

+                    heightStyle: 'content',

+                    header: '.toggler',

+                    collapsible: true,

+                    create: function(event, ui) {

+                        ui.header.addClass('active');

+                        $('.toggler').attr('tabindex', 0);

+                    },

+                    activate: function(event, ui) {

+                        ui.newHeader.addClass('active');

+                        ui.oldHeader.removeClass('active');

+                        $('.toggler').attr('tabindex', 0);

+                    }

+                });

+            });

+        </script>#}

+    {% endblock %}

+

 </div>

@@ -15,11 +15,14 @@ namespace vonRotenberg\WeinanlieferungBundle\Controller\Frontend\Ajax;

 use Contao\CoreBundle\Controller\AbstractController;

 use Contao\CoreBundle\Framework\ContaoFramework;

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

+use Contao\FrontendUser;

+use Contao\Input;

 use Contao\System;

 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\WeinanlieferungReservationModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungSlotsModel;

 /**

@@ -57,6 +60,9 @@ class SlotAjaxController extends AbstractController

             case 'details':

                 return $this->renderDetails();

                 break;

+

+            case 'reservate':

+                return $this->reservate();

         }

         return new Response('',500);

@@ -78,20 +84,59 @@ class SlotAjaxController extends AbstractController

         $arrSorten = [];

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

         {

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

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

         }

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

+

         $arrData = [

             'id'       => $Slot->id,

             'slot'     => array_merge($Slot->row(),[

-                'sorte' => $arrSorten

+                'sorte' => $arrSorten,

+                'behaelterAvailable' => $intAvailableBehaelter

             ]),

-            'standort' => $Slot->getRelated('pid')

+            'standort' => $Slot->getRelated('pid'),

+            'buchen' => [

+                'buchbar' => (boolean) $intAvailableBehaelter,

+                'behaelter' => range(min($intAvailableBehaelter,1),$intAvailableBehaelter),

+                'sorten' => $arrSorten

+            ]

         ];

         return $this->render('@Contao/modal_slot_details.html.twig',$arrData);

     }

+    protected function reservate()

+    {

+        if (empty($_REQUEST['id']) || empty(Input::post('behaelter')) || empty(Input::post('sorten')))

+        {

+            return new Response('Missing parameter',500);

+        }

+

+        $arrSorten = [];

+        if (!is_array(Input::post('sorten')))

+        {

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

+        } else {

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

+        }

+

+        $Reservation = new WeinanlieferungReservationModel();

+

+        $Reservation->setRow([

+            'pid' => $_REQUEST['id'],

+            'tstamp' => time(),

+            'uid' => FrontendUser::getInstance()->id,

+            'behaelter' => Input::post('behaelter'),

+            'sorten' => $arrSorten

+        ]);

+

+

+        $Reservation->save();

+

+        return new Response('<p>Reservierung erfolgreich</p>');

+    }

+

     protected function renderUnauthorized()

     {

         return $this->render('@Contao/modal_unauthorized.html.twig');

@@ -12,13 +12,18 @@ declare(strict_types=1);

 namespace vonRotenberg\WeinanlieferungBundle\Controller\Frontend\Module;

+use Contao\Controller;

 use Contao\CoreBundle\Controller\FrontendModule\AbstractFrontendModuleController;

+use Contao\CoreBundle\Exception\ResponseException;

+use Contao\CoreBundle\InsertTag\InsertTagParser;

 use Contao\CoreBundle\ServiceAnnotation\FrontendModule;

+use Contao\Date;

 use Contao\ModuleModel;

 use Contao\StringUtil;

 use Contao\Template;

 use Symfony\Component\HttpFoundation\Request;

 use Symfony\Component\HttpFoundation\Response;

+use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungRebsorteModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungSlotsModel;

 /**

@@ -28,22 +33,71 @@ class WeinanlieferungSlotsListModuleController extends AbstractFrontendModuleCon

 {

     public const TYPE = 'wa_slots_list';

+    private $insertTagParser;

+

+    public function __construct(InsertTagParser $insertTagParser)

+    {

+        $this->insertTagParser = $insertTagParser;

+    }

+

+

     protected function getResponse(Template $template, ModuleModel $model, Request $request): ?Response

     {

         $standortIds = StringUtil::deserialize($model->vr_wa_standortId);

-

         $arrData = $template->getData();

+        $arrOptions = [];

-        if (($slots = WeinanlieferungSlotsModel::findMultiplePublishedByPids($standortIds)) !== null)

+        // Add filter values

+        if (!empty($_GET['filter_kapazitaet']))

+        {

+            $arrData['filter']['kapazitaet']['selected'] = $_GET['filter_kapazitaet'];

+            $arrOptions['column'][] = 'behaelter = ?';

+            $arrOptions['value'][] = $_GET['filter_kapazitaet'];

+        }

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

         {

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

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

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

+        }

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

+

+        if (($Sorten = WeinanlieferungRebsorteModel::findAll(['order'=>'title ASC'])) !== null)

+        {

+            $arrData['filter']['sorte']['options'] = array_combine($Sorten->fetchEach('id'),$Sorten->fetchEach('title'));

+        }

+

+        // Get available slots

+        if (($slots = WeinanlieferungSlotsModel::findMultiplePublishedByPids($standortIds,$arrOptions)) !== null)

+        {

+            /** @var WeinanlieferungSlotsModel $slot */

             foreach ($slots as $slot)

             {

-                $arrData['slots'][] = $slot->row();

+                $day = new Date($slot->date);

+                $arrSorten = [];

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

+

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

+                {

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

+                }

+

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

+                    'sorte' => $arrSorten,

+                    'behaelterAvailable' => $intAvailableBehaelter,

+                    'buchbar' => (boolean) $intAvailableBehaelter

+                ]);

             }

         }

         $template->setData($arrData);

+        // Handle ajax

+        if ($request->headers->get('VR-Ajax') == 'WaSlotsModule')

+        {

+            throw new ResponseException(new Response($this->insertTagParser->replace($template->parse())));

+        }

+

         return $template->getResponse();

     }

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 WeinanlieferungReservationModel extends Model

+{

+    /**

+     * Table name

+     * @var string

+     */

+    protected static $strTable = 'tl_vr_wa_reservation';

+}

@@ -12,9 +12,11 @@ declare(strict_types=1);

 namespace vonRotenberg\WeinanlieferungBundle\Model;

+use Contao\Controller;

 use Contao\Database;

 use Contao\Model;

 use Contao\Model\Registry;

+use Doctrine\DBAL\Connection;

 class WeinanlieferungSlotsModel extends Model

 {

@@ -40,7 +42,7 @@ class WeinanlieferungSlotsModel extends Model

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

         }

-        return static::findBy($arrColumns, $intId, $arrOptions);

+        return static::findOneBy($arrColumns, $intId, $arrOptions);

     }

     public static function findPublishedByPid($intPid, array $arrOptions=array())

@@ -94,4 +96,22 @@ class WeinanlieferungSlotsModel extends Model

         return static::findBy($arrColumns,null,$arrOptions);

     }

+

+    public function getAvailableBehaelter()

+    {

+        /** @var Connection $db */

+        $db = Controller::getContainer()->get('database_connection');

+

+        $ReservedBehaelter = $db->prepare("SELECT SUM(behaelter) FROM tl_vr_wa_reservation WHERE pid = ?")

+            ->executeQuery([$this->id]);

+

+        $intReserved = $ReservedBehaelter->fetchOne();

+

+        if ($intReserved === null)

+        {

+            $intReserved = 0;

+        }

+

+        return (int) $this->behaelter - $intReserved;

+    }

 }