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,
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,
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;
}
$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");
}
foreach ($submissions as $submission) {
if ($submission->timecreated <= $workshop->deadline) {
$submitted = userdate($submission->timecreated);
- }
+ }
else {
$submitted = "<FONT COLOR=red>".userdate($submission->timecreated)."</FONT>";
- }
+ }
$due = userdate($workshop->deadline);
- if (!$workshop->visible) {
- //Show dimmed if the mod is hidden
- $link = "<A class=\"dimmed\" HREF=\"view.php?id=$workshop->coursemodule\">$workshop->name</A><BR>".
+ if (!$workshop->visible) {
+ //Show dimmed if the mod is hidden
+ $link = "<A class=\"dimmed\" HREF=\"view.php?id=$workshop->coursemodule\">$workshop->name</A><br />".
"($submission->title)";
- } else {
- //Show normal if the mod is visible
- $link = "<A HREF=\"view.php?id=$workshop->coursemodule\">$workshop->name</A><BR>".
+ } else {
+ //Show normal if the mod is visible
+ $link = "<A HREF=\"view.php?id=$workshop->coursemodule\">$workshop->name</A><br />".
"($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 = "<A class=\"dimmed\" HREF=\"view.php?id=$workshop->coursemodule\">$workshop->name</A>";
- } else {
- //Show normal if the mod is visible
-
$link = "<A HREF=\"view.php?id=$workshop->coursemodule\">$workshop->name</A>";
- }
+ if (!$workshop->visible) {
+ //Show dimmed if the mod is hidden
+ $link = "<A class=\"dimmed\" HREF=\"view.php?id=$workshop->coursemodule\">$workshop->name</A>";
+ } else {
+ //Show normal if the mod is visible
+ $link = "<A HREF=\"view.php?id=$workshop->coursemodule\">$workshop->name</A>";
+ }
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 "<BR>";
+ }
+ echo "<br />";
print_table($table);
// 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;
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)**/
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)**/
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) ************************************/
// 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");
if ($useteachersgrades) {
echo "<td align=\"center\"><b>".get_string("teacherassessments", "workshop",
$course->teacher)."</b></td>";
- }
+ }
if ($usepeergrades) {
echo "<td align=\"center\"><b>".get_string("studentassessments", "workshop",
$course->student)."</b></td>";
- }
+ }
echo "<td align=\"center\"><b>".get_string("assessmentsdone", "workshop")."</b></td>";
if ($usebiasgrades) {
echo "<td align=\"center\"><b>".get_string("gradeforbias", "workshop")."</b></td>";
- }
+ }
if ($usereliabilitygrades) {
echo "<td align=\"center\"><b>".get_string("gradeforreliability", "workshop")."</b></td>";
- }
+ }
if ($usegradinggrades) {
echo "<td align=\"center\"><b>".get_string("gradeforassessments", "workshop")."</b></td>";
- }
+ }
echo "<td align=\"center\"><b>".get_string("overallgrade", "workshop")."</b></td></TR>\n";
// now the weights
echo "<TR><td><b>".get_string("weights", "workshop")."</b></td>";
if ($useteachersgrades) {
echo "<td align=\"center\"><b>$WORKSHOP_FWEIGHTS[$teacherweight]</b></td>\n";
- }
+ }
if ($usepeergrades) {
echo "<td align=\"center\"><b>$WORKSHOP_FWEIGHTS[$peerweight]</b></td>\n";
- }
+ }
echo "<td><b> </b></td>\n";
if ($usebiasgrades) {
echo "<td align=\"center\"><b>$WORKSHOP_FWEIGHTS[$biasweight]</b></td>\n";
- }
+ }
if ($usereliabilitygrades) {
echo "<td align=\"center\"><b>$WORKSHOP_FWEIGHTS[$reliabilityweight]</b></td>\n";
- }
+ }
if ($usegradinggrades) {
echo "<td align=\"center\"><b>$WORKSHOP_FWEIGHTS[$gradingweight]</b></td>\n";
- }
+ }
echo "<td><b> </b></td></TR>\n";
foreach ($submissions as $submission) {
echo "<TR><td>".workshop_print_submission_title($workshop, $submission)."</td>\n";
if ($useteachersgrades) {
echo "<td align=\"center\">".workshop_print_submission_assessments($workshop,
$submission, "teacher")."</td>";
- }
+ }
if ($usepeergrades) {
echo "<td align=\"center\">".workshop_print_submission_assessments($workshop,
$submission, "student")."</td>";
- }
+ }
echo "<td align=\"center\">".workshop_print_user_assessments($workshop, $USER)."</td>";
if ($usebiasgrades) {
echo "<td align=\"center\">$submission->biasgrade</td>";
- }
+ }
if ($usereliabilitygrades) {
echo "<td align=\"center\">$submission->reliabilitygrade</td>";
- }
+ }
if ($usegradinggrades) {
echo "<td align=\"center\">$submission->gradinggrade</td>";
- }
- echo "<td align=\"center\">$submission->finalgrade</td></TR>\n";
}
+ echo "<td align=\"center\">$submission->finalgrade</td></TR>\n";
}
+ }
echo "</TABLE><BR CLEAR=ALL>\n";
if ($workshop->showleaguetable) {
workshop_print_league_table($workshop);
- }
+ }
echo "<br />".get_string("allgradeshaveamaximumof", "workshop", $workshop->grade);
- }\r
+ }
/****************** make final grades available (for teachers only)**************/
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)**/
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)***********************/
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 ***********************/
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) {
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").":");
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"));
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);
if (!isteacher($course->id)) {
error("Only teachers can look at this page");
- }
+ }
$strdifference = format_time($workshop->deadline - time());
if (($workshop->deadline - time()) < 0) {
// print upload form
print_heading(get_string("submitassignment", "assignment").":");
workshop_print_upload_form($workshop);
- }
+ }
/****************** teacher's view - display admin page (current phase options) ************/
"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 "<center>\n";
switch ($workshop->phase) {
"</a></b> \n";
helpbutton("assessmentofexamples", get_string("teachersubmissionsforassessment",
"workshop"), "workshop");
- }
+ }
break;
case 2: // submissions and assessments
}
print_heading("<A HREF=\"submissions.php?id=$cm->id&action=adminlist\">".
get_string("administration")."</A>");
- }
+ }
/*************** no man's land **************************************/
projects / moodle.git / commitdiff