Skip to content

Commit 08ae166

Browse files
watson8watson8
committed
CTP-3690 indentation fixes
1 parent 055afb8 commit 08ae166

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+591
-591
lines changed

‎actions/upload_grading_sheet.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969

7070
$csvimport = new \mod_coursework\export\import($coursework, false, false);
7171

72-
// $csv_cells = $csvimport->csv_columns(); //all columns from spreadsheet
72+
// $csv_cells = $csvimport->csv_columns(); //all columns from spreadsheet
7373

7474
$procsessingresults = $csvimport->validate_csv($content, $data->encoding, $data->delimiter_name, $csv_cells);
7575

‎backup/moodle2/backup_coursework_activity_task.class.php

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,25 @@
2424

2525
class backup_coursework_activity_task extends backup_activity_task {
2626

27-
static public function encode_content_links($content) {
28-
global $CFG;
27+
static public function encode_content_links($content) {
28+
global $CFG;
2929

30-
$base = preg_quote($CFG->wwwroot, "/");
30+
$base = preg_quote($CFG->wwwroot, "/");
3131

32-
// These have to be picked up by the restore code COURSEWORK... are arbitrary
33-
$search = "/(".$base."\/mod\/coursework\/index.php\?id\=)([0-9]+)/";
34-
$content = preg_replace($search, '$@COURSEWORKINDEX*$2@$', $content);
32+
// These have to be picked up by the restore code COURSEWORK... are arbitrary
33+
$search = "/(".$base."\/mod\/coursework\/index.php\?id\=)([0-9]+)/";
34+
$content = preg_replace($search, '$@COURSEWORKINDEX*$2@$', $content);
3535

36-
$search = "/(".$base."\/mod\/coursework\/view.php\?id\=)([0-9]+)/";
37-
$content = preg_replace($search, '$@COURSEWORKBYID*$2@$', $content);
36+
$search = "/(".$base."\/mod\/coursework\/view.php\?id\=)([0-9]+)/";
37+
$content = preg_replace($search, '$@COURSEWORKBYID*$2@$', $content);
3838

39-
return $content;
40-
}
39+
return $content;
40+
}
4141

42-
protected function define_my_settings() {
43-
}
42+
protected function define_my_settings() {
43+
}
4444

45-
protected function define_my_steps() {
46-
$this->add_step(new backup_coursework_activity_structure_step('coursework_structure', 'coursework.xml'));
47-
}
45+
protected function define_my_steps() {
46+
$this->add_step(new backup_coursework_activity_structure_step('coursework_structure', 'coursework.xml'));
47+
}
4848
}

‎classes/ability.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ function (coursework $coursework) {
152152

153153
// New feedback
154154
$this->prevent_new_feedback_with_no_submission();
155-
$this->prevent_new_feedback_when_submission_not_finalised();
155+
$this->prevent_new_feedback_when_submission_not_finalised();
156156
$this->prevent_new_feedback_when_prerequisite_stages_have_no_feedback();
157157
$this->prevent_new_feedback_with_empty_stage();
158158
$this->prevent_new_feedback_when_allocatable_already_has_feedback_for_this_stage();
@@ -163,7 +163,7 @@ function (coursework $coursework) {
163163
$this->prevent_new_feedback_when_not_assessor_for_stage();
164164
$this->prevent_new_feedback_from_non_allocated_assessors();
165165
$this->allow_new_feedback_by_allocated_assessor();
166-
$this->allow_new_feedback_from_any_assessor_when_allocation_is_disabled_for_stage_or_instance();
166+
$this->allow_new_feedback_from_any_assessor_when_allocation_is_disabled_for_stage_or_instance();
167167
$this->allow_new_feedback_if_agreed_feedback_and_user_can_add_agreed_feedback();
168168

169169
// Create feedback
@@ -230,7 +230,7 @@ function (coursework $coursework) {
230230
// Plagiarism flagging rules for Plagiarism Alert
231231

232232
// New
233-
// $this->prevent_new_plagiarism_flag_if_already_exists();
233+
// $this->prevent_new_plagiarism_flag_if_already_exists();
234234
$this->allow_new_plagiarism_flag_with_capability();
235235

236236
// Edit
@@ -425,7 +425,7 @@ function (submission $submission) {
425425
}
426426

427427
protected function allow_show_submission_to_graders_after_feedback_release() {
428-
// Show to graders after release
428+
// Show to graders after release
429429
$this->allow('show',
430430
'mod_coursework\models\submission',
431431
function (submission $submission) {
@@ -485,8 +485,8 @@ function (submission $submission) {
485485
// take into account courseworks with personal deadlines
486486
if ($submission->get_coursework()->personal_deadlines_enabled()) {
487487
$deadline_passed = (bool)$submission->submission_personal_deadline() < time();
488-
} else {
489-
$deadline_passed = $submission->get_coursework()->deadline_has_passed();
488+
} else {
489+
$deadline_passed = $submission->get_coursework()->deadline_has_passed();
490490
}
491491
$ok_to_submit_late = $submission->get_coursework()->allow_late_submissions();
492492
$coursework = $submission->get_coursework();
@@ -1202,7 +1202,7 @@ private function allow_show_grading_table_row_if_user_can_grant_extension_and_no
12021202
'mod_coursework\grading_table_row_base',
12031203
function (grading_table_row_base $row) {
12041204

1205-
return (!$row->get_coursework()->allocation_enabled() && has_capability('mod/coursework:grantextensions',
1205+
return (!$row->get_coursework()->allocation_enabled() && has_capability('mod/coursework:grantextensions',
12061206
$row->get_coursework()
12071207
->get_context()));
12081208

‎classes/allocation/manager.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -344,18 +344,18 @@ public function auto_generate_sample_set() {
344344

345345
// Save sample set
346346
if (!empty($auto_sample_set)) {
347-
foreach ($auto_sample_set as $allocatable) {
348-
$sample = new \stdClass();
349-
$sample->courseworkid = $this->coursework->id;
350-
$sample->allocatableid = $allocatable->id;
351-
$sample->allocatabletype = ($this->coursework->is_configured_to_have_group_submissions()) ? "group" : "user";
352-
$sample->stage_identifier = "assessor_{$stage_number}";
353-
$sample->selectiontype = "automatic";
354-
355-
// If this a manually selected allocatable check to see if the allocatable is already in the table
356-
$DB->insert_record("coursework_sample_set_mbrs", $sample);
357-
358-
}
347+
foreach ($auto_sample_set as $allocatable) {
348+
$sample = new \stdClass();
349+
$sample->courseworkid = $this->coursework->id;
350+
$sample->allocatableid = $allocatable->id;
351+
$sample->allocatabletype = ($this->coursework->is_configured_to_have_group_submissions()) ? "group" : "user";
352+
$sample->stage_identifier = "assessor_{$stage_number}";
353+
$sample->selectiontype = "automatic";
354+
355+
// If this a manually selected allocatable check to see if the allocatable is already in the table
356+
$DB->insert_record("coursework_sample_set_mbrs", $sample);
357+
358+
}
359359
}
360360
}
361361
}

‎classes/allocation/table/cell/builder.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,9 @@ private function prepare_allocation_table_cell() {
191191
}
192192
$contents .= '<br>';
193193

194-
if ($this->coursework->allocation_enabled()) {
195-
$assessor_dropdown = $this->get_potential_marker_dropdown();
196-
}
194+
if ($this->coursework->allocation_enabled()) {
195+
$assessor_dropdown = $this->get_potential_marker_dropdown();
196+
}
197197
$assessor_name = '';
198198
if ($this->has_feedback()) {
199199
$class .= ' has-assessor-feedback ';
@@ -210,7 +210,7 @@ private function prepare_allocation_table_cell() {
210210
}
211211

212212
if ($assessor_name) {
213-
if ($this->get_stage()->uses_sampling() && !$this->get_feedback() && !$this->has_automatic_sampling()) {
213+
if ($this->get_stage()->uses_sampling() && !$this->get_feedback() && !$this->has_automatic_sampling()) {
214214
$contents .= '<br>';
215215
}
216216
$contents .= "<span class='existing-assessor'>{$assessor_name}</span>";
@@ -437,15 +437,15 @@ private function has_final_feedback() {
437437
[$this->allocatable->id(), $this->allocatable->type()]
438438
);
439439
if ($submission) {
440-
$feedbacks = isset(feedback::$pool[$this->coursework->id]['submissionid'][$submission->id]) ?
440+
$feedbacks = isset(feedback::$pool[$this->coursework->id]['submissionid'][$submission->id]) ?
441441
feedback::$pool[$this->coursework->id]['submissionid'][$submission->id] : [];
442442

443-
foreach ($feedbacks as $feedback) {
444-
if ($feedback->stage_identifier == 'final_agreed_1') {
445-
return true;
443+
foreach ($feedbacks as $feedback) {
444+
if ($feedback->stage_identifier == 'final_agreed_1') {
445+
return true;
446+
}
446447
}
447448
}
448-
}
449449
return false;
450450
}
451451

‎classes/allocation/table/processor.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -87,19 +87,19 @@ private function get_row($allocatable) {
8787
private function clean_data($raw_data) {
8888

8989
// Data looks like this:
90-
// $example_data = array(
91-
// 4543 => array( // Student id
92-
// 'assessor_1' => array(
93-
// 'allocation_id' => 43,
94-
// 'assessor_id' => 232,
95-
// ),
96-
// 'moderator_1' => array(
97-
// 'allocation_id' => 46,
98-
// 'assessor_id' => 235,
99-
// 'in_set' => 1,
100-
// )
101-
// )
102-
// );
90+
// $example_data = array(
91+
// 4543 => array( // Student id
92+
// 'assessor_1' => array(
93+
// 'allocation_id' => 43,
94+
// 'assessor_id' => 232,
95+
// ),
96+
// 'moderator_1' => array(
97+
// 'allocation_id' => 46,
98+
// 'assessor_id' => 235,
99+
// 'in_set' => 1,
100+
// )
101+
// )
102+
// );
103103

104104
$clean_data = [];
105105
foreach ($raw_data as $allocatable_id => $datarrays) {
@@ -117,7 +117,7 @@ private function clean_data($raw_data) {
117117
$clean_data[$allocatable_id][$stage->identifier()] = $stage_data;
118118
}
119119
}
120-
/* if (array_key_exists('moderator', $datarrays)) {
120+
/* if (array_key_exists('moderator', $datarrays)) {
121121
$moderator_data = $datarrays['moderator'];
122122
$clean_data[$allocatable_id]['moderator'] = $moderator_data;
123123
}*/

‎classes/assessor_feedback_row.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public function get_graded_by() {
128128
* @return string
129129
*/
130130
public function get_graders_name() {
131-
return $this->get_graded_by()->profile_link();
131+
return $this->get_graded_by()->profile_link();
132132
}
133133

134134
/**

‎classes/controllers/feedback_controller.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ private function next_available_stage($feedback) {
591591
* @param $submission
592592
*/
593593
protected function try_auto_feedback_creation($submission) {
594-
// automatic agreement if necessary
594+
// automatic agreement if necessary
595595
$auto_feedback_classname = '\mod_coursework\auto_grader\\' . $this->coursework->automaticagreementstrategy;
596596
/**
597597
* @var auto_grader $auto_grader

‎classes/controllers/personal_deadlines_controller.php

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -87,33 +87,33 @@ protected function new_personal_deadline() {
8787

8888
$allocatables = unserialize($data->allocatableid);
8989

90-
foreach ($allocatables as $allocatableid) {
91-
$data->allocatableid = $allocatableid;
92-
$data->id = '';
93-
//$data->id = '';
94-
$findparams = array(
95-
'allocatableid' => $allocatableid,
96-
'allocatabletype' => $data->allocatabletype,
97-
'courseworkid' => $data->courseworkid,
98-
);
99-
$this->personal_deadline = personal_deadline::find_or_build($findparams);
100-
101-
if (empty($this->personal_deadline->personal_deadline)) { // personal deadline doesnt exist
102-
// add new
103-
$data->createdbyid = $USER->id;
104-
$this->personal_deadline = personal_deadline::build($data);
105-
$this->personal_deadline->save();
106-
107-
} else {
108-
// update
109-
$data->id = $this->personal_deadline->id;
110-
$data->lastmodifiedbyid = $USER->id;
111-
$data->timemodified = time();
112-
$this->personal_deadline->update_attributes($data);
113-
}
114-
90+
foreach ($allocatables as $allocatableid) {
91+
$data->allocatableid = $allocatableid;
92+
$data->id = '';
93+
//$data->id = '';
94+
$findparams = array(
95+
'allocatableid' => $allocatableid,
96+
'allocatabletype' => $data->allocatabletype,
97+
'courseworkid' => $data->courseworkid,
98+
);
99+
$this->personal_deadline = personal_deadline::find_or_build($findparams);
100+
101+
if (empty($this->personal_deadline->personal_deadline)) { // personal deadline doesnt exist
102+
// add new
103+
$data->createdbyid = $USER->id;
104+
$this->personal_deadline = personal_deadline::build($data);
105+
$this->personal_deadline->save();
106+
107+
} else {
108+
// update
109+
$data->id = $this->personal_deadline->id;
110+
$data->lastmodifiedbyid = $USER->id;
111+
$data->timemodified = time();
112+
$this->personal_deadline->update_attributes($data);
115113
}
116114

115+
}
116+
117117
}
118118
redirect($coursework_page_url);
119119
}
@@ -143,10 +143,10 @@ protected function set_default_current_deadline() {
143143

144144
// If the allocatableid is an array then the current page will probably be setting multiple the personal deadlines
145145
// of multiple allocatable ids in which case set the personal deadline to the coursework default
146-
if (is_array($this->params['allocatableid']) || !$this->get_personal_deadline()) { // if no personal deadline then use coursework deadline
147-
$this->personal_deadline->personal_deadline = $this->coursework->deadline;
146+
if (is_array($this->params['allocatableid']) || !$this->get_personal_deadline()) { // if no personal deadline then use coursework deadline
147+
$this->personal_deadline->personal_deadline = $this->coursework->deadline;
148148

149-
}
149+
}
150150

151151
return $params;
152152
}

‎classes/controllers/submissions_controller.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,12 @@ protected function create_submission() {
116116
$submission->authorid = $submission->get_author_id(); // Create new function to get the author id depending on whether the current user is submitting on behalf
117117
$submission->timesubmitted = time();
118118

119-
// Automatically finalise any submissions that's past the deadline/personal deadline and doesn't have valid extension
119+
// Automatically finalise any submissions that's past the deadline/personal deadline and doesn't have valid extension
120120
if ($this->coursework->personal_deadlines_enabled()) {
121121
// Check is submission has a valid personal deadline or a valid extension
122-
if (!$this->has_valid_personal_deadline($submission) && !$this->has_valid_extension($submission)) {
123-
$submission->finalised = 1;
124-
}
122+
if (!$this->has_valid_personal_deadline($submission) && !$this->has_valid_extension($submission)) {
123+
$submission->finalised = 1;
124+
}
125125
} else if ($this->coursework->deadline_has_passed() && !$this->has_valid_extension($submission)) {
126126
$submission->finalised = 1;
127127
}
@@ -167,7 +167,7 @@ protected function create_submission() {
167167
}
168168
}
169169

170-
if ($submission->finalised) {
170+
if ($submission->finalised) {
171171
if (!$submission->get_coursework()->has_deadline()) {
172172

173173
$userids = explode(',', $submission->get_coursework()->get_submission_notification_users());
@@ -221,11 +221,11 @@ protected function edit_submission() {
221221

222222
$submit_form->set_data($submission);
223223

224-
if ($validation != true) {
224+
if ($validation != true) {
225225
$this->get_page_renderer()->edit_submission_page($submit_form, $submission);
226226
return true;
227-
}
228-
}
227+
}
228+
}
229229

230230
/**
231231
*
@@ -399,11 +399,11 @@ protected function check_coursework_is_open($coursework) {
399399
*/
400400
private function exception_if_late($submission) {
401401
$could_have_submitted = has_capability('mod/coursework:submit', $this->coursework->get_context());
402-
if ($this->coursework->personal_deadlines_enabled()) {
403-
$deadline_has_passed = !$this->has_valid_personal_deadline($submission);
404-
} else {
405-
$deadline_has_passed = $this->coursework->deadline_has_passed();
406-
}
402+
if ($this->coursework->personal_deadlines_enabled()) {
403+
$deadline_has_passed = !$this->has_valid_personal_deadline($submission);
404+
} else {
405+
$deadline_has_passed = $this->coursework->deadline_has_passed();
406+
}
407407

408408
if ($could_have_submitted && $deadline_has_passed && !$this->has_valid_extension($submission) && !$this->coursework->allow_late_submissions()) {
409409
throw new late_submission($this->coursework);

0 commit comments

Comments
 (0)