Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java =================================================================== diff -u -r8c74eb1d41455f08644a9cc637bbea499587c7ab -r763fa73e0c5267c561a47be1154b5f1f7f80f767 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java (.../IUserManagementService.java) (revision 8c74eb1d41455f08644a9cc637bbea499587c7ab) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java (.../IUserManagementService.java) (revision 763fa73e0c5267c561a47be1154b5f1f7f80f767) @@ -37,6 +37,7 @@ import org.lamsfoundation.lams.usermanagement.Workspace; import org.lamsfoundation.lams.usermanagement.WorkspaceFolder; import org.lamsfoundation.lams.usermanagement.dao.IAuthenticationMethodDAO; +import org.lamsfoundation.lams.usermanagement.dao.ILocaleDAO; import org.lamsfoundation.lams.usermanagement.dao.IOrganisationDAO; import org.lamsfoundation.lams.usermanagement.dao.IOrganisationStateDAO; import org.lamsfoundation.lams.usermanagement.dao.IOrganisationTypeDAO; @@ -85,6 +86,14 @@ public void setRoleDAO(IRoleDAO roleDao); /** + * Set ILocaleDAO + * + * @param localeDao + */ + public void setLocaleDAO(ILocaleDAO localeDao); + + + /** * Set IOrganisationDAO * * @param organisationDao @@ -446,5 +455,9 @@ * TODO modify/remove when the index page is implemented properly */ public List getLearnerLessonsFromOrganisation(Integer userID, Integer organisationID); + + public List getAllCountries(); + + public List getAllLanguages(); } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java =================================================================== diff -u -r9ee21b9038a403027299fd2d3121ad638d1c28b1 -r763fa73e0c5267c561a47be1154b5f1f7f80f767 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision 9ee21b9038a403027299fd2d3121ad638d1c28b1) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision 763fa73e0c5267c561a47be1154b5f1f7f80f767) @@ -44,6 +44,7 @@ import org.lamsfoundation.lams.usermanagement.Workspace; import org.lamsfoundation.lams.usermanagement.WorkspaceFolder; import org.lamsfoundation.lams.usermanagement.dao.IAuthenticationMethodDAO; +import org.lamsfoundation.lams.usermanagement.dao.ILocaleDAO; import org.lamsfoundation.lams.usermanagement.dao.IOrganisationDAO; import org.lamsfoundation.lams.usermanagement.dao.IOrganisationStateDAO; import org.lamsfoundation.lams.usermanagement.dao.IOrganisationTypeDAO; @@ -77,6 +78,8 @@ private IUserDAO userDAO; private IRoleDAO roleDAO; + + private ILocaleDAO localeDAO; private IOrganisationDAO organisationDAO; @@ -676,4 +679,15 @@ public OrganisationType getOrganisationTypeById(Integer typeId) { return organisationTypeDAO.getOrganisationTypeById(typeId); } + + public void setLocaleDAO(ILocaleDAO localeDao) { + } + + public List getAllCountries() { + return localeDAO.getAllCountries(); + } + + public List getAllLanguages() { + return localeDAO.getAllLanguages(); + } }