mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-21 23:48:45 +01:00
Code Issues Projects Releases Wiki Activity

Tidy up the handling of "hanging" assessments.

Browse Source
This commit is contained in:
rkingdon 2003-09-02 20:23:29 +00:00
parent 8b3c82ae52
commit 203add24ab
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/workshop/assessments.php
View File

@ -28,7 +28,7 @@
************************************************/
require("../../config.php");
require("lib.php");
require("lib.php");
optional_variable($id); // Course Module ID
optional_variable($a); // workshop ID

37
mod/workshop/lib.php
View File

@ -2,9 +2,6 @@
include_once("$CFG->dirroot/files/mimetypes.php");
// reset error reporting
error_reporting($CFG->debug);
/*** Constants **********************************/
$WORKSHOP_TYPE = array (0 => get_string("notgraded", "workshop"),
@ -38,6 +35,7 @@ if (!defined("COMMENTSCALE")) {
define("COMMENTSCALE", 20);
}
/*** Standard Moodle functions ******************
function workshop_add_instance($workshop)
function workshop_update_instance($workshop)
@ -209,10 +207,10 @@ function workshop_user_complete($course, $user, $mod, $workshop) {
function workshop_cron () {
// Function to be run periodically according to the moodle cron
// Finds all workshop notifications that have yet to be mailed out, and mails them
global $CFG, $USER;
// Find all workshop notifications that have yet to be mailed out, and mails them
$cutofftime = time() - $CFG->maxeditingtime;
// look for new assessments
@ -1392,7 +1390,18 @@ function workshop_list_assessed_submissions($workshop, $user) {
foreach ($assessments as $assessment) {
$comment = "";
$submission = get_record("workshop_submissions", "id", $assessment->submissionid);
if (($timenow - $assessment->timecreated) > $CFG->maxeditingtime) {
// the assessment may be in three states: 1. "hanging", created but not completed (timecreated is in the future)
// 2. just created and still capable of being edited, and 3. fixed (after the editing time)
if ($assessment->timecreated > $timenow) { // funny but it does happen!
$action = "<A HREF=\"assessments.php?action=assesssubmission&a=$workshop->id&sid=$submission->id\">".
get_string("assess", "workshop")."</A>";
}
elseif (($timenow - $assessment->timecreated) < $CFG->maxeditingtime) { // still time to edit
$action = "<A HREF=\"assessments.php?action=assesssubmission&a=$workshop->id&sid=$submission->id\">".
get_string("edit", "workshop")."</A> | <A HREF=\"assessments.php?action=userconfirmdelete&a=$workshop->id&aid=$assessment->id\">".
get_string("delete", "workshop")."</A>";
}
else { // it's gone cold
$action = "<A HREF=\"assessments.php?action=viewassessment&a=$workshop->id&aid=$assessment->id&".
"allowcomments=$workshop->agreeassessments\">".
get_string("view", "workshop")."</A>";
@ -1401,12 +1410,12 @@ function workshop_list_assessed_submissions($workshop, $user) {
get_string("reassess", "workshop")."</A>";
}
}
else { // there's still time left to edit...
$action = "<A HREF=\"assessments.php?action=assesssubmission&a=$workshop->id&sid=$submission->id\">".
get_string("edit", "workshop")."</A> | <A HREF=\"assessments.php?action=userconfirmdelete&a=$workshop->id&aid=$assessment->id\">".
get_string("delete", "workshop")."</A>";
if ($assessment->timecreated < $timenow) { // only show the date if it's in the past (future dates cause confusion
$comment = get_string("assessedon", "workshop", userdate($assessment->timecreated));
}
else {
$comment = '';
}
$comment = get_string("assessedon", "workshop", userdate($assessment->timecreated));
if ($submission->userid == $user->id) { // self assessment?
$comment .= "; ".get_string("ownwork", "workshop"); // just in case they don't know!
}
@ -1620,7 +1629,11 @@ function workshop_list_submissions_for_admin($workshop, $order) {
if ($assessment = get_record_select("workshop_assessments", "submissionid = $submission->id
AND userid = $USER->id")) {
$curtime = time();
if (($curtime - $assessment->timecreated) > $CFG->maxeditingtime) {
if ($assessment->timecreated > $curtime) { // it's a "hanging" assessment
$action .= " | <a href=\"assessments.php?action=assesssubmission&a=$workshop->id&sid=$submission->id\">".
get_string("assess", "workshop")."</a>";
}
elseif (($curtime - $assessment->timecreated) > $CFG->maxeditingtime) {
$action .= " | <a href=\"assessments.php?action=assesssubmission&a=$workshop->id&sid=$submission->id\">"
.get_string("reassess", "workshop")."</a>";
}