mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity

MDL-9657 advanced upload assignment draft tracking now available as activity setting; merged from MOODLE_19_STABLE

Browse Source
This commit is contained in:
skodak 2008-02-25 13:34:17 +00:00
parent 39bc9fbbbb
commit 42f50aec59
5 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lang/en_utf8/assignment.php
View File

@ -117,6 +117,7 @@ $string['submitedformarking'] = 'Assignment was already submitted for marking an
$string['submitformarking'] = 'Final submission for assignment marking';
$string['submitted'] = 'Submitted';
$string['submittedfiles'] = 'Submitted files';
$string['trackdrafts'] = 'Enable Send for marking';
$string['typeoffline'] = 'Offline activity';
$string['typeonline'] = 'Online text';
$string['typeupload'] = 'Advanced uploading of files';

3
lang/en_utf8/help/assignment/trackdrafts.html Normal file
View File

@ -0,0 +1,3 @@
<h1>Enable Send for marking</h1>
<p>Send for marking button allows students to indicate that they finished working on assignment. Teacher may also prevent further submission or revert to draft.</p>

6
mod/assignment/db/upgrade.php
View File

@ -49,6 +49,12 @@ function xmldb_assignment_upgrade($oldversion=0) {
$result = $result && change_field_notnull($table, $field);
}
if ($result && $oldversion < 2007091902) {
// add draft tracking default to existing upload assignments
$sql = "UPDATE {$CFG->prefix}assignment SET var4=1 WHERE assignmenttype='upload'";
$result = execute_sql($sql);
}
return $result;
}

26
mod/assignment/type/upload/assignment.class.php
View File

@ -42,7 +42,7 @@ class assignment_upload extends assignment_base {
$this->view_feedback();
if (!$this->isopen() or $this->is_finalized($submission)) {
if (!$this->drafts_tracked() or !$this->isopen() or $this->is_finalized($submission)) {
print_heading(get_string('submission', 'assignment'), '', 3);
} else {
print_heading(get_string('submissiondraft', 'assignment'), '', 3);
@ -202,7 +202,7 @@ class assignment_upload extends assignment_base {
} else if (!$this->isopen()) {
print_heading(get_string('nomoresubmissions','assignment'), '', 3);
} else if ($state = $this->is_finalized($submission)) {
} else if ($this->drafts_tracked() and $state = $this->is_finalized($submission)) {
if ($state == ASSIGNMENT_STATUS_SUBMITTED) {
print_heading(get_string('submitedformarking','assignment'), '', 3);
} else {
@ -272,7 +272,7 @@ class assignment_upload extends assignment_base {
$output = '';
if ($basedir = $this->file_area($userid)) {
if ($this->isopen() and !$this->is_finalized($submission)) {
if ($this->drafts_tracked() and $this->isopen() and !$this->is_finalized($submission)) {
$output .= '<strong>'.get_string('draft', 'assignment').':</strong> ';
}
@ -327,7 +327,7 @@ class assignment_upload extends assignment_base {
$candelete = $this->can_delete_files($submission);
$strdelete = get_string('delete');
if ($this->isopen() and !$this->is_finalized($submission) and !empty($mode)) { // only during grading
if ($this->drafts_tracked() and $this->isopen() and !$this->is_finalized($submission) and !empty($mode)) { // only during grading
$output .= '<strong>'.get_string('draft', 'assignment').':</strong><br />';
}
@ -860,13 +860,20 @@ class assignment_upload extends assignment_base {
}
}
function drafts_tracked() {
return !empty($this->assignment->var4);
}
/**
* Returns submission status
* @param object $submission - may be empty
* @return string submission state - empty, ASSIGNMENT_STATUS_SUBMITTED or ASSIGNMENT_STATUS_CLOSED
*/
function is_finalized($submission) {
if (empty($submission)) {
if (!$this->drafts_tracked()) {
return '';
} else if (empty($submission)) {
return '';
} else if ($submission->data2 == ASSIGNMENT_STATUS_SUBMITTED or $submission->data2 == ASSIGNMENT_STATUS_CLOSED) {
@ -878,6 +885,9 @@ class assignment_upload extends assignment_base {
}
function can_unfinalize($submission) {
if (!$this->drafts_tracked()) {
return false;
}
if (has_capability('mod/assignment:grade', $this->context)
and $this->isopen()
and $this->is_finalized($submission)) {
@ -889,6 +899,9 @@ class assignment_upload extends assignment_base {
function can_finalize($submission) {
global $USER;
if (!$this->drafts_tracked()) {
return false;
}
if ($this->is_finalized($submission)) {
return false;
@ -995,6 +1008,9 @@ class assignment_upload extends assignment_base {
$mform->setHelpButton('emailteachers', array('emailteachers', get_string('emailteachers', 'assignment'), 'assignment'));
$mform->setDefault('emailteachers', 0);
$mform->addElement('select', 'var4', get_string("trackdrafts", "assignment"), $ynoptions);
$mform->setHelpButton('var4', array('trackdrafts', get_string('trackdrafts', 'assignment'), 'assignment'));
$mform->setDefault('trackdrafts', 1);
}

2
mod/assignment/version.php
View File

@ -5,7 +5,7 @@
// This fragment is called by /admin/index.php
////////////////////////////////////////////////////////////////////////////////
$module->version = 2007091900;
$module->version = 2007091902;
$module->requires = 2007101000; // Requires this Moodle version
$module->cron = 60;