Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IOrganisationDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IOrganisationDAO.java,v diff -u -r1.7 -r1.8 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IOrganisationDAO.java 7 Jun 2006 02:48:36 -0000 1.7 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IOrganisationDAO.java 15 Jun 2006 06:11:07 -0000 1.8 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IUserOrganisationDAO.java,v diff -u -r1.7 -r1.8 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IUserOrganisationDAO.java 7 Jun 2006 02:48:36 -0000 1.7 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IUserOrganisationDAO.java 15 Jun 2006 06:11:07 -0000 1.8 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/Attic/IUserOrganisationRoleDAO.java,v diff -u -r1.6 -r1.7 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IUserOrganisationRoleDAO.java 2 Jun 2006 06:57:27 -0000 1.6 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IUserOrganisationRoleDAO.java 15 Jun 2006 06:11:07 -0000 1.7 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java,v diff -u -r1.9 -r1.10 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java 9 Jun 2006 02:45:26 -0000 1.9 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java 15 Jun 2006 06:11:16 -0000 1.10 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserOrganisationDAO.java,v diff -u -r1.8 -r1.9 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserOrganisationDAO.java 7 Jun 2006 02:48:52 -0000 1.8 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserOrganisationDAO.java 15 Jun 2006 06:11:16 -0000 1.9 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/Attic/UserOrganisationRoleDAO.java,v diff -u -r1.7 -r1.8 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserOrganisationRoleDAO.java 2 Jun 2006 06:57:27 -0000 1.7 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserOrganisationRoleDAO.java 15 Jun 2006 06:11:16 -0000 1.8 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java,v diff -u -r1.20 -r1.21 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java 8 Jun 2006 07:05:20 -0000 1.20 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java 15 Jun 2006 06:11:23 -0000 1.21 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java,v diff -u -r1.26 -r1.27 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java 9 Jun 2006 02:46:16 -0000 1.26 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java 15 Jun 2006 06:11:23 -0000 1.27 @@ -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); + } + }