From: rkingdon Date: Wed, 27 Aug 2003 15:39:21 +0000 (+0000) Subject: Addition of Mail strings to cron routine; More help in admin page; bug X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=41b12a791ba140522a67a081521a351a4dfec904;p=moodle.git Addition of Mail strings to cron routine; More help in admin page; bug clearance. --- diff --git a/mod/workshop/assessments.php b/mod/workshop/assessments.php index bc75104cd5..8fc0d5dce0 100644 --- a/mod/workshop/assessments.php +++ b/mod/workshop/assessments.php @@ -60,7 +60,7 @@ } require_login($course->id); - + $navigation = ""; if ($course->category) { $navigation = "id\">$course->shortname ->"; diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php index 69c72808a1..6c25ff0585 100644 --- a/mod/workshop/lib.php +++ b/mod/workshop/lib.php @@ -252,8 +252,8 @@ function workshop_cron () { // it's an assessment, tell the submission owner $USER->lang = $submissionowner->lang; $sendto = $submissionowner; - // "Your assignment \"$submission->title\" has been assessed." - $msg = get_string("mail1", "workshop", $submission->title)."\n". + // "Your assignment \"$submission->title\" has been assessed by" + $msg = get_string("mail1", "workshop", $submission->title)." $assessmentowner->firstname $assessmentowner->lastname.\n"; // "The comments and grade can be seen in the workshop assignment '$workshop->name' $msg .= get_string("mail2", "workshop", $workshop->name)."\n\n"; @@ -261,7 +261,7 @@ function workshop_cron () { $posttext = "$course->shortname -> $strworkshops -> $workshop->name\n"; $posttext .= "---------------------------------------------------------------------\n"; $posttext .= $msg; - // "You can see it in your workshop assignment + // "You can see it in your workshop assignment" $posttext .= get_string("mail3", "workshop").":\n"; $posttext .= " $CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\n"; $posttext .= "---------------------------------------------------------------------\n"; @@ -272,8 +272,8 @@ function workshop_cron () { "wwwroot/mod/workshop/view.php?a=$workshop->id\">$workshop->name

"; $posthtml .= "
"; $posthtml .= "

$msg

"; - $posthtml .= "

You can see it wwwroot/mod/workshop/view.php?a=$workshop->id\">"; - $posthtml .= "in your workshop assignment.

"; + $posthtml .= "

".get_string("mail3", "workshop"). + " wwwroot/mod/workshop/view.php?a=$workshop->id\">$workshop->name.

"; } else { $posthtml = ""; } @@ -336,15 +336,17 @@ function workshop_cron () { if ($comment->userid != $submission->userid) { $USER->lang = $submissionowner->lang; $sendto = $submissionowner; - $msg = "A comment has been added to the assignment \"$submission->title\".\n". - "The new comment can be seen in ". - "the workshop assignment '$workshop->name'\n\n"; + // "A comment has been added to the assignment \"$submission->title\" by + $msg = get_string("mail4", "workshop", $submission->title)." $assessmentowner->firstname $assessmentowner->lastname.\n"; + // "The new comment can be seen in the workshop assignment '$workshop->name' + $msg .= get_string("mail5", "workshop", $workshop->name)."\n\n"; $postsubject = "$course->shortname: $strworkshops: $workshop->name"; $posttext = "$course->shortname -> $strworkshops -> $workshop->name\n"; $posttext .= "---------------------------------------------------------------------\n"; $posttext .= $msg; - $posttext .= "You can see it in your workshop assignment:\n"; + // "You can see it in your workshop assignment" + $posttext .= get_string("mail3", "workshop").":\n"; $posttext .= " $CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\n"; $posttext .= "---------------------------------------------------------------------\n"; if ($sendto->mailformat == 1) { // HTML @@ -354,8 +356,8 @@ function workshop_cron () { "wwwroot/mod/workshop/view.php?a=$workshop->id\">$workshop->name

"; $posthtml .= "
"; $posthtml .= "

$msg

"; - $posthtml .= "

You can see it wwwroot/mod/workshop/view.php?a=$workshop->id\">"; - $posthtml .= "in your workshop assignment.

"; + $posthtml .= "

".get_string("mail3", "workshop"). + " wwwroot/mod/workshop/view.php?a=$workshop->id\">$workshop->name.

"; } else { $posthtml = ""; @@ -376,15 +378,17 @@ function workshop_cron () { if ($comment->userid != $assessment->userid) { $USER->lang = $assessmentowner->lang; $sendto = $assessmentowner; - $msg = "A comment has been added to the assignment \"$submission->title\".\n". - "The new comment can be seen in ". - "the workshop assignment '$workshop->name'\n\n"; + // "A comment has been added to the assignment \"$submission->title\" by + $msg = get_string("mail4", "workshop", $submission->title)." $submissionowner->firstname $submissionowner->lastname.\n"; + // "The new comment can be seen in the workshop assignment '$workshop->name' + $msg .= get_string("mail5", "workshop", $workshop->name)."\n\n"; $postsubject = "$course->shortname: $strworkshops: $workshop->name"; $posttext = "$course->shortname -> $strworkshops -> $workshop->name\n"; $posttext .= "---------------------------------------------------------------------\n"; $posttext .= $msg; - $posttext .= "You can see it in your workshop assignment:\n"; + // "You can see it in your workshop assignment" + $posttext .= get_string("mail3", "workshop").":\n"; $posttext .= " $CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\n"; $posttext .= "---------------------------------------------------------------------\n"; if ($sendto->mailformat == 1) { // HTML @@ -394,8 +398,8 @@ function workshop_cron () { "wwwroot/mod/workshop/view.php?a=$workshop->id\">$workshop->name

"; $posthtml .= "
"; $posthtml .= "

$msg

"; - $posthtml .= "

You can see it wwwroot/mod/workshop/view.php?a=$workshop->id\">"; - $posthtml .= "in your workshop assignment.

"; + $posthtml .= "

".get_string("mail3", "workshop"). + " wwwroot/mod/workshop/view.php?a=$workshop->id\">$workshop->name.

"; } else { $posthtml = ""; @@ -463,26 +467,28 @@ function workshop_cron () { // it's a grading tell the assessment owner $USER->lang = $assessmentowner->lang; $sendto = $assessmentowner; - $msg = "Your assessment of the assignment \"$submission->title\" has by graded.\n". - "The comments and grade given by the $course->teacher can be seen in ". - "the workshop assignment '$workshop->name'\n\n"; + // Your assessment of the assignment \"$submission->title\" has by reviewed + $msg = get_string("mail6", "workshop", $submission->title).".\n"; + // The comments given by the $course->teacher can be seen in the Workshop Assignment + $msg .= get_string("mail7", "workshop", $course->teacher)." '$workshop->name'.\n\n"; $postsubject = "$course->shortname: $strworkshops: $workshop->name"; $posttext = "$course->shortname -> $strworkshops -> $workshop->name\n"; $posttext .= "---------------------------------------------------------------------\n"; $posttext .= $msg; - $posttext .= "You can see it in your workshop assignment:\n"; - $posttext .= " $CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\n"; + // "You can see it in your workshop assignment" + $posttext .= get_string("mail3", "workshop").":\n"; + $posttext .= " $CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\n"; $posttext .= "---------------------------------------------------------------------\n"; if ($sendto->mailformat == 1) { // HTML - $posthtml = "

". - "wwwroot/course/view.php?id=$course->id\">$course->shortname ->". - "wwwroot/mod/workshop/index.php?id=$course->id\">$strworkshops ->". - "wwwroot/mod/workshop/view.php?a=$workshop->id\">$workshop->name

"; - $posthtml .= "
"; - $posthtml .= "

$msg

"; - $posthtml .= "

You can see it wwwroot/mod/workshop/view.php?a=$workshop->id\">"; - $posthtml .= "in your workshop assignment.

"; + $posthtml = "

". + "wwwroot/course/view.php?id=$course->id\">$course->shortname ->". + "wwwroot/mod/workshop/index.php?id=$course->id\">$strworkshops ->". + "wwwroot/mod/workshop/view.php?a=$workshop->id\">$workshop->name

"; + $posthtml .= "
"; + $posthtml .= "

$msg

"; + $posthtml .= "

".get_string("mail3", "workshop"). + " wwwroot/mod/workshop/view.php?a=$workshop->id\">$workshop->name.

"; } else { $posthtml = ""; } @@ -701,6 +707,7 @@ 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_assignment_info($workshop) { function workshop_print_difference($time) { function workshop_print_feedback($course, $submission) { function workshop_print_league_table($workshop) { @@ -1587,25 +1594,7 @@ function workshop_list_submissions_for_admin($workshop, $order) { error("Course Module ID was incorrect"); } - // print standard assignment "header" - $strdifference = format_time($workshop->deadline - time()); - if (($workshop->deadline - time()) < 0) { - $strdifference = "$strdifference"; - } - $strduedate = userdate($workshop->deadline)." ($strdifference)"; - print_simple_box_start("CENTER"); - print_heading($workshop->name, "CENTER"); - print_simple_box_start("CENTER"); - echo "".get_string("duedate", "assignment").": $strduedate
"; - echo "".get_string("maximumgrade").": $workshop->grade
"; - echo "".get_string("detailsofassessment", "workshop").": - id&action=displaygradingform\">". - get_string("specimenassessmentform", "workshop")."
"; - print_simple_box_end(); - echo "
"; - echo format_text($workshop->description, $workshop->format); - print_simple_box_end(); - echo "
"; + workshop_print_assignment_info($workshop); // list any teacher submissions $table->head = array (get_string("title", "workshop"), get_string("submittedby", "workshop"), get_string("action", "workshop")); @@ -1723,7 +1712,7 @@ function workshop_list_submissions_for_admin($workshop, $order) { AND userid = $USER->id")) { $curtime = time(); if (($curtime - $assessment->timecreated) > $CFG->maxeditingtime) { - $action .= " | id&aid=$assessment->id\">". + $action .= " | id&sid=$submission->id\">". get_string("reassess", "workshop").""; } else { // there's still time left to edit... @@ -2603,6 +2592,23 @@ function workshop_print_assessments_for_admin($workshop, $submission) { } +function workshop_print_assignment_info($workshop) { + print_simple_box_start("center"); + print_heading($workshop->name); + print_simple_box_start("center"); + echo "".get_string("duedate", "assignment").": $strduedate
"; + echo "".get_string("maximumgrade").": $workshop->grade
"; + echo "".get_string("detailsofassessment", "workshop").": + id&action=displaygradingform\">". + get_string("specimenassessmentform", "workshop")."
"; + print_simple_box_end(); + echo "
"; + echo format_text($workshop->description, $workshop->format); + print_simple_box_end(); + echo "
"; + } + + function workshop_print_difference($time) { if ($time < 0) { $timetext = get_string("late", "assignment", format_time($time)); diff --git a/mod/workshop/mod.html b/mod/workshop/mod.html index 14a82d2a24..822eabfa75 100644 --- a/mod/workshop/mod.html +++ b/mod/workshop/mod.html @@ -109,7 +109,7 @@

:

- + =0; $i--) { $numbers[$i] = $i; diff --git a/mod/workshop/view.php b/mod/workshop/view.php index 1fc764de89..54cf52ad7c 100644 --- a/mod/workshop/view.php +++ b/mod/workshop/view.php @@ -236,7 +236,7 @@ /*********************** assignment not available (for students)***********************/ elseif ($action == 'notavailable') { - echo "

".get_string("notavailable", "workshop")."
\n"; + print_heading(get_string("notavailable", "workshop")); } @@ -352,46 +352,28 @@ } - /*********************** submission of assignment by a student/teacher ***********************/ + /*********************** submission of assignment by teacher only***********************/ elseif ($action == 'submitassignment') { + + if (!isteacher($course->id)) { + error("Only teachers can look at this page"); + } + $strdifference = format_time($workshop->deadline - time()); if (($workshop->deadline - time()) < 0) { $strdifference = "$strdifference"; } $strduedate = userdate($workshop->deadline)." ($strdifference)"; - print_simple_box_start("CENTER"); - print_heading($workshop->name, "CENTER"); - print_simple_box_start("CENTER"); - echo "".get_string("duedate", "assignment").": $strduedate
"; - echo "".get_string("maximumgrade").": $workshop->grade
"; - echo "".get_string("detailsofassessment", "workshop").": - id&action=displaygradingform\">". - get_string("specimenassessmentform", "workshop")."
"; - print_simple_box_end(); - echo "
"; - echo format_text($workshop->description, $workshop->format); - print_simple_box_end(); - echo "
"; + workshop_print_assignment_info($workshop); - // only list teacher and (other) student submissions if it's a student - if (isstudent($course->id)) { - workshop_list_teacher_submissions($workshop, $USER); - echo "
"; - echo "
"; - - workshop_list_student_submissions($workshop, $USER); - echo "
"; - echo "
"; - } - - // list previous submissions from this user (could be a teacher or a student) + // list previous submissions from teacher workshop_list_user_submissions($workshop, $USER); echo "
"; // print upload form - print_heading(get_string("submitassignment", "assignment").":", "CENTER"); + print_heading(get_string("submitassignment", "assignment").":"); workshop_print_upload_form($workshop); } @@ -404,6 +386,9 @@ } print_heading_with_help(get_string("managingassignment", "workshop"), "managing", "workshop"); + + workshop_print_assignment_info($workshop); + $tabs->names = array("1. ".get_string("phase1", "workshop"), "2. ".get_string("phase2", "workshop", $course->student), "3. ".get_string("phase3", "workshop"), "4. ".get_string("phase4", "workshop")); $tabs->urls = array("view.php?id=$cm->id&action=setupassignment", @@ -416,45 +401,67 @@ $tabs->highlight = 0; // phase is zero } workshop_print_tabbed_heading($tabs); - echo "

\n"; + echo "

\n"; switch ($workshop->phase) { case 0: case 1: // set up assignment - 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)). - ""); + echo "

id&action=editelements\">". + get_string("amendassessmentelements", "workshop")." \n"; + helpbutton("elements", get_string("amendassessmentelements", "workshop"), "workshop"); + if ($workshop->ntassessments) { // if teacher examples show submission and assessment links + echo "

id&action=submitassignment\">". + get_string("submitexampleassignment", "workshop")." \n"; + helpbutton("submissionofexamples", get_string("submitexampleassignment", "workshop"), "workshop"); + echo "

id&action=listforassessmentteacher\">". + get_string("teachersubmissionsforassessment", "workshop", + workshop_count_teacher_submissions_for_assessment($workshop, $USER)). + " \n"; + helpbutton("assessmentofexamples", get_string("teachersubmissionsforassessment", "workshop"), "workshop"); + } break; case 2: // submissions and assessments - 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)).""); + if ($workshop->ntassessments) { // if teacher example show student assessments link + echo "

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

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

id&action=listforassessmentstudent\">". + get_string("studentsubmissionsforassessment", "workshop", + workshop_count_student_submissions_for_assessment($workshop, $USER))." \n"; + helpbutton("gradingsubmissions", get_string("studentsubmissionsforassessment", "workshop"), "workshop"); break; case 3: // calculate final grades - 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").""); + if ($workshop->ntassessments) { // if teacher example show student assessments link + echo "

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

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

id&action=listforassessmentstudent\">". + get_string("studentsubmissionsforassessment", "workshop", + workshop_count_student_submissions_for_assessment($workshop, $USER))." \n"; + helpbutton("gradingsubmissions", get_string("studentsubmissionsforassessment", "workshop"), "workshop"); + print_heading("id&action=displayfinalweights\">". + get_string("calculationoffinalgrades", "workshop").""); break; case 4: // show final grades print_heading("id&action=displayfinalgrades\">". get_string("displayoffinalgrades", "workshop").""); } - echo "

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

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