mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-21 23:48:45 +01:00
Code Issues Projects Releases Wiki Activity

Addition of Mail strings to cron routine; More help in admin page; bug

Browse Source 
clearance.
This commit is contained in:
rkingdon 2003-08-27 15:39:21 +00:00
parent 341684f537
commit 41b12a791b
4 changed files with 117 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/workshop/assessments.php
View File

@ -60,7 +60,7 @@
}
require_login($course->id);
$navigation = "";
if ($course->category) {
$navigation = "<A HREF=\"../../course/view.php?id=$course->id\">$course->shortname</A> ->";

106
mod/workshop/lib.php
View File

@ -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 () {
"<A HREF=\"$CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\">$workshop->name</A></FONT></P>";
$posthtml .= "<HR><FONT FACE=sans-serif>";
$posthtml .= "<P>$msg</P>";
$posthtml .= "<P>You can see it <A HREF=\"$CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\">";
$posthtml .= "in your workshop assignment</A>.</P></FONT><HR>";
$posthtml .= "<P>".get_string("mail3", "workshop").
" <A HREF=\"$CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\">$workshop->name</A>.</P></FONT><HR>";
} 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 () {
"<A HREF=\"$CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\">$workshop->name</A></FONT></P>";
$posthtml .= "<HR><FONT FACE=sans-serif>";
$posthtml .= "<P>$msg</P>";
$posthtml .= "<P>You can see it <A HREF=\"$CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\">";
$posthtml .= "in your workshop assignment</A>.</P></FONT><HR>";
$posthtml .= "<P>".get_string("mail3", "workshop").
" <A HREF=\"$CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\">$workshop->name</A>.</P></FONT><HR>";
}
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 () {
"<A HREF=\"$CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\">$workshop->name</A></FONT></P>";
$posthtml .= "<HR><FONT FACE=sans-serif>";
$posthtml .= "<P>$msg</P>";
$posthtml .= "<P>You can see it <A HREF=\"$CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\">";
$posthtml .= "in your workshop assignment</A>.</P></FONT><HR>";
$posthtml .= "<P>".get_string("mail3", "workshop").
" <A HREF=\"$CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\">$workshop->name</A>.</P></FONT><HR>";
}
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 = "<P><FONT FACE=sans-serif>".
"<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A> ->".
"<A HREF=\"$CFG->wwwroot/mod/workshop/index.php?id=$course->id\">$strworkshops</A> ->".
"<A HREF=\"$CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\">$workshop->name</A></FONT></P>";
$posthtml .= "<HR><FONT FACE=sans-serif>";
$posthtml .= "<P>$msg</P>";
$posthtml .= "<P>You can see it <A HREF=\"$CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\">";
$posthtml .= "in your workshop assignment</A>.</P></FONT><HR>";
$posthtml = "<P><FONT FACE=sans-serif>".
"<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A> ->".
"<A HREF=\"$CFG->wwwroot/mod/workshop/index.php?id=$course->id\">$strworkshops</A> ->".
"<A HREF=\"$CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\">$workshop->name</A></FONT></P>";
$posthtml .= "<HR><FONT FACE=sans-serif>";
$posthtml .= "<P>$msg</P>";
$posthtml .= "<P>".get_string("mail3", "workshop").
" <A HREF=\"$CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\">$workshop->name</A>.</P></FONT><HR>";
} 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 = "<FONT COLOR=RED>$strdifference</FONT>";
}
$strduedate = userdate($workshop->deadline)." ($strdifference)";
print_simple_box_start("CENTER");
print_heading($workshop->name, "CENTER");
print_simple_box_start("CENTER");
echo "<B>".get_string("duedate", "assignment")."</B>: $strduedate<BR>";
echo "<B>".get_string("maximumgrade")."</B>: $workshop->grade<BR>";
echo "<B>".get_string("detailsofassessment", "workshop")."</B>:
<A HREF=\"assessments.php?id=$cm->id&action=displaygradingform\">".
get_string("specimenassessmentform", "workshop")."</A><BR>";
print_simple_box_end();
echo "<BR>";
echo format_text($workshop->description, $workshop->format);
print_simple_box_end();
echo "<BR>";
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 .= " | <a href=\"assessments.php?action=assesssubmission&a=$workshop->id&aid=$assessment->id\">".
$action .= " | <a href=\"assessments.php?action=assesssubmission&a=$workshop->id&sid=$submission->id\">".
get_string("reassess", "workshop")."</a>";
}
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 "<b>".get_string("duedate", "assignment")."</b>: $strduedate<br />";
echo "<b>".get_string("maximumgrade")."</b>: $workshop->grade<br />";
echo "<b>".get_string("detailsofassessment", "workshop")."</b>:
<a href=\"assessments.php?id=$cm->id&action=displaygradingform\">".
get_string("specimenassessmentform", "workshop")."</a><br />";
print_simple_box_end();
echo "<br />";
echo format_text($workshop->description, $workshop->format);
print_simple_box_end();
echo "<br />";
}
function workshop_print_difference($time) {
if ($time < 0) {
$timetext = get_string("late", "assignment", format_time($time));

2
mod/workshop/mod.html
View File

@ -109,7 +109,7 @@
<tr valign=top>
<td align=right><P><B><? print_string("numberofassessmentelements", "workshop") ?>:</B></P></TD>
<td>
<td valign="middle">
<?
for ($i=20; $i>=0; $i--) {
$numbers[$i] = $i;

111
mod/workshop/view.php
View File

@ -236,7 +236,7 @@
/*********************** assignment not available (for students)***********************/
elseif ($action == 'notavailable') {
echo "<p><center>".get_string("notavailable", "workshop")."</center>\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 = "<FONT COLOR=RED>$strdifference</FONT>";
}
$strduedate = userdate($workshop->deadline)." ($strdifference)";
print_simple_box_start("CENTER");
print_heading($workshop->name, "CENTER");
print_simple_box_start("CENTER");
echo "<B>".get_string("duedate", "assignment")."</B>: $strduedate<BR>";
echo "<B>".get_string("maximumgrade")."</B>: $workshop->grade<BR>";
echo "<B>".get_string("detailsofassessment", "workshop")."</B>:
<A HREF=\"assessments.php?id=$cm->id&action=displaygradingform\">".
get_string("specimenassessmentform", "workshop")."</A><BR>";
print_simple_box_end();
echo "<BR>";
echo format_text($workshop->description, $workshop->format);
print_simple_box_end();
echo "<BR>";
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 "<HR SIZE=1 NOSHADE>";
echo "<BR>";
workshop_list_student_submissions($workshop, $USER);
echo "<HR SIZE=1 NOSHADE>";
echo "<BR>";
}
// 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 "<HR SIZE=1 NOSHADE>";
// 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 "<CENTER><P>\n";
echo "<center>\n";
switch ($workshop->phase) {
case 0:
case 1: // set up assignment
print_heading("<A HREF=\"assessments.php?id=$cm->id&action=editelements\">".
get_string("amendassessmentelements", "workshop")."</A>");
print_heading("<A HREF=\"view.php?id=$cm->id&action=submitassignment\">".
get_string("submitexampleassignment", "workshop")."</A>");
print_heading("<A HREF=\"submissions.php?id=$cm->id&action=listforassessmentteacher\">".
get_string("teachersubmissionsforassessment", "workshop",
workshop_count_teacher_submissions_for_assessment($workshop, $USER)).
"</A>");
echo "<p><b><a href=\"assessments.php?id=$cm->id&action=editelements\">".
get_string("amendassessmentelements", "workshop")."</a></b> \n";
helpbutton("elements", get_string("amendassessmentelements", "workshop"), "workshop");
if ($workshop->ntassessments) { // if teacher examples show submission and assessment links
echo "<p><b><a href=\"view.php?id=$cm->id&action=submitassignment\">".
get_string("submitexampleassignment", "workshop")."</a></b> \n";
helpbutton("submissionofexamples", get_string("submitexampleassignment", "workshop"), "workshop");
echo "<p><b><a href=\"submissions.php?id=$cm->id&action=listforassessmentteacher\">".
get_string("teachersubmissionsforassessment", "workshop",
workshop_count_teacher_submissions_for_assessment($workshop, $USER)).
"</a></b> \n";
helpbutton("assessmentofexamples", get_string("teachersubmissionsforassessment", "workshop"), "workshop");
}
break;
case 2: // submissions and assessments
print_heading("<A HREF=\"assessments.php?id=$cm->id&action=listungradedteachersubmissions\">".
get_string("ungradedassessmentsofteachersubmissions", "workshop", workshop_count_ungraded_assessments_teacher($workshop))."</A>");
print_heading("<A HREF=\"assessments.php?id=$cm->id&action=listungradedstudentsubmissions\">".
get_string("ungradedassessmentsofstudentsubmissions", "workshop", workshop_count_ungraded_assessments_student($workshop))."</A>");
print_heading("<A HREF=\"submissions.php?id=$cm->id&action=listforassessmentstudent\">".
get_string("studentsubmissionsforassessment", "workshop", workshop_count_student_submissions_for_assessment($workshop, $USER))."</A>");
if ($workshop->ntassessments) { // if teacher example show student assessments link
echo "<p><b><a href=\"assessments.php?id=$cm->id&action=listungradedteachersubmissions\">".
get_string("ungradedassessmentsofteachersubmissions", "workshop",
workshop_count_ungraded_assessments_teacher($workshop))."</a></b> \n";
helpbutton("ungradedassessments_teacher", get_string("ungradedassessmentsofteachersubmissions", "workshop"), "workshop");
}
echo "<p><b><a href=\"assessments.php?id=$cm->id&action=listungradedstudentsubmissions\">".
get_string("ungradedassessmentsofstudentsubmissions", "workshop",
workshop_count_ungraded_assessments_student($workshop))."</a></b> \n";
helpbutton("ungradedassessments_student", get_string("ungradedassessmentsofstudentsubmissions", "workshop"), "workshop");
echo "<p><b><a href=\"submissions.php?id=$cm->id&action=listforassessmentstudent\">".
get_string("studentsubmissionsforassessment", "workshop",
workshop_count_student_submissions_for_assessment($workshop, $USER))."</a></b> \n";
helpbutton("gradingsubmissions", get_string("studentsubmissionsforassessment", "workshop"), "workshop");
break;
case 3: // calculate final grades
print_heading("<A HREF=\"assessments.php?id=$cm->id&action=listungradedstudentsubmissions\">".
get_string("ungradedassessmentsofstudentsubmissions", "workshop", workshop_count_ungraded_assessments_student($workshop))."</A>");
print_heading("<A HREF=\"submissions.php?id=$cm->id&action=listforassessmentstudent\">".
get_string("studentsubmissionsforassessment", "workshop", workshop_count_student_submissions_for_assessment($workshop, $USER))."</A>");
print_heading("<A HREF=\"submissions.php?id=$cm->id&action=displayfinalweights\">".
get_string("calculationoffinalgrades", "workshop")."</A>");
if ($workshop->ntassessments) { // if teacher example show student assessments link
echo "<p><b><a href=\"assessments.php?id=$cm->id&action=listungradedteachersubmissions\">".
get_string("ungradedassessmentsofteachersubmissions", "workshop",
workshop_count_ungraded_assessments_teacher($workshop))."</a></b> \n";
helpbutton("ungradedassessments_teacher", get_string("ungradedassessmentsofteachersubmissions", "workshop"), "workshop");
}
echo "<p><b><a href=\"assessments.php?id=$cm->id&action=listungradedstudentsubmissions\">".
get_string("ungradedassessmentsofstudentsubmissions", "workshop",
workshop_count_ungraded_assessments_student($workshop))."</a></b> \n";
helpbutton("ungradedassessments_student", get_string("ungradedassessmentsofstudentsubmissions", "workshop"), "workshop");
echo "<p><b><a href=\"submissions.php?id=$cm->id&action=listforassessmentstudent\">".
get_string("studentsubmissionsforassessment", "workshop",
workshop_count_student_submissions_for_assessment($workshop, $USER))."</a></b> \n";
helpbutton("gradingsubmissions", get_string("studentsubmissionsforassessment", "workshop"), "workshop");
print_heading("<a href=\"submissions.php?id=$cm->id&action=displayfinalweights\">".
get_string("calculationoffinalgrades", "workshop")."</a>");
break;
case 4: // show final grades
print_heading("<A HREF=\"submissions.php?id=$cm->id&action=displayfinalgrades\">".
get_string("displayoffinalgrades", "workshop")."</A>");
}
echo "<P><FONT SIZE=1>[".get_string("deadlineis", "workshop", userdate($workshop->deadline))."]</FONT></P>\n";
print_heading("<A HREF=\"submissions.php?id=$cm->id&action=adminlist\">".
get_string("administration")."</A>");
print_heading("<A HREF=\"submissions.php?id=$cm->id&action=adminlist\">".
get_string("administration")."</A>");
}