Index: lams_tool_vote/conf/language/ApplicationResources.properties =================================================================== diff -u -r73ed8a0a0d5fa96ffce05fb414831b759b9c000c -rbc57e15fafb3b401d129d35de37586324e2e2a83 --- lams_tool_vote/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 73ed8a0a0d5fa96ffce05fb414831b759b9c000c) +++ lams_tool_vote/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision bc57e15fafb3b401d129d35de37586324e2e2a83) @@ -125,7 +125,7 @@ label.export =Portfolio Export label.class.summary =Class Votes Summary label.class.summaryAll =All Votes Summary -label.individual.learnerVotes =Individual Learner Votes +label.individual.learnerVotes =Learner Votes label.all.learnerVotes =All Learner Votes label.warning =Warning label.summary.sessionSeparator =_________________________________________________ Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java =================================================================== diff -u -ra0b65aea3bdb1d0bf8043497107f75c6c1ffefda -rbc57e15fafb3b401d129d35de37586324e2e2a83 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java (.../ExportServlet.java) (revision a0b65aea3bdb1d0bf8043497107f75c6c1ffefda) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java (.../ExportServlet.java) (revision bc57e15fafb3b401d129d35de37586324e2e2a83) @@ -127,7 +127,7 @@ VoteMonitoringAction voteMonitoringAction= new VoteMonitoringAction(); voteMonitoringAction.refreshSummaryData(request, content, voteService, true, true, toolSessionID.toString(), userID.toString() , true); - MonitoringUtil.prepareChartDataForExportLearner(request, voteService, null, content.getVoteContentId(), voteSession.getUid()); + MonitoringUtil.prepareChartDataForExportTeacher(request, voteService, null, content.getVoteContentId(), voteSession.getUid()); logger.debug("post prepareChartDataForExport"); logger.debug("ending learner mode: "); Index: lams_tool_vote/web/export/ExportContent.jsp =================================================================== diff -u -r168d3aadc7610e2b46667fe0c1200f164ee4cf4c -rbc57e15fafb3b401d129d35de37586324e2e2a83 --- lams_tool_vote/web/export/ExportContent.jsp (.../ExportContent.jsp) (revision 168d3aadc7610e2b46667fe0c1200f164ee4cf4c) +++ lams_tool_vote/web/export/ExportContent.jsp (.../ExportContent.jsp) (revision bc57e15fafb3b401d129d35de37586324e2e2a83) @@ -46,23 +46,12 @@ - - + - - - - - - - - - - - + @@ -82,6 +71,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + @@ -119,6 +138,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +
+ + + + @@ -164,6 +221,8 @@ + + Index: lams_tool_vote/web/monitoring/AllSessionsSummary.jsp =================================================================== diff -u -r73ed8a0a0d5fa96ffce05fb414831b759b9c000c -rbc57e15fafb3b401d129d35de37586324e2e2a83 --- lams_tool_vote/web/monitoring/AllSessionsSummary.jsp (.../AllSessionsSummary.jsp) (revision 73ed8a0a0d5fa96ffce05fb414831b759b9c000c) +++ lams_tool_vote/web/monitoring/AllSessionsSummary.jsp (.../AllSessionsSummary.jsp) (revision bc57e15fafb3b401d129d35de37586324e2e2a83) @@ -202,7 +202,8 @@ - + +
@@ -212,11 +213,9 @@ - - - + + + @@ -273,7 +272,7 @@ - + Index: lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp =================================================================== diff -u -r73ed8a0a0d5fa96ffce05fb414831b759b9c000c -rbc57e15fafb3b401d129d35de37586324e2e2a83 --- lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp (.../IndividualSessionSummary.jsp) (revision 73ed8a0a0d5fa96ffce05fb414831b759b9c000c) +++ lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp (.../IndividualSessionSummary.jsp) (revision bc57e15fafb3b401d129d35de37586324e2e2a83) @@ -192,7 +192,7 @@ - + @@ -202,11 +202,9 @@
- -



- - - + + +
- -