Skip to content

Commit f72a8df

Browse files
watson8watson8
committed
CTP-3690 correct commit 16f5fa2 underscores
1 parent 11da13d commit f72a8df

File tree

7 files changed

+63
-58
lines changed

7 files changed

+63
-58
lines changed

‎actions/ajax/datatable/grading.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
$reportoptions['showsubmissiongrade'] = false;
4848
$reportoptions['showgradinggrade'] = false;
4949
$reportoptions['courseworkid'] = $courseworkid;
50-
$reportoptions['mode'] = \mod_coursework\grading_report::$modegetremainrecords;
50+
$reportoptions['mode'] = \mod_coursework\grading_report::MODE_GET_REMAIN_RECORDS;
5151

5252
//$controller = new mod_coursework\controllers\grading_controller(['courseworkid' => $report_options, 'allocatableid' => $USER->id, 'allocatabletype' => $USER->id]);
5353
$controller = new mod_coursework\controllers\grading_controller([]);

‎classes/ability/rule.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ class rule {
5252

5353
/**
5454
* @param string $action
55-
* @param string $class_name
56-
* @param $rule_function
55+
* @param string $classname
56+
* @param $rulefunction
5757
* @param bool $allow
5858
*/
5959
public function __construct($action, $classname, $rulefunction, $allow = true) {
6060
$this->action = $action;
61-
$this->class_name = $classname;
62-
$this->rule_function = $rulefunction;
61+
$this->classname = $classname;
62+
$this->rulefunction = $rulefunction;
6363
$this->allow = $allow;
6464
}
6565

@@ -81,7 +81,7 @@ public function matches($action, $object) {
8181
* @return bool
8282
*/
8383
public function allows($object) {
84-
$rule = $this->rule_function;
84+
$rule = $this->rulefunction;
8585
return $rule($object) && $this->allow;
8686
}
8787

@@ -92,7 +92,7 @@ public function allows($object) {
9292
* @return bool
9393
*/
9494
public function prevents($object) {
95-
$rule = $this->rule_function;
95+
$rule = $this->rulefunction;
9696
return $rule($object) && !$this->allow;
9797
}
9898

@@ -109,10 +109,10 @@ protected function action_matches($action) {
109109
* @return bool
110110
*/
111111
protected function class_matches($object) {
112-
if (get_class($object) == $this->class_name) {
112+
if (get_class($object) == $this->classname) {
113113
return true;
114114
}
115-
if (get_parent_class($object) == $this->class_name) {
115+
if (get_parent_class($object) == $this->classname) {
116116
return true;
117117
}
118118
return false;

‎classes/allocation/manager.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ public function auto_generate_sample_set() {
304304

305305
for ($stagenumber = 2; $stagenumber <= $this->get_coursework()->get_max_markers(); $stagenumber++) {
306306

307-
$stage = "assessor{$stagenumber}";
307+
$stage = "assessor_{$stagenumber}";
308308

309309
$this->remove_unmarked_automatic_allocatables($stage);
310310

@@ -353,7 +353,7 @@ public function auto_generate_sample_set() {
353353
$sample->courseworkid = $this->coursework->id;
354354
$sample->allocatableid = $allocatable->id;
355355
$sample->allocatabletype = ($this->coursework->is_configured_to_have_group_submissions()) ? "group" : "user";
356-
$sample->stage_identifier = "assessor{$stagenumber}";
356+
$sample->stage_identifier = "assessor_{$stagenumber}";
357357
$sample->selectiontype = "automatic";
358358

359359
// If this a manually selected allocatable check to see if the allocatable is already in the table
@@ -369,7 +369,7 @@ public function get_include_in_sample_set($stagenumber) {
369369

370370
global $DB;
371371

372-
$stage = "assessor{$stagenumber}";
372+
$stage = "assessor_{$stagenumber}";
373373

374374
$sql = "SELECT allocatableid,
375375
courseworkid,

‎classes/export/csv.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class csv {
6666
public function __construct($coursework, $csvcells, $filename) {
6767
$this->coursework = $coursework;
6868
$this->dateformat = '%a, %d %b %Y, %H:%M';
69-
$this->csv_cells = $csvcells;
69+
$this->csvcells = $csvcells;
7070
$this->filename = $filename;
7171
}
7272

@@ -80,7 +80,7 @@ public function export() {
8080

8181
$csvdata = [];
8282
// headers
83-
$this->add_headers($this->csv_cells);
83+
$this->add_headers($this->csvcells);
8484

8585
/**
8686
* @var submission[] $submissions
@@ -246,7 +246,7 @@ public function add_csv_data($submission) {
246246
$students = $submission->get_students();
247247

248248
foreach ($students as $student) {
249-
$csvdata[] = $this->add_cells_to_array($submission, $student, $this->csv_cells);
249+
$csvdata[] = $this->add_cells_to_array($submission, $student, $this->csvcells);
250250
}
251251

252252
return $csvdata;

‎classes/grading_report.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@
3939
*/
4040
class grading_report {
4141

42-
//added static vars to determine in what manner the report is loaded
43-
public static $modegetall = 1;
44-
public static $modegetfirstrecords = 2;
45-
public static $modegetremainrecords = 3;
42+
// Added constants to determine in what manner the report is loaded.
43+
const MODE_GET_ALL = 1;
44+
const MODE_GET_FIRST_RECORDS = 2;
45+
const MODE_GET_REMAIN_RECORDS = 3;
4646

4747
/**
4848
* @var array rendering options
@@ -406,13 +406,13 @@ public function get_table_rows_for_page($rowcount = false) {
406406

407407
$counter = count($rows);
408408
$this->realtotalrows = $counter;
409-
$mode = empty($this->options['mode']) ? self::$modegetall : $this->options['mode'];
409+
$mode = empty($this->options['mode']) ? self::MODE_GET_ALL : $this->options['mode'];
410410
if ($mode != self::$modegetall) {
411411
$perpage = $this->options['perpage'] ?? 10;
412412
if ($counter > $perpage) {
413-
if ($mode == self::$modegetfirstrecords) {
413+
if ($mode == self::MODE_GET_FIRST_RECORDS) {
414414
$rows = array_slice($rows, 0, $perpage);
415-
} else if ($mode == self::$modegetremainrecords) {
415+
} else if ($mode == self::MODE_GET_REMAIN_RECORDS) {
416416
$rows = array_slice($rows, $perpage);
417417
}
418418
}

‎classes/sample_set_rule/range_sample_type.php

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function add_form_elements($assessornumber=0) {
6060
{coursework_sample_set_plugin} sp
6161
WHERE sr.sample_set_plugin_id = sp.id
6262
AND sr.courseworkid = {$this->coursework->id}
63-
AND sr.stageidentifier = 'assessor{$assessornumber}'
63+
AND sr.stage_identifier = 'assessor_{$assessornumber}'
6464
AND sp.rulename = 'range_sample_type'";
6565

6666
$rulesfound = false;
@@ -77,9 +77,9 @@ public function add_form_elements($assessornumber=0) {
7777
$html .= $this->range_elements($assessornumber, 0, false);
7878
}
7979

80-
$html .= html_writer::link('#', get_string('addgraderule', 'mod_coursework'), ['id' => "assessor{$assessornumber}addgradderule", 'class' => 'addgradderule sample_set_rule']);
80+
$html .= html_writer::link('#', get_string('addgraderule', 'mod_coursework'), ['id' => "assessor_{$assessornumber}_addgradderule", 'class' => 'addgradderule sample_set_rule']);
8181
$html .= " ";
82-
$html .= html_writer::link('#', get_string('removegraderule', 'mod_coursework'), ['id' => "assessor{$assessornumber}removegradderule", 'class' => 'removegradderule sample_set_rule']);
82+
$html .= html_writer::link('#', get_string('removegraderule', 'mod_coursework'), ['id' => "assessor_{$assessornumber}_removegradderule", 'class' => 'removegradderule sample_set_rule']);
8383

8484
return $html;
8585
}
@@ -118,10 +118,14 @@ public function range_elements($assessornumber, $sequence, $dbrecord=false) {
118118
$ruleschecked = false;
119119
}
120120

121-
$html = html_writer::start_tag('div', ['class' => "assessor{$assessornumber}graderules", 'id' => "assessor{$assessornumber}graderules{$sequence}"]);
121+
$html = html_writer::start_tag(
122+
'div',
123+
['class' => "assessor_{$assessornumber}_grade_rules", 'id' => "assessor_{$assessornumber}_grade_rules_{$sequence}"]
124+
);
122125

123-
$html .= html_writer::checkbox("assessor{$assessornumber}samplerules[]", 1, $ruleschecked, '',
124-
['id' => "assessor{$assessornumber}samplerules{$sequence}", 'class' => "assessor{$assessornumber} rangegradecheckbox samplesetrule"]);
126+
$html .= html_writer::checkbox(
127+
"assessor_{$assessornumber}_samplerules[]", 1, $ruleschecked, '',
128+
['id' => "assessor_{$assessornumber}_samplerules_{$sequence}", 'class' => "assessor_{$assessornumber} range_grade_checkbox sample_set_rule"]);
125129

126130
$gradescaletext = ($this->coursework->grade < 0) ? get_string('scale', 'mod_coursework') : get_string('grade', 'mod_coursework');
127131
$gradescaleval = ($this->coursework->grade < 0) ? 'scale' : 'grade';
@@ -130,28 +134,28 @@ public function range_elements($assessornumber, $sequence, $dbrecord=false) {
130134
$gradescaleval => $gradescaletext];
131135

132136
$html .= html_writer::select($options,
133-
"assessor{$assessornumber}sampletype[]",
137+
"assessor_{$assessornumber}_sampletype[]",
134138
"",
135139
$selectedtype,
136-
['id' => "assessor{$assessornumber}sampletype{$sequence}", 'class' => "grade_type sample_set_rule"]);
140+
['id' => "assessor_{$assessornumber}_sampletype_{$sequence}", 'class' => "grade_type sample_set_rule"]);
137141

138142
$html .= html_writer::label(get_string('from', 'mod_coursework'), 'assessortwo_samplefrom[0]');
139143

140144
$ruleoptions = (!empty($selectedtype) && array_key_exists('percentage', $selectedtype)) ? $percentageoptions : $scale; //change this into a ternary statement that
141145

142146
$html .= html_writer::select($ruleoptions,
143-
"assessor{$assessornumber}samplefrom[]",
147+
"assessor_{$assessornumber}_samplefrom[]",
144148
"",
145149
$selectedfrom,
146-
['id' => "assessor{$assessornumber}samplefrom{$sequence}", 'class' => " sample_set_rule range_drop_down range_samp_from"]);
150+
['id' => "assessor_{$assessornumber}_samplefrom_{$sequence}", 'class' => " sample_set_rule range_drop_down range_samp_from"]);
147151

148-
$html .= html_writer::label(get_string('to', 'mod_coursework'), "assessor{$assessornumber}sampleto[0]");
152+
$html .= html_writer::label(get_string('to', 'mod_coursework'), "assessor_{$assessornumber}_sampleto[0]");
149153

150154
$html .= html_writer::select(array_reverse($ruleoptions, true),
151-
"assessor{$assessornumber}sampleto[]",
155+
"assessor_{$assessornumber}_sampleto[]",
152156
"",
153157
$selectedto,
154-
['id' => "assessor{$assessornumber}sampleto{$sequence}", 'class' => " sample_set_rule range_drop_down"]);
158+
['id' => "assessor_{$assessornumber}_sampleto_{$sequence}", 'class' => " sample_set_rule range_drop_down"]);
155159

156160
$html .= html_writer::end_tag('div', '');
157161

@@ -330,10 +334,10 @@ public function save_form_data($assessornumber=0, &$order=0) {
330334

331335
global $DB;
332336

333-
$samplerules = optional_param_array("assessor{$assessornumber}samplerules", false, PARAM_RAW);
334-
$sampletype = optional_param_array("assessor{$assessornumber}sampletype", false, PARAM_RAW);
335-
$samplefrom = optional_param_array("assessor{$assessornumber}samplefrom", false, PARAM_RAW);
336-
$sampleto = optional_param_array("assessor{$assessornumber}sampleto", false, PARAM_RAW);
337+
$samplerules = optional_param_array("assessor_{$assessornumber}_samplerules", false, PARAM_RAW);
338+
$sampletype = optional_param_array("assessor_{$assessornumber}_sampletype", false, PARAM_RAW);
339+
$samplefrom = optional_param_array("assessor_{$assessornumber}_samplefrom", false, PARAM_RAW);
340+
$sampleto = optional_param_array("assessor_{$assessornumber}_sampleto", false, PARAM_RAW);
337341

338342
$sampleplugin = $DB->get_record('coursework_sample_set_plugin', ['rulename' => 'range_sample_type']);
339343

@@ -348,7 +352,7 @@ public function save_form_data($assessornumber=0, &$order=0) {
348352
$dbrecord->sample_set_plugin_id = $sampleplugin->id;
349353
$dbrecord->courseworkid = $this->coursework->id;
350354
$dbrecord->ruleorder = $order;
351-
$dbrecord->stage_identifier = "assessor{$assessornumber}";
355+
$dbrecord->stage_identifier = "assessor_{$assessornumber}";
352356

353357
$DB->insert_record("coursework_sample_set_rules", $dbrecord);
354358
$order++;
@@ -361,7 +365,7 @@ public function adjust_sample_set($stagenumber, &$allocatables, &$manualsamplese
361365

362366
global $DB;
363367

364-
$stage = "assessor_".$stagenumber;
368+
$stage = "assessor_" . $stagenumber;
365369

366370
$sql = "SELECT r.*,p.rulename
367371
FROM {coursework_sample_set_plugin} p,
@@ -391,7 +395,6 @@ public function adjust_sample_set($stagenumber, &$allocatables, &$manualsamplese
391395
&& isset($allocatables[$awf->allocatableid])) {
392396
$autosampleset[$awf->allocatableid] = $allocatables[$awf->allocatableid];
393397
}
394-
395398
}
396399
}
397400
}
@@ -454,9 +457,9 @@ private function get_allocatables_in_range($stage, $limit1, $limit2) {
454457
// Note as things stand limit1 and limit2 can not be params as the type of the grade field (varchar)
455458
//means the values are cast as strings
456459

457-
return $DB->get_records_sql($sql, ['courseworkid' => $this->coursework->id,
458-
'stage' => $stage]);
459-
460+
return $DB->get_records_sql($sql,
461+
['courseworkid' => $this->coursework->id, 'stage' => $stage]
462+
);
460463
}
461464

462465
}

‎classes/sample_set_rule/total_sample_type.php

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function get_default_rule_order() {
4949

5050
}
5151

52-
public function add_form_elements($assessornumber=0) {
52+
public function add_form_elements($assessornumber = 0) {
5353

5454
global $DB;
5555

@@ -58,7 +58,7 @@ public function add_form_elements($assessornumber=0) {
5858
{coursework_sample_set_plugin} sp
5959
WHERE sr.sample_set_plugin_id = sp.id
6060
AND sr.courseworkid = {$this->coursework->id}
61-
AND sr.stageidentifier = 'assessor{$assessornumber}'
61+
AND sr.stage_identifier = 'assessor_{$assessornumber}'
6262
AND sp.rulename = 'total_sample_type'";
6363

6464
$selected = ($record = $DB->get_record_sql($sql)) ? [$record->upperlimit => $record->upperlimit] : false;
@@ -72,22 +72,24 @@ public function add_form_elements($assessornumber=0) {
7272

7373
$html = html_writer::start_div('sampletotal');
7474

75-
$html .= html_writer::checkbox("assessor{$assessornumber}sampletotalcheckbox", 1, $checked, get_string('topupto', 'mod_coursework'),
76-
['id' => "assessor{$assessornumber}sampletotalcheckbox", 'class' => "assessor{$assessornumber} totalcheckbox samplesetrule"]);
75+
$html .= html_writer::checkbox(
76+
"assessor_{$assessornumber}_sampletotal_checkbox", 1, $checked, get_string('topupto', 'mod_coursework'),
77+
['id' => "assessor_{$assessornumber}_sampletotal_checkbox", 'class' => "assessor{$assessornumber} totalcheckbox samplesetrule"]);
7778

78-
$html .= html_writer::select($percentageoptions,
79-
"assessor{$assessornumber}sampletotal",
79+
$html .= html_writer::select(
80+
$percentageoptions,
81+
"assessor_{$assessornumber}_sampletotal",
8082
"",
8183
$selected,
82-
['id' => "assessor{$assessornumber}sampletotal", 'class' => " sample_set_rule"]);
84+
['id' => "assessor_{$assessornumber}_sampletotal", 'class' => " sample_set_rule"]);
8385
$html .= html_writer::label(get_string('ofallstudents', 'mod_coursework'), 'assessortwo_sampletotal[]');
8486

8587
$html .= html_writer::end_div();
8688

8789
return $html;
8890
}
8991

90-
public function add_form_elements_js($assessornumber=0) {
92+
public function add_form_elements_js($assessornumber = 0) {
9193

9294
$jsscript = "
9395
@@ -113,11 +115,11 @@ public function add_form_elements_js($assessornumber=0) {
113115

114116
}
115117

116-
function save_form_data($assessornumber=0, &$order=0) {
118+
function save_form_data($assessornumber = 0, &$order = 0) {
117119
global $DB;
118120

119-
$totalcheckbox = optional_param("assessor{$assessornumber}sampletotalcheckbox", false, PARAM_INT);
120-
$sampletotal = optional_param("assessor{$assessornumber}sampletotal", false, PARAM_INT);
121+
$totalcheckbox = optional_param("assessor_{$assessornumber}_sampletotal_checkbox", false, PARAM_INT);
122+
$sampletotal = optional_param("assessor_{$assessornumber}_sampletotal", false, PARAM_INT);
121123

122124
if ($totalcheckbox) {
123125

@@ -128,7 +130,7 @@ function save_form_data($assessornumber=0, &$order=0) {
128130
$dbrecord->sample_set_plugin_id = 2; // TODO: THIS SHOULD NOT BE HARD CODED - AF
129131
$dbrecord->courseworkid = $this->coursework->id;
130132
$dbrecord->ruleorder = $order;
131-
$dbrecord->stage_identifier = "assessor{$assessornumber}";
133+
$dbrecord->stage_identifier = "assessor_{$assessornumber}";
132134

133135
$DB->insert_record('coursework_sample_set_rules', $dbrecord);
134136
}
@@ -146,7 +148,7 @@ public function adjust_sample_set($stagenumber, &$allocatables, &$manualsamplese
146148

147149
global $DB;
148150

149-
$stage = "assessor_".$stagenumber;
151+
$stage = "assessor_" . $stagenumber;
150152

151153
$sql = "SELECT r.*,p.rulename
152154
FROM {coursework_sample_set_plugin} p,

0 commit comments

Comments
 (0)