REMOVE Mutliple calls to get_course_metadata

lib.php

@@ -54,16 +54,22 @@ function local_sembasednav_extend_navigation(global_navigation $navigation)
 
     // Creates a new array with semesters that contain their courses
     foreach ($courses as $c) {
-        $c->semesterId = get_semester_id((int) $c->key, $semFieldName);
-        $c->semesterName = get_semester_name((int) $c->key, $semFieldName);
+        $semesterCustomField = get_semester_customFields((int) $c->key, $semFieldName);
+        $semesterId = preg_replace('/[^0-9]/', '', $semesterCustomField);
+        $semesterName = \customfield_semester\data_controller::get_name_for_semester((int)$semesterId);
+
+        $c->semesterId = $semesterId;
+        $c->semesterName = $semesterName;
 
         $courseName = empty($CFG->navshowfullcoursenames) ? $c->shorttext : $c->title;
 
         if ($c->semesterId == 1) {
+            // Term-independent
             $specialNodesList[$c->semesterId]["name"] = $c->semesterName;
             $specialNodesList[$c->semesterId]["courses"][] = $c;
-            $myCoursesNode->children->remove($c->key); 
+            $c->showinflatnavigation = false; 
         } else {
+            // Normal semesters
             $mySemesters[$c->semesterId]["name"] = $c->semesterName;
             $mySemesters[$c->semesterId]["courses"][] = $c;
             $c->showinflatnavigation = false;
@@ -124,9 +130,9 @@ function add_semester_nodes(array $semesterList, $parentNode)
         // 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);
+            $c->showinflatnavigation = true;
 
             if (!$semesterNode->forceopen)
                 $c->add_class('localboostnavigationcollapsedchild');
@@ -208,45 +214,19 @@ function create_node_key(string $semesterName)
 }
 
 /**
- * Returns semester name of given course id.
- * If no semester is found, return no semester assigned name.
+ * Gets the custom fields of a given course id 
  * @param int $id
  * @return string
  */
-function get_semester_name(int $id, $semFieldName)
-{
-    $noSemesterAssigned = get_config('sembasednav', 'setting_nosemestername');
-    $semesterName = '';
-
+function get_semester_customFields(int $id, $semFieldName) {
     try {
         $allCustomFields = get_course_metadata($id);
         $semesterField = $allCustomFields[$semFieldName->shortname];
-        $semesterValue = preg_replace('/[^0-9]/', '', $semesterField); // extract semester int from string
-        $semesterName = \customfield_semester\data_controller::get_name_for_semester((int)$semesterValue);
-    } catch (Exception $e) {
-        echo $e->getMessage();
-    }
-
-    return empty($semesterName) || $semesterName === '' ? $noSemesterAssigned : $semesterName;
-}
 
-/**
- * @param int $id
- * @return string
- */
-function get_semester_id(int $id, $semFieldName)
-{
-    $semesterValue = '';
-
-    try {
-        $allCustomFields = get_course_metadata($id);
-        $semesterField = $allCustomFields[$semFieldName->shortname];
-        $semesterValue = preg_replace('/[^0-9]/', '', $semesterField); // extract semester int from string
+        return $semesterField;
     } catch (Exception $e) {
         echo $e->getMessage();
     }
-
-    return empty($semesterValue) || $semesterValue === '' ? 0 : $semesterValue;
 }
 
 // https://docs.moodle.org/dev/Custom_fields_API#Example_code_for_course_custom_fields