Skip to content

Commit 9da623c

Browse files
mchurchwardmchurchward
committed
WIP
1 parent 49ed52e commit 9da623c

File tree

12 files changed

+372
-324
lines changed

12 files changed

+372
-324
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ jobs:
8484

8585
- name: Moodle Code Checker
8686
if: ${{ always() }}
87-
run: moodle-plugin-ci codechecker || true
87+
run: moodle-plugin-ci phpcs --max-warnings 0
8888

8989
- name: Moodle PHPDoc Checker
9090
if: ${{ always() }}
91-
run: moodle-plugin-ci phpdoc
91+
run: moodle-plugin-ci phpdoc --max-warnings 0
9292

9393
- name: Validating
9494
if: ${{ always() }}
@@ -104,12 +104,12 @@ jobs:
104104

105105
- name: Grunt
106106
if: ${{ always() }}
107-
run: moodle-plugin-ci grunt
107+
run: moodle-plugin-ci grunt --max-lint-warnings 0
108108

109109
- name: PHPUnit tests
110110
if: ${{ always() }}
111-
run: moodle-plugin-ci phpunit
111+
run: moodle-plugin-ci phpunit --fail-on-warning
112112

113113
- name: Behat features
114114
if: ${{ always() }}
115-
run: moodle-plugin-ci behat --profile chrome
115+
run: moodle-plugin-ci behat --profile chrome --scss-deprecations

‎classes/db/bulk_sql_config.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
2525
*/
2626
class bulk_sql_config {
27-
2827
/**
2928
* @var string $table
3029
*/
@@ -74,7 +73,7 @@ public function get_extra_select() {
7473
return [
7574
'choice_id' => $this->usechoiceid,
7675
'response' => $this->useresponse,
77-
'rankvalue' => $this->userank
76+
'rankvalue' => $this->userank,
7877
];
7978
}
8079
}

‎db/access.php‎

Lines changed: 89 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -25,217 +25,180 @@
2525

2626
defined('MOODLE_INTERNAL') || die();
2727

28-
$capabilities = array(
29-
28+
$capabilities = [
3029
// Ability to add a new questionnaire instance to the course.
31-
'mod/questionnaire:addinstance' => array(
32-
30+
'mod/questionnaire:addinstance' => [
3331
'riskbitmask' => RISK_XSS,
3432
'captype' => 'write',
3533
'contextlevel' => CONTEXT_COURSE,
36-
'archetypes' => array(
34+
'archetypes' => [
3735
'editingteacher' => CAP_ALLOW,
3836
'manager' => CAP_ALLOW
39-
),
37+
],
4038
'clonepermissionsfrom' => 'moodle/course:manageactivities'
41-
),
42-
39+
],
4340
// Ability to see that the questionnaire exists, and the basic information
4441
// about it.
45-
'mod/questionnaire:view' => array(
46-
42+
'mod/questionnaire:view' => [
4743
'captype' => 'read',
4844
'contextlevel' => CONTEXT_MODULE,
49-
'legacy' => array(
45+
'legacy' => [
5046
'student' => CAP_ALLOW,
5147
'teacher' => CAP_ALLOW,
5248
'editingteacher' => CAP_ALLOW,
5349
'coursecreator' => CAP_ALLOW,
54-
'manager' => CAP_ALLOW
55-
)
56-
),
57-
50+
'manager' => CAP_ALLOW,
51+
],
52+
],
5853
// Ability to complete the questionnaire and submit.
59-
'mod/questionnaire:submit' => array(
60-
54+
'mod/questionnaire:submit' => [
6155
'captype' => 'write',
6256
'contextlevel' => CONTEXT_MODULE,
63-
'legacy' => array(
64-
'student' => CAP_ALLOW
65-
)
66-
),
67-
57+
'legacy' => ['student' => CAP_ALLOW],
58+
],
6859
// Ability to view individual responses to the questionnaire.
69-
'mod/questionnaire:viewsingleresponse' => array(
70-
60+
'mod/questionnaire:viewsingleresponse' => [
7161
'captype' => 'read',
7262
'contextlevel' => CONTEXT_MODULE,
73-
'legacy' => array(
63+
'legacy' => [
7464
'teacher' => CAP_ALLOW,
7565
'editingteacher' => CAP_ALLOW,
76-
'manager' => CAP_ALLOW
77-
)
78-
),
79-
66+
'manager' => CAP_ALLOW,
67+
],
68+
],
8069
// Receive a notificaton for every submission.
81-
'mod/questionnaire:submissionnotification' => array(
82-
70+
'mod/questionnaire:submissionnotification' => [
8371
'captype' => 'read',
8472
'contextlevel' => CONTEXT_MODULE,
85-
'legacy' => array(
73+
'legacy' => [
8674
'teacher' => CAP_ALLOW,
8775
'editingteacher' => CAP_ALLOW,
88-
'manager' => CAP_ALLOW
89-
)
90-
),
91-
76+
'manager' => CAP_ALLOW,
77+
],
78+
],
9279
// Ability to download responses in a CSV file.
93-
'mod/questionnaire:downloadresponses' => array(
94-
80+
'mod/questionnaire:downloadresponses' => [
9581
'captype' => 'read',
9682
'contextlevel' => CONTEXT_MODULE,
97-
'legacy' => array(
83+
'legacy' => [
9884
'teacher' => CAP_ALLOW,
9985
'editingteacher' => CAP_ALLOW,
100-
'manager' => CAP_ALLOW
101-
)
102-
),
103-
86+
'manager' => CAP_ALLOW,
87+
],
88+
],
10489
// Ability to delete someone's (or own) previous responses.
105-
'mod/questionnaire:deleteresponses' => array(
106-
90+
'mod/questionnaire:deleteresponses' => [
10791
'captype' => 'write',
10892
'contextlevel' => CONTEXT_MODULE,
109-
'legacy' => array(
93+
'legacy' => [
11094
'editingteacher' => CAP_ALLOW,
111-
'manager' => CAP_ALLOW
112-
)
113-
),
114-
95+
'manager' => CAP_ALLOW,
96+
],
97+
],
11598
// Ability to create and edit surveys.
116-
'mod/questionnaire:manage' => array(
117-
99+
'mod/questionnaire:manage' => [
118100
'riskbitmask' => RISK_XSS,
119101
'captype' => 'write',
120102
'contextlevel' => CONTEXT_MODULE,
121-
'legacy' => array(
103+
'legacy' => [
122104
'editingteacher' => CAP_ALLOW,
123105
'coursecreator' => CAP_ALLOW,
124-
'manager' => CAP_ALLOW
125-
)
126-
),
127-
106+
'manager' => CAP_ALLOW,
107+
],
108+
],
128109
// Ability to edit survey questions.
129-
'mod/questionnaire:editquestions' => array(
130-
110+
'mod/questionnaire:editquestions' => [
131111
'riskbitmask' => RISK_XSS,
132112
'captype' => 'write',
133113
'contextlevel' => CONTEXT_MODULE,
134-
'legacy' => array(
114+
'legacy' => [
135115
'editingteacher' => CAP_ALLOW,
136116
'coursecreator' => CAP_ALLOW,
137-
'manager' => CAP_ALLOW
138-
)
139-
),
140-
117+
'manager' => CAP_ALLOW,
118+
],
119+
],
141120
// Ability to create template surveys which can be copied, but not used.
142-
'mod/questionnaire:createtemplates' => array(
143-
121+
'mod/questionnaire:createtemplates' => [
144122
'captype' => 'write',
145123
'contextlevel' => CONTEXT_MODULE,
146-
'legacy' => array(
124+
'legacy' => [
147125
'coursecreator' => CAP_ALLOW,
148-
'manager' => CAP_ALLOW
149-
)
150-
),
151-
126+
'manager' => CAP_ALLOW,
127+
],
128+
],
152129
// Ability to create public surveys which can be accessed from multiple places.
153-
'mod/questionnaire:createpublic' => array(
154-
130+
'mod/questionnaire:createpublic' => [
155131
'captype' => 'write',
156132
'contextlevel' => CONTEXT_MODULE,
157-
'legacy' => array(
133+
'legacy' => [
158134
'coursecreator' => CAP_ALLOW,
159-
'manager' => CAP_ALLOW
160-
)
161-
),
162-
135+
'manager' => CAP_ALLOW,
136+
],
137+
],
163138
// Ability to read own previous responses to questionnaires.
164-
'mod/questionnaire:readownresponses' => array(
165-
139+
'mod/questionnaire:readownresponses' => [
166140
'captype' => 'read',
167141
'contextlevel' => CONTEXT_MODULE,
168-
'legacy' => array(
142+
'legacy' => [
169143
'manager' => CAP_ALLOW,
170-
'student' => CAP_ALLOW
171-
)
172-
),
173-
144+
'student' => CAP_ALLOW,
145+
],
146+
],
174147
// Ability to read others' previous responses to questionnaires.
175148
// Subject to constraints on whether responses can be viewed whilst
176149
// questionnaire still open or user has not yet responded themselves.
177-
'mod/questionnaire:readallresponses' => array(
178-
150+
'mod/questionnaire:readallresponses' => [
179151
'captype' => 'read',
180152
'contextlevel' => CONTEXT_MODULE,
181-
'legacy' => array(
153+
'legacy' => [
182154
'manager' => CAP_ALLOW,
183155
'teacher' => CAP_ALLOW,
184156
'editingteacher' => CAP_ALLOW,
185-
'student' => CAP_ALLOW
186-
)
187-
),
188-
157+
'student' => CAP_ALLOW,
158+
],
159+
],
189160
// Ability to read others's responses without the above checks.
190-
'mod/questionnaire:readallresponseanytime' => array(
191-
161+
'mod/questionnaire:readallresponseanytime' => [
192162
'captype' => 'read',
193163
'contextlevel' => CONTEXT_MODULE,
194-
'legacy' => array(
164+
'legacy' => [
195165
'manager' => CAP_ALLOW,
196166
'teacher' => CAP_ALLOW,
197-
'editingteacher' => CAP_ALLOW
198-
)
199-
),
200-
167+
'editingteacher' => CAP_ALLOW,
168+
],
169+
],
201170
// Ability to print a blank questionnaire.
202-
'mod/questionnaire:printblank' => array(
203-
171+
'mod/questionnaire:printblank' => [
204172
'captype' => 'read',
205173
'contextlevel' => CONTEXT_MODULE,
206-
'legacy' => array(
174+
'legacy' => [
207175
'manager' => CAP_ALLOW,
208176
'coursecreator' => CAP_ALLOW,
209177
'teacher' => CAP_ALLOW,
210178
'editingteacher' => CAP_ALLOW,
211-
'student' => CAP_ALLOW
212-
)
213-
),
214-
179+
'student' => CAP_ALLOW,
180+
],
181+
],
215182
// Ability to preview a questionnaire.
216-
'mod/questionnaire:preview' => array(
217-
183+
'mod/questionnaire:preview' => [
218184
'captype' => 'read',
219185
'contextlevel' => CONTEXT_MODULE,
220-
'legacy' => array(
221-
'manager' => CAP_ALLOW,
222-
'coursecreator' => CAP_ALLOW,
223-
'teacher' => CAP_ALLOW,
224-
'editingteacher' => CAP_ALLOW
225-
)
226-
),
227-
186+
'legacy' => [
187+
'manager' => CAP_ALLOW,
188+
'coursecreator' => CAP_ALLOW,
189+
'teacher' => CAP_ALLOW,
190+
'editingteacher' => CAP_ALLOW,
191+
],
192+
],
228193
// Ability to message students from a questionnaire.
229-
'mod/questionnaire:message' => array(
230-
194+
'mod/questionnaire:message' => [
231195
'riskbitmask' => RISK_SPAM,
232196
'captype' => 'write',
233197
'contextlevel' => CONTEXT_MODULE,
234-
'archetypes' => array(
235-
'manager' => CAP_ALLOW,
236-
'teacher' => CAP_ALLOW,
237-
'editingteacher' => CAP_ALLOW
238-
)
239-
)
240-
241-
);
198+
'archetypes' => [
199+
'manager' => CAP_ALLOW,
200+
'teacher' => CAP_ALLOW,
201+
'editingteacher' => CAP_ALLOW,
202+
],
203+
],
204+
];

‎db/install.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,5 +113,4 @@ function xmldb_questionnaire_install() {
113113
$questiontype->has_choices = 'n';
114114
$questiontype->response_table = '';
115115
$id = $DB->insert_record('questionnaire_question_type', $questiontype);
116-
117116
}

‎db/log.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
defined('MOODLE_INTERNAL') || die();
2626

2727
$logs = array(
28-
array('module' => 'questionnaire', 'action' => 'view all', 'mtable' => 'questionnaire', 'field' => 'name'),
29-
array('module' => 'questionnaire', 'action' => 'submit', 'mtable' => 'questionnaire_response', 'field' => 'id'),
30-
array('module' => 'questionnaire', 'action' => 'view', 'mtable' => 'questionnaire', 'field' => 'name'),
28+
['module' => 'questionnaire', 'action' => 'view all', 'mtable' => 'questionnaire', 'field' => 'name'],
29+
['module' => 'questionnaire', 'action' => 'submit', 'mtable' => 'questionnaire_response', 'field' => 'id'],
30+
['module' => 'questionnaire', 'action' => 'view', 'mtable' => 'questionnaire', 'field' => 'name'],
3131
);

‎db/messages.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@
2929
// Message to nonrespondents.
3030
'message' => [],
3131
// Response submissions.
32-
'notification' => []
32+
'notification' => [],
3333
];

0 commit comments

Comments
 (0)