From 7c2a2e1a939f21881916d86f3ad620a45f902c36 Mon Sep 17 00:00:00 2001
From: Simey Lameze <simey@moodle.com>
Date: Wed, 5 Nov 2014 13:34:40 +0800
Subject: [PATCH] MDL-47869 tool_monitor: Add sorting on event monitor pages

---
 admin/tool/monitor/classes/output/managesubs/rules.php | 4 ++--
 admin/tool/monitor/classes/rule_manager.php            | 5 +++--
 admin/tool/monitor/classes/subscription_manager.php    | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/admin/tool/monitor/classes/output/managesubs/rules.php b/admin/tool/monitor/classes/output/managesubs/rules.php
index 7014a3536ad..b298abff3f6 100644
--- a/admin/tool/monitor/classes/output/managesubs/rules.php
+++ b/admin/tool/monitor/classes/output/managesubs/rules.php
@@ -214,9 +214,9 @@ class rules extends \table_sql implements \renderable {
         if ($numcourses > COURSE_MAX_COURSES_PER_DROPDOWN) {
             return false;
         }
-
+        $orderby = 'visible DESC, sortorder ASC';
         $options = array(0 => get_string('site'));
-        if ($courses = get_user_capability_course('tool/monitor:subscribe', null, true, 'fullname')) {
+        if ($courses = get_user_capability_course('tool/monitor:subscribe', null, true, 'fullname', $orderby)) {
             foreach ($courses as $course) {
                 $options[$course->id] = format_string($course->fullname, true,
                     array('context' => \context_course::instance($course->id)));
diff --git a/admin/tool/monitor/classes/rule_manager.php b/admin/tool/monitor/classes/rule_manager.php
index b0c60e0b822..c93f76b51a7 100644
--- a/admin/tool/monitor/classes/rule_manager.php
+++ b/admin/tool/monitor/classes/rule_manager.php
@@ -222,8 +222,9 @@ class rule_manager {
     public static function get_rules_by_courseid($courseid, $limitfrom = 0, $limitto = 0) {
         global $DB;
         $select = "courseid = ? OR courseid = ?";
-        return self::get_instances($DB->get_records_select('tool_monitor_rules', $select, array(0, $courseid), null, '*',
-                $limitfrom, $limitto));
+        $orderby = "courseid DESC, name ASC";
+        return self::get_instances($DB->get_records_select('tool_monitor_rules', $select, array(0, $courseid), $orderby,
+                '*', $limitfrom, $limitto));
     }
 
     /**
diff --git a/admin/tool/monitor/classes/subscription_manager.php b/admin/tool/monitor/classes/subscription_manager.php
index 1ecf5656177..81fdc37a06d 100644
--- a/admin/tool/monitor/classes/subscription_manager.php
+++ b/admin/tool/monitor/classes/subscription_manager.php
@@ -280,7 +280,7 @@ class subscription_manager {
      * @return array list of subscriptions
      */
     public static function get_user_subscriptions($limitfrom = 0, $limitto = 0, $userid = 0,
-                                                             $order = 's.timecreated DESC' ) {
+                                                             $order = 's.courseid ASC, r.name' ) {
         global $DB, $USER;
         if ($userid == 0) {
             $userid = $USER->id;