From: rkingdon Date: Wed, 8 Oct 2003 18:15:22 +0000 (+0000) Subject: Cosmetic change to index.php list; Logging of phase changes in a workshop; tidy up... X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=1d23070249231a1442c4d288bce811129d4b9cf4;p=moodle.git Cosmetic change to index.php list; Logging of phase changes in a workshop; tidy up of log_display entries - thus the new version; --- diff --git a/mod/workshop/db/mysql.php b/mod/workshop/db/mysql.php index 7c222f3724..3253483027 100644 --- a/mod/workshop/db/mysql.php +++ b/mod/workshop/db/mysql.php @@ -7,12 +7,9 @@ function workshop_upgrade($oldversion) { global $CFG; if ($oldversion < 2003050400) { - execute_sql(" ALTER TABLE `{$CFG->prefix}workshop` CHANGE `graded` `agreeassessments` TINYINT(2) UNSIGNED DEFAULT '0' NOT NULL"); execute_sql(" ALTER TABLE `{$CFG->prefix}workshop` CHANGE `showgrades` `hidegrades` TINYINT(2) UNSIGNED DEFAULT '0' NOT NULL"); - execute_sql(" ALTER TABLE `{$CFG->prefix}workshop_assessments` ADD `timeagreed` INT(10) UNSIGNED DEFAULT '0' NOT NULL AFTER `timecreated`"); - execute_sql(" CREATE TABLE `{$CFG->prefix}workshop_comments` ( `id` int(10) unsigned NOT NULL auto_increment, @@ -26,13 +23,10 @@ function workshop_upgrade($oldversion) { PRIMARY KEY (`id`) ) COMMENT='Defines comments' "); - - } + } if ($oldversion < 2003051400) { - execute_sql(" ALTER TABLE `{$CFG->prefix}workshop` ADD `showleaguetable` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0' AFTER `gradingweight`"); - execute_sql(" CREATE TABLE `{$CFG->prefix}workshop_rubrics` ( `id` int(10) unsigned NOT NULL auto_increment, @@ -43,26 +37,35 @@ function workshop_upgrade($oldversion) { PRIMARY KEY (`id`) ) COMMENT='Info about the rubrics marking scheme' "); - - } + } if ($oldversion < 2003082200) { execute_sql(" ALTER TABLE `{$CFG->prefix}workshop_rubrics` CHANGE `elementid` `elementno` INT(10) UNSIGNED NOT NULL DEFAULT '0'"); - - } + } if ($oldversion < 2003092500) { - execute_sql(" ALTER TABLE `{$CFG->prefix}workshop` ADD `overallocation` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0' AFTER `nsassessments`"); - - } - if ($oldversion < 2003100200) { + } + + if ($oldversion < 2003100200) { execute_sql(" ALTER TABLE `{$CFG->prefix}workshop_assessments` ADD `resubmission` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0' AFTER `mailed`"); + } - } - + if ($oldversion < 2003100800) { + // tidy up log_display entries + execute_sql("DELETE FROM `{$CFG->prefix}log_display` WHERE `module` = 'workshop'"); + execute_sql("INSERT INTO `{$CFG->prefix}log_display` VALUES('workshop', 'assessments', 'workshop', 'name')"); + execute_sql("INSERT INTO `{$CFG->prefix}log_display` VALUES ('workshop', 'close', 'workshop', 'name')"); + execute_sql("INSERT INTO `{$CFG->prefix}log_display` VALUES ('workshop', 'display', 'workshop', 'name')"); + execute_sql("INSERT INTO `{$CFG->prefix}log_display` VALUES ('workshop', 'resubmit', 'workshop', 'name')"); + execute_sql("INSERT INTO `{$CFG->prefix}log_display` VALUES ('workshop', 'set up', 'workshop', 'name')"); + execute_sql("INSERT INTO `{$CFG->prefix}log_display` VALUES ('workshop', 'submissions', 'workshop', 'name')"); + execute_sql("INSERT INTO `{$CFG->prefix}log_display` VALUES ('workshop', 'view', 'workshop', 'name')"); + execute_sql("INSERT INTO `{$CFG->prefix}log_display` VALUES ('workshop', 'update', 'workshop', 'name')"); + } + return true; } diff --git a/mod/workshop/db/mysql.sql b/mod/workshop/db/mysql.sql index 27adbfd3f2..5c0bd39ab3 100644 --- a/mod/workshop/db/mysql.sql +++ b/mod/workshop/db/mysql.sql @@ -143,10 +143,12 @@ CREATE TABLE `prefix_workshop_comments` ( +INSERT INTO `prefix_log_display` VALUES ('workshop', 'assessments', 'workshop', 'name'); INSERT INTO `prefix_log_display` VALUES ('workshop', 'close', 'workshop', 'name'); -INSERT INTO `prefix_log_display` VALUES ('workshop', 'display grades', 'workshop', 'name'); -INSERT INTO `prefix_log_display` VALUES ('workshop', 'hide grades', 'workshop', 'name'); -INSERT INTO `prefix_log_display` VALUES ('workshop', 'open', 'workshop', 'name'); +INSERT INTO `prefix_log_display` VALUES ('workshop', 'display', 'workshop', 'name'); +INSERT INTO `prefix_log_display` VALUES ('workshop', 'resubmit', 'workshop', 'name'); +INSERT INTO `prefix_log_display` VALUES ('workshop', 'set up', 'workshop', 'name'); +INSERT INTO `prefix_log_display` VALUES ('workshop', 'submissions', 'workshop', 'name'); INSERT INTO `prefix_log_display` VALUES ('workshop', 'view', 'workshop', 'name'); INSERT INTO `prefix_log_display` VALUES ('workshop', 'update', 'workshop', 'name'); diff --git a/mod/workshop/index.php b/mod/workshop/index.php index 4a4d4be833..522041ba53 100644 --- a/mod/workshop/index.php +++ b/mod/workshop/index.php @@ -34,13 +34,13 @@ $timenow = time(); if ($course->format == "weeks") { - $table->head = array ($strweek, $strname, $strdeadline, $strsubmitted); + $table->head = array ($strweek, $strname, $strsubmitted, $strdeadline); $table->align = array ("CENTER", "LEFT", "LEFT", "LEFT"); - } else if ($course->format == "topics") { - $table->head = array ($strtopic, $strname, $strdeadline, $strsubmitted); + } elseif ($course->format == "topics") { + $table->head = array ($strtopic, $strname, $strsubmitted, $strdeadline); $table->align = array ("CENTER", "LEFT", "LEFT", "LEFT"); } else { - $table->head = array ($strname, $strdeadline, $strsubmitted); + $table->head = array ($strname, $strsubmitted, $strdeadline); $table->align = array ("LEFT", "LEFT", "LEFT"); } @@ -49,47 +49,47 @@ foreach ($submissions as $submission) { if ($submission->timecreated <= $workshop->deadline) { $submitted = userdate($submission->timecreated); - } + } else { $submitted = "".userdate($submission->timecreated).""; - } + } $due = userdate($workshop->deadline); - if (!$workshop->visible) { - //Show dimmed if the mod is hidden - $link = "coursemodule\">$workshop->name
". + if (!$workshop->visible) { + //Show dimmed if the mod is hidden + $link = "coursemodule\">$workshop->name
". "($submission->title)"; - } else { - //Show normal if the mod is visible - $link = "coursemodule\">$workshop->name
". + } else { + //Show normal if the mod is visible + $link = "coursemodule\">$workshop->name
". "($submission->title)"; - } + } if ($course->format == "weeks" or $course->format == "topics") { - $table->data[] = array ($workshop->section, $link, $due, $submitted); - } + $table->data[] = array ($workshop->section, $link, $submitted, $due); + } else { - $table->data[] = array ($link, $due, $submitted); - } + $table->data[] = array ($link, $submitted, $due); } } + } else { $submitted = get_string("no"); $due = userdate($workshop->deadline); - if (!$workshop->visible) { - //Show dimmed if the mod is hidden - $link = "coursemodule\">$workshop->name"; - } else { - //Show normal if the mod is visible - $link = "coursemodule\">$workshop->name"; - } + if (!$workshop->visible) { + //Show dimmed if the mod is hidden + $link = "coursemodule\">$workshop->name"; + } else { + //Show normal if the mod is visible + $link = "coursemodule\">$workshop->name"; + } if ($course->format == "weeks" or $course->format == "topics") { - $table->data[] = array ($workshop->section, $link, $due, $submitted); - } + $table->data[] = array ($workshop->section, $link, $submitted, $due); + } else { - $table->data[] = array ($link, $due, $submitted); - } + $table->data[] = array ($link, $submitted, $due); } } - echo "
"; + } + echo "
"; print_table($table); diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php index 1115a50f08..9c7f2315c0 100644 --- a/mod/workshop/lib.php +++ b/mod/workshop/lib.php @@ -3190,10 +3190,10 @@ function workshop_print_assignment_info($workshop) { if (! $course = get_record("course", "id", $workshop->course)) { error("Course is misconfigured"); - } + } if (! $cm = get_coursemodule_from_instance("workshop", $workshop->id, $course->id)) { error("Course Module ID was incorrect"); - } + } // print standard assignment heading $strdifference = format_time($workshop->deadline - time()); if (($workshop->deadline - time()) < 0) { @@ -3495,10 +3495,17 @@ function workshop_print_time_to_deadline($time) { function workshop_print_upload_form($workshop) { // Arguments are objects, needs title coming in + if (! $course = get_record("course", "id", $workshop->course)) { + error("Course is misconfigured"); + } + if (! $cm = get_coursemodule_from_instance("workshop", $workshop->id, $course->id)) { + error("Course Module ID was incorrect"); + } + echo "
"; echo "
"; echo " maxbytes\">"; - echo " id\">"; + echo " id\">"; echo "".get_string("title", "workshop").":

\n"; echo " "; echo " "; diff --git a/mod/workshop/upload.php b/mod/workshop/upload.php index 4f997dcade..a63a51ad60 100644 --- a/mod/workshop/upload.php +++ b/mod/workshop/upload.php @@ -3,21 +3,25 @@ require("../../config.php"); require("lib.php"); - require_variable($a); // workshop ID + require_variable($id); // CM ID $newfile = $HTTP_POST_FILES["newfile"]; - if (! $workshop = get_record("workshop", "id", $a)) { - error("Not a valid workshop ID"); + if (! $cm = get_record("course_modules", "id", $id)) { + error("Course Module ID was incorrect"); } - if (! $course = get_record("course", "id", $workshop->course)) { + if (! $course = get_record("course", "id", $cm->course)) { error("Course is misconfigured"); } + if (! $workshop = get_record("workshop", "id", $cm->instance)) { + error("Course module is incorrect"); + } + require_login($course->id); - add_to_log($course->id, "workshop", "submit", "view.php?a=$workshop->id", "$workshop->id"); + add_to_log($course->id, "workshop", "submit", "view.php?id=$cm->id", "$workshop->id"); if ($course->category) { $navigation = "id\">$course->shortname ->"; @@ -73,7 +77,6 @@ if ($assessments = workshop_get_assessments($submission, 'ALL')) { foreach ($assessments as $assessment) { if ($assessment->timecreated < $timenow) { - echo "Copying $assessment->id ...
"; // a Cold or Warm assessment - copy it with feedback.. $newassessment = workshop_copy_assessment($assessment, $newsubmission, true); @@ -87,7 +90,7 @@ } } } - add_to_log($course->id, "workshop", "resubmit", "view.php?a=$workshop->id", + add_to_log($course->id, "workshop", "resubmit", "view.php?id=$cm->id", "$workshop->id"); } if (! $dir = workshop_file_area($workshop, $newsubmission)) { diff --git a/mod/workshop/version.php b/mod/workshop/version.php index 85f6088f6a..7551b750ab 100644 --- a/mod/workshop/version.php +++ b/mod/workshop/version.php @@ -5,7 +5,7 @@ // This fragment is called by /admin/index.php //////////////////////////////////////////////////////////////////////////////// -$module->version = 2003100200; +$module->version = 2003100800; $module->cron = 60; ?> diff --git a/mod/workshop/view.php b/mod/workshop/view.php index 67e21bd538..041d41a157 100644 --- a/mod/workshop/view.php +++ b/mod/workshop/view.php @@ -71,16 +71,16 @@ // has the assignment any elements if (count_records("workshop_elements", "workshopid", $workshop->id)) { $action = "teachersview"; - } + } else { - redirect("assessments.php?action=editelements&id=$cm->id"); - } + redirect("assessments.php?action=editelements&id=$cm->id"); } } + } elseif (!isguest()) { // it's a student then if (!$cm->visible) { notice(get_string("activityiscurrentlyhidden")); - } + } switch ($workshop->phase) { case 0 : case 1 : $action = 'notavailable'; break; @@ -88,11 +88,11 @@ case 3: $action = 'studentsview'; break; case 4 : $action = 'notavailable'; break; case 5 : $action = 'displayfinalgrade'; - } } + } else { // it's a guest, oh no! $action = 'notavailable'; - } + } /************** allow peer assessments (move to phase 3) (for teachers)**/ @@ -100,12 +100,13 @@ if (!isteacher($course->id)) { error("Only teachers can look at this page"); - } + } - // move tp phase 3 + // move to phase 3 set_field("workshop", "phase", 3, "id", "$workshop->id"); + add_to_log($course->id, "workshop", "assessments", "view.php?id=$cm->id", "$workshop->id"); redirect("view.php?a=$workshop->id", get_string("movingtophase", "workshop", 3)); - } + } /****************** close workshop for student assessments/submissions (move to phase 4) (for teachers)**/ @@ -113,12 +114,13 @@ if (!isteacher($course->id)) { error("Only teachers can look at this page"); - } + } - // move tp phase 4 + // move to phase 4 set_field("workshop", "phase", 4, "id", "$workshop->id"); + add_to_log($course->id, "workshop", "close", "view.php?id=$cm->id", "$workshop->id"); redirect("view.php?a=$workshop->id", get_string("movingtophase", "workshop", 4)); - } + } /****************** display final grade (for students) ************************************/ @@ -135,38 +137,38 @@ // teacher grades? if ($workshop->gradingstrategy and $teacherweight) { $useteachersgrades = 1; - } + } else { $useteachersgrades = 0; - } + } // peergrades? if ($workshop->gradingstrategy and $workshop->nsassessments and $peerweight) { $usepeergrades = 1; - } + } else { $usepeergrades = 0; - } + } // bias grades? if ((($workshop->ntassessments >= 3) or ($workshop->nsassessments >= 3)) and $biasweight ) { $usebiasgrades = 1; - } + } else { $usebiasgrades = 0; - } + } // reliability grades? if ((($workshop->ntassessments >= 3) or ($workshop->nsassessments >= 3)) and $reliabilityweight ) { $usereliabilitygrades = 1; - } + } else { $usereliabilitygrades = 0; - } + } // grading grades? if (($workshop->ntassessments or $workshop->nsassessments) and $gradingweight ) { $usegradinggrades = 1; - } + } else { $usegradinggrades = 0; - } + } // show the final grades as stored in the tables... print_heading_with_help(get_string("displayoffinalgrades", "workshop"), "finalgrades", "workshop"); @@ -176,70 +178,70 @@ if ($useteachersgrades) { echo "".get_string("teacherassessments", "workshop", $course->teacher).""; - } + } if ($usepeergrades) { echo "".get_string("studentassessments", "workshop", $course->student).""; - } + } echo "".get_string("assessmentsdone", "workshop").""; if ($usebiasgrades) { echo "".get_string("gradeforbias", "workshop").""; - } + } if ($usereliabilitygrades) { echo "".get_string("gradeforreliability", "workshop").""; - } + } if ($usegradinggrades) { echo "".get_string("gradeforassessments", "workshop").""; - } + } echo "".get_string("overallgrade", "workshop")."\n"; // now the weights echo "".get_string("weights", "workshop").""; if ($useteachersgrades) { echo "$WORKSHOP_FWEIGHTS[$teacherweight]\n"; - } + } if ($usepeergrades) { echo "$WORKSHOP_FWEIGHTS[$peerweight]\n"; - } + } echo " \n"; if ($usebiasgrades) { echo "$WORKSHOP_FWEIGHTS[$biasweight]\n"; - } + } if ($usereliabilitygrades) { echo "$WORKSHOP_FWEIGHTS[$reliabilityweight]\n"; - } + } if ($usegradinggrades) { echo "$WORKSHOP_FWEIGHTS[$gradingweight]\n"; - } + } echo " \n"; foreach ($submissions as $submission) { echo "".workshop_print_submission_title($workshop, $submission)."\n"; if ($useteachersgrades) { echo "".workshop_print_submission_assessments($workshop, $submission, "teacher").""; - } + } if ($usepeergrades) { echo "".workshop_print_submission_assessments($workshop, $submission, "student").""; - } + } echo "".workshop_print_user_assessments($workshop, $USER).""; if ($usebiasgrades) { echo "$submission->biasgrade"; - } + } if ($usereliabilitygrades) { echo "$submission->reliabilitygrade"; - } + } if ($usegradinggrades) { echo "$submission->gradinggrade"; - } - echo "$submission->finalgrade\n"; } + echo "$submission->finalgrade\n"; } + } echo "
\n"; if ($workshop->showleaguetable) { workshop_print_league_table($workshop); - } + } echo "
".get_string("allgradeshaveamaximumof", "workshop", $workshop->grade); - } + } /****************** make final grades available (for teachers only)**************/ @@ -247,18 +249,18 @@ if (!isteacher($course->id)) { error("Only teachers can look at this page"); - } + } set_field("workshop", "phase", 5, "id", "$workshop->id"); + add_to_log($course->id, "workshop", "display", "view.php?id=$cm->id", "$workshop->id"); redirect("view.php?a=$workshop->id", get_string("movingtophase", "workshop", 5)); - add_to_log($course->id, "workshop", "display grades", "view.php?a=$workshop->id", "$workshop->id"); - } + } /****************** assignment not available (for students)***********************/ elseif ($action == 'notavailable') { print_heading(get_string("notavailable", "workshop")); - } + } /****************** open workshop for student assessments (move to phase 2) (for teachers)**/ @@ -266,18 +268,18 @@ if (!isteacher($course->id)) { error("Only teachers can look at this page"); - } + } // move to phase 2, check that teacher has made enough submissions if (workshop_count_teacher_submissions($workshop) < $workshop->ntassessments) { redirect("view.php?id=$cm->id", get_string("notenoughexamplessubmitted", "workshop", $course->teacher)); - } + } else { set_field("workshop", "phase", 2, "id", "$workshop->id"); + add_to_log($course->id, "workshop", "submissions", "view.php?id=$cm->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"); - } } + } /****************** set up assignment (move back to phase 1) (for teachers)***********************/ @@ -285,11 +287,12 @@ if (!isteacher($course->id)) { error("Only teachers can look at this page"); - } + } set_field("workshop", "phase", 1, "id", "$workshop->id"); + add_to_log($course->id, "workshop", "set up", "view.php?id=$cm->id", "$workshop->id"); redirect("view.php?a=$workshop->id", get_string("movingtophase", "workshop", 1)); - } + } /****************** student's view could be in 1 of 4 stages ***********************/ @@ -301,7 +304,7 @@ print_heading(get_string("pleaseassesstheseexamplesfromtheteacher", "workshop", $course->teacher)); workshop_list_teacher_submissions($workshop, $USER); - } + } // in stage 2? - submit own first attempt else { if ($workshop->ntassessments) { @@ -309,7 +312,7 @@ print_heading(get_string("yourassessmentsofexamplesfromtheteacher", "workshop", $course->teacher)); workshop_list_teacher_submissions($workshop, $USER); - } + } if (!workshop_get_user_submissions($workshop, $USER)) { // print upload form print_heading(get_string("submitassignmentusingform", "workshop").":"); @@ -321,16 +324,16 @@ if (workshop_count_teacher_assessments($workshop, $USER)) { 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 peer assessments are being done and workshop is in phase 3 then show some to assess... if ($workshop->nsassessments and ($workshop->phase == 3)) { workshop_list_student_submissions($workshop, $USER); - } + } // ..and any they have already done (and have gone cold)... if (workshop_count_user_assessments($workshop, $USER, "student")) { print_heading(get_string("yourassessments", "workshop")); @@ -340,7 +343,7 @@ 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")); workshop_list_user_submissions($workshop, $USER); @@ -374,7 +377,7 @@ if (!isteacher($course->id)) { error("Only teachers can look at this page"); - } + } $strdifference = format_time($workshop->deadline - time()); if (($workshop->deadline - time()) < 0) { @@ -392,7 +395,7 @@ // print upload form print_heading(get_string("submitassignment", "assignment").":"); workshop_print_upload_form($workshop); - } + } /****************** teacher's view - display admin page (current phase options) ************/ @@ -418,9 +421,9 @@ "view.php?id=$cm->id&action=makefinalgradesavailable"); if ($workshop->phase) { // phase 1 or more $tabs->highlight = $workshop->phase - 1; - } else { + } else { $tabs->highlight = 0; // phase is zero - } + } workshop_print_tabbed_heading($tabs); echo "
\n"; switch ($workshop->phase) { @@ -441,7 +444,7 @@ " \n"; helpbutton("assessmentofexamples", get_string("teachersubmissionsforassessment", "workshop"), "workshop"); - } + } break; case 2: // submissions and assessments @@ -493,7 +496,7 @@ } print_heading("id&action=adminlist\">". get_string("administration").""); - } + } /*************** no man's land **************************************/