Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_central/web/css/chart.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/chart.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/d3.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/raphael/chart.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/raphael/g.bar.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/raphael/g.pie.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/raphael/g.raphael.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_survey/web/pages/learning/resultOtherUsers.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/learning/resultOtherUsers.jsp,v
diff -u -r1.3.2.3 -r1.3.2.4
--- lams_tool_survey/web/pages/learning/resultOtherUsers.jsp	13 Feb 2015 23:01:15 -0000	1.3.2.3
+++ lams_tool_survey/web/pages/learning/resultOtherUsers.jsp	17 Jul 2015 11:35:13 -0000	1.3.2.4
@@ -2,6 +2,7 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="lams"><lams:LAMSURL /></c:set>
+<c:set var="tool"><lams:WebAppURL/></c:set>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
 <lams:html>
@@ -10,6 +11,7 @@
 	<%@ include file="/common/header.jsp"%>
 	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme-blue.css">
 	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.pager.css">
+	<link type="text/css" href="${lams}/css/chart.css" rel="stylesheet" />
 	<style media="screen,projection" type="text/css">
 		#other-users-answers-title {
 			margin-top: 20px;
@@ -21,17 +23,12 @@
 	</style>
 	
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/raphael/raphael.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/raphael/g.raphael.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/raphael/g.pie.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/raphael/chart.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/d3.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/chart.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-pager.js"></script>
 
 	<script type="text/javascript">
-		var chartDataUrl = '<lams:WebAppURL />showChart.do';
-		var alwaysFetchChartValues = true;
-	
 		$(document).ready(function(){
 	
 			$(".tablesorter").tablesorter({
@@ -221,10 +218,11 @@
 						<%-- Only show pie/bar chart when question is single/multiple choics type --%>
 						<c:if test="${question.type != 3}">
 							<div style="float:right">
+								<c:set var="chartURL" value="${tool}showChart.do?toolSessionID=${sessionMap.toolSessionID}&questionUid=${question.uid}" />
 								<img src='<c:out value="${tool}"/>includes/images/piechart.gif'
 									title="<fmt:message key='message.view.pie.chart'/>"
 									style="cursor: pointer; width: 30px; border: none"
-									onclick="javascript:drawChart('pie', ${queStatus.index}, {'toolSessionID' : '${sessionMap.toolSessionID}','questionUid' : '${question.uid}'})">
+									onclick="javascript:drawChart('pie', 'chartDiv${queStatus.index}', '${chartURL}')">
 							</div>
 						</c:if>
 					</th>
Index: lams_tool_survey/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/monitoring/summary.jsp,v
diff -u -r1.18.2.3 -r1.18.2.4
--- lams_tool_survey/web/pages/monitoring/summary.jsp	4 May 2015 17:01:29 -0000	1.18.2.3
+++ lams_tool_survey/web/pages/monitoring/summary.jsp	17 Jul 2015 11:35:13 -0000	1.18.2.4
@@ -10,6 +10,7 @@
 
 <link type="text/css" href="${lams}/css/jquery-ui-smoothness-theme.css" rel="stylesheet">
 <link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet"> 
+<link type="text/css" href="${lams}/css/chart.css" rel="stylesheet" />
 
 <script type="text/javascript">
 	//pass settings to monitorToolSummaryAdvanced.js
@@ -27,15 +28,10 @@
 <script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery-ui.timepicker.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/raphael.js"></script>
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/g.raphael.js"></script>
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/g.pie.js"></script>
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/chart.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/d3.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/chart.js"></script>
 <script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 <script type="text/javascript">
-	var chartDataUrl = '<lams:WebAppURL />showChart.do';
-	var alwaysFetchChartValues = true;
-	
 	function exportSurvey(sessionId){
 		var url = "<c:url value="/monitoring/exportSurvey.do"/>";
 	    var reqIDVar = new Date();
@@ -95,10 +91,11 @@
 					<div style="float:right">
 					<%-- Only show pie/bar chart when question is single/multiple choics type --%>
 					<c:if test="${question.type != 3}">
+						<c:set var="chartURL" value="${tool}showChart.do?toolSessionID=${surveySession.sessionId}&questionUid=${question.uid}" />
 						<img src='<c:out value="${tool}"/>includes/images/piechart.gif'
 							title="<fmt:message key='message.view.pie.chart'/>"
 							style="cursor: pointer; width: 30px; border: none"
-							onclick="javascript:drawChart('pie', ${queStatus.index}, {'toolSessionID' : '${surveySession.sessionId}','questionUid' : '${question.uid}'})">
+							onclick="javascript:drawChart('pie', 'chartDiv${queStatus.index}', '${chartURL}')"> 
 					</c:if>
 					</div>
 				</th>
Index: lams_tool_vote/web/learning/AllNominations.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/AllNominations.jsp,v
diff -u -r1.56.2.1 -r1.56.2.2
--- lams_tool_vote/web/learning/AllNominations.jsp	12 Sep 2014 22:43:36 -0000	1.56.2.1
+++ lams_tool_vote/web/learning/AllNominations.jsp	17 Jul 2015 11:35:11 -0000	1.56.2.2
@@ -13,18 +13,16 @@
 <lams:head>
 	<html:base />
 	<lams:css />
+	<link type="text/css" href="${lams}/css/chart.css" rel="stylesheet" />
+	
 	<title><fmt:message key="activity.title" /></title>
+	
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/raphael.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/g.raphael.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/g.pie.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/g.bar.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/chart.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/d3.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/chart.js"></script>
 	
 	<script type="text/javascript">
-		var chartDataUrl = '<lams:WebAppURL />chartGenerator.do';
-		
 		function submitMethod(actionMethod) {
 			if (actionMethod == 'learnerFinished') {
 				document.getElementById("finishButton").disabled = true;
@@ -152,15 +150,15 @@
 
 			<div>
 				<div class="float-right">
+					<c:set var="chartURL" value="${tool}chartGenerator.do?currentSessionId=${formBean.toolSessionID}" />
 					<img src='<c:out value="${tool}"/>images/piechart.gif' width="30"
 						title="<fmt:message key='label.tip.displayPieChart'/>"
 						style="cursor: pointer; height: 30px; border: none"
-						onclick="javascript:drawChart('pie', 0, {'currentSessionId' : '${formBean.toolSessionID}'})">
-
+						onclick="javascript:drawChart('pie', 'chartDiv', '${chartURL}')">
 					<img src='<c:out value="${tool}"/>images/columnchart.gif' width="30"
 						title="<fmt:message key='label.tip.displayBarChart'/>" 
 						style="cursor: pointer;" height="30" border="0"
-						onclick="javascript:drawChart('bar', 0, {'currentSessionId' : '${formBean.toolSessionID}'})">
+						onclick="javascript:drawChart('bar', 'chartDiv', '${chartURL}')">
 				</div>
 				
 				<c:if test="${VoteLearningForm.allowTextEntry}">
@@ -208,7 +206,7 @@
 				</p>
 			</c:if>							
 
-			<div id="chartDiv0" style="height: 220px; display: none;"></div>
+			<div id="chartDiv" style="height: 220px; display: none;"></div>
 
 			<div class="space-bottom-top">
 				<c:if test="${voteGeneralLearnerFlowDTO.reportViewOnly != 'true' }">
Index: lams_tool_vote/web/learning/ExitLearning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/ExitLearning.jsp,v
diff -u -r1.38.2.1 -r1.38.2.2
--- lams_tool_vote/web/learning/ExitLearning.jsp	12 Sep 2014 22:43:36 -0000	1.38.2.1
+++ lams_tool_vote/web/learning/ExitLearning.jsp	17 Jul 2015 11:35:11 -0000	1.38.2.2
@@ -13,20 +13,16 @@
 <lams:head>
 	<html:base />
 	<lams:css />
+	<link type="text/css" href="${lams}/css/chart.css" rel="stylesheet" />
 	
 	<title><fmt:message key="activity.title" /></title>
 	
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/raphael.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/g.raphael.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/g.pie.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/g.bar.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/chart.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/d3.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/chart.js"></script>
 	
 	<script type="text/javascript">
-		var chartDataUrl = '<lams:WebAppURL />chartGenerator.do';
-		
 		function submitMethod(actionMethod) 
 		{
 			if (actionMethod == "learnerFinished") {
Index: lams_tool_vote/web/learning/RevisitedAllNominations.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/RevisitedAllNominations.jsp,v
diff -u -r1.19.2.1 -r1.19.2.2
--- lams_tool_vote/web/learning/RevisitedAllNominations.jsp	12 Sep 2014 22:43:36 -0000	1.19.2.1
+++ lams_tool_vote/web/learning/RevisitedAllNominations.jsp	17 Jul 2015 11:35:11 -0000	1.19.2.2
@@ -13,20 +13,16 @@
 <lams:head>
 	<html:base />
 	<lams:css />
+	<link type="text/css" href="${lams}/css/chart.css" rel="stylesheet" />
 	
 	<title><fmt:message key="activity.title" /></title>
 	
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/raphael.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/g.raphael.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/g.pie.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/g.bar.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/chart.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/d3.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/chart.js"></script>
 	
 	<script type="text/javascript">
-		var chartDataUrl = '<lams:WebAppURL />chartGenerator.do';
-		
 		function submitMethod(actionMethod) {
 			if (actionMethod == "learnerFinished") {
 				document.getElementById("finishButton").disabled = true;
Index: lams_tool_vote/web/learning/RevisitedDisplay.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/RevisitedDisplay.jsp,v
diff -u -r1.10.2.2 -r1.10.2.3
--- lams_tool_vote/web/learning/RevisitedDisplay.jsp	15 Dec 2014 21:07:00 -0000	1.10.2.2
+++ lams_tool_vote/web/learning/RevisitedDisplay.jsp	17 Jul 2015 11:35:11 -0000	1.10.2.3
@@ -75,14 +75,15 @@
 
 <div>
 	<div class="float-right">
+		<c:set var="chartURL" value="${tool}chartGenerator.do?currentSessionId=${VoteLearningForm.toolSessionID}" />
 		<img src='<c:out value="${tool}"/>images/piechart.gif' width="30"
 			title="<fmt:message key='label.tip.displayPieChart'/>"
 			style="cursor: pointer;" height="30" border="0"
-			onclick="javascript:drawChart('pie', 0, {'currentSessionId' : '${VoteLearningForm.toolSessionID}'})">
+			onclick="javascript:drawChart('pie', 'chartDiv', '${chartURL}')">
 		<img src='<c:out value="${tool}"/>images/columnchart.gif' width="30"
 			title="<fmt:message key='label.tip.displayBarChart'/>" 
 			style="cursor: pointer;" height="30" border="0"
-			onclick="javascript:drawChart('bar', 0, {'currentSessionId' : '${VoteLearningForm.toolSessionID}'})">
+			onclick="javascript:drawChart('pie', 'chartDiv', '${chartURL}')">
 	</div>
 				
 	<c:if test="${VoteLearningForm.allowTextEntry}">
@@ -114,5 +115,5 @@
 		<c:out value="${VoteLearningForm.userEntry}" escapeXml="true"/>
 	</div>
 
-	<div id="chartDiv0" style="height: 220px; display: none;"></div>
+	<div id="chartDiv" style="height: 220px; display: none;"></div>
 </div>
Index: lams_tool_vote/web/learning/mobile/AllNominations.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/mobile/AllNominations.jsp,v
diff -u -r1.10 -r1.10.2.1
--- lams_tool_vote/web/learning/mobile/AllNominations.jsp	2 Apr 2014 15:04:58 -0000	1.10
+++ lams_tool_vote/web/learning/mobile/AllNominations.jsp	17 Jul 2015 11:35:11 -0000	1.10.2.1
@@ -39,14 +39,13 @@
 		
 	<link rel="stylesheet" href="${lams}css/jquery.mobile.css" />
 	<link rel="stylesheet" href="${lams}css/defaultHTML_learner_mobile.css" />
+	<link type="text/css" href="${lams}/css/chart.css" rel="stylesheet" />
+	
 	<script src="${lams}includes/javascript/jquery.js"></script>
 	<script src="${lams}includes/javascript/jquery.mobile.js"></script>		
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/raphael.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/g.raphael.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/g.pie.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/g.bar.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/chart.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/d3.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/chart.js"></script>
 	
 	<script type="text/javascript">
 		var chartDataUrl = '<lams:WebAppURL />chartGenerator.do';
@@ -185,15 +184,15 @@
 
 			<div>
 				<div class="float-right">
+					<c:set var="chartURL" value="${tool}chartGenerator.do?currentSessionId=${formBean.toolSessionID}" />
 					<img src='<c:out value="${tool}"/>images/piechart.gif' width="30"
 						title="<fmt:message key='label.tip.displayPieChart'/>"
-						style="cursor: pointer;" height="30" border="0"
-						onclick="javascript:drawChart('pie', 0, {'currentSessionId' : '${formBean.toolSessionID}'})">
-
+						style="cursor: pointer; height: 30px; border: none"
+						onclick="javascript:drawChart('pie', 'chartDiv', '${chartURL}')">
 					<img src='<c:out value="${tool}"/>images/columnchart.gif' width="30"
 						title="<fmt:message key='label.tip.displayBarChart'/>" 
 						style="cursor: pointer;" height="30" border="0"
-						onclick="javascript:drawChart('bar', 0, {'currentSessionId' : '${formBean.toolSessionID}'})">
+						onclick="javascript:drawChart('bar', 'chartDiv', '${chartURL}')">
 				</div>
 				
 				<c:if test="${VoteLearningForm.allowTextEntry}">
Index: lams_tool_vote/web/learning/mobile/ExitLearning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/mobile/ExitLearning.jsp,v
diff -u -r1.8 -r1.8.2.1
--- lams_tool_vote/web/learning/mobile/ExitLearning.jsp	2 Apr 2014 15:04:59 -0000	1.8
+++ lams_tool_vote/web/learning/mobile/ExitLearning.jsp	17 Jul 2015 11:35:11 -0000	1.8.2.1
@@ -38,18 +38,15 @@
 	
 	<link rel="stylesheet" href="${lams}css/jquery.mobile.css" />
 	<link rel="stylesheet" href="${lams}css/defaultHTML_learner_mobile.css" />
+	<link type="text/css" href="${lams}/css/chart.css" rel="stylesheet" />
+	
 	<script src="${lams}includes/javascript/jquery.js"></script>
 	<script src="${lams}includes/javascript/jquery.mobile.js"></script>			
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/raphael.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/g.raphael.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/g.pie.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/g.bar.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/chart.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/d3.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/chart.js"></script>
 	
 	<script type="text/javascript">
-		var chartDataUrl = '<lams:WebAppURL />chartGenerator.do';
-		
 		function submitMethod(actionMethod) 
 		{
 			if (actionMethod == "learnerFinished") {
Index: lams_tool_vote/web/learning/mobile/RevisitedAllNominations.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/mobile/RevisitedAllNominations.jsp,v
diff -u -r1.10 -r1.10.2.1
--- lams_tool_vote/web/learning/mobile/RevisitedAllNominations.jsp	3 Apr 2014 18:24:32 -0000	1.10
+++ lams_tool_vote/web/learning/mobile/RevisitedAllNominations.jsp	17 Jul 2015 11:35:11 -0000	1.10.2.1
@@ -34,22 +34,20 @@
 <lams:html>
 <lams:head>
 	<html:base />
+	
 	<title><fmt:message key="activity.title" /></title>
 	
 	<link rel="stylesheet" href="${lams}css/jquery.mobile.css" />
 	<link rel="stylesheet" href="${lams}css/defaultHTML_learner_mobile.css" />
+	<link type="text/css" href="${lams}/css/chart.css" rel="stylesheet" />
+	
 	<script src="${lams}includes/javascript/jquery.js"></script>
 	<script src="${lams}includes/javascript/jquery.mobile.js"></script>	
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/raphael.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/g.raphael.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/g.pie.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/g.bar.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/chart.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/d3.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/chart.js"></script>
 	
 	<script type="text/javascript">
-		var chartDataUrl = '<lams:WebAppURL />chartGenerator.do';
-		
 		function submitMethod(actionMethod) 
 		{
 			if (actionMethod == "learnerFinished") {
Index: lams_tool_vote/web/learning/mobile/RevisitedDisplay.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/mobile/RevisitedDisplay.jsp,v
diff -u -r1.7.2.1 -r1.7.2.2
--- lams_tool_vote/web/learning/mobile/RevisitedDisplay.jsp	15 Dec 2014 21:07:00 -0000	1.7.2.1
+++ lams_tool_vote/web/learning/mobile/RevisitedDisplay.jsp	17 Jul 2015 11:35:11 -0000	1.7.2.2
@@ -108,15 +108,16 @@
 
 			<div>
 				<div class="float-right">
+					<c:set var="chartURL" value="${tool}chartGenerator.do?currentSessionId=${VoteLearningForm.toolSessionID}" />
 					<img src='<c:out value="${tool}"/>images/piechart.gif' width="30"
 						title="<fmt:message key='label.tip.displayPieChart'/>"
 						style="cursor: pointer;" height="30" border="0"
-						onclick="javascript:drawChart('pie', 0, {'currentSessionId' : '${VoteLearningForm.toolSessionID}'})">
+						onclick="javascript:drawChart('pie', 'chartDiv', '${chartURL}')">
 
 					<img src='<c:out value="${tool}"/>images/columnchart.gif' width="30"
 						title="<fmt:message key='label.tip.displayBarChart'/>" 
 						style="cursor: pointer;" height="30" border="0"
-						onclick="javascript:drawChart('bar', 0, {'currentSessionId' : '${VoteLearningForm.toolSessionID}'})">
+						onclick="javascript:drawChart('pie', 'chartDiv', '${chartURL}')">
 				</div>
 				
 				<c:if test="${VoteLearningForm.allowTextEntry}">
@@ -150,5 +151,5 @@
 					<lams:out value="${VoteLearningForm.userEntry}" escapeHtml="true" />
 				</div>
 				
-				<div id="chartDiv0" style="height: 220px; display: none;"></div>
+				<div id="chartDiv" style="height: 220px; display: none;"></div>
 		</div>
Index: lams_tool_vote/web/monitoring/AllSessionsSummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/AllSessionsSummary.jsp,v
diff -u -r1.29 -r1.29.2.1
--- lams_tool_vote/web/monitoring/AllSessionsSummary.jsp	18 Apr 2014 20:15:45 -0000	1.29
+++ lams_tool_vote/web/monitoring/AllSessionsSummary.jsp	17 Jul 2015 11:35:11 -0000	1.29.2.1
@@ -151,15 +151,16 @@
 	
 	<c:if test="${!statsTabActive}">
 		<p class="float-right " style="margin-right: 8%;">
+			<c:set var="chartURL" value="${tool}chartGenerator.do?currentSessionId=${sessionDto.sessionId}&toolContentID=${toolContentID}" />
 			<img src='<c:out value="${tool}"/>images/piechart.gif' width="30"
 				title="<fmt:message key='label.tip.displayPieChart'/>"
 				style="cursor: pointer; height: 30px; border: none"
-				onclick="javascript:drawChart('pie', ${sessionDto.sessionId})">
+				onclick="javascript:drawChart('pie', 'chartDiv${sessionDto.sessionId}', '${chartURL}')">
 	
 			<img src='<c:out value="${tool}"/>images/columnchart.gif' width="30"
 				title="<fmt:message key='label.tip.displayBarChart'/>" 
 				style="cursor: pointer;" height="30" border="0"
-				onclick="javascript:drawChart('bar', ${sessionDto.sessionId})">
+				onclick="javascript:drawChart('bar', 'chartDiv${sessionDto.sessionId}', '${chartURL}')">
 		</p>
 	
 		<p id="chartDiv${sessionDto.sessionId}" style="height: 220px; display: none;" class="space-bottom"></p>
Index: lams_tool_vote/web/monitoring/SummaryContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/SummaryContent.jsp,v
diff -u -r1.46.2.3 -r1.46.2.4
--- lams_tool_vote/web/monitoring/SummaryContent.jsp	4 May 2015 17:01:19 -0000	1.46.2.3
+++ lams_tool_vote/web/monitoring/SummaryContent.jsp	17 Jul 2015 11:35:11 -0000	1.46.2.4
@@ -4,22 +4,20 @@
 
 <link type="text/css" href="${lams}/css/jquery-ui-smoothness-theme.css" rel="stylesheet">
 <link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet">
+<link type="text/css" href="${lams}/css/chart.css" rel="stylesheet">
 
 <script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery-ui.timepicker.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>  
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/raphael.js"></script>
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/g.raphael.js"></script>
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/g.pie.js"></script>
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/g.bar.js"></script>
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/chart.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/d3.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/chart.js"></script>
+
 <script type="text/javascript">
-	var chartDataUrl = '<lams:WebAppURL />chartGenerator.do';
-	
-	$(document).ready(function(){
+	$(window).load(function(){
 		<c:forEach var="currentDto" items="${voteGeneralMonitoringDTO.sessionDTOs}">
-			drawChart('pie', ${currentDto.sessionId}, {'currentSessionId' : '${currentDto.sessionId}', 'toolContentID' : '${toolContentID}'});
+			<c:set var="chartURL" value="${tool}chartGenerator.do?currentSessionId=${currentDto.sessionId}&toolContentID=${toolContentID}" />
+			drawChart('pie', 'chartDiv${currentDto.sessionId}', '${chartURL}');
 		</c:forEach>
 	});