diff --git a/src/main/java/org/wise/portal/presentation/web/controllers/admin/UserInfoController.java b/src/main/java/org/wise/portal/presentation/web/controllers/admin/UserInfoController.java index 06b4b7fe0..d6fde5152 100644 --- a/src/main/java/org/wise/portal/presentation/web/controllers/admin/UserInfoController.java +++ b/src/main/java/org/wise/portal/presentation/web/controllers/admin/UserInfoController.java @@ -34,6 +34,7 @@ import org.wise.portal.domain.authentication.MutableUserDetails; import org.wise.portal.domain.user.User; import org.wise.portal.service.authentication.UserDetailsService; +import org.wise.portal.service.project.ProjectService; import org.wise.portal.service.run.RunService; import org.wise.portal.service.student.StudentService; import org.wise.portal.service.user.UserService; @@ -55,6 +56,9 @@ public class UserInfoController { @Autowired private RunService runService; + @Autowired + private ProjectService projectService; + @GetMapping(value = {"/student/account/info", "/teacher/account/info"}) protected String getUserAccountInfo(Authentication auth, @RequestParam String username, ModelMap modelMap) throws Exception { @@ -73,6 +77,7 @@ protected String getUserAccountInfo(Authentication auth, @RequestParam String us } else { modelMap.put("isStudent", false); modelMap.put("runList", runService.getRunListByOwner(user)); + modelMap.put("projectList", projectService.getProjectList(user)); return "teacher/account/info"; } } else { diff --git a/src/main/resources/i18n/i18n.properties b/src/main/resources/i18n/i18n.properties index 61e55883c..f56dce2e2 100644 --- a/src/main/resources/i18n/i18n.properties +++ b/src/main/resources/i18n/i18n.properties @@ -3198,6 +3198,12 @@ teacher.teacherinfo.lastLogin=Last Login teacher.teacherinfo.lastLogin.description=The label for the Last Login field teacher.teacherinfo.accountEnabled=Account Enabled teacher.teacherinfo.accountEnabled.description=The label for the Account Enabled field +teacher.teacherinfo.unitList=Unit List +teacher.teacherinfo.unitList.description=The header for the unit list +teacher.teacherinfo.unitId=Unit ID +teacher.teacherinfo.unitId.description=The label for the Unit ID field +teacher.teacherinfo.unitName=Unit Name +teacher.teacherinfo.unitName.description=The label for the Unit Name field teacher.teacherinfo.closeThisWindow=Close this window teacher.teacherinfo.closeThisWindow.description=The text for the Close this window link diff --git a/src/main/webapp/portal/teacher/account/info.jsp b/src/main/webapp/portal/teacher/account/info.jsp index 499fb3d87..50af59777 100644 --- a/src/main/webapp/portal/teacher/account/info.jsp +++ b/src/main/webapp/portal/teacher/account/info.jsp @@ -5,17 +5,24 @@ <%@ include file="../../favicon.jsp"%> -Teacher Information " media="screen" rel="stylesheet" type="text/css" /> " media="screen" rel="stylesheet" type="text/css" /> +" media="screen" rel="stylesheet" type="text/css" /> " rel="stylesheet" type="text/css" > + + +