From 9e98808ddbc72d4d5abd8bff1025f1af03c8c2c6 Mon Sep 17 00:00:00 2001
From: Myriam Delaruelle <myriam.delaruelle@univ-lorraine.fr>
Date: Wed, 11 Dec 2024 10:18:35 +0100
Subject: [PATCH] Fix single view for sections
---
classes/output/courseformat/content.php | 28 +++++++++++++++----------
styles.css | 4 ++++
templates/courseformat/content.mustache | 6 +++---
3 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/classes/output/courseformat/content.php b/classes/output/courseformat/content.php
index 1f9a7e0..548df63 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 5c5452d..09b35d3 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 b702e7c..48288f1 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}}
--
GitLab