Planner: improve the improved default selected course in Unit Planner…

… sidebar menu
GibbonEdu · Sep 5, 2024 · 4b4adf3 · 4b4adf3
1 parent 4d55430
commit 4b4adf3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/modules/Planner/moduleFunctions.php b/modules/Planner/moduleFunctions.php
@@ -407,8 +407,8 @@ function sidebarExtraUnits($guid, $connection2, $gibbonCourseID, $gibbonSchoolYe
         // Show class picker in sidebar
         $courseGateway = $container->get(CourseGateway::class);
 
-        if (!empty($_GET['gibbonCourseID'])) {
-            $session->set('gibbonCourseIDUnitPlanner', $_GET['gibbonCourseID']);
+        if (!empty($_GET['courseName'])) {
+            $session->set('courseNameUnitPlanner', $_GET['courseName']);
         }
 
         if ($highestAction == 'Unit Planner_all') {

diff --git a/modules/Planner/units.php b/modules/Planner/units.php
@@ -48,14 +48,14 @@
 
     // School Year Info
     $gibbonSchoolYearID = $_GET['gibbonSchoolYearID'] ?? $session->get('gibbonSchoolYearID');
-    $gibbonCourseID = $_GET['gibbonCourseID'] ?? $session->get('gibbonCourseIDUnitPlanner') ?? null;
+    $gibbonCourseID = $_GET['gibbonCourseID'] ?? null;
 
     if (empty($gibbonSchoolYearID)) {
         $page->addError(__('Your request failed because your inputs were invalid.'));
         return;
     }
 
-    $courseName = $_GET['courseName'] ?? '';
+    $courseName = $_GET['courseName'] ?? $session->get('courseNameUnitPlanner') ?? '';
 
     if (empty($gibbonCourseID) && !empty($courseName)) {
         $row = $container->get(CourseGateway::class)->selectBy(['gibbonSchoolYearID' => $gibbonSchoolYearID, 'nameShort' => $courseName])->fetch();