Fix subsection navigation nodes (MDL-82845) WIP 4

Author: james-cnz

classes/global_navigation_wrapper.php

@@ -182,7 +182,6 @@ public function load_generic_course_sections(stdClass $course, navigation_node $
 
             if ($course->id == $SITE->id) {
                 $this->load_section_activities_navigation($coursenode, $section, $activities);
-                // CHANGED ABOVE: Pass section info rather than num.
                 continue;
             }
 
@@ -203,7 +202,7 @@ public function load_generic_course_sections(stdClass $course, navigation_node $
 
             // CHANGED.
             $sectionname = $format->get_section_short_name($section);
-            $url = course_get_url($course, $section, ['navigation' => true]); // CHANGED: Custom call.
+            $url = $format->get_view_url($section);
 
             // Add multiple nodes per section, one per level as required.
             // The course node already exists, so we must start below course level.
@@ -217,19 +216,19 @@ public function load_generic_course_sections(stdClass $course, navigation_node $
                 $parentnode = $nodeln[$level - 1];                          // ADDED.
                 $nodeid = ($level == $lastlevel) ? $sectionid : $extraid--; // ADDED.
                 $sectionnode = $parentnode->add(
-                    $sectionname,
-                    $url,
-                    \navigation_node::TYPE_SECTION,
-                    null,
-                    $nodeid,
-                    new \pix_icon(
+                    text: $sectionname,
+                    action: $url,
+                    type: navigation_node::TYPE_SECTION,
+                    key: $nodeid,
+                    icon: new pix_icon(
                         ($sectionextra->levelsan < FORMAT_MULTITOPIC_SECTION_LEVEL_TOPIC) ? 'i/section' : 'e/bullet_list',
                         ''
                     )
                 );
                 // CHANGED ABOVE: Attach to parentnode with nodeid as defined above, and use a list icon for topic sections.
-                $sectionnode->nodetype = \navigation_node::NODETYPE_BRANCH;
+                $sectionnode->nodetype = navigation_node::NODETYPE_BRANCH;
                 $sectionnode->hidden = (!$section->visible || !$section->available) && ($section->section != 0);
+                $sectionnode->add_attribute('data-section-name-for', $section->id);
                 $nodeln[$level] = $sectionnode;                             // ADDED.
             }
 
@@ -240,9 +239,8 @@ public function load_generic_course_sections(stdClass $course, navigation_node $
             }
 
             if (
-                ($this->inner->includesectionnum !== false) && ($this->inner->includesectionnum == $section->section)
-                || isset($this->innerincludesectionid) && ($this->innerincludesectionid == $section->id)
-                || $sectionextra->hassubsections
+                isset($this->innerincludesectionid) && ($this->innerincludesectionid == $section->id)
+                || $sectionextra->hassubsections // TODO: Replace with is_section_in_breadcrumbs?
                 // CHANGED ABOVE: Use section ID.
                 // Also check for subsections, because activities might not get loaded otherwise.
             ) {
@@ -262,7 +260,7 @@ public function load_generic_course_sections(stdClass $course, navigation_node $
      *
      * @param navigation_node $sectionnode
      * @param section_info $section
-     * @param array $activitiesdata An array of activites as returned by see global_navigation::generate_sections_and_activities()
+     * @param stdClass[] $activitiesdata An array of activites as returned by see global_navigation::generate_sections_and_activities()
      * @return stdClass[] Array of activity nodes
      */
     protected function load_section_activities_navigation(