Merge branch 'MDL-46565_master' of git://github.com/markn86/moodle

grade/report/grader/classes/event/grade_report_viewed.php

@@ -34,7 +34,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2014 Adrian Greeve <adrian@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class report_viewed extends \core\event\grade_report_viewed {
+class grade_report_viewed extends \core\event\grade_report_viewed {
 
     /**
      * Returns localised general event name.
@@ -42,6 +42,6 @@ class report_viewed extends \core\event\grade_report_viewed {
      * @return string
      */
     public static function get_name() {
-        return get_string('eventreportviewed', 'gradereport_grader');
+        return get_string('eventgradereportviewed', 'gradereport_grader');
     }
 }

grade/report/grader/index.php

@@ -125,14 +125,6 @@ if (!empty($target) && !empty($action) && confirm_sesskey()) {
 
 $reportname = get_string('pluginname', 'gradereport_grader');
 
-$event = \gradereport_grader\event\report_viewed::create(
-    array(
-        'context' => $context,
-        'courseid' => $courseid,
-    )
-);
-$event->trigger();
-
 // Print header
 print_grade_page_head($COURSE->id, 'report', 'grader', $reportname, false, $buttons);
 
@@ -205,4 +197,13 @@ if ($USER->gradeediting[$course->id] && ($report->get_pref('showquickfeedback')
 if (!empty($studentsperpage) && $studentsperpage >= 20) {
     echo $OUTPUT->paging_bar($numusers, $report->page, $studentsperpage, $report->pbarurl);
 }
+
+$event = \gradereport_grader\event\grade_report_viewed::create(
+    array(
+        'context' => $context,
+        'courseid' => $courseid,
+    )
+);
+$event->trigger();
+
 echo $OUTPUT->footer();

grade/report/grader/lang/en/gradereport_grader.php

@@ -28,7 +28,7 @@ $string['ajaxerror'] = 'Error';
 $string['ajaxfailedupdate'] = 'Unable to update [1] for [2]';
 $string['ajaxfieldchanged'] = 'The field you are currently editing has changed, would you like to use the updated value?';
 $string['ajaxchoosescale'] = 'Choose';
-$string['eventreportviewed'] = 'Grader report viewed';
+$string['eventgradereportviewed'] = 'Grader report viewed';
 $string['grader:manage'] = 'Manage the grader report';
 $string['grader:view'] = 'View the grader report';
 $string['pluginname'] = 'Grader report';

grade/report/outcomes/classes/event/grade_report_viewed.php

@@ -34,7 +34,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2014 Adrian Greeve <adrian@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class report_viewed extends \core\event\grade_report_viewed {
+class grade_report_viewed extends \core\event\grade_report_viewed {
 
     /**
      * Returns localised general event name.
@@ -42,6 +42,6 @@ class report_viewed extends \core\event\grade_report_viewed {
      * @return string
      */
     public static function get_name() {
-        return get_string('eventreportviewed', 'gradereport_outcomes');
+        return get_string('eventgradereportviewed', 'gradereport_outcomes');
     }
 }

grade/report/outcomes/index.php

@@ -170,7 +170,13 @@ foreach ($report_info as $outcomeid => $outcomedata) {
     $row++;
 }
 
-$event = \gradereport_outcomes\event\report_viewed::create(
+$html .= '</table>';
+
+print_grade_page_head($courseid, 'report', 'outcomes');
+
+echo $html;
+
+$event = \gradereport_outcomes\event\grade_report_viewed::create(
     array(
         'context' => $context,
         'courseid' => $courseid,
@@ -178,12 +184,4 @@ $event = \gradereport_outcomes\event\report_viewed::create(
 );
 $event->trigger();
 
-$html .= '</table>';
-
-print_grade_page_head($courseid, 'report', 'outcomes');
-
-
-echo $html;
 echo $OUTPUT->footer();
-
-

grade/report/outcomes/lang/en/gradereport_outcomes.php

@@ -26,7 +26,7 @@
 $string['addoutcome'] = 'Add an outcome';
 $string['courseoutcomes'] = 'Course outcomes';
 $string['coursespecoutcome'] = 'Course outcomes';
-$string['eventreportviewed'] = 'Outcomes report viewed';
+$string['eventgradereportviewed'] = 'Grade outcomes report viewed';
 $string['pluginname'] = 'Outcomes report';
 $string['outcomes:view'] = 'View the outcomes report';
 $string['usedgradeitem'] = 'Number of grade items';

grade/report/overview/classes/event/grade_report_viewed.php

@@ -34,7 +34,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2014 Adrian Greeve <adrian@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class report_viewed extends \core\event\grade_report_viewed {
+class grade_report_viewed extends \core\event\grade_report_viewed {
 
     /**
      * Returns localised general event name.
@@ -42,7 +42,7 @@ class report_viewed extends \core\event\grade_report_viewed {
      * @return string
      */
     public static function get_name() {
-        return get_string('eventreportviewed', 'gradereport_overview');
+        return get_string('eventgradereportviewed', 'gradereport_overview');
     }
 
     /**

grade/report/overview/index.php

@@ -148,7 +148,7 @@ if (has_capability('moodle/grade:viewall', $systemcontext)) { //Admins will see
     }
 }
 
-$event = \gradereport_overview\event\report_viewed::create(
+$event = \gradereport_overview\event\grade_report_viewed::create(
     array(
         'context' => $context,
         'courseid' => $courseid,

grade/report/overview/lang/en/gradereport_overview.php

@@ -22,6 +22,6 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['eventreportviewed'] = 'Overview report viewed';
+$string['eventgradereportviewed'] = 'Grade overview report viewed';
 $string['pluginname'] = 'Overview report';
 $string['overview:view'] = 'View the overview report';

grade/report/user/classes/event/grade_report_viewed.php

@@ -34,7 +34,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2014 Adrian Greeve <adrian@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class report_viewed extends \core\event\grade_report_viewed {
+class grade_report_viewed extends \core\event\grade_report_viewed {
 
     /**
      * Returns localised general event name.
@@ -42,7 +42,7 @@ class report_viewed extends \core\event\grade_report_viewed {
      * @return string
      */
     public static function get_name() {
-        return get_string('eventreportviewed', 'gradereport_user');
+        return get_string('eventgradereportviewed', 'gradereport_user');
     }
 
     /**

grade/report/user/index.php

@@ -164,7 +164,7 @@ if (has_capability('moodle/grade:viewall', $context)) { //Teachers will see all
     }
 }
 
-$event = \gradereport_user\event\report_viewed::create(
+$event = \gradereport_user\event\grade_report_viewed::create(
     array(
         'context' => $context,
         'courseid' => $courseid,

grade/report/user/lang/en/gradereport_user.php

@@ -22,7 +22,7 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['eventreportviewed'] = 'User grade report viewed';
+$string['eventgradereportviewed'] = 'Grade user report viewed';
 $string['pluginname'] = 'User report';
 $string['user:view'] = 'View your own grade report';
 $string['tablesummary'] = 'The table is arranged as a list of graded items including categories of graded items. When items are in a category they will be indicated as such.';