Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java,v
diff -u -r1.15.2.5 -r1.15.2.6
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java	11 May 2016 07:14:44 -0000	1.15.2.5
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java	29 Jun 2016 13:00:04 -0000	1.15.2.6
@@ -21,12 +21,14 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.monitoring.web;
 
 import java.io.IOException;
+import java.util.Comparator;
 import java.util.Iterator;
 import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -38,14 +40,17 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.tomcat.util.json.JSONException;
 import org.apache.tomcat.util.json.JSONObject;
+import org.lamsfoundation.lams.learning.web.action.GroupingAction;
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.learningdesign.Group;
+import org.lamsfoundation.lams.learningdesign.GroupComparator;
 import org.lamsfoundation.lams.learningdesign.Grouping;
 import org.lamsfoundation.lams.learningdesign.GroupingActivity;
 import org.lamsfoundation.lams.lesson.service.LessonServiceException;
 import org.lamsfoundation.lams.monitoring.service.IMonitoringService;
 import org.lamsfoundation.lams.monitoring.service.MonitoringServiceProxy;
 import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.util.FirstNameAlphabeticComparator;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -58,19 +63,13 @@
  * </UL>
  *
  * @author Fiona Malikoff
- *
- *
- *
- *
- *
- *
- *
  */
 public class GroupingAJAXAction extends LamsDispatchAction {
 
     // ---------------------------------------------------------------------
 
     private static final String CHOSEN_GROUPING_SCREEN = "chosenGrouping";
+    private static final String VIEW_GROUPS_SCREEN = "viewGroups";
     private static final String PARAM_ACTIVITY_TITLE = "title";
     private static final String PARAM_ACTIVITY_DESCRIPTION = "description";
     public static final String PARAM_MAX_NUM_GROUPS = "maxNumberOfGroups";
@@ -130,9 +129,22 @@
 	    request.setAttribute(GroupingAJAXAction.PARAM_VIEW_MODE, Boolean.FALSE);
 
 	    return mapping.findForward(GroupingAJAXAction.CHOSEN_GROUPING_SCREEN);
+	}
 
+	SortedSet<Group> groups = new TreeSet<Group>(new GroupComparator());
+	groups.addAll(grouping.getGroups());
+
+	// sort users with first, then last name, then login
+	Comparator<User> userComparator = new FirstNameAlphabeticComparator();
+	for (Group group : groups) {
+	    Set<User> sortedUsers = new TreeSet<User>(userComparator);
+	    sortedUsers.addAll(group.getUsers());
+	    group.setUsers(sortedUsers);
 	}
-	return null;
+
+	request.setAttribute(GroupingAction.GROUPS, groups);
+	// go to a view only screen for random grouping
+	return mapping.findForward(GroupingAJAXAction.VIEW_GROUPS_SCREEN);
     }
 
     /**
@@ -299,4 +311,4 @@
 	response.getWriter().write(responseJSON.toString());
 	return null;
     }
-}
\ No newline at end of file
+}
Index: lams_monitoring/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/Attic/struts-config.xml,v
diff -u -r1.2.2.2 -r1.2.2.3
--- lams_monitoring/web/WEB-INF/struts-config.xml	27 Apr 2016 13:22:27 -0000	1.2.2.2
+++ lams_monitoring/web/WEB-INF/struts-config.xml	29 Jun 2016 13:00:04 -0000	1.2.2.3
@@ -161,6 +161,11 @@
       validate="false"
     >
       <forward
+        name="viewGroups"
+        path=".viewGroups"
+        redirect="false"
+      />
+      <forward
         name="chosenGrouping"
         path="/grouping/chosenGrouping.jsp"
         redirect="false"
Fisheye: Tag 1.11.10.1 refers to a dead (removed) revision in file `lams_monitoring/web/grouping/viewGroups.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?