Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IOrganisationDAO.java
===================================================================
diff -u -rd4153a35e76b6fae554d777ea551588ac0b1e945 -r9b511aa7e69c9d2239c94a0723df6f5fb391fb51
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IOrganisationDAO.java	(.../IOrganisationDAO.java)	(revision d4153a35e76b6fae554d777ea551588ac0b1e945)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IOrganisationDAO.java	(.../IOrganisationDAO.java)	(revision 9b511aa7e69c9d2239c94a0723df6f5fb391fb51)
@@ -77,4 +77,6 @@
     public Organisation getOrganisationByWorkspaceID(Integer workspaceID);
     
     public List getOrganisationsByType(Integer organisationTypeId);
+    
+    public List getOrganisationsByTypeAndStatus(Integer organisationTypeId,Integer organisationStateId);
 }
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IUserOrganisationDAO.java
===================================================================
diff -u -rd4153a35e76b6fae554d777ea551588ac0b1e945 -r9b511aa7e69c9d2239c94a0723df6f5fb391fb51
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IUserOrganisationDAO.java	(.../IUserOrganisationDAO.java)	(revision d4153a35e76b6fae554d777ea551588ac0b1e945)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IUserOrganisationDAO.java	(.../IUserOrganisationDAO.java)	(revision 9b511aa7e69c9d2239c94a0723df6f5fb391fb51)
@@ -98,4 +98,6 @@
     public void deleteUserOrganisationById(Integer userOrganisationId);
 
     public List getUserOrganisationsByType(Integer organisationTypeId);
+
+	public List getUserOrganisationsForUserByTypeAndStatus(String username, Integer organisationTypeId, Integer organisationStateId);
 }
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IUserOrganisationRoleDAO.java
===================================================================
diff -u -r9ee21b9038a403027299fd2d3121ad638d1c28b1 -r9b511aa7e69c9d2239c94a0723df6f5fb391fb51
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IUserOrganisationRoleDAO.java	(.../IUserOrganisationRoleDAO.java)	(revision 9ee21b9038a403027299fd2d3121ad638d1c28b1)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IUserOrganisationRoleDAO.java	(.../IUserOrganisationRoleDAO.java)	(revision 9b511aa7e69c9d2239c94a0723df6f5fb391fb51)
@@ -64,5 +64,7 @@
      * @param userOrganisationRoleId the userOrganisationRole's userOrganisationRoleId
      */
     public void deleteUserOrganisationRoleById(Integer userOrganisationRoleId);
+
+	public List getUserOrganisationRoles(Integer organisationId, String username);
 	
 }
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java
===================================================================
diff -u -r6feed3e3e5993eb7e64c026cc7673503dddb8854 -r9b511aa7e69c9d2239c94a0723df6f5fb391fb51
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java	(.../OrganisationDAO.java)	(revision 6feed3e3e5993eb7e64c026cc7673503dddb8854)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java	(.../OrganisationDAO.java)	(revision 9b511aa7e69c9d2239c94a0723df6f5fb391fb51)
@@ -24,12 +24,10 @@
 package org.lamsfoundation.lams.usermanagement.dao.hibernate;
 
 import java.util.List;
-import java.util.Iterator;
 
 import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
-
-import org.lamsfoundation.lams.usermanagement.dao.IOrganisationDAO;
 import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.dao.IOrganisationDAO;
 
 /**
  * This class interacts with Spring's HibernateTemplate to save/delete and
@@ -98,4 +96,10 @@
 		return getHibernateTemplate().find(queryString,organisationTypeId);
 	}
 
+	public List getOrganisationsByTypeAndStatus(Integer organisationTypeId, Integer organisationStateId) {
+		String queryString = "from Organisation o where o.organisationType.organisationTypeId=? and o.organisationState.organisationStateId=?";
+		Integer[] params = new Integer[]{organisationTypeId,organisationStateId};
+		return getHibernateTemplate().find(queryString,params);
+	}
+
 }
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserOrganisationDAO.java
===================================================================
diff -u -r950ee64939e4b71aec82daa0dce40ddfe554bff8 -r9b511aa7e69c9d2239c94a0723df6f5fb391fb51
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserOrganisationDAO.java	(.../UserOrganisationDAO.java)	(revision 950ee64939e4b71aec82daa0dce40ddfe554bff8)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserOrganisationDAO.java	(.../UserOrganisationDAO.java)	(revision 9b511aa7e69c9d2239c94a0723df6f5fb391fb51)
@@ -118,4 +118,10 @@
 		return getHibernateTemplate().find(queryString,organisationTypeId);
 	}
 
+	public List getUserOrganisationsForUserByTypeAndStatus(String username, Integer organisationTypeId, Integer organisationStateId) {
+		String queryString = "from UserOrganisation uo where uo.user.login=? and uo.organisation.organisationType.organisationTypeId=? and uo.organisation.organisationState.organisationStateId=?";
+		Object[] params = new Object[]{username,organisationTypeId,organisationStateId};
+		return getHibernateTemplate().find(queryString,params);
+	}
+
 }
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserOrganisationRoleDAO.java
===================================================================
diff -u -r9ee21b9038a403027299fd2d3121ad638d1c28b1 -r9b511aa7e69c9d2239c94a0723df6f5fb391fb51
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserOrganisationRoleDAO.java	(.../UserOrganisationRoleDAO.java)	(revision 9ee21b9038a403027299fd2d3121ad638d1c28b1)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserOrganisationRoleDAO.java	(.../UserOrganisationRoleDAO.java)	(revision 9b511aa7e69c9d2239c94a0723df6f5fb391fb51)
@@ -78,4 +78,9 @@
 		delete(getUserOrganisationRoleById(userOrganisationRoleId));
 	}
 
+	public List getUserOrganisationRoles(Integer organisationId, String username) {
+		String queryString = "from UserOrganisationRole uor where uor.userOrganisation.organisation.organisationId=? and uor.userOrganisation.user.login=?";
+		return getHibernateTemplate().find(queryString,new Object[]{organisationId,username});
+	}
+
 }
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
===================================================================
diff -u -r6554380a974d1d1ce19c561687068700b4eee434 -r9b511aa7e69c9d2239c94a0723df6f5fb391fb51
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java	(.../IUserManagementService.java)	(revision 6554380a974d1d1ce19c561687068700b4eee434)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java	(.../IUserManagementService.java)	(revision 9b511aa7e69c9d2239c94a0723df6f5fb391fb51)
@@ -481,5 +481,11 @@
 	public boolean isUserInRoleInOrganisation(String login, Integer roleId, Integer orgId);
 	
 	public void deleteOrganisationById(Integer orgId);
+	
+	public List getOrganisationsByTypeAndStatus(Integer organisationTypeId, Integer organisationStateId);
+	
+	public List getUserOrganisationsForUserByTypeAndStatus(String username,Integer organisationTypeId, Integer organisationStateId);
+	
+	public List getUserOrganisationRoles(Integer organisationId, String username);
 
 }
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
===================================================================
diff -u -ra217ec496faa38cd996876c85fefcf1d74089a86 -r9b511aa7e69c9d2239c94a0723df6f5fb391fb51
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision a217ec496faa38cd996876c85fefcf1d74089a86)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision 9b511aa7e69c9d2239c94a0723df6f5fb391fb51)
@@ -727,4 +727,16 @@
 		organisationDAO.deleteOrganisationById(orgId);
 	}
 
+	public List getOrganisationsByTypeAndStatus(Integer organisationTypeId, Integer organisationStateId) {
+		return organisationDAO.getOrganisationsByTypeAndStatus(organisationTypeId,organisationStateId);
+	}
+
+	public List getUserOrganisationsForUserByTypeAndStatus(String username, Integer organisationTypeId, Integer organisationStateId) {
+		return userOrganisationDAO.getUserOrganisationsForUserByTypeAndStatus(username,organisationTypeId,organisationStateId);
+	}
+
+	public List getUserOrganisationRoles(Integer organisationId, String username) {
+		return userOrganisationRoleDAO.getUserOrganisationRoles(organisationId,username);
+	}
+
 }