From c304a9b16b719253be0a682dd08077576feaab26 Mon Sep 17 00:00:00 2001
From: Myriam Delaruelle
<Myriam Delaruelle@bdn-un-mdelarue.ad.univ-lorraine.fr>
Date: Tue, 1 Mar 2022 15:06:54 +0100
Subject: [PATCH] =?UTF-8?q?les=20sections=20qui=20n'ont=20pas=20d'activit?=
=?UTF-8?q?=C3=A9s=20n'apparaissent=20plus=20dans=20la=20modale=20pour=20l?=
=?UTF-8?q?a=20matrice?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
competency_iena_competencies_mgmt.php | 14 ++++++++++----
entity/block_competency_iena_competency.php | 2 +-
styles.css | 2 +-
templates/modal_activities.mustache | 2 +-
4 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/competency_iena_competencies_mgmt.php b/competency_iena_competencies_mgmt.php
index c0140f0..10abc7d 100644
--- a/competency_iena_competencies_mgmt.php
+++ b/competency_iena_competencies_mgmt.php
@@ -259,10 +259,16 @@
$section_matrix->id=$section->id;
array_push($sections_matrix, $section_matrix);
}
- $section_modal->id=$section->id;
- $section_modal->name=$section->name;
- array_push($sections_modal, $section_modal);
- $index++;
+ $nb_modules=count($section_modal->modules);
+ if($nb_modules > 0){
+ $section_modal->id=$section->id;
+ $section_modal->name=$section->name;
+ $section_modal->nb_modules=$nb_modules;
+ array_push($sections_modal, $section_modal);
+ $index++;
+ }
+
+
}
//Comme on a unset, on réindexe le tableau pour des clés propres
diff --git a/entity/block_competency_iena_competency.php b/entity/block_competency_iena_competency.php
index 9a978c2..bcce9d6 100644
--- a/entity/block_competency_iena_competency.php
+++ b/entity/block_competency_iena_competency.php
@@ -234,7 +234,7 @@ list_evidence_in_course
/**
* Récupère les compétences par le module ID
* @param type $id_module
- * @return type
+ * @return array
*/
public function get_competencies_by_moduleID($id_module)
{
diff --git a/styles.css b/styles.css
index 78e3902..c02c381 100644
--- a/styles.css
+++ b/styles.css
@@ -23,7 +23,7 @@
list-style: none
}
-.iena-cpt-sel-tree .tree ufl {
+.iena-cpt-sel-tree .tree ul {
margin-left: 1em;
position: relative
}
diff --git a/templates/modal_activities.mustache b/templates/modal_activities.mustache
index 6288658..b1a4653 100644
--- a/templates/modal_activities.mustache
+++ b/templates/modal_activities.mustache
@@ -20,7 +20,7 @@
<li class='activity-iena'>
{{#sections}}
<li class="activity-iena section-iena section-{{id}}" data-section="{{id}}">
- <input class="iena-checkbox-section" onclick="selectActivity(this, 'section')" type="checkbox" id="{{name}}" value="{{id}}"><a>{{name}}</a>
+ <input class="iena-checkbox-section" onclick="selectActivity(this, 'section')" type="checkbox" id="{{name}}" value="{{id}}"><a>{{name}} ({{nb_modules}})</a>
<ul>
{{#modules}}
<li class="activity-iena">
--
GitLab