MDL-47501 gradebook: Add an indication that the grade letters was overridden

diff --git a/grade/edit/letter/index.php b/grade/edit/letter/index.php
index 00fb110..89a5912 100644 (file)
--- a/grade/edit/letter/index.php
+++ b/grade/edit/letter/index.php
@@ -76,6 +76,8 @@ $pagename  = get_string('letters', 'grades');
 $letters = grade_get_letters($context);
 $num = count($letters) + 3;
 
 $letters = grade_get_letters($context);
 $num = count($letters) + 3;
 

+$override = $DB->record_exists('grade_letters', array('contextid' => $context->id));
+

 //if were viewing the letters
 if (!$edit) {
 
 //if were viewing the letters
 if (!$edit) {
 


@@ -93,6 +95,10 @@ if (!$edit) {
 
     print_grade_page_head($COURSE->id, 'letter', 'view', get_string('gradeletters', 'grades'));
 
 
     print_grade_page_head($COURSE->id, 'letter', 'view', get_string('gradeletters', 'grades'));
 

+    if (!empty($override)) {
+        echo $OUTPUT->notification(get_string('gradeletteroverridden', 'grades'), 'notifymessage');
+    }
+

     $stredit = get_string('editgradeletters', 'grades');
     $editlink = html_writer::nonempty_tag('div', html_writer::link($returnurl.$editparam, $stredit), array('class'=>'mdl-align'));
     echo $editlink;
     $stredit = get_string('editgradeletters', 'grades');
     $editlink = html_writer::nonempty_tag('div', html_writer::link($returnurl.$editparam, $stredit), array('class'=>'mdl-align'));
     echo $editlink;


@@ -122,7 +128,7 @@ if (!$edit) {
         $data->$gradeboundaryname = $boundary;
         $i++;
     }
         $data->$gradeboundaryname = $boundary;
         $i++;
     }

-    $data->override = $DB->record_exists('grade_letters', array('contextid' => $context->id));
+    $data->override = $override;

 
     $mform = new edit_letter_form($returnurl.$editparam, array('num'=>$num, 'admin'=>$admin));
     $mform->set_data($data);
 
     $mform = new edit_letter_form($returnurl.$editparam, array('num'=>$num, 'admin'=>$admin));
     $mform->set_data($data);

diff --git a/lang/en/grades.php b/lang/en/grades.php
index ce64984..1d9513d 100644 (file)
--- a/lang/en/grades.php
+++ b/lang/en/grades.php
@@ -284,6 +284,7 @@ $string['gradeitemsinc'] = 'Grade items to be included';
 $string['gradeletter'] = 'Grade letter';
 $string['gradeletter_help'] = 'Grade letters are letters, A, B, C, ..., or words, for example Distinction, Merit, Pass, ..., used to represent a range of grades.';
 $string['gradeletternote'] = 'To delete a grade letter just empty any of the<br /> three text areas for that letter and click submit.';
 $string['gradeletter'] = 'Grade letter';
 $string['gradeletter_help'] = 'Grade letters are letters, A, B, C, ..., or words, for example Distinction, Merit, Pass, ..., used to represent a range of grades.';
 $string['gradeletternote'] = 'To delete a grade letter just empty any of the<br /> three text areas for that letter and click submit.';

+$string['gradeletteroverridden'] = 'The default grade letters are currently overridden.';

 $string['gradeletters'] = 'Grade letters';
 $string['gradelocked'] = 'Grade is locked';
 $string['gradelong'] = '{$a->grade} / {$a->max}';
 $string['gradeletters'] = 'Grade letters';
 $string['gradelocked'] = 'Grade is locked';
 $string['gradelong'] = '{$a->grade} / {$a->max}';