diff --git a/competency_iena_competencies_mgmt.php b/competency_iena_competencies_mgmt.php index b9cbf3d510d6f631e0310bc102a8ecf5c01322fd..c0140f0aeca3ebe9e89aa4fd688c8751ca47c487 100644 --- a/competency_iena_competencies_mgmt.php +++ b/competency_iena_competencies_mgmt.php @@ -175,6 +175,7 @@ $sections_matrix=array(); $sections_modal=array(); + //Pour chaque section on va regarder s'il y a des modules, et si oui on formate et on ajoute les modules à la section foreach ($sections as $section) { @@ -191,8 +192,10 @@ } $matrix_modules=$module_instance->get_matrix_modules_by_id_section($section->id); + $completion_activity=false; foreach ($modules as $key => $module) { if($module->section == $section->id && $module->completion>0){ + $completion_activity=true; if(in_array($key, array_column($matrix_modules, 'cmid'))){ $module_matrix=new stdClass(); $moduleI = new block_competency_iena_ressource(); @@ -288,6 +291,10 @@ //echo $view->get_content(htmlspecialchars($courseid)); $data=array(); + $completioninfo = new completion_info($course); + + $data['completion_course']=!$completioninfo->is_enabled(); + $data['completion_activity']=!$completion_activity; $data['competencies']=$competencies; //$data['modules']=$modules; $data['sections']=$sections_modal; @@ -298,7 +305,7 @@ $data['form_link']= $CFG->wwwroot . "/blocks/competency_iena/competency_iena_competency_mgmt.php?courseid=" . $COURSE->id; $data['update_link']=$CFG->wwwroot . '/blocks/competency_iena/competency_iena_competencies_api.php?courseid=' . $COURSE->id; $data['edit_link']=$CFG->wwwroot . '/blocks/competency_iena/competency_iena_competencies_mgmt.php?courseid=' . $COURSE->id; - + $data['link_edit_course']= $CFG->wwwroot ."/course/edit.php?id=".$COURSE->id ; $data['courseid']=$COURSE->id; $data['edit']=$editmode; diff --git a/lang/en/block_competency_iena.php b/lang/en/block_competency_iena.php index 1ac87a5506d920ad1fe8bc44e0e21ee41ac56fbf..640bfdd9ed9eccc5ae8b529d74bcaa92eaad55a4 100644 --- a/lang/en/block_competency_iena.php +++ b/lang/en/block_competency_iena.php @@ -94,5 +94,7 @@ $string['assessments']="Assessment history"; $string['details_competency']="Details competency/student"; $string['linked_activities']="Activities and resources related to this competency"; + $string['completion_course']="Activity completion is not enabled in this course, to do so please go to the course parameters <a href='{{{link_edit_course}}}'>here</a>."; + $string['completion_activity']="No activy or resources have completion enabled. The activities need completion enabled to be used in the matrix."; ?> \ No newline at end of file diff --git a/lang/fr/block_competency_iena.php b/lang/fr/block_competency_iena.php index dbc4348526ab4c5bd311d6854845d902c71b55ac..c8e67ecea8ef4da5dbd01fcb9b45266fb00c54f2 100644 --- a/lang/fr/block_competency_iena.php +++ b/lang/fr/block_competency_iena.php @@ -93,6 +93,8 @@ $string['assessments']="Évolution des évaluations"; $string['details_competency']="Détails compétence/étudiant"; $string['linked_activities']="Activités et ressources liées à cette compétence"; + $string['completion_course']="Le suivi d'achèvement d'activités n'est pas activé dans ce cours. Activez-le dans les paramètres du cours <a href='{{{link_edit_course}}}'>ici</a>."; + $string['completion_activity']="Aucune activité ou ressource n'a été paramétrée avec le suivi d'achèvement. Seules les activités avec suivi d'achèvement peuvent être ajoutées à la matrice."; diff --git a/templates/matrix_competencies.mustache b/templates/matrix_competencies.mustache index 11e3dfb32deb140dcce0ca57b09aac51e8f1db1a..3d35eef0cb822a6ce41577a99664c0a9f481783d 100644 --- a/templates/matrix_competencies.mustache +++ b/templates/matrix_competencies.mustache @@ -1,6 +1,13 @@ <h3>{{# str }} manage_comp, block_competency_iena{{/ str }}</h3> <p>{{# str }} add_comment, block_competency_iena{{/ str }}</p> +{{#completion_course}} +<div class="alert alert-warning">{{#str}} completion_course, block_competency_iena{{/str}}</div> +{{/completion_course}} +{{#completion_activity}} +<div class="alert alert-warning">{{#str}} completion_activity, block_competency_iena{{/str}}</div> +{{/completion_activity}} + <table id="tab_mgmt" class="table-bordered order-column row-border dataTable" > <thead> <tr>