ADD Arrays for semester containing their courses, optimize sorting of...

ADD Arrays for semester containing their courses, optimize sorting of semesters and courses, internal changes to work with new changes

lib.php

@@ -45,89 +45,54 @@ function local_sembasednav_extend_navigation(global_navigation $navigation)
     $specialNodesList = [];
     $mySemesters = [];
 
-    // Sort semester depending on setting
-    if ($semesterDescending == 0) {
-        // Descending
-        usort($courses, function ($a, $b) use ($semFieldName) {
-            $aId = get_semester_id((int) $a->key, $semFieldName);
-            $bId = get_semester_id((int) $b->key, $semFieldName);
-
-            return strcasecmp($bId, $aId);
-        });
-    } else {
-        // Ascending
-        usort($courses, function ($a, $b) use ($semFieldName) {
-            $aId = get_semester_id((int) $a->key, $semFieldName);
-            $bId = get_semester_id((int) $b->key, $semFieldName);
-
+    // Sorts all courses basend on the shorttext
+    usort($courses, function ($a, $b) {
+        $aId = $a->shorttext;
+        $bId = $b->shorttext;
         return strcasecmp($aId, $bId);
     });
-    }
 
-    // Assign all modules and semesters
+    // Creates a new array with semesters that contain their courses
     foreach ($courses as $c) {
-        $semesterName = get_semester_name($c->key, $semFieldName);
+        $c->semesterId = get_semester_id((int) $c->key, $semFieldName);
+        $c->semesterName = get_semester_name((int) $c->key, $semFieldName);
 
         $courseName = empty($CFG->navshowfullcoursenames) ? $c->shorttext : $c->title;
 
-        if (in_array($semesterName, $specialNodes, true)) {
-            $specialNodesList[$semesterName][] = $courseName;
+        if ($c->semesterId == 1) {
+            $specialNodesList[$c->semesterId]["name"] = $c->semesterName;
+            $specialNodesList[$c->semesterId]["courses"][] = $c;
+            $myCoursesNode->children->remove($c->key); 
         } else {
-            if (count($mySemesters) >= $maxSemesterNodes) {
-                continue; // TODO: Why not a break?
+            $mySemesters[$c->semesterId]["name"] = $c->semesterName;
+            $mySemesters[$c->semesterId]["courses"][] = $c;
+            $c->showinflatnavigation = false;
         }
-            $mySemesters[$semesterName][] = $courseName;
     }
+
+    // Sort semesters depending on setting
+    if ($semesterDescending == 1) {
+        // Descending
+        ksort($mySemesters);
+    } else {
+        // Ascending
+        krsort($mySemesters);
     }
 
     if ($specialNodesFirst == 0)
         add_semester_nodes($specialNodesList, $myCoursesNode);
 
     // Add all semester nodes
-    add_semester_nodes($mySemesters, $myCoursesNode);
-
-    if ($openFirstSemester)
-       open_semester_node(array_keys($mySemesters)[0] , $myCoursesNode);
+    add_semester_nodes(array_slice($mySemesters, 0, $maxSemesterNodes), $myCoursesNode);
 
     // Add all special nodes
     if ($specialNodesFirst == 1)
         add_semester_nodes($specialNodesList, $myCoursesNode);
 
-    // Sorts course node alphabetically
-    usort($courses, function ($a, $b) use ($semFieldName) {
-        $aId = $a->shorttext;
-        $bId = $b->shorttext;
-
-        return strcasecmp($aId, $bId);
-    });
-
-    // Creates all course nodes and assigns them to their semester node
-    foreach ($courses as $c) {
-        $semesterName = get_semester_name((int) $c->key, $semFieldName);
-        $semesterKey = create_node_key($semesterName);
-        $semesterNode = $navigation->find($semesterKey, null);
-
-        // Can't find semester of current course
-        $isSemester = $c->type == 1;
-
-        if (!$semesterNode || $isSemester) {
-            continue;
-        }
-
-        $myCoursesNode->children->remove($c->key); 
-        $c->showinflatnavigation = true;
-        $c->add_class('p-l-3');
-        $c->set_parent($semesterNode);
-
-        if (!$semesterNode->forceopen)
-            $c->add_class('localboostnavigationcollapsedchild');
-
-        $semesterNode->add_node($c);
-
-        // Open semester node of active course
-        if ($c->isactive) {
-            open_semester_node($semesterNode->text , $myCoursesNode);
-        }
+    if ($openFirstSemester) {
+        $key = create_node_key($mySemesters[array_key_first($mySemesters)]["name"]);
+        $semesterNode = $myCoursesNode->find($key, global_navigation::NODETYPE_BRANCH);
+        open_semester_node($semesterNode, $myCoursesNode);
     }
 }
 
@@ -146,13 +111,31 @@ function add_semester_nodes(array $semesterList, $parentNode)
     $collapsenodesforjs = [];
 
     foreach ($semesterList as $key => $value) {
-        $semesterNode = create_semester_node($key);
+        $semesterNode = create_semester_node($value["name"]);
 
         if (!in_array($semesterNode->key, $collapsenodesforjs)) {
             $collapsenodesforjs[] = $semesterNode->key;
         }
 
         $parentNode->add_node($semesterNode);
+
+        // Assign courses to their semester in the navigation
+        foreach ($value["courses"] as $c) {
+            $parentNode->children->remove($c->key); 
+            $c->showinflatnavigation = true;
+            $c->add_class('p-l-3');
+            $c->set_parent($semesterNode);
+
+            if (!$semesterNode->forceopen)
+                $c->add_class('localboostnavigationcollapsedchild');
+
+            $semesterNode->add_node($c);
+
+            // Open semester node of active course
+            if ($c->isactive) {
+                open_semester_node($semesterNode, $parentNode);
+            }
+        }
     }
 
     // Apply collapse navigation js to every semester
@@ -167,22 +150,19 @@ function add_semester_nodes(array $semesterList, $parentNode)
 }
 
 /**
- * @param $semesterKey
+ * @param $semesterNode
  * @param $myCourseNode
  */
-function open_semester_node($semesterKey, $myCourseNode)
+function open_semester_node($semesterNode, $myCourseNode)
 {
-    if (empty($semesterKey))
+    if (empty($semesterNode))
         return;
 
-    $key = create_node_key($semesterKey);
-    $semesterNode = $myCourseNode->find($key, global_navigation::NODETYPE_BRANCH);
-
     $semesterNode->forceopen = true;
     $semesterNode->remove_class('localboostnavigationcollapsedparent');
 
-    foreach ($semesterNode->get_children_key_list() as $c) {
-        $node = $myCourseNode->find($c, null);
+    foreach ($semesterNode->get_children_key_list() as $key) {
+        $node = $myCourseNode->find($key, null);
         $node->remove_class('localboostnavigationcollapsedchild');
     }
 }

version.php

@@ -26,7 +26,7 @@ defined('MOODLE_INTERNAL') || die();
 
 $plugin->component = 'local_sembasednav';
 $plugin->release = '0.1.0';
-$plugin->version = 2020060301;
+$plugin->version = 2020060302;
 $plugin->requires = 2019052000;
 $plugin->maturity = MATURITY_ALPHA;
 $plugin->dependencies = [