From f64bfefc7f7edc2a4281923a4df841b552077d57 Mon Sep 17 00:00:00 2001
From: CORDEL Yannick <yannick.cordel@univ-lorraine.fr>
Date: Mon, 30 May 2022 15:53:30 +0200
Subject: [PATCH] =?UTF-8?q?Ajout=20ent=C3=AAte=20avec=20le=20nom=20et=20la?=
=?UTF-8?q?=20date=20du=20cours=20dans=20la=20notification=20par=20mail?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
entity/course_format_iena_cron_action.php | 34 +++++++++++------------
lang/fr/format_iena.php | 2 +-
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/entity/course_format_iena_cron_action.php b/entity/course_format_iena_cron_action.php
index d046585..79d2e57 100644
--- a/entity/course_format_iena_cron_action.php
+++ b/entity/course_format_iena_cron_action.php
@@ -52,13 +52,7 @@ class course_format_iena_cron_action {
if ($datenotif == false) {
continue;
}
- if ((empty($section->msg)) && ($section->presence == 2)) {
- $this->iena_send_message($requete, $section, get_config('format_iena', 'msg_dist'));
- } else if ((empty($section->msg)) && ($section->presence == 1)) {
- $this->iena_send_message($requete, $section, get_config('format_iena', 'msg_pres'));
- } else {
- $this->iena_send_message($requete, $section, $section->msg);
- }
+ $this->iena_send_message($requete, $section);
}
}
@@ -84,10 +78,23 @@ class course_format_iena_cron_action {
* @throws coding_exception
* @throws dml_exception
*/
- private function iena_send_message($requete, $section, $message) {
+ private function iena_send_message($requete, $section) {
global $DB, $CFG, $USER;
$coursectx = context_course::instance($requete->course);
+ if ($section->presence == 2) {
+ $modalite = get_string('not_presence', 'format_iena');
+ } else if ($section->presence == 1) {
+ $modalite = get_string('in_presence', 'format_iena');
+ }
+
+ // Si le message personnalisé est vide.
+ if ((empty($section->msg)) && ($section->presence == 2)) {
+ $section->msg = get_config('format_iena', 'msg_dist');
+ } else if ((empty($section->msg)) && ($section->presence == 1)) {
+ $section->msg = get_config('format_iena', 'msg_pres');
+ }
+
// A vérifier : on récupère tous les utilisateurs, même les invités.
// 2. $students = get_role_users(5 , $context) (the 5 represents the role-id with role.shortname = 'student').
$students = get_enrolled_users($coursectx);
@@ -96,19 +103,12 @@ class course_format_iena_cron_action {
$messagecontent = false;
$messagecontent .= "<h1>Rappel</h1>";
- $messagecontent .= "<h2>$course->fullname</h2>";
-
- $datejour = date('d/m', $section->daterendu);
- $dateheure = date('H:i', $section->daterendu);
+ $messagecontent .= "<h2>$course->fullname ($modalite) - " . date('d/m/Y H:i', $section->daterendu) . "</h2>";
// 0 : NC
// 1 : work in the classroom
// 2 : online work
- if ( $section->presence < 2 ) {
- $messagecontent .= "$message";
- } else if ( $section->presence == 2 ) {
- $messagecontent .= "$message";
- }
+ $messagecontent .= "$section->msg";
$messagecontent .= "<p>Lien vers le cours : <a href='" . $CFG->wwwroot .
"/course/view.php?id=" . $course->id . "'>" . $course->fullname . "</a></p>";
diff --git a/lang/fr/format_iena.php b/lang/fr/format_iena.php
index 4fd4934..ce725ec 100644
--- a/lang/fr/format_iena.php
+++ b/lang/fr/format_iena.php
@@ -97,4 +97,4 @@ $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";
+$string['message_default_dist'] = "message par défaut distance";
\ No newline at end of file
--
GitLab