Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
===================================================================
diff -u -r7e8b71604044e851c877e918e7d6570a9942a356 -rd18554fe841b507a786bfd1c044a3019453f3b48
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java	(.../IUserManagementService.java)	(revision 7e8b71604044e851c877e918e7d6570a9942a356)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java	(.../IUserManagementService.java)	(revision d18554fe841b507a786bfd1c044a3019453f3b48)
@@ -28,6 +28,7 @@
 
 import org.lamsfoundation.lams.usermanagement.AuthenticationMethod;
 import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.OrganisationState;
 import org.lamsfoundation.lams.usermanagement.OrganisationType;
 import org.lamsfoundation.lams.usermanagement.Role;
 import org.lamsfoundation.lams.usermanagement.User;
@@ -37,6 +38,7 @@
 import org.lamsfoundation.lams.usermanagement.WorkspaceFolder;
 import org.lamsfoundation.lams.usermanagement.dao.IAuthenticationMethodDAO;
 import org.lamsfoundation.lams.usermanagement.dao.IOrganisationDAO;
+import org.lamsfoundation.lams.usermanagement.dao.IOrganisationStateDAO;
 import org.lamsfoundation.lams.usermanagement.dao.IOrganisationTypeDAO;
 import org.lamsfoundation.lams.usermanagement.dao.IRoleDAO;
 import org.lamsfoundation.lams.usermanagement.dao.IUserDAO;
@@ -55,6 +57,17 @@
  * 
  * @author <a href="mailto:fyang@melcoe.mq.edu.au">Fei Yang</a>
  */
+/**
+ * @version
+ *
+ * <p>
+ * <a href="IUserManagementService.java.html"><i>View Source</i></a>
+ * </p>
+ *
+ * @author <a href="mailto:fyang@melcoe.mq.edu.au">Fei Yang</a>
+ *
+ * Created at 11:53:53 on 2006-6-2
+ */
 public interface IUserManagementService {
 
     /**
@@ -85,6 +98,13 @@
      */
 	public void setOrganisationTypeDAO(IOrganisationTypeDAO organisationTypeDao);
 	
+    /**
+     * Set IOrganisationStateDAO
+     *
+     * @param organisationStateDao 
+     */
+	public void setOrganisationStateDAO(IOrganisationStateDAO organisationStateDao);
+
 	
     /**
      * Set IUserOrganisationDAO
@@ -283,6 +303,22 @@
      * @return AuthenticationMethod with the name
      */
     public AuthenticationMethod getAuthenticationMethodByName(String name);
+    
+    
+    /**
+     * Retrieves a list of all the OrganisationState objects
+     * 
+     * @return OrganisationState object list
+     */
+    public List<OrganisationState> getAllOrgnisationStates();
+    
+    /**
+     * Retrieve the OrganisationState by the Id
+     * 
+     * @param oranisationStateId the Id of the organisationState
+     * @return the OrganisationState object specified by the organisationStateId
+     */
+    public OrganisationState getOrganisationStateById(Integer organisationStateId);
    
      /**
       * 
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
===================================================================
diff -u -r7e8b71604044e851c877e918e7d6570a9942a356 -rd18554fe841b507a786bfd1c044a3019453f3b48
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision 7e8b71604044e851c877e918e7d6570a9942a356)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision d18554fe841b507a786bfd1c044a3019453f3b48)
@@ -35,6 +35,7 @@
 import org.lamsfoundation.lams.lesson.dao.ILessonDAO;
 import org.lamsfoundation.lams.usermanagement.AuthenticationMethod;
 import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.OrganisationState;
 import org.lamsfoundation.lams.usermanagement.OrganisationType;
 import org.lamsfoundation.lams.usermanagement.Role;
 import org.lamsfoundation.lams.usermanagement.User;
@@ -44,6 +45,7 @@
 import org.lamsfoundation.lams.usermanagement.WorkspaceFolder;
 import org.lamsfoundation.lams.usermanagement.dao.IAuthenticationMethodDAO;
 import org.lamsfoundation.lams.usermanagement.dao.IOrganisationDAO;
+import org.lamsfoundation.lams.usermanagement.dao.IOrganisationStateDAO;
 import org.lamsfoundation.lams.usermanagement.dao.IOrganisationTypeDAO;
 import org.lamsfoundation.lams.usermanagement.dao.IRoleDAO;
 import org.lamsfoundation.lams.usermanagement.dao.IUserDAO;
@@ -79,6 +81,8 @@
 	private IOrganisationDAO organisationDAO;
 
 	private IOrganisationTypeDAO organisationTypeDAO;
+	
+	private IOrganisationStateDAO organisationStateDAO;
 
 	private IUserOrganisationDAO userOrganisationDAO;
 
@@ -135,6 +139,13 @@
 	}
 
 	/**
+	 * @see org.lamsfoundation.lams.usermanagement.service.IUserManagementService#setOrganisationStateDAO(org.lamsfoundation.lams.usermanagement.dao.IOrganisationStateDAO)
+	 */
+	public void setOrganisationStateDAO(IOrganisationStateDAO organisationStateDAO) {
+		this.organisationStateDAO = organisationStateDAO;
+	}
+
+	/**
 	 * @see org.lamsfoundation.lams.usermanagement.service.IUserManagementService#setUserOrganisationDAO(org.lamsfoundation.lams.usermanagement.dao.IUserOrganisationDAO)
 	 */
 	public void setUserOrganisationDAO(IUserOrganisationDAO userOrganisationDAO) {
@@ -654,4 +665,12 @@
 	public List getLearnerLessonsFromOrganisation(Integer userID, Integer organisationID) {
 		return lessonDAO.getActiveLessonsForLearner(userID, organisationID);
 	}
+
+	public List<OrganisationState> getAllOrgnisationStates() {
+		return organisationStateDAO.getAllOrganisationStates();
+	}
+
+	public OrganisationState getOrganisationStateById(Integer organisationStateId) {
+		return organisationStateDAO.getOrganisationStateById(organisationStateId);
+	}
 }