From 9ff4b7935b1e2b9cb9dad1be0f53a86a34ef7fd2 Mon Sep 17 00:00:00 2001
From: unknown <pni17@.canterbury.ac.nz>
Date: Fri, 25 Jun 2010 11:16:41 +1200
Subject: [PATCH] Add group / grouping natural sort

---
 group/assign.php      |    2 ++
 group/groupings.php   |    2 ++
 group/index.php       |    2 ++
 group/lib.php         |   12 ++++++++++++
 group/overview.php    |   22 ++++++++++++++++++++++
 user/selector/lib.php |    6 +++++-
 6 files changed, 45 insertions(+), 1 deletions(-)

diff --git a/group/assign.php b/group/assign.php
index fcc07d3..a2a0f2a 100644
--- a/group/assign.php
+++ b/group/assign.php
@@ -68,11 +68,13 @@ $currentmembers = array();
 $potentialmembers  = array();
 
 if ($groups = $DB->get_records('groups', array('courseid'=>$courseid), 'name')) {
+    uasort($groups, 'object_name_sort_compare');  // Perform natural sort on groups
     if ($assignment = $DB->get_records('groupings_groups', array('groupingid'=>$grouping->id))) {
         foreach ($assignment as $ass) {
             $currentmembers[$ass->groupid] = $groups[$ass->groupid];
             unset($groups[$ass->groupid]);
         }
+        uasort($currentmembers, 'object_name_sort_compare'); // Perform natural sort on assigned groups
     }
     $potentialmembers = $groups;
 }
diff --git a/group/groupings.php b/group/groupings.php
index 468febe..99d5057 100644
--- a/group/groupings.php
+++ b/group/groupings.php
@@ -67,11 +67,13 @@ echo $OUTPUT->heading($strgroupings);
 
 $data = array();
 if ($groupings = $DB->get_records('groupings', array('courseid'=>$course->id), 'name')) {
+    uasort($groupings, 'object_name_sort_compare'); // Perform natural sort on groupings
     foreach($groupings as $grouping) {
         $line = array();
         $line[0] = format_string($grouping->name);
 
         if ($groups = groups_get_all_groups($courseid, 0, $grouping->id)) {
+            uasort($groups, 'object_name_sort_compare'); // Perform natural sort on groups
             $groupnames = array();
             foreach ($groups as $group) {
                 $groupnames[] = format_string($group->name);
diff --git a/group/index.php b/group/index.php
index 28dd58c..1f6fe58 100644
--- a/group/index.php
+++ b/group/index.php
@@ -173,6 +173,8 @@ echo '<select name="groups[]" multiple="multiple" id="groups" size="15" class="s
 echo ' onclick="window.status=this.selectedIndex==-1 ? \'\' : this.options[this.selectedIndex].title;" onmouseout="window.status=\'\';">'."\n";
 
 $groups = groups_get_all_groups($courseid);
+uasort($groups, 'object_name_sort_compare'); // Perform natural sort on groups
+
 $selectedname = '&nbsp;';
 
 if ($groups) {
diff --git a/group/lib.php b/group/lib.php
index 9f6c667..169f62a 100644
--- a/group/lib.php
+++ b/group/lib.php
@@ -730,3 +730,15 @@ function groups_calculate_role_people($rs, $context) {
     // Return list of roles containing their users
     return $roles;
 }
+
+/**
+ * Custom array sort function to do natural ordering on the "name" attribute
+ * of the member objects.  Used on groups and groupings.
+ *
+ * @param object $a First object to compare
+ * @param object $b Second object to compare
+ * @return array As described in groups_get_members_by_role
+ */
+function object_name_sort_compare($a, $b) {
+    return strnatcasecmp($a->name, $b->name);
+}
\ No newline at end of file
diff --git a/group/overview.php b/group/overview.php
index 1b9649f..7c273a9 100644
--- a/group/overview.php
+++ b/group/overview.php
@@ -9,6 +9,7 @@
  */
 
 require_once('../config.php');
+require_once('lib.php');
 
 $courseid   = required_param('id', PARAM_INT);
 $groupid    = optional_param('group', 0, PARAM_INT);
@@ -48,6 +49,7 @@ $strdescription      = get_string('description');
 
 // Get all groupings
 $groupings = $DB->get_records('groupings', array('courseid'=>$courseid), 'name');
+uasort($groupings, 'object_name_sort_compare'); // Perform natural sort on groupings
 $members = array();
 foreach ($groupings as $grouping) {
     $members[$grouping->id] = array();
@@ -56,6 +58,7 @@ $members[-1] = array(); //groups not in a grouping
 
 // Get all groups
 $groups = $DB->get_records('groups', array('courseid'=>$courseid), 'name');
+uasort($groups, 'object_name_sort_compare'); // Perform natural sort on groups
 
 $params = array('courseid'=>$courseid);
 if ($groupid) {
@@ -98,6 +101,25 @@ if ($rs = $DB->get_recordset_sql($sql, $params)) {
         }
     }
     $rs->close();
+
+    // Sort $members based on the already naturally-sorted $groups and $groupings
+    $groupKeys = array_flip(array_keys($groups));
+    foreach ($members as $gpgid=>$groupdata) {
+        $tmpGroups = array();
+        foreach ($groupKeys as $gpid=>$group) {
+            if (array_key_exists($gpid, $members[$gpgid])) {
+                $tmpGroups[$gpid]=$members[$gpgid][$gpid];
+            }
+        }
+        $members[$gpgid] = $tmpGroups;
+    }
+    $tmpGroups = array();
+    foreach ($groupKeys as $gpid=>$group) {
+        if (array_key_exists($gpid, $members[-1])) {
+            $tmpGroups[$gpid]=$members[-1][$gpid];
+        }
+    }
+    $members[-1] = $tmpGroups;
 }
 
 $PAGE->settingsnav->get('courseadmin')->get('groups')->make_active();
diff --git a/user/selector/lib.php b/user/selector/lib.php
index e984d4f..1d775c6 100644
--- a/user/selector/lib.php
+++ b/user/selector/lib.php
@@ -734,7 +734,7 @@ class group_non_members_selector extends groups_user_selector_base {
      * Used on the add group members page.
      */
     public function print_user_summaries($courseid) {
-        global $DB;
+        global $DB, $CFG;
 
         echo <<<END
         <script type="text/javascript">
@@ -757,6 +757,10 @@ END;
                     $usergroups[$usergroup->userid][$usergroup->id] = $usergroup;
                 }
                 $rs->close();
+                require_once($CFG->dirroot . '/group/lib.php');
+                foreach($usergroups as $uid=>$ugroups) {
+                    uasort($usergroups[$uid], 'object_name_sort_compare'); // Perform natural sort on user's groups
+                }
             }
 
             $membercnt = count($potentialmembersids);
-- 
1.7.0.2.msysgit.0