@@ -91,7 +91,7 @@ class WeinanlieferungBookingsController extends AbstractController

         }

         $arrMonthOptions = [];

-        $MonthRequest = $this->db->executeQuery("SELECT s.date, DATE_FORMAT(FROM_UNIXTIME(s.date),'%m/%Y') as 'month_label' FROM tl_vr_wa_reservation r INNER JOIN tl_vr_wa_slot s ON s.id = r.pid GROUP BY month_label, s.date ORDER BY s.date ASC");

+        $MonthRequest = $this->db->executeQuery("SELECT s.date, DATE_FORMAT(FROM_UNIXTIME(s.date),'%m/%Y') as 'month_label' FROM tl_vr_wa_reservation r INNER JOIN tl_vr_wa_slot s ON s.id = r.pid GROUP BY month_label ORDER BY s.date ASC");

         foreach ($MonthRequest->iterateAssociative() as $month)

         {

@@ -68,6 +68,28 @@ class WeinanlieferungBookingsController extends AbstractController

         System::loadLanguageFile('default');

         // Filter

+        if (Input::post('FORM_SUBMIT') === 'tl_filters' && Input::post('filter_reset') === null)

+        {

+            $queryBuilder = $this->db->createQueryBuilder()

+                ->select('id')

+                ->from(WeinanlieferungSlotsModel::getTable());

+

+            if (!empty(Input::post('tl_month')) && is_numeric(Input::post('tl_month')))

+            {

+                $Month = new Date(Input::post('tl_month'));

+                $arrData['filter']['month']['selected'] = Input::post('tl_month');

+                $queryBuilder->andWhere('date BETWEEN :month_start AND :month_end')

+                    ->setParameter('month_start', $Month->monthBegin)

+                    ->setParameter('month_end', $Month->monthEnd);

+            } else {

+                $Today = new Date();

+                $queryBuilder->andWhere("time >= :today")

+                    ->setParameter('today',$Today->dayBegin);

+            }

+

+            $arrSlots = $queryBuilder->fetchFirstColumn();

+

+        }

         $arrMonthOptions = [];

         $MonthRequest = $this->db->executeQuery("SELECT s.date, DATE_FORMAT(FROM_UNIXTIME(s.date),'%m/%Y') as 'month_label' FROM tl_vr_wa_reservation r INNER JOIN tl_vr_wa_slot s ON s.id = r.pid GROUP BY month_label, s.date ORDER BY s.date ASC");

@@ -76,9 +98,28 @@ class WeinanlieferungBookingsController extends AbstractController

             $arrMonthOptions[$month['date']] = $month['month_label'];

         }

+        $arrData['filter']['month']['options'] = $arrMonthOptions;

+

         // Get bookings

-        if (($bookings = WeinanlieferungReservationModel::findAllFuture(['order' => "(SELECT tl_vr_wa_slot.time FROM tl_vr_wa_slot WHERE tl_vr_wa_slot.id=tl_vr_wa_reservation.pid) ASC"])) !== null)

+        if (isset($queryBuilder))

+        {

+            $arrColumns = null;

+            if (count($arrSlots))

+            {

+                $arrColumns[] = "pid IN (".implode(',',$arrSlots).")";

+            }

+            if (!$arrColumns)

+            {

+                $bookings = WeinanlieferungReservationModel::findAllFuture(['order' => "(SELECT tl_vr_wa_slot.time FROM tl_vr_wa_slot WHERE tl_vr_wa_slot.id=tl_vr_wa_reservation.pid) ASC"]);

+            } else {

+                $bookings = WeinanlieferungReservationModel::findBy($arrColumns,null,['order' => "(SELECT tl_vr_wa_slot.time FROM tl_vr_wa_slot WHERE tl_vr_wa_slot.id=tl_vr_wa_reservation.pid) ASC"]);

+            }

+

+        } else {

+            $bookings = WeinanlieferungReservationModel::findAllFuture(['order' => "(SELECT tl_vr_wa_slot.time FROM tl_vr_wa_slot WHERE tl_vr_wa_slot.id=tl_vr_wa_reservation.pid) ASC"]);

+        }

+        if ($bookings !== null)

         {

             /** @var WeinanlieferungReservationModel $booking */

             foreach ($bookings as $booking)

@@ -20,6 +20,7 @@ use Contao\FrontendUser;

 use Contao\Input;

 use Contao\StringUtil;

 use Contao\System;

+use Doctrine\DBAL\Connection;

 use Symfony\Component\HttpFoundation\RequestStack;

 use Symfony\Component\HttpFoundation\Response;

 use Symfony\Component\Routing\Annotation\Route;

@@ -37,12 +38,14 @@ class WeinanlieferungBookingsController extends AbstractController

     private $twig;

     private $tokenManager;

     private $request;

+    private $db;

-    public function __construct(TwigEnvironment $twig, ContaoCsrfTokenManager $tokenManager, RequestStack $requestStack)

+    public function __construct(TwigEnvironment $twig, ContaoCsrfTokenManager $tokenManager, RequestStack $requestStack, Connection $db)

     {

         $this->twig = $twig;

         $this->tokenManager = $tokenManager;

         $this->request = $requestStack->getCurrentRequest();

+        $this->db = $db;

         $container = System::getContainer();

         $objSession = $container->get('session');

@@ -64,6 +67,16 @@ class WeinanlieferungBookingsController extends AbstractController

         ];

         System::loadLanguageFile('default');

+        // Filter

+        $arrMonthOptions = [];

+        $MonthRequest = $this->db->executeQuery("SELECT s.date, DATE_FORMAT(FROM_UNIXTIME(s.date),'%m/%Y') as 'month_label' FROM tl_vr_wa_reservation r INNER JOIN tl_vr_wa_slot s ON s.id = r.pid GROUP BY month_label, s.date ORDER BY s.date ASC");

+

+        foreach ($MonthRequest->iterateAssociative() as $month)

+        {

+            $arrMonthOptions[$month['date']] = $month['month_label'];

+        }

+

+

         // Get bookings

         if (($bookings = WeinanlieferungReservationModel::findAllFuture(['order' => "(SELECT tl_vr_wa_slot.time FROM tl_vr_wa_slot WHERE tl_vr_wa_slot.id=tl_vr_wa_reservation.pid) ASC"])) !== null)

         {

@@ -78,7 +78,17 @@ class WeinanlieferungBookingsController extends AbstractController

                     $arrErnteart = [];

                     $arrLagen = [];

-                    if (!isset($arrData['days'][$day->dayBegin][$Slot->time]))

+                    if (!isset($arrData['days'][$day->dayBegin][$Slot->pid]))

+                    {

+                        $Standort = $Slot->getRelated('pid');

+

+                        $arrData['days'][$day->dayBegin][$Slot->pid] = [

+                            'standort' => $Standort !== null ? $Standort->title : ''

+                        ];

+

+                    }

+

+                    if (!isset($arrData['days'][$day->dayBegin][$Slot->pid]['times'][$Slot->time]))

                     {

                         $arrSortenAvailable = [];

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

@@ -88,7 +98,7 @@ class WeinanlieferungBookingsController extends AbstractController

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

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

                         }

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

+                        $arrData['days'][$day->dayBegin][$Slot->pid]['times'][$Slot->time] = array_merge($Slot->row(),[

                             'sorten' => $arrSortenAvailable,

                             'behaelterAvailable' => $Slot->getAvailableBehaelter(),

                         ]);

@@ -128,7 +138,7 @@ class WeinanlieferungBookingsController extends AbstractController

                         $strStandort = $Standort->title;

                     }

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

+                    $arrData['days'][$day->dayBegin][$Slot->pid]['times'][$Slot->time]['items'][] = array_merge($booking->row(), [

                         'sorte'              => $arrSorten,

                         'ernteart' => $arrErnteart,

                         'lage' => $arrLagen,

@@ -122,11 +122,18 @@ class WeinanlieferungBookingsController extends AbstractController

                         }

                     }

+                    $strStandort = '';

+                    if (($Standort = $Slot->getRelated('pid')) !== null)

+                    {

+                        $strStandort = $Standort->title;

+                    }

+

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

                         'sorte'              => $arrSorten,

                         'ernteart' => $arrErnteart,

                         'lage' => $arrLagen,

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

+                        'standort' => $strStandort,

                         'member' => $booking->getRelated('uid') !== null ? $booking->getRelated('uid')->row() : null

                     ]);

                 }

@@ -62,6 +62,7 @@ class WeinanlieferungBookingsController extends AbstractController

             'request_token' => $this->tokenManager->getDefaultTokenValue(),

             'ref' => $this->request->attributes->get('_contao_referer_id')

         ];

+        System::loadLanguageFile('default');

         // Get bookings

         if (($bookings = WeinanlieferungReservationModel::findAllFuture(['order' => "(SELECT tl_vr_wa_slot.time FROM tl_vr_wa_slot WHERE tl_vr_wa_slot.id=tl_vr_wa_reservation.pid) ASC"])) !== null)

@@ -74,6 +75,8 @@ class WeinanlieferungBookingsController extends AbstractController

                 {

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

                     $arrSorten = [];

+                    $arrErnteart = [];

+                    $arrLagen = [];

                     if (!isset($arrData['days'][$day->dayBegin][$Slot->time]))

                     {

@@ -103,8 +106,26 @@ class WeinanlieferungBookingsController extends AbstractController

                         }

                     }

+                    if ($booking->ernteart !== null)

+                    {

+                        foreach (explode(',', $booking->ernteart) as $ernteart)

+                        {

+                            $arrErnteart[$ernteart] = $GLOBALS['TL_LANG']['REF']['wa_ernteart'][$ernteart] ?? $ernteart;

+                        }

+                    }

+

+                    if (($Lagen = $booking->getRelated('lage')) !== null)

+                    {

+                        foreach ($Lagen as $lage)

+                        {

+                            $arrLagen[$lage->id] = $lage->title;

+                        }

+                    }

+

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

                         'sorte'              => $arrSorten,

+                        'ernteart' => $arrErnteart,

+                        'lage' => $arrLagen,

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

                         'member' => $booking->getRelated('uid') !== null ? $booking->getRelated('uid')->row() : null

                     ]);

@@ -106,7 +106,7 @@ class WeinanlieferungBookingsController extends AbstractController

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

                         'sorte'              => $arrSorten,

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

-                        'member' => $booking->getRelated('uid')->row()

+                        'member' => $booking->getRelated('uid') !== null ? $booking->getRelated('uid')->row() : null

                     ]);

                 }

             }

new file mode 100644

@@ -0,0 +1,122 @@

+<?php

+

+declare(strict_types=1);

+

+/*

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

+ *

+ * (c) vonRotenberg

+ *

+ * @license commercial

+ */

+

+namespace vonRotenberg\WeinanlieferungBundle\Controller\Backend;

+

+use Contao\CoreBundle\Controller\AbstractController;

+use Contao\CoreBundle\Csrf\ContaoCsrfTokenManager;

+use Contao\Date;

+use Contao\Environment;

+use Contao\FrontendUser;

+use Contao\Input;

+use Contao\StringUtil;

+use Contao\System;

+use Symfony\Component\HttpFoundation\RequestStack;

+use Symfony\Component\HttpFoundation\Response;

+use Symfony\Component\Routing\Annotation\Route;

+use Twig\Environment as TwigEnvironment;

+use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungLeseartModel;

+use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungRebsorteModel;

+use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungReservationModel;

+use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungSlotsModel;

+

+/**

+ * @Route("contao/weinanlieferung/buchungsliste", name=WeinanlieferungBookingsController::class, defaults={"_scope" = "backend"})

+ */

+class WeinanlieferungBookingsController extends AbstractController

+{

+    private $twig;

+    private $tokenManager;

+    private $request;

+

+    public function __construct(TwigEnvironment $twig, ContaoCsrfTokenManager $tokenManager, RequestStack $requestStack)

+    {

+        $this->twig = $twig;

+        $this->tokenManager = $tokenManager;

+        $this->request = $requestStack->getCurrentRequest();

+

+        $container = System::getContainer();

+        $objSession = $container->get('session');

+

+

+        $strKey = Input::get('popup') ? 'popupReferer' : 'referer';

+        $strRefererId = $this->request->attributes->get('_contao_referer_id');

+

+        $session = $objSession->get($strKey);

+        $session[$strRefererId]['current'] = substr(Environment::get('requestUri'), \strlen(Environment::get('path')) + 1);

+        $objSession->set($strKey, $session);

+    }

+    public function __invoke(): Response

+    {

+        $GLOBALS['TL_CSS']['cirrus'] = 'bundles/vonrotenbergweinanlieferung/css/backend.css|static';

+        $arrData = [

+            'request_token' => $this->tokenManager->getDefaultTokenValue(),

+            'ref' => $this->request->attributes->get('_contao_referer_id')

+        ];

+

+        // Get bookings

+        if (($bookings = WeinanlieferungReservationModel::findAllFuture(['order' => "(SELECT tl_vr_wa_slot.time FROM tl_vr_wa_slot WHERE tl_vr_wa_slot.id=tl_vr_wa_reservation.pid) ASC"])) !== null)

+        {

+            /** @var WeinanlieferungReservationModel $booking */

+            foreach ($bookings as $booking)

+            {

+                /** @var WeinanlieferungSlotsModel $Slot */

+                if (($Slot = $booking->getRelated('pid')) !== null)

+                {

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

+                    $arrSorten = [];

+

+                    if (!isset($arrData['days'][$day->dayBegin][$Slot->time]))

+                    {

+                        $arrSortenAvailable = [];

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

+                        foreach($Sorten as $sorte)

+                        {

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

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

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

+                        }

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

+                            'sorten' => $arrSortenAvailable,

+                            'behaelterAvailable' => $Slot->getAvailableBehaelter(),

+                        ]);

+                    }

+

+                    if ($booking->sorten !== null)

+                    {

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

+                        foreach ($SortenLeseart as $sorteLeseart)

+                        {

+                            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][$Slot->time]['items'][] = array_merge($booking->row(), [

+                        'sorte'              => $arrSorten,

+                        'slot'  => $Slot->row(),

+                        'member' => $booking->getRelated('uid')->row()

+                    ]);

+                }

+            }

+        }

+

+        return new Response(

+            $this->twig->render(

+                '@Contao_VonrotenbergWeinanlieferungBundle/be_wa_buchungsliste.html.twig',

+                $arrData

+            )

+        );

+    }

+}