id\">". - get_string("teacherassessmenttable", "exercise", $course->teacher)."
\n"; + get_string("teacherassessmenttable", "exercise", $course->teacher)."\n"; - ?> - \n"; + + + // list any teacher submissions + $table->head = array (get_string("title", "exercise"), get_string("submitted", "exercise"), get_string("action", "exercise")); + $table->align = array ("left", "left", "left"); + $table->size = array ("*", "*", "*"); + $table->cellpadding = 2; + $table->cellspacing = 0; + + if ($submissions = exercise_get_teacher_submissions($exercise)) { + foreach ($submissions as $submission) { + $action = "id&sid=$submission->id\">". + get_string("amendtitle", "exercise").""; + $action .= " | id&sid=$submission->id\">". + get_string("delete", "exercise").""; + $table->data[] = array(exercise_print_submission_title($exercise, $submission), + userdate($submission->timecreated), $action); + } + print_heading(get_string("studentsubmissions", "exercise", $course->teacher), "center"); + print_table($table); + } } - $nentries = $exercise->showleaguetable; - if ($nentries == 99) { - $nentries = 'All'; - } - choose_from_menu($numbers, "nentries", "$nentries", ""); - echo "\n"; - echo "".get_string("resubmitnote", "exercise", $course->student)."
\n"; } - echo "".get_string("allgradeshaveamaximumof", "exercise", $exercise->grade)."
\n"; + echo "".get_string("allgradeshaveamaximumof", "exercise", $exercise->grade). + "
\n"; } } @@ -1606,7 +1619,7 @@ function exercise_list_teacher_submissions($exercise, $user, $reassess = false) if (! $course = get_record("course", "id", $exercise->course)) { error("Course is misconfigured"); - } + } if (! $cm = get_coursemodule_from_instance("exercise", $exercise->id, $course->id)) { error("Course Module ID was incorrect"); } @@ -1614,42 +1627,27 @@ function exercise_list_teacher_submissions($exercise, $user, $reassess = false) $strexercises = get_string("modulenameplural", "exercise"); $strexercise = get_string("modulename", "exercise"); - $nexercises = 1; // set as a variable (possible future extension) - if ($nexercises ==1 ) { - $table->head = array ($strexercise, get_string("action", "exercise"), get_string("assessed", "exercise"), - get_string("comment", "exercise")); - } - else { //use plural - $table->head = array ($strexercises, get_string("action", "exercise"), get_string("assessed", "exercise"), - get_string("comment", "exercise")); - } - $table->align = array ("LEFT", "LEFT", "LEFT", "LEFT"); - $table->size = array ("*", "*", "*", "*"); - $table->cellpadding = 2; - $table->cellspacing = 0; - - // get the number of assessments this user has done (could include placeholder one) - $nassessed = count_records_select("exercise_assessments", "exerciseid = $exercise->id - AND userid = $user->id"); - if ($nassessed < $nexercises) { - // if user has not assessed enough, set up "future" assessment records for this user for the teacher submissions... - // ... first count the number of assessments for each teacher submission... + // get any assessment this user has done (could include hot one) + if (!$assessment = get_record_select("exercise_assessments", "exerciseid = $exercise->id + AND userid = $user->id")) { + // the user has not yet assessed this exercise, set up a hot assessment record for this user for one + // of the teacher submissions, first count the number of assessments for each teacher submission... if ($submissions = exercise_get_teacher_submissions($exercise)) { - srand ((float)microtime()*1000000); // initialise random number generator + mt_srand ((float)microtime()*1000000); // initialise random number generator foreach ($submissions as $submission) { $n = count_records("exercise_assessments", "submissionid", $submission->id); // ...OK to have zero, we add a small random number to randomise things... - $nassessments[$submission->id] = $n + rand(0, 99) / 100; - } + $nassessments[$submission->id] = $n + mt_rand(0, 99) / 100; + } // ...put the submissions with the lowest number of assessments first... asort($nassessments); reset($nassessments); - foreach ($nassessments as $submissionid => $n) { // break out of loop when we allocated enough assessments... + foreach ($nassessments as $submissionid => $n) { // break out of loop after the first element $submission = get_record("exercise_submissions", "id", $submissionid); // ... provided the user has NOT already assessed that submission... if (!$assessment = exercise_get_submission_assessment($submission, $user)) { $yearfromnow = time() + 365 * 86400; - // ...create one and set timecreated way in the future, this is reset when record is updated + // ...create one and set timecreated way in the future, reset when record is updated $assessment->exerciseid = $exercise->id; $assessment->submissionid = $submission->id; $assessment->userid = $user->id; @@ -1657,46 +1655,66 @@ function exercise_list_teacher_submissions($exercise, $user, $reassess = false) $assessment->timecreated = $yearfromnow; if (!$assessment->id = insert_record("exercise_assessments", $assessment)) { error("Could not insert exercise assessment!"); - } - $nassessed++; - if ($nassessed >= $nexercises) { - break; - } } + break; } } } + } else { + // get hold of the teacher submission + if (!$submission = get_record("exercise_submissions", "id", $assessment->submissionid)) { + error("List teacher submissions: submission record not found"); + } + } + print_simple_box_start("center"); + print_heading_with_help(get_string("theexercise", "exercise"), "junk", "exercise"); + print_simple_box_start("center"); + echo "".get_string("description", "exercise").": \n"; + echo exercise_print_submission_title($exercise, $submission); + echo "
\n"; + print_simple_box_end(); + print_simple_box_end(); + + $table->head = array (get_string("action", "exercise"), get_string("assessed", "exercise"), + get_string("comment", "exercise")); + $table->align = array ("LEFT", "LEFT", "LEFT"); + $table->size = array ("*", "*", "*"); + $table->cellpadding = 2; + $table->cellspacing = 0; + // now list user's assessments (but only list those which come from teacher submissions) + print_heading(get_string("yourassessment", "exercise")); if ($assessments = exercise_get_user_assessments($exercise, $user)) { $timenow = time(); foreach ($assessments as $assessment) { if (!$submission = get_record("exercise_submissions", "id", $assessment->submissionid)) { error ("exercise_list_teacher_submissions: unable to get submission"); - } + } // submission from a teacher, i.e an exercise submission? if ($submission->isexercise) { $comment = ''; - if ($reassess) { //just show re-assess + if ($reassess) { // just show re-assess $action = "id&sid=$submission->id\">". get_string("reassess", "exercise").""; - } + } else { // reassess is false - assessment is a "normal state" - // user assessment has three states: record created but not assessed (date created in the future); - // just assessed but still editable; and "static" (may or may not have been graded by teacher, that - // is shown in the comment) + // user assessment has three states: record created but not assessed (date created + // in the future); just assessed but still editable; and "static" (may or may not + // have been graded by teacher, that is shown in the comment) if ($assessment->timecreated > $timenow) { // user needs to assess this submission $action = "id&sid=$submission->id\">". get_string("assess", "exercise").""; - } - elseif ($assessment->timecreated > ($timenow - $CFG->maxeditingtime)) { // there's still time left to edit... + } + elseif ($assessment->timecreated > ($timenow - $CFG->maxeditingtime)) { + // there's still time left to edit... $action = "id&sid=$submission->id\">". get_string("edit", "exercise").""; - } + } else { $action = "id&aid=$assessment->id\">" .get_string("view", "exercise").""; - } } + } // show the date if in the past (otherwise the user hasn't done the assessment yet $assessmentdate = ''; if ($assessment->timecreated < $timenow) { @@ -1705,19 +1723,18 @@ function exercise_list_teacher_submissions($exercise, $user, $reassess = false) if (exercise_count_user_submissions($exercise, $user) > 0) { if ($assessment->timegraded and (($timenow - $assessment->timegraded) > $CFG->maxeditingtime)) { $comment .= get_string("thereisfeedbackfromthe", "exercise", $course->teacher); - } + } else { $comment .= get_string("awaitingfeedbackfromthe", "exercise", $course->teacher); - } } } - $table->data[] = array(exercise_print_submission_title($exercise, $submission), $action, $assessmentdate, - $comment); } + $table->data[] = array($action, $assessmentdate, $comment); } } - print_table($table); - } + print_table($table); + } +} /////////////////////////////////////////////////////////////////////////////////////////////// @@ -1772,21 +1789,24 @@ function exercise_list_unassessed_student_submissions($exercise, $user) { $studentassessment = $assessment; break; // there should only be one! } + $timegap = get_string("ago", "exercise", format_time($submission->timecreated - + $timenow)); + if ($submission->late) { + $timegap = "".$timegap.""; + } if ($warm) { // last chance salon $action = "id&aid=$studentassessment->id&sid=$submission->id\">". get_string("edit", "exercise").""; $table->data[] = array(exercise_print_submission_title($exercise, $submission), $submissionowner->firstname." ".$submissionowner->lastname, - get_string("ago", "exercise", format_time($submission->timecreated - - $timenow)), $action, $comment); + $timegap, $action, $comment); } else { $action = "id&aid=$studentassessment->id&sid=$submission->id\">". get_string("assess", "exercise").""; $table->data[] = array(exercise_print_submission_title($exercise, $submission), $submissionowner->firstname." ".$submissionowner->lastname, - get_string("ago", "exercise", format_time($submission->timecreated - - $timenow)), $action, $comment); + $timegap, $action, $comment); } } else { // there's no student assessment, odd!! @@ -1817,9 +1837,14 @@ function exercise_list_unassessed_student_submissions($exercise, $user) { // last chance salon $action = "id&sid=$submission->id\">". get_string("edit", "exercise").""; + $timegap = get_string("ago", "exercise", format_time($submission->timecreated - + $timenow)); + if ($submission->late) { + $timegap = "".$timegap.""; + } $table->data[] = array(exercise_print_submission_title($exercise, $submission), $submissionowner->firstname." ".$submissionowner->lastname, - format_time($submission->timecreated - $timenow), $action, $comment); + $timegap, $action, $comment); } if (!$teacherassessed) { // no teacher's assessment @@ -1849,10 +1874,14 @@ function exercise_list_unassessed_student_submissions($exercise, $user) { } $action = "id&sid=$submission->id\">". get_string("assess", "exercise").""; + $timegap = get_string("ago", "exercise", format_time($submission->timecreated - + $timenow)); + if ($submission->late) { + $timegap = "".$timegap.""; + } $table->data[] = array(exercise_print_submission_title($exercise, $submission), $submissionowner->firstname." ".$submissionowner->lastname, - get_string("ago", "exercise", format_time($submission->timecreated - $timenow)), - $action, $comment); + $timegap, $action, $comment); } } } @@ -1969,7 +1998,7 @@ function exercise_list_user_submissions($exercise, $user) { $timenow = time(); $table->head = array (get_string("title", "exercise"), get_string("action", "exercise"), - get_string("submitted", "assignment"), get_string("comment", "exercise")); + get_string("submitted", "exercise"), get_string("assessment", "exercise")); $table->align = array ("LEFT", "LEFT", "LEFT", "LEFT"); $table->size = array ("*", "*", "*", "*"); $table->cellpadding = 2; @@ -1979,14 +2008,11 @@ function exercise_list_user_submissions($exercise, $user) { foreach ($submissions as $submission) { $action = ''; $comment = ''; - if (isstudent($course->id, $user->id)) { - $comment = get_string("awaitingassessmentbythe", "exercise", $course->teacher); - } // allow user to delete submission if it's warm if ($submission->timecreated > $timenow - $CFG->maxeditingtime) { $action = "id&sid=$submission->id\">". get_string("delete", "exercise").""; - } + } // get the teacher assessments (could be more than one, if unlikely, when multiple teachers) if ($assessments = get_records_select("exercise_assessments", "exerciseid = $exercise->id AND submissionid = $submission->id")) { @@ -1995,19 +2021,35 @@ function exercise_list_user_submissions($exercise, $user) { if ($assessment->timecreated < $timenow - $CFG->maxeditingtime) { // it's cold if ($action) { $action .= " | "; - } - $action .= "id&aid=$assessment->id\">". - get_string("viewassessment", "exercise")."";; - $comment = get_string("assessmentmadebythe", "exercise", $course->teacher); } - } + $action .= "id&aid=$assessment->id\">". + get_string("viewassessment", "exercise").""; + if ($comment) { + $action .= " | "; + } + $grade = number_format($assessment->grade * $exercise->grade / 100.0, 1); + if ($submission->late) { + $comment .= get_string("grade"). + ": ($grade)"; + } else { + $comment .= get_string("grade").": $grade"; + } + } } - $table->data[] = array(exercise_print_submission_title($exercise, $submission), $action, - userdate($submission->timecreated), $comment); } - print_table($table); + if (!$comment and isstudent($course->id, $user->id)) { + $comment = get_string("awaitingassessmentbythe", "exercise", $course->teacher); + } + $submissiondate = userdate($submission->timecreated); + if ($submission->late) { + $submissiondate = "".$submissiondate.""; + } + $table->data[] = array(exercise_print_submission_title($exercise, $submission), $action, + $submissiondate, $comment); } + print_table($table); } +} /////////////////////////////////////////////////////////////////////////////////////////////// @@ -2142,14 +2184,14 @@ function exercise_print_assessment_form($exercise, $assessment = false, $allowch // now print the form for ($i=0; $i < count($elements); $i++) { $iplus1 = $i+1; - echo "". get_string("element","exercise")." $iplus1:
". get_string("element","exercise")." $iplus1:
". get_string("feedback").":
". get_string("feedback").":