Index: lams_admin/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -rf0924238dddb80210e0e088cda5fe967f66ef979 -r0524198761582d928377cf28d63b3de571db91b9 --- lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision f0924238dddb80210e0e088cda5fe967f66ef979) +++ lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 0524198761582d928377cf28d63b3de571db91b9) @@ -504,6 +504,8 @@ sysadmin.maintain.session =Logged in users sysadmin.maintain.session.login =Login sysadmin.maintain.session.id =Session ID +sysadmin.maintain.session.access =Last access +sysadmin.maintain.session.created =Started on: error.portrait.removal.failed =Unable to delete portrait. See error file for details label.delete.portrait =Delete portrait sysadmin.maintain.session.delete =Delete Index: lams_admin/web/sessionmaintain.jsp =================================================================== diff -u -r29e9d2c044afba2c36294605adecca084d6b593c -r0524198761582d928377cf28d63b3de571db91b9 --- lams_admin/web/sessionmaintain.jsp (.../sessionmaintain.jsp) (revision 29e9d2c044afba2c36294605adecca084d6b593c) +++ lams_admin/web/sessionmaintain.jsp (.../sessionmaintain.jsp) (revision 0524198761582d928377cf28d63b3de571db91b9) @@ -11,6 +11,14 @@ + + + + @@ -25,14 +33,18 @@ + - + +  "> + + Index: lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java =================================================================== diff -u -r7342460aa103c2f8ecd74a5ddfacbaad6b483f5c -r0524198761582d928377cf28d63b3de571db91b9 --- lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java (.../SessionManager.java) (revision 7342460aa103c2f8ecd74a5ddfacbaad6b483f5c) +++ lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java (.../SessionManager.java) (revision 0524198761582d928377cf28d63b3de571db91b9) @@ -23,6 +23,7 @@ package org.lamsfoundation.lams.web.session; +import java.util.Date; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -34,7 +35,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import org.apache.commons.lang.time.FastDateFormat; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; +import org.lamsfoundation.lams.util.DateUtil; import org.lamsfoundation.lams.web.util.AttributeNames; public class SessionManager { @@ -212,14 +215,18 @@ /** * Lists all logins with their assigned sessions */ - public static Map> getLoginToSessionIDMappings() { - Map> result = new TreeMap<>(); + public static Map> getLoginToSessionIDMappings() { + FastDateFormat sessionCreatedDateFormatter = FastDateFormat.getInstance(DateUtil.PRETTY_FORMAT); + + Map> result = new TreeMap<>(); for (Entry entry : loginMapping.entrySet()) { HttpSession session = entry.getValue(); UserDTO user = (UserDTO) session.getAttribute(AttributeNames.USER); - List sessionInfo = new LinkedList<>(); + List sessionInfo = new LinkedList<>(); sessionInfo.add(user.getFirstName()); sessionInfo.add(user.getLastName()); + sessionInfo.add(new Date(session.getLastAccessedTime())); + sessionInfo.add(sessionCreatedDateFormatter.format(new Date(session.getCreationTime()))); sessionInfo.add(session.getId()); result.put(entry.getKey(), sessionInfo); }