Skip to content

Commit 7fda566

Browse files
author
David Monllao
committed
Merge branch 'MDL-62761-34' of https://github.com/jmvedrine/moodle into MOODLE_34_STABLE
2 parents 3d5d4ad + 5eb7a89 commit 7fda566

File tree

3 files changed

+185
-5
lines changed

3 files changed

+185
-5
lines changed

‎mod/lesson/index.php

+7-5
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@
8585
$table->head = array ($strname, $strgrade, $strdeadline);
8686
$table->align = array ("left", "center", "center");
8787
}
88-
88+
// Get all deadlines.
89+
$deadlines = lesson_get_user_deadline($course->id);
8990
foreach ($lessons as $lesson) {
9091
if (!$lesson->visible) {
9192
//Show dimmed if the mod is hidden
@@ -97,12 +98,13 @@
9798
$cm = get_coursemodule_from_instance('lesson', $lesson->id);
9899
$context = context_module::instance($cm->id);
99100

100-
if ($lesson->deadline == 0) {
101+
$deadline = $deadlines[$lesson->id]->userdeadline;
102+
if ($deadline == 0) {
101103
$due = $strnodeadline;
102-
} else if ($lesson->deadline > $timenow) {
103-
$due = userdate($lesson->deadline);
104+
} else if ($deadline > $timenow) {
105+
$due = userdate($deadline);
104106
} else {
105-
$due = "<font color=\"red\">".userdate($lesson->deadline)."</font>";
107+
$due = "<font color=\"red\">" . userdate($deadline) . "</font>";
106108
}
107109

108110
if ($usesections) {

‎mod/lesson/locallib.php

+38
Original file line numberDiff line numberDiff line change
@@ -1187,6 +1187,44 @@ function lesson_get_user_detailed_report_data(lesson $lesson, $userid, $attempt)
11871187
return array($answerpages, $userstats);
11881188
}
11891189

1190+
/**
1191+
* Return user's deadline for all lessons in a course, hereby taking into account group and user overrides.
1192+
*
1193+
* @param int $courseid the course id.
1194+
* @return object An object with of all lessonsids and close unixdates in this course,
1195+
* taking into account the most lenient overrides, if existing and 0 if no close date is set.
1196+
*/
1197+
function lesson_get_user_deadline($courseid) {
1198+
global $DB, $USER;
1199+
1200+
// For teacher and manager/admins return lesson's deadline.
1201+
if (has_capability('moodle/course:update', context_course::instance($courseid))) {
1202+
$sql = "SELECT lesson.id, lesson.deadline AS userdeadline
1203+
FROM {lesson} lesson
1204+
WHERE lesson.course = :courseid";
1205+
1206+
$results = $DB->get_records_sql($sql, array('courseid' => $courseid));
1207+
return $results;
1208+
}
1209+
1210+
$sql = "SELECT a.id,
1211+
COALESCE(v.userclose, v.groupclose, a.deadline, 0) AS userdeadline
1212+
FROM (
1213+
SELECT lesson.id as lessonid,
1214+
MAX(leo.deadline) AS userclose, MAX(qgo.deadline) AS groupclose
1215+
FROM {lesson} lesson
1216+
LEFT JOIN {lesson_overrides} leo on lesson.id = leo.lessonid AND leo.userid = :userid
1217+
LEFT JOIN {groups_members} gm ON gm.userid = :useringroupid
1218+
LEFT JOIN {lesson_overrides} qgo on lesson.id = qgo.lessonid AND qgo.groupid = gm.groupid
1219+
WHERE lesson.course = :courseid
1220+
GROUP BY lesson.id
1221+
) v
1222+
JOIN {lesson} a ON a.id = v.lessonid";
1223+
1224+
$results = $DB->get_records_sql($sql, array('userid' => $USER->id, 'useringroupid' => $USER->id, 'courseid' => $courseid));
1225+
return $results;
1226+
1227+
}
11901228

11911229
/**
11921230
* Abstract class that page type's MUST inherit from.

‎mod/lesson/tests/locallib_test.php

+140
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,144 @@ public function test_duplicate_page() {
7676
}
7777
}
7878
}
79+
80+
/**
81+
* Test test_lesson_get_user_deadline().
82+
*/
83+
public function test_lesson_get_user_deadline() {
84+
global $DB;
85+
86+
$this->resetAfterTest();
87+
$this->setAdminUser();
88+
89+
$basetimestamp = time(); // The timestamp we will base the enddates on.
90+
91+
// Create generator, course and lessons.
92+
$student1 = $this->getDataGenerator()->create_user();
93+
$student2 = $this->getDataGenerator()->create_user();
94+
$student3 = $this->getDataGenerator()->create_user();
95+
$teacher = $this->getDataGenerator()->create_user();
96+
$course = $this->getDataGenerator()->create_course();
97+
$lessongenerator = $this->getDataGenerator()->get_plugin_generator('mod_lesson');
98+
99+
// Both lessons close in two hours.
100+
$lesson1 = $lessongenerator->create_instance(array('course' => $course->id, 'deadline' => $basetimestamp + 7200));
101+
$lesson2 = $lessongenerator->create_instance(array('course' => $course->id, 'deadline' => $basetimestamp + 7200));
102+
$group1 = $this->getDataGenerator()->create_group(array('courseid' => $course->id));
103+
$group2 = $this->getDataGenerator()->create_group(array('courseid' => $course->id));
104+
105+
$student1id = $student1->id;
106+
$student2id = $student2->id;
107+
$student3id = $student3->id;
108+
$teacherid = $teacher->id;
109+
110+
// Users enrolments.
111+
$studentrole = $DB->get_record('role', array('shortname' => 'student'));
112+
$teacherrole = $DB->get_record('role', array('shortname' => 'editingteacher'));
113+
$this->getDataGenerator()->enrol_user($student1id, $course->id, $studentrole->id, 'manual');
114+
$this->getDataGenerator()->enrol_user($student2id, $course->id, $studentrole->id, 'manual');
115+
$this->getDataGenerator()->enrol_user($student3id, $course->id, $studentrole->id, 'manual');
116+
$this->getDataGenerator()->enrol_user($teacherid, $course->id, $teacherrole->id, 'manual');
117+
118+
// Create groups.
119+
$group1 = $this->getDataGenerator()->create_group(array('courseid' => $course->id));
120+
$group2 = $this->getDataGenerator()->create_group(array('courseid' => $course->id));
121+
$group1id = $group1->id;
122+
$group2id = $group2->id;
123+
$this->getDataGenerator()->create_group_member(array('userid' => $student1id, 'groupid' => $group1id));
124+
$this->getDataGenerator()->create_group_member(array('userid' => $student2id, 'groupid' => $group2id));
125+
126+
// Group 1 gets an group override for lesson 1 to close in three hours.
127+
$record1 = (object) [
128+
'lessonid' => $lesson1->id,
129+
'groupid' => $group1id,
130+
'deadline' => $basetimestamp + 10800 // In three hours.
131+
];
132+
$DB->insert_record('lesson_overrides', $record1);
133+
134+
// Let's test lesson 1 closes in three hours for user student 1 since member of group 1.
135+
// lesson 2 closes in two hours.
136+
$this->setUser($student1id);
137+
$params = new stdClass();
138+
139+
$comparearray = array();
140+
$object = new stdClass();
141+
$object->id = $lesson1->id;
142+
$object->userdeadline = $basetimestamp + 10800; // The overriden deadline for lesson 1.
143+
144+
$comparearray[$lesson1->id] = $object;
145+
146+
$object = new stdClass();
147+
$object->id = $lesson2->id;
148+
$object->userdeadline = $basetimestamp + 7200; // The unchanged deadline for lesson 2.
149+
150+
$comparearray[$lesson2->id] = $object;
151+
152+
$this->assertEquals($comparearray, lesson_get_user_deadline($course->id));
153+
154+
// Let's test lesson 1 closes in two hours (the original value) for user student 3 since member of no group.
155+
$this->setUser($student3id);
156+
$params = new stdClass();
157+
158+
$comparearray = array();
159+
$object = new stdClass();
160+
$object->id = $lesson1->id;
161+
$object->userdeadline = $basetimestamp + 7200; // The original deadline for lesson 1.
162+
163+
$comparearray[$lesson1->id] = $object;
164+
165+
$object = new stdClass();
166+
$object->id = $lesson2->id;
167+
$object->userdeadline = $basetimestamp + 7200; // The original deadline for lesson 2.
168+
169+
$comparearray[$lesson2->id] = $object;
170+
171+
$this->assertEquals($comparearray, lesson_get_user_deadline($course->id));
172+
173+
// User 2 gets an user override for lesson 1 to close in four hours.
174+
$record2 = (object) [
175+
'lessonid' => $lesson1->id,
176+
'userid' => $student2id,
177+
'deadline' => $basetimestamp + 14400 // In four hours.
178+
];
179+
$DB->insert_record('lesson_overrides', $record2);
180+
181+
// Let's test lesson 1 closes in four hours for user student 2 since personally overriden.
182+
// lesson 2 closes in two hours.
183+
$this->setUser($student2id);
184+
185+
$comparearray = array();
186+
$object = new stdClass();
187+
$object->id = $lesson1->id;
188+
$object->userdeadline = $basetimestamp + 14400; // The overriden deadline for lesson 1.
189+
190+
$comparearray[$lesson1->id] = $object;
191+
192+
$object = new stdClass();
193+
$object->id = $lesson2->id;
194+
$object->userdeadline = $basetimestamp + 7200; // The unchanged deadline for lesson 2.
195+
196+
$comparearray[$lesson2->id] = $object;
197+
198+
$this->assertEquals($comparearray, lesson_get_user_deadline($course->id));
199+
200+
// Let's test a teacher sees the original times.
201+
// lesson 1 and lesson 2 close in two hours.
202+
$this->setUser($teacherid);
203+
204+
$comparearray = array();
205+
$object = new stdClass();
206+
$object->id = $lesson1->id;
207+
$object->userdeadline = $basetimestamp + 7200; // The unchanged deadline for lesson 1.
208+
209+
$comparearray[$lesson1->id] = $object;
210+
211+
$object = new stdClass();
212+
$object->id = $lesson2->id;
213+
$object->userdeadline = $basetimestamp + 7200; // The unchanged deadline for lesson 2.
214+
215+
$comparearray[$lesson2->id] = $object;
216+
217+
$this->assertEquals($comparearray, lesson_get_user_deadline($course->id));
218+
}
79219
}

0 commit comments

Comments
 (0)