diff --git a/competency_iena_competencies_mgmt.php b/competency_iena_competencies_mgmt.php index c0140f0aeca3ebe9e89aa4fd688c8751ca47c487..10abc7d2b4eda7c58d7d0d684a32cdf020dee245 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 9a978c2ff3301a804bc6b2451219e64e0a479b92..bcce9d60bf939c2d2de41b44af40c94945f72519 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 78e39020e486ed2fdd8eb3b0b57eadb3aa9fd616..c02c381983f6690dc7705b1bebc5b017c6421946 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 628865892955375c2a55f71ba9289c14f70baa70..b1a4653479e0b2110658158821c997f4fdd37fb1 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">