Skip to content

Commit 8ed5f2c

Browse files
mchurchwardmchurchward
committed
WIP14
1 parent 0f9a274 commit 8ed5f2c

File tree

3 files changed

+52
-39
lines changed

3 files changed

+52
-39
lines changed

‎backup/moodle2/restore_questionnaire_activity_task.class.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ public static function define_decode_contents() {
5252
$contents[] = new restore_decode_content('questionnaire', ['intro'], 'questionnaire');
5353
$contents[] = new restore_decode_content(
5454
'questionnaire_survey',
55-
['info', 'thank_head', 'thank_body', 'thanks_page', 'feedbacknotes'], 'questionnaire_survey'
55+
['info', 'thank_head', 'thank_body', 'thanks_page', 'feedbacknotes'],
56+
'questionnaire_survey'
5657
);
5758
$contents[] = new restore_decode_content('questionnaire_question', ['content'], 'questionnaire_question');
5859
$contents[] = new restore_decode_content('questionnaire_fb_sections', ['sectionheading'], 'questionnaire_fb_sections');

‎index.php‎

Lines changed: 47 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,20 @@
2323
*/
2424

2525
require_once("../../config.php");
26-
require_once($CFG->dirroot.'/mod/questionnaire/locallib.php');
26+
require_once($CFG->dirroot . '/mod/questionnaire/locallib.php');
2727

2828
$id = required_param('id', PARAM_INT);
29-
$PAGE->set_url('/mod/questionnaire/index.php', array('id' => $id));
30-
if (! $course = $DB->get_record('course', array('id' => $id))) {
29+
$PAGE->set_url('/mod/questionnaire/index.php', ['id' => $id]);
30+
if (! $course = $DB->get_record('course', ['id' => $id])) {
3131
throw new \moodle_exception('Filter has not been set.', 'mod_questionnaire');
3232
}
3333
$coursecontext = context_course::instance($id);
3434
require_login($course->id);
3535
$PAGE->set_pagelayout('incourse');
3636

37-
$event = \mod_questionnaire\event\course_module_instance_list_viewed::create(array(
38-
'context' => context_course::instance($course->id)));
37+
$event = \mod_questionnaire\event\course_module_instance_list_viewed::create(
38+
['context' => context_course::instance($course->id)]
39+
);
3940
$event->trigger();
4041

4142
// Print the header.
@@ -63,15 +64,15 @@
6364
}
6465

6566
// Configure table for displaying the list of instances.
66-
$headings = array(get_string('name'));
67-
$align = array('left');
67+
$headings = [get_string('name')];
68+
$align = ['left'];
6869

6970
if ($showclosingheader) {
7071
array_push($headings, get_string('questionnairecloses', 'questionnaire'));
7172
array_push($align, 'left');
7273
}
7374

74-
array_unshift($headings, get_string('sectionname', 'format_'.$course->format));
75+
array_unshift($headings, get_string('sectionname', 'format_' . $course->format));
7576
array_unshift($align, 'left');
7677

7778
$showing = '';
@@ -98,8 +99,8 @@
9899
$currentsection = '';
99100
foreach ($questionnaires as $questionnaire) {
100101
$cmid = $questionnaire->coursemodule;
101-
$data = array();
102-
$realm = $DB->get_field('questionnaire_survey', 'realm', array('id' => $questionnaire->sid));
102+
$data = [];
103+
$realm = $DB->get_field('questionnaire_survey', 'realm', ['id' => $questionnaire->sid]);
103104
// Template surveys should NOT be displayed as an activity to students.
104105
if (!($realm == 'template' && !has_capability('mod/questionnaire:manage', context_module::instance($cmid)))) {
105106
// Section number if necessary.
@@ -128,10 +129,10 @@
128129
if ($responses = questionnaire_get_user_responses($questionnaire->id, $USER->id, $complete = false)) {
129130
foreach ($responses as $response) {
130131
if ($response->complete == 'y') {
131-
$status .= get_string('submitted', 'questionnaire').' '.userdate($response->submitted).'<br />';
132+
$status .= get_string('submitted', 'questionnaire') . ' ' . userdate($response->submitted) . '<br />';
132133
} else {
133-
$status .= get_string('attemptstillinprogress', 'questionnaire').' '.
134-
userdate($response->submitted).'<br />';
134+
$status .= get_string('attemptstillinprogress', 'questionnaire') . ' ' .
135+
userdate($response->submitted) . '<br />';
135136
}
136137
}
137138
}
@@ -146,54 +147,65 @@
146147
$publicoriginal = '';
147148
$originalcourse = $DB->get_record('course', ['id' => $survey->courseid]);
148149
$originalcoursecontext = context_course::instance($survey->courseid);
149-
$originalquestionnaire = $DB->get_record('questionnaire',
150-
['sid' => $survey->id, 'course' => $survey->courseid]);
150+
$originalquestionnaire = $DB->get_record(
151+
'questionnaire',
152+
['sid' => $survey->id, 'course' => $survey->courseid]
153+
);
151154
$cm = get_coursemodule_from_instance("questionnaire", $originalquestionnaire->id, $survey->courseid);
152155
$context = context_course::instance($survey->courseid, MUST_EXIST);
153156
$canvieworiginal = has_capability('mod/questionnaire:preview', $context, $USER->id, true);
154157
// If current user can view questionnaires in original course,
155158
// provide a link to the original public questionnaire.
156159
if ($canvieworiginal) {
157-
$publicoriginal = '<br />'.get_string('publicoriginal', 'questionnaire').'&nbsp;'.
158-
'<a href="'.$CFG->wwwroot.'/mod/questionnaire/preview.php?id='.
159-
$cm->id.'" title="'.$strpreview.']">'.$originalquestionnaire->name.' ['.
160-
$originalcourse->fullname.']</a>';
160+
$publicoriginal = '<br />' . get_string('publicoriginal', 'questionnaire') . '&nbsp;' .
161+
'<a href="' . $CFG->wwwroot . '/mod/questionnaire/preview.php?id=' .
162+
$cm->id . '" title="' . $strpreview . ']">' . $originalquestionnaire->name . ' [' .
163+
$originalcourse->fullname . ']</a>';
161164
} else {
162165
// If current user is not enrolled as teacher in original course,
163166
// only display the original public questionnaire's name and course name.
164-
$publicoriginal = '<br />'.get_string('publicoriginal', 'questionnaire').'&nbsp;'.
165-
$originalquestionnaire->name.' ['.$originalcourse->fullname.']';
167+
$publicoriginal = '<br />' . get_string('publicoriginal', 'questionnaire') . '&nbsp;' .
168+
$originalquestionnaire->name . ' [' . $originalcourse->fullname . ']';
166169
}
167-
$data[] = get_string($realm, 'questionnaire').' '.$publicoriginal;
170+
$data[] = get_string($realm, 'questionnaire') . ' ' . $publicoriginal;
168171
} else {
169172
// Original public questionnaire was created in current course.
170173
// Find which courses it is used in.
171174
$publiccopy = '';
172-
$select = 'course != '.$course->id.' AND sid = '.$questionnaire->sid;
173-
if ($copies = $DB->get_records_select('questionnaire', $select, null,
174-
$sort = 'course ASC', $fields = 'id, course, name')) {
175+
$select = 'course != ' . $course->id . ' AND sid = ' . $questionnaire->sid;
176+
if (
177+
$copies = $DB->get_records_select(
178+
'questionnaire',
179+
$select,
180+
null,
181+
$sort = 'course ASC',
182+
$fields = 'id, course, name'
183+
)
184+
) {
175185
foreach ($copies as $copy) {
176-
$copycourse = $DB->get_record('course', array('id' => $copy->course));
186+
$copycourse = $DB->get_record('course', ['id' => $copy->course]);
177187
$select = 'course = '.$copycourse->id.' AND sid = '.$questionnaire->sid;
178-
$copyquestionnaire = $DB->get_record('questionnaire',
179-
array('id' => $copy->id, 'sid' => $survey->id, 'course' => $copycourse->id));
188+
$copyquestionnaire = $DB->get_record(
189+
'questionnaire',
190+
['id' => $copy->id, 'sid' => $survey->id, 'course' => $copycourse->id]
191+
);
180192
$cm = get_coursemodule_from_instance("questionnaire", $copyquestionnaire->id, $copycourse->id);
181193
$context = context_course::instance($copycourse->id, MUST_EXIST);
182194
$canviewcopy = has_capability('mod/questionnaire:view', $context, $USER->id, true);
183195
if ($canviewcopy) {
184-
$publiccopy .= '<br />'.get_string('publiccopy', 'questionnaire').'&nbsp;:&nbsp;'.
185-
'<a href = "'.$CFG->wwwroot.'/mod/questionnaire/preview.php?id='.
186-
$cm->id.'" title = "'.$strpreview.'">'.
187-
$copyquestionnaire->name.' ['.$copycourse->fullname.']</a>';
196+
$publiccopy .= '<br />' . get_string('publiccopy', 'questionnaire').'&nbsp;:&nbsp;' .
197+
'<a href = "' . $CFG->wwwroot . '/mod/questionnaire/preview.php?id=' .
198+
$cm->id . '" title = "' . $strpreview . '">' .
199+
$copyquestionnaire->name . ' [' . $copycourse->fullname . ']</a>';
188200
} else {
189201
// If current user does not have "view" capability in copy course,
190202
// only display the copied public questionnaire's name and course name.
191-
$publiccopy .= '<br />'.get_string('publiccopy', 'questionnaire').'&nbsp;:&nbsp;'.
192-
$copyquestionnaire->name.' ['.$copycourse->fullname.']';
203+
$publiccopy .= '<br />' . get_string('publiccopy', 'questionnaire') . '&nbsp;:&nbsp;'.
204+
$copyquestionnaire->name . ' [' . $copycourse->fullname . ']';
193205
}
194206
}
195207
}
196-
$data[] = get_string($realm, 'questionnaire').' '.$publiccopy;
208+
$data[] = get_string($realm, 'questionnaire') . ' ' . $publiccopy;
197209
}
198210
} else {
199211
$data[] = get_string($realm, 'questionnaire');

‎lib.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -462,9 +462,9 @@ function questionnaire_grade_item_update($questionnaire, $grades = null) {
462462
}
463463

464464
if ($questionnaire->cmidnumber != '') {
465-
$params = array('itemname' => $questionnaire->name, 'idnumber' => $questionnaire->cmidnumber);
465+
$params = ['itemname' => $questionnaire->name, 'idnumber' => $questionnaire->cmidnumber];
466466
} else {
467-
$params = array('itemname' => $questionnaire->name);
467+
$params = ['itemname' => $questionnaire->name];
468468
}
469469

470470
if ($questionnaire->grade > 0) {
@@ -1201,7 +1201,7 @@ function questionnaire_print_recent_mod_activity($activity, $courseid, $detail,
12011201
}
12021202
echo html_writer::tag(
12031203
'a',
1204-
get_string('response', 'questionnaire') . ' '. $activity->nbattempts . $stranonymous,
1204+
get_string('response', 'questionnaire') . ' ' . $activity->nbattempts . $stranonymous,
12051205
['href' => new moodle_url('/mod/questionnaire/' . $report, $urlparams)]
12061206
);
12071207
echo html_writer::end_tag('div');

0 commit comments

Comments
 (0)