-
Notifications
You must be signed in to change notification settings - Fork 1
/
moodle.patch
519 lines (472 loc) · 22 KB
/
moodle.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
From 5474e486db4f33e23c8680b911663f9b33a356e3 Mon Sep 17 00:00:00 2001
From: Pavel Sokolov <[email protected]>
Date: Thu, 13 Jun 2013 19:19:39 +0200
Subject: [PATCH 1/8] navigation
---
mod/assign/lib.php | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/mod/assign/lib.php b/mod/assign/lib.php
index 750404c..922d0d7 100644
--- a/mod/assign/lib.php
+++ b/mod/assign/lib.php
@@ -260,6 +260,40 @@ function assign_extend_settings_navigation(settings_navigation $settings, naviga
if (!$course) {
return;
}
+
+ // Give the assign feedback and submission plugins a chance to include some navigation into settings block if they want.
+ global $CFG;
+ $plugins = get_plugin_list('assignsubmission');
+
+ foreach ($plugins as $name => $plugin) {
+ $disabled = get_config('assignsubmission_' . $name, 'disabled');
+ if (!$disabled) {
+ $function = 'assignsubmission_' . $name . '_extend_settings_navigation';
+ $file = $CFG->dirroot . '/mod/assign/submission/' . $name . '/lib.php';
+ if (file_exists($file)) {
+ require_once($file);
+ }
+ if (function_exists($function)) {
+ $function($settings, $navref);
+ }
+ }
+ }
+
+ $plugins = get_plugin_list('assignfeedback');
+
+ foreach ($plugins as $name => $plugin) {
+ $disabled = get_config('assignfeedback_' . $name, 'disabled');
+ if (!$disabled) {
+ $function = 'assignfeedback_' . $name . '_extend_settings_navigation';
+ $file = $CFG->dirroot . '/mod/assign/feedback/' . $name . '/lib.php';
+ if (file_exists($file)) {
+ require_once($file);
+ }
+ if (function_exists($function)) {
+ $function($settings, $navref);
+ }
+ }
+ }
// Link to gradebook.
if (has_capability('gradereport/grader:view', $cm->context) &&
--
2.10.1 (Apple Git-78)
From 774f8a61844f478efc2fa9ddec42e38e19131b41 Mon Sep 17 00:00:00 2001
From: Pavel Sokolov <[email protected]>
Date: Sat, 8 Jun 2013 21:54:51 +0200
Subject: [PATCH 2/8] Hack for disabling buttons for reflection plugin
---
mod/assign/renderer.php | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/mod/assign/renderer.php b/mod/assign/renderer.php
index 665a0d3..00b615d 100644
--- a/mod/assign/renderer.php
+++ b/mod/assign/renderer.php
@@ -909,6 +909,22 @@ class mod_assign_renderer extends plugin_renderer_base {
$o .= html_writer::table($t);
$o .= $this->output->box_end();
+
+ // Hack for Reflection submission plugin.
+ if ($status->submission) {
+ global $CFG, $DB;
+ require_once($CFG->dirroot.'/group/lib.php');
+ $waitingid = $DB->get_field('assign_plugin_config', 'value', array('assignment' => $status->submission->assignment,
+ 'plugin' => 'reflection', 'name' => 'waitingid'));
+ if ($waitingid) {
+ if (groups_is_member($waitingid, $status->submission->userid)) {
+ $status->cansubmit = false;
+ $status->canedit = false;
+ }
+ }
+ }
+
+
// Links.
if ($status->view == assign_submission_status::STUDENT_VIEW) {
if ($status->canedit) {
--
2.10.1 (Apple Git-78)
From 1adc9035c6ca033156f216d7f9d66490e351c303 Mon Sep 17 00:00:00 2001
From: Pavel Sokolov <[email protected]>
Date: Thu, 26 Sep 2013 21:50:24 +0400
Subject: [PATCH 3/8] Adding a better interface for blog association, allowing
users to change associations of a blog entry or to add an association ofter
initial submission.
Conflicts:
blog/edit.php
blog/edit_form.php
---
blog/edit.php | 10 ++++++
blog/edit_form.php | 96 ++++++++++++++++++++++++++++--------------------------
blog/locallib.php | 5 +++
3 files changed, 65 insertions(+), 46 deletions(-)
diff --git a/blog/edit.php b/blog/edit.php
index d732236..2c9a0f8 100644
--- a/blog/edit.php
+++ b/blog/edit.php
@@ -222,6 +222,16 @@ if ($blogeditform->is_cancelled()) {
redirect($returnurl);
} else if ($data = $blogeditform->get_data()) {
+ // Since a user can change the associated context: Update the return url with the current association.
+ if (!empty($data->modassoc)) {
+ $modulecontext = context::instance_by_id($data->modassoc);
+ $returnurl->param('modid', $modulecontext->instanceid);
+ $returnurl->remove_params('courseid');
+ } else if (!empty($data->courseassoc)) {
+ $coursecontext = context::instance_by_id($data->courseassoc);
+ $returnurl->param('courseid', $coursecontext->instanceid);
+ $returnurl->remove_params('modid');
+ }
switch ($action) {
case 'add':
diff --git a/blog/edit_form.php b/blog/edit_form.php
index 7060c93..128bf64 100644
--- a/blog/edit_form.php
+++ b/blog/edit_form.php
@@ -74,55 +74,40 @@ class blog_edit_form extends moodleform {
$allmodnames = array();
if (!empty($CFG->useblogassociations)) {
- if ((!empty($entry->courseassoc) || (!empty($courseid) && empty($modid)))) {
- if (!empty($courseid)) {
- $course = $DB->get_record('course', array('id' => $courseid));
- $context = context_course::instance($courseid);
- $a = new stdClass();
- $a->coursename = format_string($course->fullname, true, array('context' => $context));
- $contextid = $context->id;
- } else {
- $context = context::instance_by_id($entry->courseassoc);
- $sql = 'SELECT fullname FROM {course} cr LEFT JOIN {context} ct ON ct.instanceid = cr.id WHERE ct.id = ?';
- $a = new stdClass();
- $a->coursename = $DB->get_field_sql($sql, array($entry->courseassoc));
- $contextid = $entry->courseassoc;
- }
+ // Create a new array for all context where that the user is allowed to associate entries.
+ $permittedcontexts = array('' => '');
+
+ foreach (get_courses() as $course) {
+ $coursecontext = context_course::instance($course->id);
+ if (has_capability('moodle/blog:associatecourse', $coursecontext) && is_enrolled($coursecontext)) {
+ $permittedcontexts[$coursecontext->id] = $course->fullname;
+ foreach ($coursecontext->get_child_contexts() as $childcontext) {
+ if ($childcontext->contextlevel == CONTEXT_MODULE
+ && has_capability('moodle/blog:associatemodule', $childcontext)) {
+ $cm = get_coursemodule_from_id(null, $childcontext->instanceid);
+ $permittedcontexts[$childcontext->id] = '- '.$cm->name;
+ }
+ }
+ }
+ }
+ // If there are any allowed contexts (more than the empty first option), show the select element and set the default option.
+ if (count($permittedcontexts) > 1) {
$mform->addElement('header', 'assochdr', get_string('associations', 'blog'));
- $mform->addElement('advcheckbox',
- 'courseassoc',
- get_string('associatewithcourse', 'blog', $a),
- null,
- null,
- array(0, $contextid));
- $mform->setDefault('courseassoc', $contextid);
-
- } else if ((!empty($entry->modassoc) || !empty($modid))) {
- if (!empty($modid)) {
- $mod = get_coursemodule_from_id(false, $modid);
- $a = new stdClass();
- $a->modtype = get_string('modulename', $mod->modname);
- $a->modname = $mod->name;
- $context = context_module::instance($modid);
- } else {
- $context = context::instance_by_id($entry->modassoc);
- $cm = $DB->get_record('course_modules', array('id' => $context->instanceid));
- $a = new stdClass();
- $a->modtype = $DB->get_field('modules', 'name', array('id' => $cm->module));
- $a->modname = $DB->get_field($a->modtype, 'name', array('id' => $cm->instance));
- $modid = $context->instanceid;
+ $associationselect = $mform->addElement('select', 'assoc', get_string('association', 'blog'), $permittedcontexts);
+
+ if (!empty($entry->modassoc)) {
+ $mform->setDefault('assoc', $entry->modassoc);
+ } else if (!empty($entry->courseassoc)) {
+ $mform->setDefault('assoc', $entry->courseassoc);
+ } else if (!empty($modid)) {
+ $modulecontext = context_module::instance($modid);
+ $mform->setDefault('assoc', $modulecontext->id);
+ } else if (!empty($courseid)) {
+ $coursecontext = context_course::instance($courseid);
+ $mform->setDefault('assoc', $coursecontext->id);
}
-
- $mform->addElement('header', 'assochdr', get_string('associations', 'blog'));
- $mform->addElement('advcheckbox',
- 'modassoc',
- get_string('associatewithmodule', 'blog', $a),
- null,
- null,
- array(0, $context->id));
- $mform->setDefault('modassoc', $context->id);
- }
+ }
}
$this->add_action_buttons();
@@ -152,6 +137,25 @@ class blog_edit_form extends moodleform {
public function validation($data, $files) {
global $CFG, $DB, $USER;
+ // Before validation starts: Change the name of the association element to either modassoc or courseassoc, depending on
+ // what kind of context is chosen.
+ // This is not strictly validation, but needs to be performed before validation therefore
+ // definition_before_data() can't be used.
+
+ $mform =& $this->_form;
+ if (isset($mform->_elementIndex['assoc'])) {
+ $associationselect = $mform->getElement('assoc');
+ $selectedvalue = $associationselect->getValue();
+ if ($selectedvalue[0] != '') {
+ $selectedcontext = context::instance_by_id($selectedvalue[0]);
+ if ($selectedcontext->contextlevel == CONTEXT_MODULE) {
+ $associationselect->setName('modassoc');
+ } else if ($selectedcontext->contextlevel == CONTEXT_COURSE) {
+ $associationselect->setName('courseassoc');
+ }
+ }
+ }
+
$errors = parent::validation($data, $files);
// Validate course association.
diff --git a/blog/locallib.php b/blog/locallib.php
index af1b72e..458ad77 100644
--- a/blog/locallib.php
+++ b/blog/locallib.php
@@ -287,6 +287,11 @@ class blog_entry implements renderable {
$sitecontext = context_system::instance();
$entry = $this;
+ // Unset the values for associations to avoid that an old association remains if the user changes the association from
+ // module to course or vice versa.
+ unset($entry->modassoc);
+ unset($entry->courseassoc);
+
$this->form = $form;
foreach ($params as $var => $val) {
$entry->$var = $val;
--
2.10.1 (Apple Git-78)
From 4151a1ce74aa44a9996af031a5880b6806e55322 Mon Sep 17 00:00:00 2001
From: Erik Lundberg <[email protected]>
Date: Wed, 11 Jul 2012 14:50:57 +0200
Subject: [PATCH 4/8] Now the "Blog entries about course"-view will include
nested entries; i. e. entries associated with modules that belongs to the
course.
---
blog/locallib.php | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/blog/locallib.php b/blog/locallib.php
index 458ad77..d5a856c 100644
--- a/blog/locallib.php
+++ b/blog/locallib.php
@@ -923,7 +923,18 @@ class blog_filter_context extends blog_filter {
$context = context_course::instance($this->id);
$this->tables['ba'] = 'blog_association';
$this->conditions[] = 'p.id = ba.blogid';
- $this->conditions[] = 'ba.contextid = '.$context->id;
+
+ // Create a new array that will contain the context id for the course and all nested modules.
+ $ids = array();
+ $ids[] = $context->id;
+
+ foreach ($context->get_child_contexts() as $childcontextid => $contextobject) {
+ if (get_class($contextobject) == 'context_module') {
+ $ids[] = $childcontextid;
+ }
+ }
+ $ids_string = implode(',', $ids);
+ $this->conditions[] = 'ba.contextid IN ('.$ids_string.')';
break;
} else {
// We are dealing with the site course, do not break from the current case.
--
2.10.1 (Apple Git-78)
From d84488e681b7c8752ff36e129e70c5330ed922ff Mon Sep 17 00:00:00 2001
From: Pavel Sokolov <[email protected]>
Date: Wed, 20 Nov 2013 17:06:49 +0400
Subject: [PATCH 5/8] Including all blog posts to view all posts link and
fixing bug when no posts are seen from assignment group view
---
blog/locallib.php | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/blog/locallib.php b/blog/locallib.php
index d5a856c..41431a1 100644
--- a/blog/locallib.php
+++ b/blog/locallib.php
@@ -679,6 +679,10 @@ class blog_listing {
$conditions[] = $permissionsql; // Add permission constraints.
}
+ if (!empty($this->filters['group']) && !empty($this->filters['module'])) {
+ $this->filters['group']->params[2] = $this->filters['module']->params[0];
+ }
+
foreach ($this->filters as $type => $blogfilter) {
$conditions = array_merge($conditions, $blogfilter->conditions);
$params = array_merge($params, $blogfilter->params);
@@ -1013,10 +1017,20 @@ class blog_filter_user extends blog_filter {
$coursecontext = context_course::instance($DB->get_field('groups', 'courseid', array('id' => $this->id)));
$this->tables['ba'] = 'blog_association';
$this->conditions[] = 'gm.groupid = ?';
- $this->conditions[] = 'ba.contextid = ?';
$this->conditions[] = 'ba.blogid = p.id';
$this->params[] = $this->id;
- $this->params[] = $coursecontext->id;
+
+ // Create a new array that will contain the context id for the course and all nested modules.
+ $ids = array();
+ $ids[] = $coursecontext->id;
+
+ foreach ($coursecontext->get_child_contexts() as $childcontextid => $contextobject) {
+ if (get_class($contextobject) == 'context_module') {
+ $ids[] = $childcontextid;
+ }
+ }
+ $ids_string = implode(',', $ids);
+ $this->conditions[] = 'ba.contextid IN ('.$ids_string.')';
}
}
--
2.10.1 (Apple Git-78)
From 353cc4fc5e19fcbf12ba3000849710f22583419d Mon Sep 17 00:00:00 2001
From: Pavel Sokolov <[email protected]>
Date: Mon, 10 Mar 2014 09:46:23 +0100
Subject: [PATCH 6/8] Fixing leading zeros when autocreating groups
---
group/autogroup.php | 2 +-
group/autogroup_form.php | 2 +-
group/lib.php | 9 +++++++--
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/group/autogroup.php b/group/autogroup.php
index 0c1bb5d..986aacb 100644
--- a/group/autogroup.php
+++ b/group/autogroup.php
@@ -133,7 +133,7 @@ if ($editform->is_cancelled()) {
// allocate the users - all groups equal count first
for ($i=0; $i<$numgrps; $i++) {
$groups[$i] = array();
- $groups[$i]['name'] = groups_parse_name(trim($data->namingscheme), $i);
+ $groups[$i]['name'] = groups_parse_name(trim($data->namingscheme), $i, $data->number);
$groups[$i]['members'] = array();
if ($data->allocateby == 'no') {
continue; // do not allocate users
diff --git a/group/autogroup_form.php b/group/autogroup_form.php
index 8e17c17..0fcdace 100644
--- a/group/autogroup_form.php
+++ b/group/autogroup_form.php
@@ -54,7 +54,7 @@ class autogroup_form extends moodleform {
$mform->setType('namingscheme', PARAM_TEXT);
// There must not be duplicate group names in course.
$template = get_string('grouptemplate', 'group');
- $gname = groups_parse_name($template, 0);
+ $gname = groups_parse_name($template, 0, 0);
if (!groups_get_group_by_name($COURSE->id, $gname)) {
$mform->setDefault('namingscheme', $template);
}
diff --git a/group/lib.php b/group/lib.php
index 3f8de4e..19107f5 100644
--- a/group/lib.php
+++ b/group/lib.php
@@ -799,7 +799,7 @@ function groups_get_potential_members($courseid, $roleid = null, $source = null,
* @param int $groupnumber The number of the group to be used in the parsed format string
* @return string the parsed format string
*/
-function groups_parse_name($format, $groupnumber) {
+function groups_parse_name($format, $groupnumber, $count = 0) {
if (strstr($format, '@') !== false) { // Convert $groupnumber to a character series
$letter = 'A';
for($i=0; $i<$groupnumber; $i++) {
@@ -807,7 +807,12 @@ function groups_parse_name($format, $groupnumber) {
}
$str = str_replace('@', $letter, $format);
} else {
- $str = str_replace('#', $groupnumber+1, $format);
+ if ($count > 9) {
+ $num_length = strlen((string)$count);
+ $str = str_replace('#', str_pad($groupnumber+1, $num_length, '0', STR_PAD_LEFT), $format);
+ } else {
+ $str = str_replace('#', $groupnumber+1, $format);
+ }
}
return($str);
}
--
2.10.1 (Apple Git-78)
From 0058a95e8543b779df6035f5ed681a1258d7ca8c Mon Sep 17 00:00:00 2001
From: Pavel Sokolov <[email protected]>
Date: Thu, 6 Mar 2014 13:07:22 +0400
Subject: [PATCH 7/8] MDL-44481 assign: add sorting of assign submissions by a
group name
---
mod/assign/gradingtable.php | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/mod/assign/gradingtable.php b/mod/assign/gradingtable.php
index 867ac14..46fc783 100644
--- a/mod/assign/gradingtable.php
+++ b/mod/assign/gradingtable.php
@@ -186,6 +186,27 @@ class assign_grading_table extends table_sql implements renderable {
$fields .= ', um.id as recordid ';
}
+ if ($this->assignment->get_instance()->teamsubmission) {
+ $groupingid = $assignment->get_instance()->teamsubmissiongroupingid;
+ if ($groupingid) {
+ $query = 'SELECT g.id FROM {groups} g JOIN {groupings_groups} gg ON gg.groupid = g.id WHERE gg.groupingid = '.$groupingid;
+ $teamsubmissiongroupinggroups = $DB->get_fieldset_sql($query);
+ $teamsubmissiongroupinggroups = '(' . join(',', $teamsubmissiongroupinggroups) . ')';
+ $groupingmodifier = ' AND gr.id IN '.$teamsubmissiongroupinggroups;
+ } else {
+ $groupingmodifier = '';
+ }
+
+ $usergroups = "SELECT gms.userid, CASE WHEN COUNT(gr.id)=1 THEN gr.name ELSE 'Default' END as team
+ FROM {groups_members} gms
+ LEFT JOIN {groups} gr ON gms.groupid = gr.id
+ WHERE gr.courseid = ".$assignment->get_instance()->course.$groupingmodifier."
+ GROUP BY gms.userid, gr.name";
+
+ $fields .= ", CASE WHEN ugs.team is NULL THEN 'Default' ELSE ugs.team END as team ";
+ $from .= ' LEFT JOIN ( ' . $usergroups . ' ) ugs ON u.id = ugs.userid';
+ }
+
$userparams = array();
$userindex = 0;
@@ -425,7 +446,8 @@ class assign_grading_table extends table_sql implements renderable {
$this->no_sorting('outcomes');
if ($assignment->get_instance()->teamsubmission) {
- $this->no_sorting('team');
+ $this->sortable('team');
+ $this->no_sorting('teamstatus');
}
$plugincolumnindex = 0;
--
2.10.1 (Apple Git-78)
From db11a1f94b47013dec2d30e6e38e0f88ff20b8f9 Mon Sep 17 00:00:00 2001
From: Dan Wheeler - Colgate <[email protected]>
Date: Thu, 26 Jun 2014 13:23:01 -0700
Subject: [PATCH 8/8] MDL-44481 assign: Added checking for no groups in
selected Grouping
---
mod/assign/gradingtable.php | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/mod/assign/gradingtable.php b/mod/assign/gradingtable.php
index 46fc783..5025060 100644
--- a/mod/assign/gradingtable.php
+++ b/mod/assign/gradingtable.php
@@ -191,8 +191,12 @@ class assign_grading_table extends table_sql implements renderable {
if ($groupingid) {
$query = 'SELECT g.id FROM {groups} g JOIN {groupings_groups} gg ON gg.groupid = g.id WHERE gg.groupingid = '.$groupingid;
$teamsubmissiongroupinggroups = $DB->get_fieldset_sql($query);
- $teamsubmissiongroupinggroups = '(' . join(',', $teamsubmissiongroupinggroups) . ')';
- $groupingmodifier = ' AND gr.id IN '.$teamsubmissiongroupinggroups;
+ if ($teamsubmissiongroupinggroups) {
+ $teamsubmissiongroupinggroups = '(' . join(',', $teamsubmissiongroupinggroups) . ')';
+ $groupingmodifier = ' AND gr.id IN '.$teamsubmissiongroupinggroups;
+ } else {
+ $groupingmodifier = '';
+ }
} else {
$groupingmodifier = '';
}
--
2.10.1 (Apple Git-78)