From 0e29a0b1d8568afe58c60ee8a396de3d5ed639e9 Mon Sep 17 00:00:00 2001 From: rkingdon Date: Mon, 28 Jul 2003 17:37:16 +0000 Subject: [PATCH] Minor errors fixed; Student can delete submissions and assessments; Teachers see student names; Tabbed Admin screen. --- mod/workshop/assessments.php | 54 +++++- mod/workshop/lib.php | 325 +++++++++++++++++++++++++++-------- mod/workshop/submissions.php | 51 +++++- mod/workshop/todo.txt | 12 +- mod/workshop/view.php | 159 ++++++----------- 5 files changed, 419 insertions(+), 182 deletions(-) diff --git a/mod/workshop/assessments.php b/mod/workshop/assessments.php index e4b0db9ac3..5165b85780 100644 --- a/mod/workshop/assessments.php +++ b/mod/workshop/assessments.php @@ -5,6 +5,8 @@ ACTIONS handled are: addcomment + adminconfirmdelete + admindelete adminlist agreeassessment assesssubmission @@ -20,6 +22,8 @@ updateassessment updatecomment updategrading + userconfirmdelete + userdelete viewassessment ************************************************/ @@ -121,7 +125,7 @@ error("Admin confirm delete: assessment id missing"); } - notice_yesno(get_string("confirmdeletionofthisitem","workshop"), + notice_yesno(get_string("confirmdeletionofthisitem","workshop", get_string("assessment", "workshop")), "assessments.php?action=admindelete&id=$cm->id&aid=$_GET[aid]", "submissions.php?action=adminlist&id=$cm->id"); } @@ -147,7 +151,7 @@ } - /*********************** admin list of asssessments (by teachers)***********************/ + /*********************** admin list of asssessments (of a submission) (by teachers)**************/ elseif ($action == 'adminlist') { if (!isteacher($course->id)) { @@ -163,6 +167,22 @@ } + /*********************** admin list of asssessments by a student (used by teachers only )******************/ + elseif ($action == 'adminlistbystudent') { + + if (!isteacher($course->id)) { + error("Only teachers can look at this page"); + } + + if (empty($_GET['userid'])) { + error ("Workshop asssessments: adminlistbystudent called with no userid"); + } + $user = get_record("user", "id", $_GET['userid']); + workshop_print_assessments_by_user_for_admin($workshop, $user); + print_continue("submissions.php?action=adminlist&a=$workshop->id"); + } + + /*************** agree (to) assessment (by student) ***************************/ elseif ($action == 'agreeassessment') { $timenow = time(); @@ -844,6 +864,36 @@ } + /******************* user confirm delete ************************************/ + elseif ($action == 'userconfirmdelete' ) { + + if (empty($_GET['aid'])) { + error("User confirm delete: assessment id missing"); + } + + notice_yesno(get_string("confirmdeletionofthisitem","workshop", get_string("assessment", "workshop")), + "assessments.php?action=userdelete&id=$cm->id&aid=$_GET[aid]", "view.php?id=$cm->id"); + } + + + /******************* user delete ************************************/ + elseif ($action == 'userdelete' ) { + + if (empty($_GET['aid'])) { + error("User delete: assessment id missing"); + } + + print_string("deleting", "workshop"); + // first delete all the associated records... + delete_records("workshop_comments", "assessmentid", $_GET['aid']); + delete_records("workshop_grades", "assessmentid", $_GET['aid']); + // ...now delete the assessment... + delete_records("workshop_assessments", "id", $_GET['aid']); + + print_continue("view.php?id=$cm->id"); + } + + /*********************** view all assessments ***********************/ elseif ($action == 'viewallassessments') { diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php index 99e8b4ec1d..69e17b3196 100644 --- a/mod/workshop/lib.php +++ b/mod/workshop/lib.php @@ -2,6 +2,8 @@ include_once("$CFG->dirroot/files/mimetypes.php"); +error_reporting(15); + /*** Constants **********************************/ $WORKSHOP_TYPE = array (0 => get_string("notgraded", "workshop"), @@ -653,10 +655,11 @@ function workshop_log_info($log) { /*** Functions for the workshop module ****** -function workshop_count_all_assessments($workshop, $user) { function workshop_count_all_submissions_for_assessment($workshop, $user) { +function workshop_count_assessments($submission) { function workshop_count_comments($assessment) { function workshop_count_peer_assessments($workshop, $user) { +function workshop_count_self_assessments($workshop, $user) { function workshop_count_student_submissions($workshop) { function workshop_count_student_submissions_for_assessment($workshop, $user) { function workshop_count_teacher_assessments($workshop, $user) { @@ -664,6 +667,7 @@ function workshop_count_teacher_submissions($workshop) { function workshop_count_teacher_submissions_for_assessment($workshop, $user) { function workshop_count_ungraded_assessments_student($workshop) { function workshop_count_ungraded_assessments_teacher($workshop) { +function workshop_count_user_assessments($worshop, $user, $type = "all") { $type is all, student or teacher function workshop_delete_submitted_files($workshop, $submission) { function workshop_delete_user_files($workshop, $user, $exception) { @@ -701,10 +705,13 @@ function workshop_list_user_submissions($workshop, $user) { function workshop_print_assessment($workshop, $assessment, $allowchanges, $showcommentlinks) +function workshop_print_assessments_by_user_for_admin($workshop, $user) { +function workshop_print_assessments_for_admin($workshop, $submission) { function workshop_print_difference($time) { function workshop_print_feedback($course, $submission) { function workshop_print_submission_assessments($workshop, $submission, $type) { function workshop_print_submission_title($workshop, $user) { +function workshop_print_tabbed_table($table) { function workshop_print_time_to_deadline($time) { function workshop_print_upload_form($workshop) { function workshop_print_user_assessments($workshop, $user) { @@ -712,10 +719,6 @@ function workshop_print_user_assessments($workshop, $user) { function workshop_test_user_assessments($workshop, $user) { ***************************************/ -function workshop_count_all_assessments($workshop, $user) { - return count_records("workshop_assessments", "workshopid", $workshop->id, "userid", $user->id); - } - function workshop_count_all_submissions_for_assessment($workshop, $user) { // looks at all submissions and deducts the number which has been assessed by this user @@ -730,31 +733,13 @@ function workshop_count_all_submissions_for_assessment($workshop, $user) { } -function workshop_count_assessments($workshop, $stype, $user) { - // returns the number of assessments made by a user on either the student or teacher submissions - // the maxeditingtime is NOT taken into account here - - switch ($stype) { - case "student" : - $submissions = workshop_get_student_submissions($workshop); - break; - case "teacher" : - $submissions = workshop_get_teacher_submissions($workshop); - break; - } - $n = 0; - if ($submissions) { - foreach ($submissions as $submission) { - $n += count_records_select("workshop_assessments", "(submissionid = $submission->id) AND - (userid = $user->id)"); - } - } - return $n; - } - +function workshop_count_assessments($submission) { + // Return the assessments for this submission, + return count_records_select("workshop_assessments", "submissionid = $submission->id"); +} function workshop_count_comments($assessment) { - // Return the number comments for this assessment provided they are newer than the assessment, + // Return the number of comments for this assessment provided they are newer than the assessment, return count_records_select("workshop_comments", "(assessmentid = $assessment->id) AND timecreated > $assessment->timecreated"); } @@ -780,6 +765,22 @@ function workshop_count_peer_assessments($workshop, $user) { } +function workshop_count_self_assessments($workshop, $user) { + // returns the number of assessments made by user on their own submissions + + $n = 0; + if ($submissions = workshop_get_user_submissions($workshop, $user)) { + foreach ($submissions as $submission) { + if ($assessment = get_record_select("workshop_assessments", "userid = $user->id AND + submissionid = $submission->id")) { + $n++; + } + } + } + return $n; + } + + function workshop_count_student_submissions($workshop) { global $CFG; @@ -899,6 +900,37 @@ function workshop_count_ungraded_assessments_teacher($workshop) { } +function workshop_count_user_assessments($workshop, $user, $stype = "all") { + // returns the number of assessments made by a user, all of them, or just those for the student or teacher submissions + // the student's self assessments are included in the count + // the maxeditingtime is NOT taken into account here + + $n = 0; + if ($assessments = workshop_get_user_assessments($workshop, $user)) { + foreach ($assessments as $assessment) { + switch ($stype) { + case "all" : + $n++; + break; + case "student" : + $submission = get_record("workshop_submissions", "id", $assessment->submissionid); + if (isstudent($workshop->course, $submission->userid)) { + $n++; + } + break; + case "teacher" : + $submission = get_record("workshop_submissions", "id", $assessment->submissionid); + if (isteacher($workshop->course, $submission->userid)) { + $n++; + } + break; + } + } + } + return $n; + } + + function workshop_delete_submitted_files($workshop, $submission) { // Deletes the files in the workshop area for this submission @@ -1005,11 +1037,11 @@ function workshop_get_student_submissions($workshop, $order = "title") { // Return all ENROLLED student submissions global $CFG; - if ($order = "title") { + if ($order == "title") { $order = "s.title"; } if ($order == "name") { - $order = "firstname, lastname"; + $order = "a.firstname, a.lastname"; } return get_records_sql("SELECT s.* FROM {$CFG->prefix}workshop_submissions s, {$CFG->prefix}user_students u, {$CFG->prefix}user a @@ -1319,9 +1351,13 @@ function workshop_list_assessed_submissions($workshop, $user) { } else { // there's still time left to edit... $action = "id&sid=$submission->id\">". - get_string("edit", "workshop").""; + get_string("edit", "workshop")." | id&aid=$assessment->id\">". + get_string("delete", "workshop").""; } $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! + } // has teacher commented on user's assessment? if ($assessment->timegraded and ($timenow - $assessment->timegraded > $CFG->maxeditingtime)) { $comment .= "; ".get_string("gradedbyteacher", "workshop", $course->teacher); @@ -1365,7 +1401,8 @@ function workshop_list_peer_assessments($workshop, $user) { // get the assessments if ($assessments = workshop_get_assessments($submission)) { foreach ($assessments as $assessment) { - if (isstudent($workshop->course, $assessment->userid)) { // assessments by students only + // assessments by students only and exclude any self assessments + if (isstudent($workshop->course, $assessment->userid) and ($assessment->userid != $user->id)) { $timenow = time(); if (($timenow - $assessment->timecreated) > $CFG->maxeditingtime) { $action = "id&aid=$assessment->id&". @@ -1402,6 +1439,42 @@ function workshop_list_peer_assessments($workshop, $user) { +function workshop_list_self_assessments($workshop, $user) { + // list user's submissions for the user to assess + global $CFG; + + if (! $course = get_record("course", "id", $workshop->course)) { + error("Course is misconfigured"); + } + $table->head = array (get_string("title", "workshop"), get_string("action", "workshop"), get_string("comment", "workshop")); + $table->align = array ("LEFT", "LEFT", "LEFT"); + $table->size = array ("*", "*", "*"); + $table->cellpadding = 2; + $table->cellspacing = 0; + + // get the user's submissions + if ($submissions = workshop_get_user_submissions($workshop, $user)) { + foreach ($submissions as $submission) { + $comment = ""; + if (!$assessment = get_record_select("workshop_assessments", "submissionid = $submission->id AND + userid = $user->id")) { + if ($submission->userid == $user->id) { // this will always be true + $comment = get_string("ownwork", "workshop"); // just in case they don't know! + } + $action = "id&sid=$submission->id\">". + get_string("assess", "workshop").""; + $table->data[] = array(workshop_print_submission_title($workshop, $submission), $action, $comment); + } + } + } + if (isset($table->data)) { + echo "

".get_string("pleaseassessyoursubmissions", "workshop", $course->student). + "

\n"; + print_table($table); + } + } + + function workshop_list_student_submissions($workshop, $user) { // list available submissions for this user to assess, submissions with the least number // of assessments are show first @@ -1416,8 +1489,9 @@ function workshop_list_student_submissions($workshop, $user) { $table->cellpadding = 2; $table->cellspacing = 0; - // get the number of assessments this user has done - $nassessed = workshop_count_assessments($workshop, "student", $user); + // get the number of assessments this user has done on student submission, deduct self assessments + $nassessed = workshop_count_user_assessments($workshop, $user, "student") - + workshop_count_self_assessments($workshop, $user); // count the number of assessments for each student submission if ($submissions = workshop_get_student_submissions($workshop)) { @@ -1432,13 +1506,10 @@ function workshop_list_student_submissions($workshop, $user) { asort($nassessments); reset($nassessments); $nsassessments = $workshop->nsassessments; - if ($workshop->includeself) { // add one if self assessment flag is set - $nsassessments++; - } foreach ($nassessments as $submissionid =>$n) { $comment = ""; $submission = get_record("workshop_submissions", "id", $submissionid); - if (($submission->userid != $user->id) or $workshop->includeself) { + if ($submission->userid != $user->id) { // add if user has NOT already assessed this submission if (!$assessment = get_record_select("workshop_assessments", "submissionid = $submissionid AND userid = $user->id")) { @@ -1519,12 +1590,13 @@ function workshop_list_submissions_for_admin($workshop, $order) { unset($table); switch ($order) { case "title" : - $table->head = array (get_string("title", "workshop"), "id&order=name\">". - get_string("submittedby", "workshop")."", get_string("action", "workshop")); + $table->head = array("id&order=name\">". + get_string("submittedby", "workshop")."", get_string("title", "workshop"), get_string("action", "workshop")); break; case "name" : - $table->head = array ("id&order=title\">". - get_string("title", "workshop")."", get_string("submittedby", "workshop"), get_string("action", "workshop")); + $table->head = array (get_string("submittedby", "workshop"), + "id&order=title\">". + get_string("title", "workshop")."", get_string("action", "workshop")); break; } $table->align = array ("left", "left", "left"); @@ -1556,13 +1628,18 @@ function workshop_list_submissions_for_admin($workshop, $order) { $action .= " | id&sid=$submission->id\">". get_string("assess", "workshop").""; } - if ($assessments = workshop_get_assessments($submission)) { + if ($nassessments = workshop_count_assessments($submission)) { $action .= " | id&sid=$submission->id\">". - get_string("listassessments", "workshop").""; + get_string("listassessments", "workshop")." ($nassessments)"; + } + if ($nassessments = workshop_count_user_assessments($workshop, $user, "all")) { // has user assessed anything? + $action .= " | id&userid=$user->id\">". + get_string("liststudentsassessments", "workshop")." ($nassessments)"; } $action .= " | id&sid=$submission->id\">". get_string("delete", "workshop").""; - $table->data[] = array(workshop_print_submission_title($workshop, $submission), "$user->firstname $user->lastname", $action); + $table->data[] = array("$user->firstname $user->lastname", workshop_print_submission_title($workshop, $submission), + $action); } print_table($table); } @@ -1812,16 +1889,26 @@ function workshop_list_ungraded_assessments($workshop, $stype) { function workshop_list_user_submissions($workshop, $user) { - $table->head = array (get_string("title", "workshop"), get_string("submitted", "assignment"), get_string("assessments", "workshop")); - $table->align = array ("LEFT", "LEFT", "LEFT"); - $table->size = array ("*", "*", "*"); + $table->head = array (get_string("title", "workshop"), get_string("action", "workshop"), + get_string("submitted", "assignment"), get_string("assessments", "workshop")); + $table->align = array ("LEFT", "LEFT", "LEFT", "LEFT"); + $table->size = array ("*", "*", "*", "*"); $table->cellpadding = 2; $table->cellspacing = 0; if ($submissions = workshop_get_user_submissions($workshop, $user)) { foreach ($submissions as $submission) { - $n = count_records("workshop_assessments", "submissionid", $submission->id); - $table->data[] = array(workshop_print_submission_title($workshop, $submission), userdate($submission->timecreated), $n); + // allow user to delete submissions if there is more than one submission + if (count($submissions) > 1) { + $action = "id&sid=$submission->id\">". + get_string("delete", "workshop").""; + } + else { + $action = ''; + } + $n = count_records("workshop_assessments", "submissionid", $submission->id); + $table->data[] = array(workshop_print_submission_title($workshop, $submission), $action, + userdate($submission->timecreated), $n); } print_table($table); } @@ -2303,6 +2390,19 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges } +function workshop_print_assessments_by_user_for_admin($workshop, $user) { + + if ($assessments =workshop_get_user_assessments($workshop, $user)) { + foreach ($assessments as $assessment) { + echo "

".get_string("assessmentby", "workshop", $user->firstname." ".$user->lastname)."

\n"; + workshop_print_assessment($workshop, $assessment); + echo "

id&aid=$assessment->id\">". + get_string("delete", "workshop")."

\n"; + } + } + } + + function workshop_print_assessments_for_admin($workshop, $submission) { if ($assessments =workshop_get_assessments($submission)) { @@ -2421,31 +2521,89 @@ function workshop_print_submission_title($workshop, $submission) { } -function workshop_print_user_assessments($workshop, $user) { - // Returns the number of assessments and a hyperlinked list of grading grades for the assessments made by this user +function workshop_print_tabbed_heading($tabs) { +// Prints a tabbed heading where one of the tabs highlighted. +// $tabs is an object with several properties. +// $tabs->names is an array of tab names +// $tabs->urls is an array of links +// $tabs->align is an array of column alignments (defaults to "center") +// $tabs->size is an array of column sizes +// $tabs->wrap is an array of "nowrap"s or nothing +// $tabs->highlight is an index (zero based) of "active" heading . +// $tabs->width is an percentage of the page (defualts to 80%) +// $tabs->cellpadding padding on each cell (defaults to 5) - if ($assessments = workshop_get_user_assessments($workshop, $user)) { - $n = count($assessments); - $str = "$n ("; - foreach ($assessments as $assessment) { - if ($assessment->timegraded) { - $gradingscaled = intval($assessment->gradinggrade * $workshop->grade / COMMENTSCALE); - $str .= "id&aid=$assessment->id\">"; - $str .= "$gradingscaled "; - } - else { - $str .= "id&aid=$assessment->id\">"; - $str .= "- "; + global $CFG, $THEME; + + if (isset($tabs->names)) { + foreach ($tabs->names as $key => $name) { + if (!empty($tabs->urls[$key])) { + $url =$tabs->urls[$key]; + if ($tabs->highlight == $key) { + $tabcontents[$key] = "$name"; + } else { + $tabcontents[$key] = "$name"; } + } else { + $tabcontents[$key] = "$name"; + } + } + } + + if (empty($tabs->width)) { + $tabs->width = "80%"; + } + + if (empty($tabs->cellpadding)) { + $tabs->cellpadding = "5"; + } + + // print_simple_box_start("center", "$table->width", "#ffffff", 0); + echo "cellpadding\" cellspacing=\"0\" class=\"generaltable\">\n"; + + if (!empty($tabs->names)) { + echo ""; + echo "\n"; + foreach ($tabcontents as $key => $tab) { + if (isset($align[$key])) { + $alignment = "align=\"$align[$key]\""; + } else { + $alignment = "align=\"center\""; + } + if (isset($size[$key])) { + $width = "width=\"$size[$key]\""; + } else { + $width = ""; } - $str .= ")"; - } - else { - $str ="0"; - } - return $str; + if (isset($wrap[$key])) { + $wrapping = "no wrap"; + } else { + $wrapping = ""; + } + if ($key == $tabs->highlight) { + echo "\n"; + } else { + echo "\n"; + } + echo "\n"; + } + echo "\n"; + } else { + echo "\n"; } + // bottom stripe + $ncells = count($tabs->names)*2 +1; + $height = 2; + echo "\n"; + echo "
". + "wwwroot/pix/spacer.gif\" alt=\"\">cellheading2\">$tabbody\">$tab". + "wwwroot/pix/spacer.gif\" alt=\"\">
No names specified
cellheading2\">". + "wwwroot/pix/spacer.gif\" alt=\"\">
\n"; + // print_simple_box_end(); + return true; +} function workshop_print_time_to_deadline($time) { if ($time < 0) { @@ -2472,6 +2630,33 @@ function workshop_print_upload_form($workshop) { echo ""; } + +function workshop_print_user_assessments($workshop, $user) { + // Returns the number of assessments and a hyperlinked list of grading grades for the assessments made by this user + + if ($assessments = workshop_get_user_assessments($workshop, $user)) { + $n = count($assessments); + $str = "$n ("; + foreach ($assessments as $assessment) { + if ($assessment->timegraded) { + $gradingscaled = intval($assessment->gradinggrade * $workshop->grade / COMMENTSCALE); + $str .= "id&aid=$assessment->id\">"; + $str .= "$gradingscaled "; + } + else { + $str .= "id&aid=$assessment->id\">"; + $str .= "- "; + } + } + $str .= ")"; + } + else { + $str ="0"; + } + return $str; + } + + function workshop_test_user_assessments($workshop, $user) { // see if user has passed the required number of assessments of teachers submissions global $CFG; diff --git a/mod/workshop/submissions.php b/mod/workshop/submissions.php index f4b493f24c..6be55ac629 100644 --- a/mod/workshop/submissions.php +++ b/mod/workshop/submissions.php @@ -13,6 +13,8 @@ listallsubmissions listforassessmentstudent listforassessmentteacher + userconfirmdelete + userdelete ************************************************/ @@ -72,7 +74,7 @@ } - /******************* admin confirm delete ************************************/ + /******************* admin amend title ************************************/ if ($action == 'adminamendtitle' ) { if (!isteacher($course->id)) { @@ -115,7 +117,7 @@ error("Admin confirm delete: submission id missing"); } - notice_yesno(get_string("confirmdeletionofthisitem","workshop"), + notice_yesno(get_string("confirmdeletionofthisitem","workshop", get_string("submission", "workshop")), "submissions.php?action=admindelete&id=$cm->id&sid=$_GET[sid]", "submissions.php?id=$cm->id&action=adminlist"); } @@ -161,7 +163,7 @@ error("Only teachers can look at this page"); } if (empty($_GET['order'])) { - $order = "title"; + $order = "name"; } else { $order = $_GET['order']; @@ -867,6 +869,49 @@ } + /******************* user confirm delete ************************************/ + elseif ($action == 'userconfirmdelete' ) { + + if (empty($_GET['sid'])) { + error("User Confirm Delete: submission id missing"); + } + + notice_yesno(get_string("confirmdeletionofthisitem","workshop", get_string("submission", "workshop")), + "submissions.php?action=userdelete&id=$cm->id&sid=$_GET[sid]", "view.php?id=$cm->id"); + } + + + /******************* user delete ************************************/ + elseif ($action == 'userdelete' ) { + + if (empty($_GET['sid'])) { + error("User Delete: submission id missing"); + } + + if (!$submission = get_record("workshop_submissions", "id", $_GET['sid'])) { + error("User Delete: can not get submission record"); + } + print_string("deleting", "workshop"); + // first get any assessments... + if ($assessments = workshop_get_assessments($submission)) { + foreach($assessments as $assessment) { + // ...and all the associated records... + delete_records("workshop_comments", "assessmentid", $assessment->id); + delete_records("workshop_grades", "assessmentid", $assessment->id); + echo "."; + } + // ...now delete the assessments... + delete_records("workshop_assessments", "submissionid", $submission->id); + } + // ...and the submission record... + delete_records("workshop_submissions", "id", $submission->id); + // ..and finally the submitted file + workshop_delete_submitted_files($workshop, $submission); + + print_continue("view.php?id=$cm->id"); + } + + /*************** no man's land **************************************/ else { error("Fatal Error: Unknown Action: ".$action."\n"); diff --git a/mod/workshop/todo.txt b/mod/workshop/todo.txt index e153923bb6..b35c3d3024 100644 --- a/mod/workshop/todo.txt +++ b/mod/workshop/todo.txt @@ -11,15 +11,17 @@ Comments are seen by a third party, is this standard Moodle behaviour? Cron function should email something to the assessor when an assessment is agreed. -Self assessments may need special handling, remove duplication in student - view +Add a league table of submissions in the final phase for students. -Add student names to assessments and submissions for teachers. +--- -Add a league table of submissions in the final phase for students. +Self assessments may need special handling, remove duplication in student + view - Done + +Add student names to assessments and submissions for teachers - Done Ray Kingdon -17 June 2003 +28 July 2003 diff --git a/mod/workshop/view.php b/mod/workshop/view.php index 912f71bd5f..7c75d4a548 100644 --- a/mod/workshop/view.php +++ b/mod/workshop/view.php @@ -5,7 +5,6 @@ close workshop( for teachers) displayfinalgrade (for students) - makefinalgradesunavailable (for teachers) notavailable (for students) open workshop (for teachers) setupassignment (for teachers) @@ -101,15 +100,9 @@ error("Only teachers can look at this page"); } - // move phase along - if ($workshop->phase == 2) { // force phase to open workshop - set_field("workshop", "phase", 3, "id", "$workshop->id"); - echo "
".get_string("movedtophase", "workshop", 3)."
\n"; - add_to_log($course->id, "workshop", "close", "view.php?a=$workshop->id", "$workshop->id"); - } - - print_continue("view.php?a=$workshop->id"); - + // move tp phase 3 + set_field("workshop", "phase", 3, "id", "$workshop->id"); + redirect("view.php?a=$workshop->id", get_string("movingtophase", "workshop", 3)); } @@ -235,37 +228,12 @@ error("Only teachers can look at this page"); } - if ($workshop->phase == 3) { // is this at the expected phase? - set_field("workshop", "phase", 4, "id", "$workshop->id"); - echo "
".get_string("movedtophase", "workshop", 4)."
\n"; - } - else { - echo "
".get_string("assignmentnotinthecorrectphase", "workshop")."
\n"; - } - print_continue("view.php?a=$workshop->id"); + set_field("workshop", "phase", 4, "id", "$workshop->id"); + redirect("view.php?a=$workshop->id", get_string("movingtophase", "workshop", 4)); add_to_log($course->id, "workshop", "display grades", "view.php?a=$workshop->id", "$workshop->id"); } - /*********************** make final grades unavailable (for teachers only)**************/ - elseif ($action == 'makefinalgradesunavailable') { - - if (!isteacher($course->id)) { - error("Only teachers can look at this page"); - } - - if ($workshop->phase == 4) { // is this at the expected phase? - set_field("workshop", "phase", 3, "id", "$workshop->id"); - echo "
".get_string("movedtophase", "workshop", 3)."
\n"; - } - else { - echo "
".get_string("assignmentnotinthecorrectphase", "workshop")."
\n"; - } - print_continue("view.php?a=$workshop->id"); - add_to_log($course->id, "workshop", "hide grades", "view.php?a=$workshop->id", "$workshop->id"); - } - - /*********************** assignment not available (for students)***********************/ elseif ($action == 'notavailable') { echo "

".get_string("notavailable", "workshop")."
\n"; @@ -279,14 +247,9 @@ error("Only teachers can look at this page"); } - // move phase along - if (!($workshop->phase == 2)) { // force phase to open workshop - set_field("workshop", "phase", 2, "id", "$workshop->id"); - echo "
".get_string("movedtophase", "workshop", 2)."
\n"; - } - - print_continue("view.php?id=$cm->id"); - + // move to phase 2 + set_field("workshop", "phase", 2, "id", "$workshop->id"); + redirect("view.php?id=$cm->id", get_string("movingtophase", "workshop", 2)); add_to_log($course->id, "workshop", "open", "view.php?a=$workshop->id", "$workshop->id"); } @@ -298,14 +261,8 @@ error("Only teachers can look at this page"); } - if ($workshop->phase == 2) { // phase must be correct - set_field("workshop", "phase", 1, "id", "$workshop->id"); - echo "
".get_string("movedtophase", "workshop", 1)."
\n"; - } - else { - echo "
".get_string("assignmentnotinthecorrectphase", "workshop")."
\n"; - } - print_continue("view.php?a=$workshop->id"); + set_field("workshop", "phase", 1, "id", "$workshop->id"); + redirect("view.php?a=$workshop->id", get_string("movingtophase", "workshop", 1)); } @@ -354,17 +311,24 @@ print_heading(get_string("assessmentsby", "workshop", $course->teachers)); workshop_list_teacher_assessments($workshop, $USER); } + // is self assessment used in this workshop? + if ($workshop->includeself) { + // prints a table if there are any submissions which have not been self assessed yet + workshop_list_self_assessments($workshop, $USER); + } // if student assessments show any to assess... if ($workshop->nsassessments) { // if there are student assessments display them... workshop_list_student_submissions($workshop, $USER); - // ..and any they have already done... + } + // ..and any they have already done... + if (workshop_count_user_assessments($workshop, $USER, "student")) { print_heading(get_string("yourassessments", "workshop")); workshop_list_assessed_submissions($workshop, $USER); - // ... and show peer assessments - if (workshop_count_peer_assessments($workshop, $USER)) { - print_heading(get_string("assessmentsby", "workshop", $course->students)); - workshop_list_peer_assessments($workshop, $USER); - } + } + // ... and show peer assessments + if (workshop_count_peer_assessments($workshop, $USER)) { + print_heading(get_string("assessmentsby", "workshop", $course->students)); + workshop_list_peer_assessments($workshop, $USER); } // list previous submissions print_heading(get_string("submissions", "workshop")); @@ -376,8 +340,9 @@ workshop_print_upload_form($workshop); echo "
"; } - print_heading("id\">". - get_string("listofallsubmissions", "workshop")); + // allow user to list their submissions and assessments in a general way???? + // print_heading("id\">". + // get_string("listofallsubmissions", "workshop")); } } } @@ -432,63 +397,53 @@ } print_heading_with_help(get_string("managingassignment", "workshop"), "managing", "workshop"); + $tabs->names = array("1. ".get_string("phase1", "workshop"), "2. ".get_string("phase2", "workshop"), + "3. ".get_string("phase3", "workshop"), "4. ".get_string("phase4", "workshop")); + $tabs->urls = array("view.php?id=$cm->id&action=setupassignment", + "view.php?id=$cm->id&action=openworkshop", + "view.php?id=$cm->id&action=closeworkshop", + "view.php?id=$cm->id&action=makefinalgradesavailable"); + $tabs->highlight = $workshop->phase - 1; + workshop_print_tabbed_heading($tabs); echo "

\n"; switch ($workshop->phase) { case 0: case 1: // set up assignment - echo "".get_string("phase1", "workshop").""; - echo "

id&action=editelements\">". - get_string("amendassessmentelements", "workshop")."

"; - echo "

id&action=submitassignment\">". - get_string("submitexampleassignment", "workshop").""; - echo "

id&action=listforassessmentteacher\">". + print_heading("id&action=editelements\">". + get_string("amendassessmentelements", "workshop").""); + print_heading("id&action=submitassignment\">". + get_string("submitexampleassignment", "workshop").""); + print_heading("id&action=listforassessmentteacher\">". get_string("teachersubmissionsforassessment", "workshop", workshop_count_teacher_submissions_for_assessment($workshop, $USER)). - "

\n"; - echo "

id&action=openworkshop\">". - get_string("moveonto", "workshop")." ".get_string("phase2", "workshop", $course->student)."

"; + ""); break; case 2: // submissions and assessments - echo "".get_string("phase2", "workshop", $course->student).""; - echo "

id&action=listungradedteachersubmissions\">". - get_string("ungradedassessmentsofteachersubmissions", "workshop", workshop_count_ungraded_assessments_teacher($workshop))."\n"; - echo "

id&action=listungradedstudentsubmissions\">". - get_string("ungradedassessmentsofstudentsubmissions", "workshop", workshop_count_ungraded_assessments_student($workshop))."\n"; - echo "

id&action=listforassessmentstudent\">". - get_string("studentsubmissionsforassessment", "workshop", workshop_count_student_submissions_for_assessment($workshop, $USER)). - "\n"; - echo "

id&action=closeworkshop\">". - get_string("moveonto", "workshop")." ".get_string("phase3", "workshop")."

"; - echo "

[".get_string("deadlineis", "workshop", userdate($workshop->deadline))."]

\n"; - echo "

id&action=setupassignment\">(". - get_string("returnto", "workshop")." ".get_string("phase1", "workshop").")

"; + print_heading("id&action=listungradedteachersubmissions\">". + get_string("ungradedassessmentsofteachersubmissions", "workshop", workshop_count_ungraded_assessments_teacher($workshop)).""); + print_heading("id&action=listungradedstudentsubmissions\">". + get_string("ungradedassessmentsofstudentsubmissions", "workshop", workshop_count_ungraded_assessments_student($workshop)).""); + print_heading("id&action=listforassessmentstudent\">". + get_string("studentsubmissionsforassessment", "workshop", workshop_count_student_submissions_for_assessment($workshop, $USER)).""); break; case 3: // calculate final grades - echo "".get_string("phase3", "workshop").""; - echo "

id&action=listungradedstudentsubmissions\">". - get_string("ungradedassessmentsofstudentsubmissions", "workshop", workshop_count_ungraded_assessments_student($workshop))."\n"; - echo "

id&action=listforassessmentstudent\">". - get_string("studentsubmissionsforassessment", "workshop", workshop_count_student_submissions_for_assessment($workshop, $USER)). - "\n"; - echo "

id&action=displayfinalweights\">". - get_string("calculationoffinalgrades", "workshop")."

"; - echo "

id&action=makefinalgradesavailable\">". - get_string("moveonto", "workshop")." ".get_string("phase4", "workshop")."

"; - echo "

id&action=openworkshop\">(". - get_string("returnto", "workshop")." ".get_string("phase2", "workshop", $course->student).")

"; + print_heading("id&action=listungradedstudentsubmissions\">". + get_string("ungradedassessmentsofstudentsubmissions", "workshop", workshop_count_ungraded_assessments_student($workshop)).""); + print_heading("id&action=listforassessmentstudent\">". + get_string("studentsubmissionsforassessment", "workshop", workshop_count_student_submissions_for_assessment($workshop, $USER)).""); + print_heading("id&action=displayfinalweights\">". + get_string("calculationoffinalgrades", "workshop").""); break; case 4: // show final grades - echo "".get_string("phase4", "workshop").""; - echo "

id&action=displayfinalgrades\">". - get_string("displayoffinalgrades", "workshop")."

"; - echo "

id&action=makefinalgradesunavailable\">(". - get_string("returnto", "workshop")." ".get_string("phase3", "workshop").")

"; + print_heading("id&action=displayfinalgrades\">". + get_string("displayoffinalgrades", "workshop").""); } - echo "

id&action=adminlist\">". - get_string("listofallsubmissions", "workshop")."

\n"; + echo "

[".get_string("deadlineis", "workshop", userdate($workshop->deadline))."]

\n"; + print_heading("id&action=adminlist\">". + get_string("administration").""); } -- 2.39.5