MDL-10364 Added calculation icon, changed customdata to set_data for feedback form.

diff --git a/grade/report/grader/edit_feedback.php b/grade/report/grader/edit_feedback.php
index 7fcb8203a308edb4ca21415e960c2773a4d84809..24ea345d8c6ebd4e36b7b37ea1349154c36fa56f 100644 (file)
--- a/grade/report/grader/edit_feedback.php
+++ b/grade/report/grader/edit_feedback.php
@@ -20,11 +20,11 @@ require_capability('gradereport/grader:manage', $context);
 // default return url
 $returnurl = $CFG->wwwroot.'/grade/report.php?report=grader&id='.$course->id;
 
-$mform = new edit_feedback_form('edit_feedback.php', compact('course', 'id'));
+$mform = new edit_feedback_form();
 if ($grade_text = get_record('grade_grades_text', 'gradeid', $id)) {
     $mform->set_data($grade_text);
 } else {
-    $mform->set_data(array('courseid'=>$course->id));
+    $mform->set_data(array('courseid'=>$course->id, 'id' => $id));
 }
 
 if ($mform->is_cancelled()) {

diff --git a/grade/report/grader/edit_feedback_form.php b/grade/report/grader/edit_feedback_form.php
index ed3c7c18967fdec085dfe738b83266ab021a4688..104f556534c670dd41700dec5708dd817e5a96f4 100644 (file)
--- a/grade/report/grader/edit_feedback_form.php
+++ b/grade/report/grader/edit_feedback_form.php
@@ -8,9 +8,7 @@ class edit_feedback_form extends moodleform {
         $mform =& $this->_form;
 
         $feedbackformat = get_user_preferences('grade_report_feedbackformat', $CFG->grade_report_feedbackformat);
-        $course = $this->_customdata['course'];
-        $id     = $this->_customdata['id'];
-
+        
         // visible elements
         // User preference determines the format
         if ($CFG->htmleditor && $USER->htmleditor && $feedbackformat == GRADER_REPORT_FEEDBACK_FORMAT_HTML) {
@@ -25,11 +23,9 @@ class edit_feedback_form extends moodleform {
         // hidden params
         $mform->addElement('hidden', 'id', 0);
         $mform->setType('gradeid', PARAM_INT);
-        $mform->setDefault('id', $id);
 
         $mform->addElement('hidden', 'courseid', 0);
         $mform->setType('courseid', PARAM_INT);
-        $mform->setDefault('courseid', $course->id);
 
 //-------------------------------------------------------------------------------
         // buttons

diff --git a/grade/report/grader/settings.php b/grade/report/grader/settings.php
index f9dc8a232b4df299e81b8fe1254fa036985005be..6eb65580f63f2954decdad13fe0b7f169621acab 100644 (file)
--- a/grade/report/grader/settings.php
+++ b/grade/report/grader/settings.php
@@ -3,20 +3,20 @@
 /// Add settings for this module to the $settings object (it's already defined)
 $settings->add(new admin_setting_configselect('grade_report_aggregationposition', get_string('aggregationposition', 'grades'),
                                           get_string('configaggregationposition', 'grades'), false,
-                                          array(get_string('left', 'grades'), get_string('right', 'grades')));
+                                          array(get_string('left', 'grades'), get_string('right', 'grades'))));
 $settings->add(new admin_setting_configselect('grade_report_aggregationview', get_string('aggregationview', 'grades'),
                                           get_string('configaggregationview', 'grades'), false,
-                                          array(get_string('full', 'grades'), get_string('compact', 'grades')));
+                                          array(get_string('full', 'grades'), get_string('compact', 'grades'))));
 $settings->add(new admin_setting_configcheckbox('grade_report_bulkcheckboxes', get_string('bulkcheckboxes', 'grades'),
                                             get_string('configbulkcheckboxes', 'grades'), 0));
 $settings->add(new admin_setting_configcheckbox('grade_report_enableajax', get_string('enableajax', 'grades'),
                                             get_string('configenableajax', 'grades'), 0));
 $settings->add(new admin_setting_configselect('grade_report_gradedisplaytype', get_string('gradedisplaytype', 'grades'),
                                           get_string('configgradedisplaytype', 'grades'), false,
-                                          array(get_string('raw', 'grades'), get_string('percentage', 'grades')));
+                                          array(get_string('raw', 'grades'), get_string('percentage', 'grades'))));
 $settings->add(new admin_setting_configselect('grade_report_grandtotalsdisplaytype', get_string('grandtotalsdisplaytype', 'grades'),
                                           get_string('configgrandtotalsdisplaytype', 'grades'), false, 
-                                          array(get_string('raw', 'grades'), get_string('percentage', 'grades')));
+                                          array(get_string('raw', 'grades'), get_string('percentage', 'grades'))));
 $settings->add(new admin_setting_configcheckbox('grade_report_showcalculations', get_string('showcalculations', 'grades'),
                                             get_string('configshowcalculations', 'grades'), 0));
 $settings->add(new admin_setting_configcheckbox('grade_report_showeyecons', get_string('showeyecons', 'grades'),
@@ -35,7 +35,7 @@ $settings->add(new admin_setting_configtext('grade_report_studentsperpage', get_
                                         get_string('configstudentsperpage', 'grades'), 20));
 $settings->add(new admin_setting_configselect('grade_report_feedbackformat', get_string('feedbackformat', 'grades'),
                                           get_string('configfeedbackformat', 'grades'), false,
-                                          array(get_string('text', 'grades'), get_string('html', 'grades')));
+                                          array(get_string('text', 'grades'), get_string('html', 'grades'))));
 $settings->add(new admin_setting_configselect('grade_report_decimalpoints', get_string('decimalpoints', 'grades'),
                                           get_string('configdecimalpoints', 'grades'), 2,
                                           array( '0' => '0',

diff --git a/lang/en_utf8/grades.php b/lang/en_utf8/grades.php
index 0c1dc822d515f30584597ae7f42480e6bc1f9b76..dfe412923b6097432631ac9da55f1d3a932ff7d2 100644 (file)
--- a/lang/en_utf8/grades.php
+++ b/lang/en_utf8/grades.php
@@ -19,6 +19,10 @@ $string['baduser'] = 'Supplied user is invalid';
 $string['bonuspoints'] = 'Bonus Points';
 $string['bulkcheckboxes'] = 'Bulk checkboxes';
 $string['calculation'] = 'Calculation';
+$string['calculationadd'] = 'Add calculation';
+$string['calculationedit'] = 'Edit calculation';
+$string['calculationview'] = 'View calculation';
+$string['calculationsaved'] = 'Calculation saved';
 $string['categories'] = 'Categories';
 $string['category'] = 'Category';
 $string['categoriesedit'] = 'Edit Categories';
@@ -55,6 +59,7 @@ $string['displayweighted'] = 'Display Weighted Grades';
 $string['dropped'] = 'Dropped';
 $string['dropxlowest'] = 'Drop X Lowest';
 $string['dropxlowestwarning'] = 'Note: If you use drop x lowest the grading assumes that all items in the category have the same point value. If point values differ results will be unpredictable';
+$string['editcalculation'] = 'Edit calculation';
 $string['editfeedback'] = 'Edit Feedback';
 $string['enableajax'] = 'Enable AJAX';
 $string['encoding'] = 'Encoding';

diff --git a/lib/gradelib.php b/lib/gradelib.php
index 01a33cd5caf4537c17544547658fb5aa33def569..b1ea495dac32fa24787d4b10a5b42a1f01fff5b7 100644 (file)
--- a/lib/gradelib.php
+++ b/lib/gradelib.php
@@ -714,6 +714,7 @@ function grade_get_icons($element, $tree) {
     $straddfeedback    = get_string("addfeedback", 'grades');
     $stredit           = get_string("edit");
     $streditfeedback   = get_string("editfeedback", 'grades');
+    $streditcalculation= get_string("editcalculation", 'grades');
     $strfeedback       = get_string("feedback");
     $strmove           = get_string("move");
     $strmoveup         = get_string("moveup");
@@ -754,9 +755,19 @@ function grade_get_icons($element, $tree) {
                   .$stredit.'" title="'.$stredit.'" /></a>'. "\n";
 
         } else if ($type == 'grade') {
+            // What is the purpose of edit_grade page?
+            /*
             $html .= '<a href="report/grader/edit_grade.php?courseid='.$object->courseid.'&amp;id='.$object->id.'">';
             $html .= '<img src="'.$CFG->pixpath.'/t/edit.gif" class="iconsmall" alt="'
                   .$stredit.'" title="'.$stredit.'" /></a>'. "\n";
+            */      
+        }
+        
+        // Calculation icon for items and categories
+        if ($type != 'grade') {
+            $html .= '<a href="report/grader/edit_calculation.php?courseid='.$object->courseid.'&amp;id='.$object->id.'">';
+            $html .= '<img src="'.$CFG->pixpath.'/t/calc.gif" class="iconsmall" alt="'
+                  .$streditcalculation.'" title="'.$streditcalculation.'" /></a>'. "\n"; 
         }
 
         // Prepare Hide/Show icon state
@@ -766,7 +777,7 @@ function grade_get_icons($element, $tree) {
         }
 
         // Setup object identifier and show feedback icon if applicable
-        if ($type != 'category' and $USER->gradefeedback) {
+        if ($type == 'grade' and $USER->gradefeedback) {
             // Display Edit/Add feedback icon
             if (empty($object->feedback)) {
                 $html .= '<a href="report/grader/edit_feedback.php?id=' . $object->id 

diff --git a/pix/t/calc.gif b/pix/t/calc.gif
new file mode 100644 (file)
index 0000000..b0f8e5f
Binary files /dev/null and b/pix/t/calc.gif differ