Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -rc3c499fa8b7a5487229a59411af3710fa878b93c -rbde17960f55b4c3dc6bef66691c95581a515a751
Binary files differ
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationGroupingDTO.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationGroupingDTO.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationGroupingDTO.java	(revision bde17960f55b4c3dc6bef66691c95581a515a751)
@@ -0,0 +1,53 @@
+package org.lamsfoundation.lams.usermanagement.dto;
+
+import org.lamsfoundation.lams.usermanagement.OrganisationGrouping;
+
+/**
+ * Class for displaying data on groupings page.
+ */
+public class OrganisationGroupingDTO implements Comparable<OrganisationGroupingDTO> {
+    private Long groupingId;
+    private String name;
+    private Integer groupCount;
+
+    public OrganisationGroupingDTO(OrganisationGrouping grouping) {
+	this.groupingId = grouping.getGroupingId();
+	this.name = grouping.getName();
+	this.groupCount = grouping.getGroups().size();
+    }
+
+    public Long getGroupingId() {
+	return groupingId;
+    }
+
+    public void setGroupingId(Long groupingId) {
+	this.groupingId = groupingId;
+    }
+
+    public String getName() {
+	return name;
+    }
+
+    public void setName(String name) {
+	this.name = name;
+    }
+
+    public Integer getGroupCount() {
+	return groupCount;
+    }
+
+    public void setGroupCount(Integer groupCount) {
+	this.groupCount = groupCount;
+    }
+
+    @Override
+    public int compareTo(OrganisationGroupingDTO o) {
+	if (o == null) {
+	    return 1;
+	}
+	if (this.name == null) {
+	    return o.name == null ? 0 : 1;
+	}
+	return this.name.compareTo(o.name);
+    }
+}