Index: lams_central/web/authoringConfirm.jsp =================================================================== diff -u -re2735806b52061fec4c1982dbdc7661e69b9766e -r166aa0735bb84ddebe9848373512a69abb3726de --- lams_central/web/authoringConfirm.jsp (.../authoringConfirm.jsp) (revision e2735806b52061fec4c1982dbdc7661e69b9766e) +++ lams_central/web/authoringConfirm.jsp (.../authoringConfirm.jsp) (revision 166aa0735bb84ddebe9848373512a69abb3726de) @@ -11,26 +11,24 @@ Index: lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java =================================================================== diff -u -r4f68a533e24967e0185132c5e361a8a054f43941 -r166aa0735bb84ddebe9848373512a69abb3726de --- lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java (.../AttributeNames.java) (revision 4f68a533e24967e0185132c5e361a8a054f43941) +++ lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java (.../AttributeNames.java) (revision 166aa0735bb84ddebe9848373512a69abb3726de) @@ -64,6 +64,7 @@ public static final String PARAM_DIRECTORY_NAME = "directoryName"; public static final String PARAM_FILENAME = "filename"; public static final String PARAM_EXPORT_PORTFOLIO_ENABLED = "portfolioEnabled"; + public static final String PARAM_CURRENT_TAB = "currentTab"; public static final String PARAM_LIB = "library"; Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dto/ChatDTO.java =================================================================== diff -u -rda54b82e5ef860fe9f8872b75f2b1718cfb7de32 -r166aa0735bb84ddebe9848373512a69abb3726de --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dto/ChatDTO.java (.../ChatDTO.java) (revision da54b82e5ef860fe9f8872b75f2b1718cfb7de32) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dto/ChatDTO.java (.../ChatDTO.java) (revision 166aa0735bb84ddebe9848373512a69abb3726de) @@ -64,6 +64,8 @@ public Set sessionDTOs = new TreeSet();; + public Long currentTab; + public ChatDTO(Chat chat) { toolContentId = chat.getToolContentId(); title = chat.getTitle(); @@ -197,4 +199,12 @@ public void setLockOnFinish(boolean lockOnFinish) { this.lockOnFinish = lockOnFinish; } + + public Long getCurrentTab() { + return currentTab; + } + + public void setCurrentTab(Long currentTab) { + this.currentTab = currentTab; + } } \ No newline at end of file Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java =================================================================== diff -u -rda54b82e5ef860fe9f8872b75f2b1718cfb7de32 -r166aa0735bb84ddebe9848373512a69abb3726de --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision da54b82e5ef860fe9f8872b75f2b1718cfb7de32) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 166aa0735bb84ddebe9848373512a69abb3726de) @@ -94,6 +94,9 @@ Chat chat = chatService.getChatByContentId(toolContentID); ChatDTO chatDTO = new ChatDTO(chat); + Long currentTab = WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB,true); + chatDTO.setCurrentTab(currentTab); + Map sessCountMap = chatService .getMessageCountBySession(chat.getUid()); Index: lams_tool_chat/web/includes/javascript/monitoring.js =================================================================== diff -u -race8b408295af831e2715b2013d64a000aa09549 -r166aa0735bb84ddebe9848373512a69abb3726de --- lams_tool_chat/web/includes/javascript/monitoring.js (.../monitoring.js) (revision ace8b408295af831e2715b2013d64a000aa09549) +++ lams_tool_chat/web/includes/javascript/monitoring.js (.../monitoring.js) (revision 166aa0735bb84ddebe9848373512a69abb3726de) @@ -1,7 +1,10 @@ function init() { - // open the first tab - selectTab(1); + if (initialTabId) { + selectTab(initialTabId); + } else { + selectTab(1); + } } function doSelectTab(tabId) { Index: lams_tool_chat/web/pages/monitoring/monitoring.jsp =================================================================== diff -u -r77eb2c44ff2c1c9b5956d01bb7f931f27ca71a24 -r166aa0735bb84ddebe9848373512a69abb3726de --- lams_tool_chat/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision 77eb2c44ff2c1c9b5956d01bb7f931f27ca71a24) +++ lams_tool_chat/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision 166aa0735bb84ddebe9848373512a69abb3726de) @@ -8,6 +8,9 @@ +