diff --git a/classes/output/courseformat/content.php b/classes/output/courseformat/content.php index 1f9a7e0aaf8d5b790953e46eaf896cc7d4cbcedd..548df63ce4134b6a585843df2a54472ade765bb1 100644 --- a/classes/output/courseformat/content.php +++ b/classes/output/courseformat/content.php @@ -48,18 +48,20 @@ class content extends content_base { global $CFG, $COURSE, $USER; $data=parent::export_for_template($output); - //$section_entity = new course_format_iena_sections(); - - // return false if completion disabled (site or course) - $completion=new course_format_iena_completion(); - $cpl = $completion->get_completion_by_sections($data->sections); - /* Passer le calcul de complétion de la classe course_format_iena_completion à part à la vue qui fait le header permet de ne pas récupérer deux fois les mêmes informations. */ - //$header = new view_course_header($nameSections, $idSections, $course, $cpl); - $progress= $this->create_view($cpl); - - foreach ($progress as $key => $value) { - $data->$key=$value; + + //Single section + if(!$data->hasnavigation){ + $completion=new course_format_iena_completion(); + $cpl = $completion->get_completion_by_sections($data->sections); + /* Passer le calcul de complétion de la classe course_format_iena_completion à part à la vue qui fait le header permet de ne pas récupérer deux fois les mêmes informations. */ + //$header = new view_course_header($nameSections, $idSections, $course, $cpl); + $progress= $this->create_view($cpl); + + foreach ($progress as $key => $value) { + $data->$key=$value; + } } + //$data->progress=(object)$progress; //$data->student=$progress['student']; //$data->summary=$progress['summary']; @@ -129,4 +131,8 @@ class content extends content_base { ]; return $this->get_data($infos); } + + + + } diff --git a/styles.css b/styles.css index 5c5452de50ef7fa757f6b24e27038413719d3b40..09b35d32170ff0e2f0090c49e2f902c29785768d 100644 --- a/styles.css +++ b/styles.css @@ -983,6 +983,8 @@ tbody th{ font-size: medium; font-size: large; font-weight: 900; + position: relative; + top: 2px; } .iena-icon-distance::after{ @@ -992,6 +994,8 @@ tbody th{ font-size: medium; font-size: large; font-weight: 950; + position: relative; + top: 2px; } diff --git a/templates/courseformat/content.mustache b/templates/courseformat/content.mustache index b702e7ce888eae411cc13cb3423bd3e9ccb1dbc9..48288f14758c868777e2c7fa06893a6ba9ca951d 100644 --- a/templates/courseformat/content.mustache +++ b/templates/courseformat/content.mustache @@ -286,9 +286,9 @@ {{/sectionnavigation}} <ul class="{{format}}"> {{#singlesection}} - {{$ format_iena/content/section }} - {{> format_iena/content/section }} - {{/ format_iena/content/section }} + {{$ format_iena/courseformat/content/section }} + {{> format_iena/courseformat/content/section }} + {{/ format_iena/courseformat/content/section }} {{/singlesection}} </ul> {{#sectionselector}}