Active tabs in subsection activity context

Author: davidherney

classes/header.php

@@ -122,7 +122,14 @@ public function export_for_template(\renderer_base $output) {
 
             // If the tabsectionbackground is not defined in the section check the parent section.
             if ($currentsection != $activetab->section) {
-                $formatoptionssub = course_get_format($course)->get_format_options($currentsection);
+                $activesubtab = $activetab->get_childs()->get_active();
+
+                if ($activesubtab) {
+                    $formatoptionssub = course_get_format($course)->get_format_options($activesubtab->section);
+                } else {
+                    $formatoptionssub = course_get_format($course)->get_format_options($currentsection);
+                }
+
                 $subtabsectionbackground = $formatoptionssub['tabsectionbackground'] ?? '';
 
                 if (!empty($subtabsectionbackground)) {
@@ -243,6 +250,23 @@ private function get_tabs(course_modinfo $modinfo, \renderer_base $output): \for
             // Can we view the section in question?
             if ((!$thissection->uservisible && $course->hiddensections == 1) || !empty($thissection->component)) {
                 $localsection++;
+
+                if (!empty($thissection->component) && $thissection->section == $displaysection) {
+                    $subsectioncm = \mod_subsection\manager::create_from_id($course->id, $thissection->itemid);
+                    $cm = $subsectioncm->get_coursemodule();
+
+                    // Find the tab.
+                    $childtab = $tabs->get_childbysection($cm->sectionnum);
+                    if ($childtab) {
+                        $childtab->selected = true;
+                        $childtab->cssstyles = 'color: red;';
+
+                        if ($childtab->parenttab) {
+                            $childtab->parenttab->selected = true;
+                        }
+                    }
+                }
+
                 continue;
             }
 
@@ -483,11 +507,11 @@ private function get_tabs(course_modinfo $modinfo, \renderer_base $output): \for
                 $insertposition = $displaysection + 1;
 
                 $paramstotabs = [
-                                    'courseid' => $course->id,
-                                    'increase' => true,
-                                    'sesskey' => sesskey(),
-                                    'insertsection' => $insertposition,
-                                ];
+                    'courseid' => $course->id,
+                    'increase' => true,
+                    'sesskey' => sesskey(),
+                    'insertsection' => $insertposition,
+                ];
 
                 // Define if subtabs are displayed (a subtab is selected or the selected tab has subtabs).
                 $selectedsubtabs = $selectedparent ? $tabs->get_tab($selectedparent->index) : null;

classes/tabs.php

@@ -49,8 +49,9 @@ public function __construct() {
      * To get a specific tab by index.
      *
      * @param int $index The tabs position or index. Null: if not found the index.
+     * @return \format_onetopic\singletab|null The tab object.
      */
-    public function get_tab($index) {
+    public function get_tab($index): ?singletab {
         return isset($this->tabslist[$index]) ? $this->tabslist[$index] : null;
     }
 
@@ -192,6 +193,24 @@ public function get_list(bool $assubtabs = false): array {
         return $tabstree;
     }
 
+    /**
+     * To get a child tab by section number.
+     *
+     * @param int $sectionnumber The section number.
+     * @return \format_onetopic\singletab|null The tab object.
+     */
+    public function get_childbysection(int $sectionnumber): ?singletab {
+        foreach ($this->tabslist as $tab) {
+            if ($tab->section == $sectionnumber) {
+                return $tab;
+            } else  if ($found = $tab->get_childs()->get_childbysection($sectionnumber)) {
+                return $found;
+            }
+        }
+
+        return null;
+    }
+
     /**
      * Check if exist tabs.
      *

styles.css

@@ -41,6 +41,7 @@
     padding-bottom: 10px;
 }
 
+.format-onetopic #page.drawers .onetopic-withsectionbg div[role="main"],
 .format-onetopic .onetopic-withsectionbg .course-section,
 .format-onetopic .onetopic-withsubsectionbg .course-section {
     margin-top: 0;
@@ -49,6 +50,10 @@
     border-radius: 5px;
 }
 
+.format-onetopic #page.drawers .onetopic-withsectionbg div[role="main"] {
+    margin: 0 10px;
+}
+
 .format-onetopic .onetopic-withsectionbg ul.section .activity-item,
 .format-onetopic .onetopic-withsectionbg .content .summarytext {
     background-color: transparent;