Update of /cvsroot/aimmath/moodle/mod/math_assignment In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1035 Modified Files: aimpage.php editgrade.php email.php lib.php mod.html pdfgen.php subjectpage.php view.php Log Message: various changes but no groups implementation yet Index: aimpage.php =================================================================== RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/aimpage.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** aimpage.php 29 Jan 2004 18:20:38 -0000 1.22 --- aimpage.php 2 Mar 2004 21:11:50 -0000 1.23 *************** *** 59,63 **** require_login($course->id); ! add_to_log($course->id, "math_assignment", "AiM page", "aimpage.php?id=$cm->id", "$math_assignment->id"); $isteacher = isteacher($course->id); --- 59,63 ---- require_login($course->id); ! add_to_log($course->id, "math_assignment", "AiM page", "aimpage.php?id=$cm->id&reviewstudent=$USER->username&aimaction=reviewquiz", "$math_assignment->id"); $isteacher = isteacher($course->id); Index: editgrade.php =================================================================== RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/editgrade.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** editgrade.php 16 Jan 2004 09:34:57 -0000 1.7 --- editgrade.php 2 Mar 2004 21:11:51 -0000 1.8 *************** *** 44,47 **** --- 44,48 ---- $gradeobj->aimgrade = -1; // not attempted $gradeobj->aimtimemodified = 0; + $gradeobj->aimadjustment = 0; $gradeobj->aimoverride = AIMOVR_OFF; $gradeobj->aimcomment = ""; *************** *** 51,81 **** unset($err); ! if (isset($grade) && isset($comment)) { $grade = trim($grade); if ($grade == "-") { // reset override (clear grade) $gradeobj->aimgrade = -1; $gradeobj->aimoverride = AIMOVR_RESET; - $gradeobj->aimcomment = $comment; } else if ($grade == "") { // clear override (leave grade alone) $gradeobj->aimoverride = AIMOVR_RESET; - $gradeobj->aimcomment = $comment; } else if ($grade >= 0 && $grade <= $math_assignment->aimgrade && $comment) { // set override $gradeobj->aimtimemodified = time(); $gradeobj->aimoverride = AIMOVR_SET; - $gradeobj->aimcomment = $comment; $gradeobj->aimgrade = $grade; } else if ($grade >= 0 && !$comment) { // comment is required $err = 3; - } else { - $err = 2; // invalid entry } if (!isset($err)) { $err = update_record('math_assignment_grades', $gradeobj) ? 0 : 1; if (!$err) { ! redirect("view.php?id=$cm->id", get_string("changessaved") . "\n" . ! get_string("delaymessage", "math_assignment", format_time($CFG->maxeditingtime)), 2); } } --- 52,81 ---- unset($err); ! if (isset($grade) && isset($comment) && isset($adjustment)) { $grade = trim($grade); if ($grade == "-") { // reset override (clear grade) $gradeobj->aimgrade = -1; $gradeobj->aimoverride = AIMOVR_RESET; } else if ($grade == "") { // clear override (leave grade alone) $gradeobj->aimoverride = AIMOVR_RESET; } else if ($grade >= 0 && $grade <= $math_assignment->aimgrade && $comment) { // set override $gradeobj->aimtimemodified = time(); $gradeobj->aimoverride = AIMOVR_SET; $gradeobj->aimgrade = $grade; } else if ($grade >= 0 && !$comment) { // comment is required $err = 3; } + if ($adjustment <> "") { + $gradeobj->aimgrade = max(0,max(0,$gradeobj->aimgrade) + $adjustment - $gradeobj->aimadjustment); + $gradeobj->aimadjustment = $adjustment; + } + $gradeobj->aimcomment = $comment; if (!isset($err)) { $err = update_record('math_assignment_grades', $gradeobj) ? 0 : 1; if (!$err) { ! redirect("view.php?id=$cm->id&showgrades=true", get_string("changessaved"), 2); } } *************** *** 104,128 **** /// Print the main part of the page - $string->email = get_string("email"); - $string->location = get_string("location"); - $string->lastaccess = get_string("lastaccess"); - $string->activity = get_string("activity"); - $string->unenrol = get_string("unenrol"); - $string->loginas = get_string("loginas"); - $string->fullprofile = get_string("fullprofile"); - $string->role = get_string("role"); - $string->never = get_string("never"); - $string->name = get_string("name"); - $string->day = get_string("day"); - $string->days = get_string("days"); - $string->hour = get_string("hour"); - $string->hours = get_string("hours"); - $string->min = get_string("min"); - $string->mins = get_string("mins"); - $string->sec = get_string("sec"); - $string->secs = get_string("secs"); - $string->year = get_string("year"); - $string->route = get_string("route"); - $stroldgrade = get_string("oldgrade", "math_assignment"); $strnewgrade = get_string("newgrade", "math_assignment"); --- 104,107 ---- *************** *** 150,154 **** <tr valign="top"> <td colspan="2"> ! <?php print_user(get_user_info_from_db("id", $userid), $course, $string); ?> </td> </tr> --- 129,133 ---- <tr valign="top"> <td colspan="2"> ! <?php print_user(get_user_info_from_db("id", $userid), $course); ?> </td> </tr> *************** *** 197,200 **** --- 176,188 ---- <tr valign="top"> + <td align="right"><p><b><?php echo get_string('gradeadjustment','math_assignment'); ?>:</b></p></td> + <td> + <input type="text" name="adjustment" size="3" maxlength="20" + value="<?php if ($gradeobj->aimadjustment > 0) echo $gradeobj->aimadjustment+0;?>" /> + <?php echo get_string('explainadjustment','math_assignment'); ?> + </td> + </tr> + + <tr valign="top"> <td align="right"><p> <?php helpbutton ("editgrade_comment", $strcomment, "math_assignment"); ?> Index: email.php =================================================================== RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/email.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** email.php 16 Jan 2004 09:34:57 -0000 1.7 --- email.php 2 Mar 2004 21:11:51 -0000 1.8 *************** *** 50,56 **** $failed = 0; foreach ($students as $student) { ! // send email to the student ! if (!math_assignment_email_grades($course, $math_assignment, $student ,$teacher, $stremailnotice[$message])) ! $failed++; } } --- 50,60 ---- $failed = 0; foreach ($students as $student) { ! // send email to the student if he has actually handed in a script ! if ($student->papergrade > -1) { ! set_time_limit(10); ! if (!math_assignment_email_grades($course, $math_assignment, $student ,$teacher, $stremailnotice[$message])) { ! $failed++; ! } ! } } } Index: lib.php =================================================================== RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/lib.php,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** lib.php 29 Jan 2004 18:20:38 -0000 1.51 --- lib.php 2 Mar 2004 21:11:51 -0000 1.52 *************** *** 208,221 **** $time = time(); // look for assignments which need closing ! if ($math_assignments = get_records_sql("SELECT `id`,`course`,`name`,`papergrade`,`aimgrade`,`timedue` FROM `{$CFG->prefix}math_assignment` WHERE `papersheetsreturned` = '0' AND `timedue` < $time AND `papergrade` = '0'")) { ! foreach ($math_assignments as $math_assignment) { ! if ($course = get_record("course", "id", $math_assignment->course) && $students = math_assignment_get_grades($math_assignment)) ! math_assignment_email_all_grades($course, $math_assignment, $students); ! } ! } ! // look for emails which need sending ! /*$time = time() - $CFG->maxeditingtime; ! if ($grades = get_records_sql("SELECT * FROM `{$CFG->prefix}math_assignment_grades` WHERE `aimoverride` = '" . AIMOVR_SET . "' AND `timemodified` < '$time'")) { ! }*/ return true; } --- 208,219 ---- $time = time(); // look for assignments which need closing ! // this was too slow so I have disabled this ! // if ($math_assignments = get_records_sql("SELECT `id`,`course`,`name`,`papergrade`,`aimgrade`,`timedue` FROM `{$CFG->prefix}math_assignment` WHERE `papersheetsreturned` = '0' AND `timedue` < $time AND `papergrade` = '0'")) { ! // foreach ($math_assignments as $math_assignment) { ! // if ($course = get_record("course", "id", $math_assignment->course) && $students = math_assignment_get_grades($math_assignment)) ! // math_assignment_email_all_grades($course, $math_assignment, $students); ! // } ! // } ! return true; } *************** *** 225,230 **** /// indexed by user. It also returns a maximum allowed grade. ! $math_assignment = get_record("math_assignment", "id", $math_assignmentid); ! $return->maxgrade = $math_assignment->papergrade+ $math_assignment->aimgrade; $return->grades = math_assignment_get_grades($math_assignment, "id", "asc"); --- 223,229 ---- /// indexed by user. It also returns a maximum allowed grade. ! if (!$math_assignment = get_record("math_assignment", "id", $math_assignmentid)) { ! return NULL; ! } $return->maxgrade = $math_assignment->papergrade+ $math_assignment->aimgrade; $return->grades = math_assignment_get_grades($math_assignment, "id", "asc"); *************** *** 295,299 **** if($math_assignment->solutions) { ! if (math_assignment_is_tex_file($math_assignment->solutions) or $math_assignment->problems == 'default') $solurl = "$CFG->wwwroot/mod/math_assignment/pdfgen.php?id=$math_assignment->id&type=solutions"; else if ($math_assignment->solutionsisurl) --- 294,298 ---- if($math_assignment->solutions) { ! if (math_assignment_is_tex_file($math_assignment->solutions) or $math_assignment->solutions == 'default') $solurl = "$CFG->wwwroot/mod/math_assignment/pdfgen.php?id=$math_assignment->id&type=solutions"; else if ($math_assignment->solutionsisurl) *************** *** 388,391 **** --- 387,392 ---- $return .= math_assignment_help_button("try_quiz", $strtryquiz, false); $return .= "<br />\n"; + // Documentation + $return .= '<a href="http://aim.york.ac.uk:8080/spring04/doc/index.html" target="doc">AiM documentation</a><br />'; // Browse Source /*$strbrowsesource = get_string("browsesource", "math_assignment"); *************** *** 674,678 **** // make help links open in a new window ! $out = preg_replace("/<a(?:\s[^<>]*?|)\shref=(\"|'|)([^\"<>]*)\/help.html\\1(\s[^<>]*?|)>Help<\/a>/i", "<a href=\"\\2/help.html\"\\3 target=\"_popup\">Help</a>", $out); // put student picture on Quiz review page --- 675,679 ---- // make help links open in a new window ! $out = preg_replace("/<a(?:\s[^<>]*?|)\shref=(\"|'|)([^\"<>]*)\/help.html\\1(\s[^<>]*?|)>Help<\/a>/i", "<a href=\"../../help.php?module=math_assignment&file=student_help.html\"\\3 target=\"_popup\">Help</a>", $out); // put student picture on Quiz review page *************** *** 727,731 **** } if ($aimgrade >= 0 && $entry->aimoverride <= AIMOVR_RESET) { // don't update if the teacher has manually updated ! $entry->aimgrade = $aimgrade; $entry->aimtimemodified = time(); $changed = true; --- 728,732 ---- } if ($aimgrade >= 0 && $entry->aimoverride <= AIMOVR_RESET) { // don't update if the teacher has manually updated ! $entry->aimgrade = max(0,$aimgrade + $entry->aimadjustment); $entry->aimtimemodified = time(); $changed = true; *************** *** 751,756 **** /// Funtion which returns the total grade given a grade object ! return min(max($gradeobj->aimgrade, 0), $math_assignment->aimgrade) ! + min(max($gradeobj->papergrade, 0), $math_assignment->papergrade); } --- 752,757 ---- /// Funtion which returns the total grade given a grade object ! return (max(0, $gradeobj->aimgrade) ! + max(0, $gradeobj->papergrade)); } *************** *** 786,803 **** switch(strtolower($CFG->dbtype)) { ! case 'mysql': if (strcasecmp($sort, "totalgrade") == 0) $sortsql = "totalgrade $sortdir"; else $sortsql = "u.$sort $sortdir"; ! $students = get_records_sql("SELECT s.userid, u.firstname, u.lastname, u.email, u.username, u.mailformat, u.picture, g.papergrade, g.aimgrade, g.aimoverride, g.aimcomment, least(greatest(g.papergrade,0), $math_assignment->papergrade)+least(greatest(g.aimgrade,0), $math_assignment->aimgrade) AS totalgrade FROM {$CFG->prefix}user_students s LEFT JOIN {$CFG->prefix}user u ON s.course = '$math_assignment->course' AND u.id = s.userid LEFT JOIN {$CFG->prefix}math_assignment_grades g ON g.assignment = '$math_assignment->id' AND g.userid = s.userid WHERE u.deleted = '0' ORDER BY $sortsql"); break; default: // emulate ! $students = get_records_sql("SELECT userid,userid FROM {$CFG->prefix}user_students WHERE course = '$math_assignment->course'"); ! if ($students) { ! foreach ($students as $key => $student) { ! if ($students[$key] = get_record_sql("SELECT firstname, lastname, email, username, mailformat, picture FROM {$CFG->prefix}user WHERE id = '$key' AND deleted = '0'")) { ! $grade = get_record_sql("SELECT papergrade, aimgrade, aimoverride, aimcomment FROM {$CFG->prefix}math_assignment_grades WHERE assignment = '$math_assignment->id' and userid = '$key'"); if ($grade) { $students[$key]->papergrade = $grade->papergrade+0; --- 787,806 ---- switch(strtolower($CFG->dbtype)) { ! case 'mysqlll': if (strcasecmp($sort, "totalgrade") == 0) $sortsql = "totalgrade $sortdir"; else $sortsql = "u.$sort $sortdir"; ! $students = get_records_sql("SELECT s.userid, u.firstname, u.lastname, u.email, u.username, u.mailformat, u.picture, g.papergrade, g.aimgrade, g.aimoverride, g.aimcomment, greatest(g.papergrade,0)+greatest(g.aimgrade,0) AS totalgrade FROM {$CFG->prefix}user_students s LEFT JOIN {$CFG->prefix}user u ON s.course = '$math_assignment->course' AND u.id = s.userid LEFT JOIN {$CFG->prefix}math_assignment_grades g ON g.assignment = '$math_assignment->id' AND g.userid = s.userid WHERE u.deleted = '0' ORDER BY $sortsql"); break; default: // emulate ! $studentlist = get_records('user_students', 'course', $math_assignment->course); ! if ($studentlist) { ! foreach ($studentlist as $student) { ! if ($students[$student->userid] = get_record('user', 'id', $student->userid, 'deleted', 0)) { ! $key = $student->userid; ! $students[$key]->userid = $student->userid; ! $grade = get_record('math_assignment_grades', 'assignment', $math_assignment->id, 'userid', $student->userid); if ($grade) { $students[$key]->papergrade = $grade->papergrade+0; Index: mod.html =================================================================== RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/mod.html,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** mod.html 29 Jan 2004 18:20:38 -0000 1.27 --- mod.html 2 Mar 2004 21:11:51 -0000 1.28 *************** *** 3,92 **** <?php ! ! require_once("$CFG->dirroot/mod/math_assignment/lib.php"); ! ! /* ! * Variables specific to this module are: ! * name, problems, solutions, aimsubject, aimquiz, papergrade, aimgrade, timedue, ! * solutiontime. ! * We check that these are setup here. ! */ ! if (!isset($form->name)) { ! $form->name = ""; ! } ! if (!isset($form->problems)) { ! $form->problems = ""; ! } ! if (!isset($form->problemscompile)) { ! $form->problemscompile = true; ! } ! if (!isset($form->solutions)) { ! $form->solutions = ""; ! } ! if (!isset($form->solutionscompile)) { ! $form->solutionscompile = true; ! } ! if (!isset($form->papersheetsreturned)) { ! $form->papersheetsreturned = 0; ! } ! if (!isset($form->aimquiz)) { ! $form->aimquiz = ""; ! } ! if (!isset($form->aimfocus)) { ! $form->aimfocus = 1; ! } ! if (!isset($form->papergrade)) { ! $form->papergrade = 10; ! } ! if (!isset($form->aimgrade)) { ! $form->aimgrade = 0; ! } ! if (!isset($form->timedue)) { ! $form->timedue = 0; ! } ! if (!isset($form->solutiontime)) { ! $form->solutiontime = 0; ! } ! // Now we set the defaults ! ! if (!$form->name) ! $form->name = get_string("modulename", "math_assignment") . ($form->section ? " $form->section" : ""); ! ! // get aimsubject from database ! if (!$aimsubject = get_field("math_assignment_subjects", "name", "course", $form->course)) ! $aimsubject = ""; ! ! // Process problems and solutions ! $form->problemsurl = ""; ! if ($form->problems) { ! if ($form->problemsisurl) { ! $form->problemsurl = $form->problems; $form->problems = ""; } ! } ! $form->solutionsurl = ""; ! if ($form->solutions) { ! if ($form->solutionsisurl) { ! $form->solutionsurl = $form->solutions; $form->solutions = ""; } ! } ! ! $strname = get_string("name"); ! $strtimedue = get_string("timedue", "math_assignment"); ! $strproblems = get_string("problems", "math_assignment"); ! $strsolutions = get_string("solutions", "math_assignment"); ! $strnone = get_string("none"); ! $struseuploaded = get_string("useuploaded", "math_assignment"); ! $stror = get_string("or", "math_assignment"); ! $struploadnew = get_string("uploadnew", "math_assignment"); ! $strexternalurl = get_string("externalurl", "math_assignment"); ! $strcompiletex = get_string("compiletex", "math_assignment"); ! $strmaxgrade = get_string("maxgrade", "math_assignment"); ! $straimsubject = get_string("aimsubject","math_assignment"); ! $straimquiz = get_string("aimquiz","math_assignment"); ! $straimstyle = get_string("aimstyle","math_assignment"); ! $strsolutiontime = get_string("solutiontime","math_assignment"); ! ?> --- 3,94 ---- <?php ! require_once("$CFG->dirroot/mod/math_assignment/lib.php"); ! ! /* ! * Variables specific to this module are: ! * name, problems, solutions, aimsubject, aimquiz, papergrade, aimgrade, timedue, ! * solutiontime. ! * We check that these are setup here. ! */ ! if (!isset($form->name)) { ! $form->name = ""; ! } ! if (empty($form->description)) { ! $form->description = ""; ! } ! if (!isset($form->problems)) { $form->problems = ""; } ! if (!isset($form->problemscompile)) { ! $form->problemscompile = true; ! } ! if (!isset($form->solutions)) { $form->solutions = ""; } ! if (!isset($form->solutionscompile)) { ! $form->solutionscompile = true; ! } ! if (!isset($form->papersheetsreturned)) { ! $form->papersheetsreturned = 0; ! } ! if (!isset($form->aimquiz)) { ! $form->aimquiz = ""; ! } ! if (!isset($form->aimfocus)) { ! $form->aimfocus = 1; ! } ! if (!isset($form->papergrade)) { ! $form->papergrade = 10; ! } ! if (!isset($form->aimgrade)) { ! $form->aimgrade = 0; ! } ! if (!isset($form->timedue)) { ! $form->timedue = 0; ! } ! if (!isset($form->solutiontime)) { ! $form->solutiontime = 0; ! } ! // Now we set the defaults ! ! if (!$form->name) ! $form->name = get_string("modulename", "math_assignment") . ($form->section ? " $form->section" : ""); ! ! // get aimsubject from database ! if (!$aimsubject = get_field("math_assignment_subjects", "name", "course", $form->course)) ! $aimsubject = ""; ! ! // Process problems and solutions ! $form->problemsurl = ""; ! if ($form->problems) { ! if ($form->problemsisurl) { ! $form->problemsurl = $form->problems; ! $form->problems = ""; ! } ! } ! $form->solutionsurl = ""; ! if ($form->solutions) { ! if ($form->solutionsisurl) { ! $form->solutionsurl = $form->solutions; ! $form->solutions = ""; ! } ! } ! ! $strname = get_string("name"); ! $strtimedue = get_string("timedue", "math_assignment"); ! $strproblems = get_string("problems", "math_assignment"); ! $strsolutions = get_string("solutions", "math_assignment"); ! $strnone = get_string("none"); ! $struseuploaded = get_string("useuploaded", "math_assignment"); ! $stror = get_string("or", "math_assignment"); ! $struploadnew = get_string("uploadnew", "math_assignment"); ! $strexternalurl = get_string("externalurl", "math_assignment"); ! $strcompiletex = get_string("compiletex", "math_assignment"); ! $strmaxgrade = get_string("maxgrade", "math_assignment"); ! $straimsubject = get_string("aimsubject","math_assignment"); ! $straimquiz = get_string("aimquiz","math_assignment"); ! $straimstyle = get_string("aimstyle","math_assignment"); ! $strsolutiontime = get_string("solutiontime","math_assignment"); ! ?> *************** *** 139,142 **** --- 141,153 ---- </tr> + <tr valign=top> + <td align=right> + <p><b><?php print_string("description", "math_assignment") ?>:</b></p> + </td> + <td> + <textarea cols="60" rows="8" name="description"><?php echo $form->description; ?></textarea> + </td> + </tr> + <tr valign="top"> <td align="right" nowrap="nowrap"> Index: pdfgen.php =================================================================== RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/pdfgen.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** pdfgen.php 29 Jan 2004 18:20:38 -0000 1.27 --- pdfgen.php 2 Mar 2004 21:11:51 -0000 1.28 *************** *** 11,15 **** optional_variable($seed, 0); // seed to be passed to AiM. 0 means no seed set. // This may be overruled by the student's saved seed. ! optional_variable($texmachine, remote); // This determines whether to do the texing // on a remote machine (manor in my case) or the local machine global $USER; --- 11,15 ---- optional_variable($seed, 0); // seed to be passed to AiM. 0 means no seed set. // This may be overruled by the student's saved seed. ! optional_variable($texmachine, local); // This determines whether to do the texing // on a remote machine (manor in my case) or the local machine global $USER; *************** *** 257,261 **** // Insert problem sheet id if ($type == "problems" and $seed > 0) { ! $latex = str_replace("\begin{document}", "\begin{document}\begin{flushright}Problem sheet ID: $seed\end{flushright}", $latex); } --- 257,261 ---- // Insert problem sheet id if ($type == "problems" and $seed > 0) { ! $latex = str_replace("\begin{document}", "\begin{document}\n\vspace{-25mm}\n\n\begin{flushright}\nProblem sheet ID: $seed\n\end{flushright}\n\n", $latex); } *************** *** 311,314 **** --- 311,318 ---- //$data = preg_replace("/id=\"question(\d+).(\d+)\"/i", // "<latex>\n\n\vspace{2mm}\\noindent{\\bf Part \$2}\n\n</latex>",$data); + // get rid of question part labels. + if ($type == "solutions") { + $data = preg_replace("/id=\"question(\d+).(\d+)\"/i", "",$data); + } $data = preg_replace("/id=\"question(\d+).(\d+)\"/i", "<latex>\n\n\vspace{1mm}\\noindent{\\bf (\$2)} </latex>",$data); Index: subjectpage.php =================================================================== RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/subjectpage.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** subjectpage.php 29 Jan 2004 18:20:38 -0000 1.6 --- subjectpage.php 2 Mar 2004 21:11:51 -0000 1.7 *************** *** 87,91 **** "", "", true, '', navmenu($course, $cm), $usexml); ! // Print the main part of the page --- 87,91 ---- "", "", true, '', navmenu($course, $cm), $usexml); ! echo '<div align="right"><a href="http://aim.york.ac.uk:8080/spring04/doc/index.html" target="doc">AiM documentation</a></div>'; // Print the main part of the page Index: view.php =================================================================== RCS file: /cvsroot/aimmath/moodle/mod/math_assignment/view.php,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** view.php 29 Jan 2004 18:20:38 -0000 1.29 --- view.php 2 Mar 2004 21:11:51 -0000 1.30 *************** *** 347,350 **** --- 347,351 ---- } } + echo format_text($math_assignment->description); if ($inbox) print_simple_box_end(); *************** *** 379,394 **** } - $stredit = get_string("edit", "math_assignment"); - $stredited = get_string("edited", "math_assignment"); - $strcommented = get_string("commented", "math_assignment"); - $i = 1; ! foreach ($students as $student) { ! $picture = print_user_picture($student->userid, $course->id, $student->picture, false, true); if ($student->papergrade >= 0) $papergrade = $student->papergrade+0; else $papergrade = ""; ! $papergrade = "<input type=\"text\" name=\"$student->userid\" size=\"10\" maxlength=\"10\" value=\"$papergrade\" tabindex=\"$i\" />"; if ($student->aimgrade >= 0) $aimgrade = $student->aimgrade+0; --- 380,391 ---- } $i = 1; ! foreach ($students as $key => $student) { ! $picture = print_user_picture($key, $course->id, $student->picture, false, true); if ($student->papergrade >= 0) $papergrade = $student->papergrade+0; else $papergrade = ""; ! $papergrade = "<input type=\"text\" name=\"$student->userid\" size=\"4\" maxlength=\"10\" value=\"$papergrade\" tabindex=\"$i\" />"; if ($student->aimgrade >= 0) $aimgrade = $student->aimgrade+0; *************** *** 396,410 **** $aimgrade = ""; ! if ($student->aimoverride > AIMOVR_RESET) { ! $edited = "$stredited ("; ! $editedclose = ")"; ! } ! else if ($student->aimcomment) { ! $edited = "$strcommented ("; ! $editedclose = ")"; } else { $edited = ""; ! $editedclose = ""; } --- 393,403 ---- $aimgrade = ""; ! if (($student->aimoverride > AIMOVR_RESET) or $student->aimcomment) { ! $edited = '<span style="color:red;">'; ! $editedclose = '</span>'; } else { $edited = ""; ! $editedclose = ''; } *************** *** 424,435 **** if ($hasboth) $table->data[] = array($picture, $student->firstname, $student->lastname, $email, $papergrade, ! "$aimgrade $edited<a href=\"editgrade.php?id=$math_assignment->id&userid=$student->userid\">$stredit</a>$editedclose ! <a href=\"aimpage.php?id=$cm->id&reviewstudent=$student->username&aimaction=reviewquiz\">$strreview</a>", $student->totalgrade); else if ($haspaper) $table->data[] = array($picture, $student->firstname, $student->lastname, $email, $papergrade); else if ($hasaim) $table->data[] = array($picture, $student->firstname, $student->lastname, $email, ! "$aimgrade $edited<a href=\"editgrade.php?id=$math_assignment->id&userid=$student->userid\">$stredit</a>$editedclose ! <a href=\"aimpage.php?id=$cm->id&reviewstudent=$student->username&aimaction=reviewquiz\">$strreview</a>"); $i++; --- 417,432 ---- if ($hasboth) $table->data[] = array($picture, $student->firstname, $student->lastname, $email, $papergrade, ! "$edited$aimgrade$editedclose <a href=\"editgrade.php?id=$math_assignment->id&userid=$student->userid\"> ! <img src=\"$CFG->pixpath/i/edit.gif\" alt\"$stredit\" border=\"0\"/></a> ! <a href=\"aimpage.php?id=$cm->id&reviewstudent=$student->username&aimaction=reviewquiz\"> ! <img src=\"$CFG->pixpath/i/log.gif\" alt\"$strreview\" border=\"0\"/></a>", $student->totalgrade+0); else if ($haspaper) $table->data[] = array($picture, $student->firstname, $student->lastname, $email, $papergrade); else if ($hasaim) $table->data[] = array($picture, $student->firstname, $student->lastname, $email, ! "$edited$aimgrade$editedclose <a href=\"editgrade.php?id=$math_assignment->id&userid=$student->userid\"> ! <img src=\"$CFG->pixpath/i/edit.gif\" alt\"$stredit\" border=\"0\"/></a> ! <a href=\"aimpage.php?id=$cm->id&reviewstudent=$student->username&aimaction=reviewquiz\"> ! <img src=\"$CFG->pixpath/i/log.gif\" alt\"$strreview\" border=\"0\"/></a>"); $i++; |
