@@ -68,8 +68,22 @@

                     {% endfor %}

                 </div>

                 <div class="daily-grid-cells-container">

-                    <div class="daily-grid-cells">

-                        {% for row, event in events %}

+                    <div class="daily-grid-columns">

+                        {% for column in columns %}

+                            <div class="daily-grid-column">

+                                {% for row, event in column.entries %}

+                                    {% if event is not null %}

+                                        <div class="event-cell" style="grid-row: {{ event.rowStart }} / {{ event.rowEnd }}">

+                                            <div class="event-title">{{ event.location.title }}</div>

+                                            <div class="event-time">{{ event.slot.time|date("H:i") }} - {{ (event.slot.time + event.slot.duration*60)|date("H:i") }}</div>

+                                        </div>

+                                    {% else %}

+                                        <div class="cell-placeholder" style="grid-row: {{ row }} / {{ row }}">+ Neuer Slot</div>

+                                    {% endif %}

+                                {% endfor %}

+                            </div>

+                        {% endfor %}

+                        {# {% for row, event in events %}

                             {% if event is not null %}

                                 <div class="event-cell" style="grid-row: {{ event.rowStart }} / {{ event.rowEnd }}">

                                     <div class="event-title">{{ event.location.title }}</div>

@@ -78,13 +92,7 @@

                             {% else %}

                                 <div class="cell-placeholder" style="grid-row: {{ row }} / {{ row }}">+ Neuer Slot</div>

                             {% endif %}

-                        {% endfor %}{#

-                        {% for line in [8,28,30,76] %}

-                            <div class="event-cell" style="grid-row: {{ line }} / {{ line+4 }}">

-                                <div class="event-title">Standort 1</div>

-                                <div class="event-time">XX:XX - XX:XX</div>

-                            </div>

-                        {% endfor %} #}

+                        {% endfor %}#}

                     </div>

                 </div>

             </div>

@@ -1,7 +1,7 @@

 // Variables for colors and sizes

 $border-color: #ddd;

-$event-bg-color: #007bff;

-$event-border-color: darken($event-bg-color,20%);

+$event-bg-color: #007bff, #ff3300;

+$event-border-color: darken(nth($event-bg-color,1),20%);

 $event-border-width: 1px;

 $event-color: #fff;

 $hour-line-color: #999;

@@ -108,7 +108,14 @@ $row-amount: 96;

     border-right: white 1px solid;

     overflow: visible;

-    .daily-grid-cells {

+    .daily-grid-columns {

+      display: flex;

+      align-items: flex-start;

+      grid-column-gap: 10px;

+    }

+

+    .daily-grid-column {

+      flex: 1 0 0;

       grid-column-gap: 3px;

       z-index: 2;

       position: relative;

@@ -146,7 +153,7 @@ $row-amount: 96;

         z-index: 2;

         box-sizing: border-box;

         border-radius: 5px;

-        background-color: $event-bg-color;

+        background-color: nth($event-bg-color, 1);

         border: $event-border-color $event-border-width solid;

         padding: 3px;

         color: $event-color;

@@ -162,6 +169,12 @@ $row-amount: 96;

           margin-inline-end: 4px;

         }

       }

+

+      @for $i from 1 through length($event-bg-color) {

+        &:nth-child(#{length($event-bg-color)}n+#{$i}) .event-cell {

+          background: nth($event-bg-color, $i)

+        }

+      }

     }

   }

 }

@@ -46,6 +46,7 @@ use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungRebsorteModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungReservationModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungSlotsModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungSlottypesModel;

+use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungStandortModel;

 /**

  * @Route("%contao.backend.route_prefix%/weinanlieferung/daily_schedule", name=self::class, defaults={"_scope" = "backend"})

@@ -115,67 +116,57 @@ class WeinanlieferungDailyScheduleController extends AbstractController

         $arrOptions['value'][] = $Tag->dayBegin;

         $arrOptions['value'][] = $Tag->dayEnd;

-        $arrSlots = [];

         // Todo: Add columns per location for a side by side view

         $arrColumns = [];

-        $arrRows = array_flip(range(1,$scheduleRows));

-        array_walk($arrRows,function(&$val) {

+        $arrRowsTemplate = array_flip(range(1,$scheduleRows));

+        array_walk($arrRowsTemplate,function(&$val) {

             $val = null;

         });

-        if (($slots = WeinanlieferungSlotsModel::findMultiplePublishedByPids([1],$arrOptions)) !== null)

+        if (($Locations = WeinanlieferungStandortModel::findAll()) !== null)

         {

-            foreach ($slots as $slot)

+            foreach ($Locations as $location)

             {

-                $Slottime = new Date($slot->time);

-                $startOffset = $slot->time - $Slottime->dayBegin;

-                $endOffset = $slot->time + ($slot->duration * 60) - $Slottime->dayBegin;

-                $rowStart = ceil($startOffset / $scheduleRowSeconds);

-                $rowEnd = ceil($endOffset / $scheduleRowSeconds);

-

-                $arrSlots[$rowStart] = [

-                    'rowStart' => $rowStart,

-                    'rowEnd' => $rowEnd,

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

-                    'location' => $slot->getRelated('pid')->row()

-                ];

+                $arrSlots = [];

+                $arrRows = $arrRowsTemplate;

-                for ($i=$rowStart; $i < $rowEnd; $i++)

+                if (($Slots = WeinanlieferungSlotsModel::findPublishedByPid($location->id,$arrOptions)) !== null)

                 {

-                    $arrRows = array_diff_key($arrRows, [$i=>null]);

+                    foreach ($Slots as $slot)

+                    {

+                        $Slottime = new Date($slot->time);

+                        $startOffset = $slot->time - $Slottime->dayBegin;

+                        $endOffset = $slot->time + ($slot->duration * 60) - $Slottime->dayBegin;

+                        $rowStart = ceil($startOffset / $scheduleRowSeconds);

+                        $rowEnd = ceil($endOffset / $scheduleRowSeconds);

+

+                        $arrSlots[$rowStart] = [

+                            'rowStart' => $rowStart,

+                            'rowEnd' => $rowEnd,

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

+                            'location' => $location->row()

+                        ];

+

+                        for ($i=$rowStart; $i < $rowEnd; $i++)

+                        {

+                            $arrRows = array_diff_key($arrRows, [$i=>null]);

+                        }

+                    }

                 }

+                $arrRows = array_replace($arrRows,$arrSlots);

+                ksort($arrRows);

+dump($arrRows);

+                $arrColumns[] = [

+                    'label' => $location->title,

+                    'entries' => $arrRows

+                ];

             }

         }

-        $arrRows = array_replace($arrRows,$arrSlots);

-        ksort($arrRows);

-

-        $events = [

-            [

-                'title' => 'Morning Meeting',

-                'start' => '09:00',

-                'end' => '10:00',

-            ],

-            [

-                'title' => 'Team Stand-up',

-                'start' => '11:00',

-                'end' => '11:30',

-            ],

-            [

-                'title' => 'Lunch Break',

-                'start' => '12:00',

-                'end' => '13:00',

-            ],

-            [

-                'title' => 'Client Call',

-                'start' => '15:00',

-                'end' => '16:00',

-            ],

-        ];

         return new Response(

             $this->twig->render(

                 '@Contao_VonrotenbergWeinanlieferungBundle/be_wa_daily_schedule.html.twig',

                 [

-                    'events' => $arrRows,

+                    'columns' => $arrColumns,

                     'date' => new \DateTime()

                 ]

             )

@@ -47,11 +47,12 @@ class WeinanlieferungSlotsModel extends Model

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

     }

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

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

     {

         $time = time();

         $t = static::$strTable;

         $arrColumns = array("$t.pid=?");

+        $arrValues = array($intPid);

         // Skip unsaved elements (see #2708)

         $arrColumns[] = "$t.tstamp!=0";

@@ -64,7 +65,19 @@ class WeinanlieferungSlotsModel extends Model

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

         }

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

+        if (isset($arrOptions['column']))

+        {

+            $arrColumns = array_merge($arrColumns,$arrOptions['column']);

+            $arrOptions = array_diff_key($arrOptions,['column'=>true]);

+        }

+

+        if (isset($arrOptions['value']))

+        {

+            $arrValues = array_merge($arrValues,$arrOptions['value']);

+            $arrOptions = array_diff_key($arrOptions,['value'=>true]);

+        }

+

+        return static::findBy($arrColumns, $arrValues, $arrOptions);

     }

     public static function findMultiplePublishedByPids(array $arrPids, array $arrOptions=array())