From c3e193ece35450e654064a04838e80e7ae8deab3 Mon Sep 17 00:00:00 2001
From: nicolasconnault <nicolasconnault>
Date: Thu, 5 Jul 2007 08:02:05 +0000
Subject: [PATCH] MDL-10286 Finished the view feedback page. Also added links
 for each user name on the grader report page (linking to their profiles).

---
 grade/report/grader/edit_feedback.php | 15 +++++++++++++--
 grade/report/grader/index.php         |  5 ++++-
 lang/en_utf8/moodle.php               |  1 +
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/grade/report/grader/edit_feedback.php b/grade/report/grader/edit_feedback.php
index fa0f2eb3b1..a1e183bf06 100644
--- a/grade/report/grader/edit_feedback.php
+++ b/grade/report/grader/edit_feedback.php
@@ -45,7 +45,7 @@ if ($mform->is_cancelled()) {
     redirect($returnurl);
 }
 
-// Get name of student and gradeitem name
+// Get extra data related to this feedback
 $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 
@@ -85,6 +85,8 @@ $nav = array(array('name'=>$strgrades,'link'=>$CFG->wwwroot.'/grade/index.php?id
 
 $navigation = build_navigation($nav);
 
+/*********** BEGIN OUTPUT *************/
+
 print_header_simple($strgrades . ': ' . $strgraderreport . ': ' . $heading, 
     ': ' . $heading , $navigation, '', '', true, '', navmenu($course));
 
@@ -92,10 +94,15 @@ print_heading($heading);
 
 print_simple_box_start("center");
 
+// Student name and link
 echo "<p><strong>$strstudent:</strong> <a href=\"" . $CFG->wwwroot . '/user/view.php?id=' 
      . $extra_info->userid . '">' . fullname($extra_info) . "</a></p>";
+
+// Grade item name and link     
 echo "<p><strong>$strgradeitem:</strong> <a href=\"" . $CFG->wwwroot . '/mod/' . $extra_info->itemmodule 
      . '/view.php?id=' . $extra_info->course_module->id . "&amp;courseid=$courseid\">$extra_info->itemname</a></p>";
+
+// Final grade and link to scale if applicable
 if (!empty($extra_info->finalgrade)) {
     $openlink = '';
     $closelink = '';
@@ -107,10 +114,14 @@ if (!empty($extra_info->finalgrade)) {
     }
     echo "<p><strong>$strgrade:</strong> " . $extra_info->finalgrade . "$openlink $stronascaleof $closelink</p>";
 }
-echo $feedback;
 
+// Form if in edit or add modes
 if ($action != 'view') {
     $mform->display();
+} else { // Feedback string and Back button if in View mode
+    echo $feedback;
+    echo "<button onclick=\"window.location='" . $CFG->wwwroot . "/grade/report.php?report=grader&amp;id=$courseid';\">"
+         . get_string('back') . '</button>';
 }
 
 print_simple_box_end();
diff --git a/grade/report/grader/index.php b/grade/report/grader/index.php
index d50fec672f..8345db3c8e 100644
--- a/grade/report/grader/index.php
+++ b/grade/report/grader/index.php
@@ -368,7 +368,10 @@ foreach ($gtree->levels as $key=>$row) {
 $studentshtml = ''; 
 
 foreach ($users as $userid => $user) {
-    $studentshtml .= '<tr><th class="user">' . $user->firstname . ' ' . $user->lastname . '</th>';
+    // Student name and link
+
+    $studentshtml .= '<tr><th class="user"><a href="' . $CFG->wwwroot . '/user/view.php?id=' 
+                  . $user->id . '">' . fullname($user) . '</a></th>';
     foreach ($items as $item) {
 
         $studentshtml .= '<td>';
diff --git a/lang/en_utf8/moodle.php b/lang/en_utf8/moodle.php
index 88c96b1106..a487fa710c 100644
--- a/lang/en_utf8/moodle.php
+++ b/lang/en_utf8/moodle.php
@@ -131,6 +131,7 @@ $string['autosubscribeyes'] = 'Yes: when I post, subscribe me to that forum';
 $string['availability'] = 'Availability';
 $string['availablecourses'] = 'Available Courses';
 $string['backtoparticipants'] = 'Back to participants list';
+$string['back'] = 'Back';
 $string['backup'] = 'Backup';
 $string['backupactivehelp'] = 'Choose whether or not to do automated backups.';
 $string['backupcancelled'] = 'Backup Cancelled';
-- 
2.39.5