Add user room groups sidebar templatesissue-5605

1 files changed, 16 insertions, 18 deletions

diff --git a/app/controllers/room_management/planning.php b/app/controllers/room_management/planning.php
index c7fda25..743162a 100644
--- a/app/controllers/room_management/planning.php
+++ b/app/controllers/room_management/planning.php
@@ -30,6 +30,7 @@ class RoomManagement_PlanningController extends AuthenticatedController
         if (Navigation::hasItem('/resources/planning/index')) {
             Navigation::activateItem('/resources/planning/index');
         }
+
         $selected_clipboard_id = Request::int('clipboard_id', $selected_clipboard_id);
 
         $this->no_clipboard = false;
@@ -88,24 +89,6 @@ class RoomManagement_PlanningController extends AuthenticatedController
             $this->get_template_factory()->open('resources/room_planning/_sidebar_date_selection.php')
         ));
 
-        $clipboards = Clipboard::getClipboardsForUser($GLOBALS['user']->id);
-        if (!empty($clipboards)) {
-            $clipboard_widget = new SelectWidget(
-                _('Individuelle Raumgruppen'),
-                $this->indexURL(),
-                'clipboard_id',
-                'get'
-            );
-            foreach ($clipboards as $clipboard) {
-                $clipboard_widget->addElement(new SelectElement(
-                    $clipboard->id,
-                    $clipboard->name,
-                    $clipboard->id === $selected_clipboard_id
-                ), "clipboard_id-{$clipboard->id}");
-            }
-            $sidebar->addWidget($clipboard_widget);
-        }
-
         $rooms = [];
         if ($selected_clipboard_id) {
             $clipboard = Clipboard::find($selected_clipboard_id);
@@ -128,6 +111,20 @@ class RoomManagement_PlanningController extends AuthenticatedController
             return;
         }
 
+        $clipboards = Clipboard::getClipboardsForUser(User::findCurrent()->user_id);
+        if ($clipboards) {
+            $sidebar->addWidget(new TemplateWidget(
+                _('Individuelle Raumgruppen'),
+                $this->get_template_factory()->open('room_management/templates/user_room_groups.php'),
+                [
+                    'url' => $this->indexURL(),
+                    'user_groups' => $clipboards,
+                    'active_group' => $this->clipboard,
+                    'rooms' => $rooms
+                ]
+            ));
+        }
+
         //Generate the resources array for the fullcalendar scheduler plugin:
         $this->scheduler_resources = [];
         foreach ($rooms as $room) {
@@ -258,6 +255,7 @@ class RoomManagement_PlanningController extends AuthenticatedController
                 'text'   => _('Anfrage')
             ];
         }
+
     }
 
     public function semester_plan_action($selected_clipboard_id = null)