moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-42179 mod_assign: Time remaining issue for group assignment

Browse source
This commit is contained in:
Damien Bezborodov 2014-06-25 15:32:25 +09:30
parent 5fd0df97c5
commit 79397b56cb
4 changed files with 251 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

55
mod/assign/gradingtable.php
View file

@ -294,9 +294,6 @@ class assign_grading_table extends table_sql implements renderable {
if ($assignment->get_instance()->teamsubmission) {
$columns[] = 'team';
$headers[] = get_string('submissionteam', 'assign');
$columns[] = 'teamstatus';
$headers[] = get_string('teamsubmissionstatus', 'assign');
}
// Allocated marker.
if ($this->assignment->get_instance()->markingallocation &&
@ -417,7 +414,6 @@ class assign_grading_table extends table_sql implements renderable {
if ($assignment->get_instance()->teamsubmission) {
$this->no_sorting('team');
$this->no_sorting('teamstatus');
}
$plugincolumnindex = 0;
@ -673,26 +669,6 @@ class assign_grading_table extends table_sql implements renderable {
}
}
/**
* Get the team status for this user.
*
* @param stdClass $row
* @return string The team name
*/
public function col_teamstatus(stdClass $row) {
$submission = false;
$group = false;
$this->get_group_and_submission($row->id, $group, $submission, -1);
$status = '';
if ($submission) {
$status = $submission->status;
}
return get_string('submissionstatus_' . $status, 'assign');
}
/**
* Format a list of outcomes.
*
@ -906,7 +882,12 @@ class assign_grading_table extends table_sql implements renderable {
public function col_timesubmitted(stdClass $row) {
$o = '-';
if ($row->timesubmitted) {
$group = false;
$submission = false;
$this->get_group_and_submission($row->id, $group, $submission, -1);
if ($group && $submission && $submission->timemodified) {
$o = userdate($submission->timemodified);
} else if ($row->timesubmitted) {
$o = userdate($row->timesubmitted);
}
@ -929,12 +910,23 @@ class assign_grading_table extends table_sql implements renderable {
$due = $row->extensionduedate;
}
$group = false;
$submission = false;
$this->get_group_and_submission($row->id, $group, $submission, -1);
if ($group && $submission) {
$timesubmitted = $submission->timemodified;
$status = $submission->status;
} else {
$timesubmitted = $row->timesubmitted;
$status = $row->status;
}
if ($this->assignment->is_any_submission_plugin_enabled()) {
$o .= $this->output->container(get_string('submissionstatus_' . $row->status, 'assign'),
array('class'=>'submissionstatus' .$row->status));
if ($due && $row->timesubmitted > $due) {
$usertime = format_time($row->timesubmitted - $due);
$o .= $this->output->container(get_string('submissionstatus_' . $status, 'assign'),
array('class'=>'submissionstatus' .$status));
if ($due && $timesubmitted > $due) {
$usertime = format_time($timesubmitted - $due);
$latemessage = get_string('submittedlateshort',
'assign',
$usertime);
@ -950,15 +942,14 @@ class assign_grading_table extends table_sql implements renderable {
$o .= $this->col_workflowstatus($row);
} else if ($row->grade !== null && $row->grade >= 0) {
$o .= $this->output->container(get_string('graded', 'assign'), 'submissiongraded');
}
if (!$row->timesubmitted) {
} else if (!$timesubmitted) {
$now = time();
if ($due && ($now > $due)) {
$overduestr = get_string('overdue', 'assign', format_time($now - $due));
$o .= $this->output->container($overduestr, 'overduesubmission');
}
}
if ($row->extensionduedate) {
$userdate = userdate($row->extensionduedate);
$extensionstr = get_string('userextensiondate', 'assign', $userdate);

1
mod/assign/lang/en/assign.php
View file

@ -423,7 +423,6 @@ $string['teamsubmission'] = 'Students submit in groups';
$string['teamsubmission_help'] = 'If enabled students will be divided into groups based on the default set of groups or a custom grouping. A group submission will be shared among group members and all members of the group will see each others changes to the submission.';
$string['teamsubmissiongroupingid'] = 'Grouping for student groups';
$string['teamsubmissiongroupingid_help'] = 'This is the grouping that the assignment will use to find groups for student groups. If not set - the default set of groups will be used.';
$string['teamsubmissionstatus'] = 'Group submission status';
$string['textinstructions'] = 'Assignment instructions';
$string['timemodified'] = 'Last modified';
$string['timeremaining'] = 'Time remaining';

12
mod/assign/renderer.php
View file

@ -558,6 +558,7 @@ class mod_assign_renderer extends plugin_renderer_base {
$row->cells = array($cell1, $cell2);
$t->data[] = $row;
$submission = $status->teamsubmission ? $status->teamsubmission : $status->submission;
$duedate = $status->duedate;
if ($duedate > 0) {
// Due date.
@ -592,8 +593,8 @@ class mod_assign_renderer extends plugin_renderer_base {
$row = new html_table_row();
$cell1 = new html_table_cell(get_string('timeremaining', 'assign'));
if ($duedate - $time <= 0) {
if (!$status->submission ||
$status->submission->status != ASSIGN_SUBMISSION_STATUS_SUBMITTED) {
if (!$submission ||
$submission->status != ASSIGN_SUBMISSION_STATUS_SUBMITTED) {
if ($status->submissionsenabled) {
$overduestr = get_string('overdue', 'assign', format_time($time - $duedate));
$cell2 = new html_table_cell($overduestr);
@ -602,16 +603,16 @@ class mod_assign_renderer extends plugin_renderer_base {
$cell2 = new html_table_cell(get_string('duedatereached', 'assign'));
}
} else {
if ($status->submission->timemodified > $duedate) {
if ($submission->timemodified > $duedate) {
$latestr = get_string('submittedlate',
'assign',
format_time($status->submission->timemodified - $duedate));
format_time($submission->timemodified - $duedate));
$cell2 = new html_table_cell($latestr);
$cell2->attributes = array('class'=>'latesubmission');
} else {
$earlystr = get_string('submittedearly',
'assign',
format_time($status->submission->timemodified - $duedate));
format_time($submission->timemodified - $duedate));
$cell2 = new html_table_cell($earlystr);
$cell2->attributes = array('class'=>'earlysubmission');
}
@ -648,7 +649,6 @@ class mod_assign_renderer extends plugin_renderer_base {
}
// Last modified.
$submission = $status->teamsubmission ? $status->teamsubmission : $status->submission;
if ($submission) {
$row = new html_table_row();
$cell1 = new html_table_cell(get_string('timemodified', 'assign'));

224
mod/assign/tests/locallib_test.php
View file

@ -118,6 +118,173 @@ class mod_assign_locallib_testcase extends mod_assign_base_testcase {
$this->editingteachers[0]->ignoresesskey = false;
}
/**
* Test submissions with extension date.
*/
public function test_gradingtable_extension_due_date() {
global $PAGE;
// Setup the assignment.
$this->create_extra_users();
$this->setUser($this->editingteachers[0]);
$assign = $this->create_instance(array(
'assignsubmission_onlinetext_enabled'=>1,
'duedate' => time() - 4 * 24 * 60 * 60,
));
$PAGE->set_url(new moodle_url('/mod/assign/view.php', array(
'id' => $assign->get_course_module()->id,
'action' => 'grading',
)));
// Check that the assignment is late.
$gradingtable = new assign_grading_table($assign, 1, '', 0, true);
$output = $assign->get_renderer()->render($gradingtable);
$this->assertContains(get_string('submissionstatus_', 'assign'), $output);
$this->assertContains(get_string('overdue', 'assign', format_time(4*24*60*60)), $output);
// Grant an extension.
$assign->testable_save_user_extension($this->students[0]->id, time() + 2 * 24 * 60 * 60);
$gradingtable = new assign_grading_table($assign, 1, '', 0, true);
$output = $assign->get_renderer()->render($gradingtable);
$this->assertContains(get_string('submissionstatus_', 'assign'), $output);
$this->assertContains(get_string('userextensiondate', 'assign', userdate(time() + 2*24*60*60)), $output);
// Simulate a submission.
$this->setUser($this->students[0]);
$submission = $assign->get_user_submission($this->students[0]->id, true);
$submission->status = ASSIGN_SUBMISSION_STATUS_SUBMITTED;
$assign->testable_update_submission($submission, $this->students[0]->id, true, false);
$data = new stdClass();
$data->onlinetext_editor = array('itemid'=>file_get_unused_draft_itemid(),
'text'=>'Submission text',
'format'=>FORMAT_MOODLE);
$plugin = $assign->get_submission_plugin_by_type('onlinetext');
$plugin->save($submission, $data);
// Verify output.
$this->setUser($this->editingteachers[0]);
$gradingtable = new assign_grading_table($assign, 1, '', 0, true);
$output = $assign->get_renderer()->render($gradingtable);
$this->assertContains(get_string('submissionstatus_submitted', 'assign'), $output);
$this->assertContains(get_string('userextensiondate', 'assign', userdate(time() + 2*24*60*60)), $output);
}
/**
* Test that late submissions with extension date calculate correctly.
*/
public function test_gradingtable_extension_date_calculation_for_lateness() {
global $PAGE;
// Setup the assignment.
$this->create_extra_users();
$this->setUser($this->editingteachers[0]);
$assign = $this->create_instance(array(
'assignsubmission_onlinetext_enabled'=>1,
'duedate' => time() - 4 * 24 * 60 * 60,
));
$PAGE->set_url(new moodle_url('/mod/assign/view.php', array(
'id' => $assign->get_course_module()->id,
'action' => 'grading',
)));
// Check that the assignment is late.
$gradingtable = new assign_grading_table($assign, 1, '', 0, true);
$output = $assign->get_renderer()->render($gradingtable);
$this->assertContains(get_string('submissionstatus_', 'assign'), $output);
$this->assertContains(get_string('overdue', 'assign', format_time(4*24*60*60)), $output);
// Grant an extension that is in the past.
$assign->testable_save_user_extension($this->students[0]->id, time() - 2 * 24 * 60 * 60);
$gradingtable = new assign_grading_table($assign, 1, '', 0, true);
$output = $assign->get_renderer()->render($gradingtable);
$this->assertContains(get_string('submissionstatus_', 'assign'), $output);
$this->assertContains(get_string('userextensiondate', 'assign', userdate(time() - 2*24*60*60)), $output);
$this->assertContains(get_string('overdue', 'assign', format_time(2*24*60*60)), $output);
// Simulate a submission.
$this->setUser($this->students[0]);
$submission = $assign->get_user_submission($this->students[0]->id, true);
$submission->status = ASSIGN_SUBMISSION_STATUS_SUBMITTED;
$assign->testable_update_submission($submission, $this->students[0]->id, true, false);
$data = new stdClass();
$data->onlinetext_editor = array('itemid'=>file_get_unused_draft_itemid(),
'text'=>'Submission text',
'format'=>FORMAT_MOODLE);
$plugin = $assign->get_submission_plugin_by_type('onlinetext');
$plugin->save($submission, $data);
// Verify output.
$this->setUser($this->editingteachers[0]);
$gradingtable = new assign_grading_table($assign, 1, '', 0, true);
$output = $assign->get_renderer()->render($gradingtable);
$this->assertContains(get_string('submissionstatus_submitted', 'assign'), $output);
$this->assertContains(get_string('userextensiondate', 'assign', userdate(time() - 2*24*60*60)), $output);
$this->assertContains(get_string('submittedlateshort', 'assign', format_time(2*24*60*60)), $output);
}
/**
* Check that group submission information is rendered correctly in the
* grading table.
*/
public function test_gradingtable_group_submissions_rendering() {
global $PAGE;
$this->create_extra_users();
// Now verify group assignments.
$this->setUser($this->teachers[0]);
$assign = $this->create_instance(array(
'teamsubmission' => 1,
'assignsubmission_onlinetext_enabled' => 1,
'submissiondrafts' => 1,
'requireallteammemberssubmit' => 0,
));
$PAGE->set_url(new moodle_url('/mod/assign/view.php', array(
'id' => $assign->get_course_module()->id,
'action' => 'grading',
)));
// Add a submission.
$this->setUser($this->extrastudents[0]);
$data = new stdClass();
$data->onlinetext_editor = array('itemid'=>file_get_unused_draft_itemid(),
'text'=>'Submission text',
'format'=>FORMAT_MOODLE);
$notices = array();
$assign->save_submission($data, $notices);
$submission = $assign->get_group_submission($this->extrastudents[0]->id, 0, true);
$submission->status = ASSIGN_SUBMISSION_STATUS_SUBMITTED;
$assign->testable_update_submission($submission, $this->extrastudents[0]->id, true, true);
// Check output.
$this->setUser($this->teachers[0]);
$gradingtable = new assign_grading_table($assign, 4, '', 0, true);
$output = $assign->get_renderer()->render($gradingtable);
$document = new DOMDocument();
$document->loadHTML($output);
$xpath = new DOMXPath($document);
// Check status.
$this->assertSame(get_string('submissionstatus_submitted', 'assign'), $xpath->evaluate('string(//td[@id="mod_assign_grading_r0_c4"]/div[@class="submissionstatussubmitted"])'));
$this->assertSame(get_string('submissionstatus_submitted', 'assign'), $xpath->evaluate('string(//td[@id="mod_assign_grading_r3_c4"]/div[@class="submissionstatussubmitted"])'));
// Check submission last modified date
$this->assertGreaterThan(0, strtotime($xpath->evaluate('string(//td[@id="mod_assign_grading_r0_c8"])')));
$this->assertGreaterThan(0, strtotime($xpath->evaluate('string(//td[@id="mod_assign_grading_r3_c8"])')));
// Check group.
$this->assertSame($this->groups[0]->name, $xpath->evaluate('string(//td[@id="mod_assign_grading_r0_c5"])'));
$this->assertSame($this->groups[0]->name, $xpath->evaluate('string(//td[@id="mod_assign_grading_r3_c5"])'));
// Check submission text.
$this->assertSame('Submission text', $xpath->evaluate('string(//td[@id="mod_assign_grading_r0_c9"]/div/div)'));
$this->assertSame('Submission text', $xpath->evaluate('string(//td[@id="mod_assign_grading_r3_c9"]/div/div)'));
// Check comments can be made.
$this->assertSame(1, (int)$xpath->evaluate('count(//td[@id="mod_assign_grading_r0_c10"]//textarea)'));
$this->assertSame(1, (int)$xpath->evaluate('count(//td[@id="mod_assign_grading_r3_c10"]//textarea)'));
}
public function test_show_intro() {
// Test whether we are showing the intro at the correct times.
$this->setUser($this->editingteachers[0]);
@ -734,7 +901,7 @@ class mod_assign_locallib_testcase extends mod_assign_base_testcase {
$this->assertEquals(null, $gradinginfo->items[0]->grades[$this->extrastudents[0]->id]->datesubmitted);
}
public function test_group_submissions_submit_for_marking() {
public function test_group_submissions_submit_for_marking_requireallteammemberssubmit() {
global $PAGE;
$this->create_extra_users();
@ -746,8 +913,8 @@ class mod_assign_locallib_testcase extends mod_assign_base_testcase {
'requireallteammemberssubmit'=>1));
$PAGE->set_url(new moodle_url('/mod/assign/view.php', array('id' => $assign->get_course_module()->id)));
$this->setUser($this->extrastudents[0]);
// Add a submission.
$this->setUser($this->extrastudents[0]);
$data = new stdClass();
$data->onlinetext_editor = array('itemid'=>file_get_unused_draft_itemid(),
'text'=>'Submission text',
@ -780,6 +947,59 @@ class mod_assign_locallib_testcase extends mod_assign_base_testcase {
$this->assertNotContains(get_string('submitassignment', 'assign'), $output);
}
public function test_group_submissions_submit_for_marking() {
global $PAGE;
$this->create_extra_users();
// Now verify group assignments.
$this->setUser($this->editingteachers[0]);
$assign = $this->create_instance(array('teamsubmission'=>1,
'assignsubmission_onlinetext_enabled'=>1,
'submissiondrafts'=>1,
'requireallteammemberssubmit'=>0,
'duedate' => time() - 2*24*60*60));
$PAGE->set_url(new moodle_url('/mod/assign/view.php', array('id' => $assign->get_course_module()->id)));
$this->setUser($this->extrastudents[0]);
// Add a submission.
$data = new stdClass();
$data->onlinetext_editor = array('itemid'=>file_get_unused_draft_itemid(),
'text'=>'Submission text',
'format'=>FORMAT_MOODLE);
$notices = array();
$assign->save_submission($data, $notices);
// Check we can see the submit button.
$output = $assign->view_student_summary($this->extrastudents[0], true);
$this->assertContains(get_string('submitassignment', 'assign'), $output);
$this->assertContains(get_string('timeremaining', 'assign'), $output);
$this->assertContains(get_string('overdue', 'assign', format_time(2*24*60*60)), $output);
$submission = $assign->get_group_submission($this->extrastudents[0]->id, 0, true);
$submission->status = ASSIGN_SUBMISSION_STATUS_SUBMITTED;
$assign->testable_update_submission($submission, $this->extrastudents[0]->id, true, true);
// Check that the student does not see "Submit" button.
$output = $assign->view_student_summary($this->extrastudents[0], true);
$this->assertNotContains(get_string('submitassignment', 'assign'), $output);
// Change to another user in the same group.
$this->setUser($this->extrastudents[self::GROUP_COUNT]);
$output = $assign->view_student_summary($this->extrastudents[self::GROUP_COUNT], true);
$this->assertNotContains(get_string('submitassignment', 'assign'), $output);
// Check that time remaining is not overdue.
$this->assertContains(get_string('timeremaining', 'assign'), $output);
$this->assertContains(get_string('submittedlate', 'assign', format_time(2*24*60*60)), $output);
$submission = $assign->get_group_submission($this->extrastudents[self::GROUP_COUNT]->id, 0, true);
$submission->status = ASSIGN_SUBMISSION_STATUS_SUBMITTED;
$assign->testable_update_submission($submission, $this->extrastudents[self::GROUP_COUNT]->id, true, true);
$output = $assign->view_student_summary($this->extrastudents[self::GROUP_COUNT], true);
$this->assertNotContains(get_string('submitassignment', 'assign'), $output);
}
public function test_submissions_open() {
$this->setUser($this->editingteachers[0]);