diff --git a/lang/en/format_iena.php b/lang/en/format_iena.php
index af1468a33fd4992e43c8bd1493b687ca53f937a2..4bb81c609387adce93039f9eb52e41c18691d92b 100644
--- a/lang/en/format_iena.php
+++ b/lang/en/format_iena.php
@@ -98,3 +98,4 @@ $string['message_pres_desc'] = "Configure default presential course message";
$string['message_dist'] = "distance learning mail";
$string['message_dist_desc'] = "Configure default blended course message";
$string['message_default_dist'] = "Default message distance learning";
+$string['formatenabled']="Course completion is disabled. You can enable it in the \"Course completion\" section here: ";
diff --git a/lang/fr/format_iena.php b/lang/fr/format_iena.php
index ce725ece71391dc13abf98a0221480df6759da19..6fc21a4f8f066b447de7b43f2f858bcd7e75d113 100644
--- a/lang/fr/format_iena.php
+++ b/lang/fr/format_iena.php
@@ -97,4 +97,5 @@ $string['message_default_pres'] = "message par defaut pres";
$string['message_pres_desc'] = "Paramétrez le message qui sera envoyé par défaut pour un cours en présentiel";
$string['message_dist'] = "Message distanciel";
$string['message_dist_desc'] = "Paramétrez le message qui sera envoyé par défaut pour un cours à distance";
-$string['message_default_dist'] = "message par défaut distance";
\ No newline at end of file
+$string['message_default_dist'] = "message par défaut distance";
+$string['formatenabled']="L'achèvement de cours n'est pas activé. Vous pouvez l'activer dans la section \"Achèvement de cours\" des paramètres du cours : ";
\ No newline at end of file
diff --git a/suivi_unit.php b/suivi_unit.php
index 48f07d526ee33ba46151cff4e0b0fc6a2f012c0c..7f61762d36ba157049caf7fcc91807fbf850cef3 100644
--- a/suivi_unit.php
+++ b/suivi_unit.php
@@ -338,26 +338,35 @@ if (isset($_POST['action']) && !empty($_POST['action'])) {
} else {
init_page($course, $PAGE);
echo $OUTPUT->header();
- $currentusergroups = [];
- $activegroupname = "";
$data = [];
+ if(!$COURSE->enablecompletion){
+ $data["completion_enabled"]=0;
+ $data["link_enable"]= "<a href='".$CFG->wwwroot . '/course/edit.php?id=' . $courseid."'>sur ce lien</a>";
+ }
+ else{
+ $data["completion_enabled"]=1;
+ $currentusergroups = [];
+ $activegroupname = "";
+
- $modules = get_activities($completion, $activesectionid);
- $groupsall = get_groups($context, $activegroupid, $progress, $groups);
+ $modules = get_activities($completion, $activesectionid);
+ $groupsall = get_groups($context, $activegroupid, $progress, $groups);
- if (isset($groupsall->current_user_groups) && !empty($groupsall->current_user_groups)) {
- $currentusergroups = $groupsall->current_user_groups;
- }
- $groups = $groupsall->groups;
- $sections = get_sections($activesectionid);
- $data = set_filters($data, $filters, $symbols, $sections, $groups, $currentusergroups, $activegroupname, $activesectionid);
- $data = set_data($data, $modules, $progress, $groups, $activegroupid, $activesectionid);
+ if (isset($groupsall->current_user_groups) && !empty($groupsall->current_user_groups)) {
+ $currentusergroups = $groupsall->current_user_groups;
+ }
+ $groups = $groupsall->groups;
+ $sections = get_sections($activesectionid);
+ $data = set_filters($data, $filters, $symbols, $sections, $groups, $currentusergroups, $activegroupname, $activesectionid);
+ $data = set_data($data, $modules, $progress, $groups, $activegroupid, $activesectionid);
+
+ if (isset($_GET["msg_success"])) {
+ $msg = $_GET["msg_success"];
+ $data["msg_success"] = $msg;
+ }
- if (isset($_GET["msg_success"])) {
- $msg = $_GET["msg_success"];
- $data["msg_success"] = $msg;
}
-
+
$renderer = $PAGE->get_renderer('format_iena');
$renderer->display_completion($data);
diff --git a/templates/suivi.mustache b/templates/suivi.mustache
index 86e3ed54b0d07460c6975a6dae93b5add3471386..8c1a7b5c2de0d52cbe468c4b87fa532a73342b15 100644
--- a/templates/suivi.mustache
+++ b/templates/suivi.mustache
@@ -1,52 +1,32 @@
+{{#completion_enabled}}
<div>
<h2 class="mb1" style="display: inline-block;">{{#str}}table_progress, format_iena{{/str}}</h2>
-
-
-
-
<div class="context-header-settings-menu">
<div class="action-menu moodle-actionmenu d-inline" id="action-menu-3" data-enhance="moodle-core-actionmenu">
-
- <div class="menubar d-flex " id="action-menu-3-menubar" role="menubar">
-
-
-
- <div class="action-menu-trigger">
- <div class="dropdown">
- <a href="#" tabindex="0" class=" dropdown-toggle icon-no-margin" id="action-menu-toggle-3" aria-label="Menu d'actions" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="true" aria-controls="action-menu-3-menu">
-
-
- <i class="icon fa fa-cog fa-fw " title="Menu d'actions" aria-label="Menu d'actions"></i>
- </a>
- <div class="dropdown-menu dropdown-menu-right menu align-tr-br" id="action-menu-3-menu" data-rel="menu-content" aria-labelledby="action-menu-toggle-3" role="menu" data-align="tr-br" x-placement="bottom-end" style="position: absolute; transform: translate3d(-256px, 24px, 0px); top: 0px; left: 0px; will-change: transform;">
- {{#link_bulkcompletion}}
- <div class="dropdown-item">
-
- <a target="_blank" href="{{link_bulkcompletion}}" class="" role="menuitem"><i class="icon fa fa-cog fa-fw " aria-hidden="true"></i>Paramétrer le suivi</a>
-
- </div>
- {{/link_bulkcompletion}}
- <div class="dropdown-item">
-
- <a href="{{link_classicview}}" class="" role="menuitem"><i class="icon fa fa-pencil fa-fw " aria-hidden="true"></i>Vue classique</a>
-
- </div>
-
- </div>
- </div>
+ <div class="menubar d-flex " id="action-menu-3-menubar" role="menubar">
+ <div class="action-menu-trigger">
+ <div class="dropdown">
+ <a href="#" tabindex="0" class=" dropdown-toggle icon-no-margin" id="action-menu-toggle-3" aria-label="Menu d'actions" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="true" aria-controls="action-menu-3-menu">
+ <i class="icon fa fa-cog fa-fw " title="Menu d'actions" aria-label="Menu d'actions"></i>
+ </a>
+ <div class="dropdown-menu dropdown-menu-right menu align-tr-br" id="action-menu-3-menu" data-rel="menu-content" aria-labelledby="action-menu-toggle-3" role="menu" data-align="tr-br" x-placement="bottom-end" style="position: absolute; transform: translate3d(-256px, 24px, 0px); top: 0px; left: 0px; will-change: transform;">
+ {{#link_bulkcompletion}}
+ <div class="dropdown-item">
+ <a target="_blank" href="{{link_bulkcompletion}}" class="" role="menuitem"><i class="icon fa fa-cog fa-fw " aria-hidden="true"></i>Paramétrer le suivi</a>
+ </div>
+ {{/link_bulkcompletion}}
+ <div class="dropdown-item">
+ <a href="{{link_classicview}}" class="" role="menuitem"><i class="icon fa fa-pencil fa-fw " aria-hidden="true"></i>Vue classique</a>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
-
- </div>
-
+ </div>
</div>
</div>
-
-
-
-</div>
-
<form style="clear: right;" class="form-inline" action="" method="GET">
<input name="courseid" type="number" hidden="hidden" style="display: none;" value="">
@@ -110,9 +90,6 @@
</select>
</div>
-
-
-
</form>
{{#msg_success}}
<div class="alert alert-success iena-message">Message(s) envoyé(s)</div>
@@ -157,4 +134,8 @@ require(['format_iena/suivi', 'core/templates'], function(module) {
</form>
</div>
</div>
-</div>
\ No newline at end of file
+</div>
+{{/completion_enabled}}
+{{^completion_enabled}}
+ <div class="alert alert-danger iena-message">{{# str }} formatenabled, format_iena {{/ str}} {{{link_enable}}}</div>
+{{/completion_enabled}}
\ No newline at end of file
diff --git a/version.php b/version.php
index 7f36504f48f5a541476a3da195fb5f3ab100f816..946ae9decdffa27ea709411dada575454b1900d4 100644
--- a/version.php
+++ b/version.php
@@ -26,7 +26,7 @@
defined('MOODLE_INTERNAL') || die();
-$plugin->version = 2022000000;
+$plugin->version = 2022000001;
$plugin->requires = 2014111000;
$plugin->component = 'format_iena';
$plugin->release = "1.0";
diff --git a/view/view_course_header.php b/view/view_course_header.php
index b3aeaef040688ff2558bd977febbf643e260384f..4ec961174ec92ac4f3ccd615908c618830f22192 100644
--- a/view/view_course_header.php
+++ b/view/view_course_header.php
@@ -309,7 +309,7 @@ class view_course_header {
$course_data=[];
$course_data['student']=false;
//if user is a student
- if(!has_capability('course/iena:suivi', $context = context_course::instance($COURSE->id), $USER->id)){
+ if(!has_capability('course/iena:suivi', $context = context_course::instance($COURSE->id), $USER->id) &&$infos["progress"]){
$course_data['progress_total']=$infos['progress']->total;