From 657e52d4daa79b0fda5be4dc8fe78b3e8a0c9db1 Mon Sep 17 00:00:00 2001 From: nicolasconnault Date: Thu, 5 Jul 2007 07:01:48 +0000 Subject: [PATCH] MDL-10286 Implementing the view feedback page. Added links to the user, module and scale when applicable. --- grade/report/grader/edit_feedback.php | 54 ++++++++++++++++++++------- lang/en_utf8/grades.php | 2 + lib/gradelib.php | 4 +- 3 files changed, 45 insertions(+), 15 deletions(-) diff --git a/grade/report/grader/edit_feedback.php b/grade/report/grader/edit_feedback.php index f8a4e664f0..fa0f2eb3b1 100644 --- a/grade/report/grader/edit_feedback.php +++ b/grade/report/grader/edit_feedback.php @@ -6,6 +6,7 @@ require_once 'edit_feedback_form.php'; $courseid = required_param('courseid', PARAM_INT); $id = optional_param('id', 0, PARAM_INT); +$action = optional_param('action', 0, PARAM_ALPHA); if (!$course = get_record('course', 'id', $courseid)) { print_error('nocourseid'); @@ -45,10 +46,12 @@ if ($mform->is_cancelled()) { } // Get name of student and gradeitem name -$query = "SELECT a.firstname, a.lastname, b.itemname, c.finalgrade, b.grademin, b.grademax - FROM {$CFG->prefix}user AS a, - {$CFG->prefix}grade_items AS b, - {$CFG->prefix}grade_grades AS c +$query = "SELECT a.id AS userid, a.firstname, a.lastname, + b.id AS itemid, b.itemname, b.grademin, b.grademax, b.iteminstance, b.itemmodule, b.scaleid, + c.finalgrade + FROM {$CFG->prefix}user a, + {$CFG->prefix}grade_items b, + {$CFG->prefix}grade_grades c WHERE c.id = $id AND b.id = c.itemid AND a.id = c.userid"; @@ -57,35 +60,60 @@ $extra_info = get_record_sql($query) ; $extra_info->grademin = round($extra_info->grademin); $extra_info->grademax = round($extra_info->grademax); $extra_info->finalgrade = round($extra_info->finalgrade); +$extra_info->course_module = get_coursemodule_from_instance($extra_info->itemmodule, $extra_info->iteminstance, $courseid); $stronascaleof = get_string('onascaleof', 'grades', $extra_info); $strgrades = get_string('grades'); $strgrade = get_string('grade'); $strgraderreport = get_string('graderreport', 'grades'); +$strfeedback = get_string('feedback', 'grades'); $strfeedbackedit = get_string('feedbackedit', 'grades'); +$strfeedbackview = get_string('feedbackview', 'grades'); +$strfeedbackadd = get_string('feedbackadd', 'grades'); $strstudent = get_string('student', 'grades'); $strgradeitem = get_string('gradeitem', 'grades'); +$feedback = null; +$heading = ${"strfeedback$action"}; +if (!empty($action) && $action == 'view') { + $feedback = "

$strfeedback:

$grade_text->feedback

"; +} + $nav = array(array('name'=>$strgrades,'link'=>$CFG->wwwroot.'/grade/index.php?id='.$courseid, 'type'=>'misc'), array('name'=>$strgraderreport, 'link'=>$CFG->wwwroot.'/grade/report.php?id='.$courseid.'&report=grader', 'type'=>'misc'), - array('name'=>$strfeedbackedit, 'link'=>'', 'type'=>'misc')); + array('name'=>$heading, 'link'=>'', 'type'=>'misc')); $navigation = build_navigation($nav); +print_header_simple($strgrades . ': ' . $strgraderreport . ': ' . $heading, + ': ' . $heading , $navigation, '', '', true, '', navmenu($course)); + +print_heading($heading); -print_header_simple($strgrades . ': ' . $strgraderreport, ': ' . $strfeedbackedit, $navigation, '', '', true, '', navmenu($course)); +print_simple_box_start("center"); -print_heading(get_string('feedbackedit', 'grades')); -print_box_start('gradefeedbackbox generalbox'); -echo "

$strstudent: " . fullname($extra_info) . "

"; -echo "

$strgradeitem: " . $extra_info->itemname . "

"; +echo "

$strstudent: wwwroot . '/user/view.php?id=' + . $extra_info->userid . '">' . fullname($extra_info) . "

"; +echo "

$strgradeitem: wwwroot . '/mod/' . $extra_info->itemmodule + . '/view.php?id=' . $extra_info->course_module->id . "&courseid=$courseid\">$extra_info->itemname

"; if (!empty($extra_info->finalgrade)) { - echo "

$strgrade: " . $extra_info->finalgrade . "$stronascaleof

"; + $openlink = ''; + $closelink = ''; + + if (!empty($extra_info->scaleid)) { + $openlink = ''; + $closelink = ''; + } + echo "

$strgrade: " . $extra_info->finalgrade . "$openlink $stronascaleof $closelink

"; } +echo $feedback; -$mform->display(); +if ($action != 'view') { + $mform->display(); +} -print_box_end(); +print_simple_box_end(); print_footer($course); die; diff --git a/lang/en_utf8/grades.php b/lang/en_utf8/grades.php index f8977c8ebb..ab3198ddf9 100644 --- a/lang/en_utf8/grades.php +++ b/lang/en_utf8/grades.php @@ -68,7 +68,9 @@ $string['exportxml'] = 'Export XML'; $string['extracredit'] = 'Extra Credit'; $string['extracreditwarning'] = 'Note: Setting all items for a category to extra credit will effectively remove them from the grade calculation. Since there will be no point total'; $string['feedback'] = 'Feedback'; +$string['feedbackadd'] = 'Add feedback'; $string['feedbackedit'] = 'Edit feedback'; +$string['feedbackview'] = 'View feedback'; $string['feedbackformat'] = 'Feedback format'; $string['forelementtypes'] = ' for the selected $a'; $string['forstudents'] = 'For Students'; diff --git a/lib/gradelib.php b/lib/gradelib.php index 9cfec768ce..01a33cd5ca 100644 --- a/lib/gradelib.php +++ b/lib/gradelib.php @@ -817,10 +817,10 @@ function grade_get_icons($element, $tree) { } } else { if ($USER->gradefeedback) { - // Display Edit/Add feedback icon + // Display view feedback icon if (!empty($object->feedback)) { $html .= 'courseid\">\n"; + . "&action=view&courseid=$object->courseid\">\n"; $html .= ''. "\n"; -- 2.39.5