Index: lams_tool_assessment/web/pages/monitoring/statisticpart.jsp
===================================================================
diff -u -rcfd463431d2171b40403dcff2508408e72685c0e -r1d81e132bc101883c5643fcf54d2d40d45c5cf2e
--- lams_tool_assessment/web/pages/monitoring/statisticpart.jsp	(.../statisticpart.jsp)	(revision cfd463431d2171b40403dcff2508408e72685c0e)
+++ lams_tool_assessment/web/pages/monitoring/statisticpart.jsp	(.../statisticpart.jsp)	(revision 1d81e132bc101883c5643fcf54d2d40d45c5cf2e)
@@ -39,26 +39,26 @@
 
 	   	// must display charts after screen is visible or cannot calculate widths.
  		<c:choose>
-		<c:when test="${sessionMap.assessment.useSelectLeaderToolOuput}">	
-			drawHistogram('chartDivLeader${sessionMap.toolContentID}', 
-					'<c:url value="/monitoring/getMarkChartData.do?sessionMapID=${sessionMapID}"/>', 
+		<c:when test="${sessionMap.assessment.useSelectLeaderToolOuput and leaderDto.count > 0}">
+			drawHistogram('chartDivLeader${sessionMap.toolContentID}',
+					'<c:url value="/monitoring/getMarkChartData.do?sessionMapID=${sessionMapID}"/>',
 					'<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.marks"/></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.number.groups.in.mark.range"/></spring:escapeBody>');
 		</c:when>
-		<c:otherwise>
-			drawHistogram('chartDivActivity${sessionMap.toolContentID}', 
-				'<c:url value="/monitoring/getMarkChartData.do?sessionMapID=${sessionMapID}"/>', 
+		<c:when test="${activityDto.count > 0}">
+			drawHistogram('chartDivActivity${sessionMap.toolContentID}',
+				'<c:url value="/monitoring/getMarkChartData.do?sessionMapID=${sessionMapID}"/>',
 				'<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.marks"/></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.number.learners.in.mark.range"/></spring:escapeBody>');
-			
+
 			<c:forEach var="sessionDto" items="${sessionDtos}">
-			drawHistogram('chartDivSession${sessionDto.sessionId}', 
-					'<c:url value="/monitoring/getMarkChartData.do?sessionMapID=${sessionMapID}&toolSessionID=${sessionDto.sessionId}"/>', 
+			drawHistogram('chartDivSession${sessionDto.sessionId}',
+					'<c:url value="/monitoring/getMarkChartData.do?sessionMapID=${sessionMapID}&toolSessionID=${sessionDto.sessionId}"/>',
 					'<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.marks"/></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.number.learners.in.mark.range"/></spring:escapeBody>');
-			</c:forEach>	
-		</c:otherwise>
+			</c:forEach>
+		</c:when>
 		</c:choose>
 
- 
-	});		
+
+	});
 </script>
 
 <c:choose>
@@ -68,21 +68,24 @@
 		<fmt:message key="message.monitoring.summary.no.session" />
 	</lams:Alert>
 </c:when>
-	
+
 <c:otherwise>
-	
+
 	<p><fmt:message key="label.graph.help"/></p>
-	
+
 	<c:choose>
-	<c:when test="${sessionMap.assessment.useSelectLeaderToolOuput}">	
+	<c:when test="${sessionMap.assessment.useSelectLeaderToolOuput}">
 		<div class="panel panel-default" >
        	<div class="panel-body">
- 		<div class="row">
-			 <div class="col-xs-12"></div>
-				 <div id="chartDivLeader${sessionMap.toolContentID}" class="markChartDiv"></div>
-		</div>
-            
-        <div class="row"> 
+
+        <c:if test="${leaderDto.count > 0}">
+            <div class="row">
+                 <div class="col-xs-12"></div>
+                 <div id="chartDivLeader${sessionMap.toolContentID}" class="markChartDiv"></div>
+            </div>
+        </c:if>
+
+        <div class="row">
             <div class="col-md-6" style="padding: 0px 20px 0px 20px;">
                 <table class="table table-striped table-hover table-condensed">
                     <tr>
@@ -91,7 +94,7 @@
                         </td>
                         <td style="text-align:right;">
                              <c:out value="${leaderDto.count}" />
-                        </td>	 
+                        </td>
                     </tr>
                     <tr>
                         <td class="field-name">
@@ -103,7 +106,7 @@
                     </tr>
                     <tr>
                         <td class="field-name">
-                          <fmt:message key="label.median.mark"/> 
+                          <fmt:message key="label.median.mark"/>
                         </td>
                         <td style="text-align:right;">
                              <c:out value="${leaderDto.medianString}" />
@@ -123,7 +126,7 @@
                     </tr>
                     <tr>
                         <td class="field-name">
-                          <fmt:message key="label.highest.mark"/> 
+                          <fmt:message key="label.highest.mark"/>
                         </td>
                         <td style="text-align:right;">
                              <c:out value="${leaderDto.maxString}" />
@@ -139,25 +142,27 @@
                     </tr>
                 </table>
             </div>
-        </div>	        
+        </div>
 
 		</div>
 		</div>
 	</c:when>
-		
+
 	<c:otherwise>
 		<c:if test="${sessionMap.isGroupedActivity}">
 			<h4 class="voffset20"><fmt:message key="label.activity.stats"/></h4>
 		</c:if>
 		<div class="panel panel-default" >
        		<div class="panel-body">
-            <div class="row">
-                 <div class="col-xs-12" ></div>
-                 <div id="chartDivActivity${sessionMap.toolContentID}" class="markChartDiv"></div>
-            </div>
 
+            <c:if test="${activityDto.count > 0}">
+                <div class="row">
+                     <div class="col-xs-12" ></div>
+                     <div id="chartDivActivity${sessionMap.toolContentID}" class="markChartDiv"></div>
+                </div>
+            </c:if>
 
-			<div class="row"> 
+			<div class="row">
 				<div class="col-md-6" style="padding: 0px 20px 0px 20px;">
 					<table class="table table-striped table-hover table-condensed">
 						<tr>
@@ -166,7 +171,7 @@
 							</td>
 							<td style="text-align:right;">
 								 <c:out value="${activityDto.count}" />
-							</td>	 
+							</td>
 						</tr>
                         <tr>
                             <td class="field-name">
@@ -178,7 +183,7 @@
                         </tr>
                         <tr>
                             <td class="field-name">
-                              <fmt:message key="label.median.mark"/> 
+                              <fmt:message key="label.median.mark"/>
                             </td>
                             <td style="text-align:right;">
                                  <c:out value="${activityDto.medianString}" />
@@ -198,7 +203,7 @@
                         </tr>
                         <tr>
                             <td class="field-name">
-                              <fmt:message key="label.highest.mark"/> 
+                              <fmt:message key="label.highest.mark"/>
                             </td>
                             <td style="text-align:right;">
                                  <c:out value="${activityDto.maxString}" />
@@ -214,11 +219,11 @@
                         </tr>
                     </table>
 				</div>
-			</div>	
-					
 			</div>
+
+			</div>
 		</div>
-		
+
 		<c:if test="${sessionMap.isGroupedActivity}">
 			<h4 class="voffset20"><fmt:message key="label.group.stats"/></h4>
 			<c:forEach var="sessionDto" items="${sessionDtos}">
@@ -229,13 +234,13 @@
 						</span>
 			        </div>
 		       		<div class="panel-body">
-                        
+
 					<div class="row">
 						 <div class="col-xs-12"></div>
 		 				 <div id="chartDivSession${sessionDto.sessionId}" class="markChartDiv"></div>
 				    </div>
-                        
-                    <div class="row"> 
+
+                    <div class="row">
                         <div class="col-md-6" style="padding: 0px 20px 0px 20px;">
                             <table class="table table-striped table-hover table-condensed">
                                 <tr>
@@ -244,7 +249,7 @@
                                     </td>
                                     <td style="text-align:right;">
                                          <c:out value="${sessionDto.count}" />
-                                    </td>	 
+                                    </td>
                                 </tr>
                                 <tr>
                                     <td class="field-name">
@@ -256,7 +261,7 @@
                                 </tr>
                                 <tr>
                                     <td class="field-name">
-                                      <fmt:message key="label.median.mark"/> 
+                                      <fmt:message key="label.median.mark"/>
                                     </td>
                                     <td style="text-align:right;">
                                         <c:out value="${sessionDto.medianString}" />
@@ -276,7 +281,7 @@
                                 </tr>
                                 <tr>
                                     <td class="field-name">
-                                      <fmt:message key="label.highest.mark"/> 
+                                      <fmt:message key="label.highest.mark"/>
                                     </td>
                                     <td style="text-align:right;">
                                         <c:out value="${sessionDto.maxString}" />
@@ -292,16 +297,16 @@
                                 </tr>
                             </table>
                         </div>
-                    </div>	
+                    </div>
 
 					</div>
 				</div>
 			</c:forEach>
 		</c:if>
 	</c:otherwise>
-	</c:choose>		
-	
-	<div id="accordion-qb-stats" class="panel-group voffset20" role="tablist" aria-multiselectable="true"> 
+	</c:choose>
+
+	<div id="accordion-qb-stats" class="panel-group voffset20" role="tablist" aria-multiselectable="true">
 	    <div class="panel panel-default">
 	        <div class="panel-heading collapsable-icon-left" id="heading-qb-stats">
 	        	<span class="panel-title">
@@ -314,10 +319,10 @@
 
 	      		</span>
 	        </div>
-	
+
 			<div aria-expanded="false" id="qb-stats" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="heading-qb-stats">
 				<table class="table table-striped table-hover table-condensed">
-					<tr>		
+					<tr>
 						<th scope="col"  class="text-left">
 							#
 						</th>
@@ -332,7 +337,7 @@
 							<lams:Popover>
 				          		<fmt:message key="label.qb.difficulty.index.tooltip" />
 				          	</lams:Popover>
-							
+
 						</th>
 						<th scope="col" class="text-center">
 							<fmt:message key="label.qb.discrimination.index"/>&nbsp;
@@ -345,17 +350,17 @@
 							<lams:Popover>
 								<fmt:message key="label.qb.point.biserial.tooltip" />
 				          	</lams:Popover>
-	
+
 						</th>
 					</tr>
-						
+
 					<c:forEach var="activityDTO" items="${qbStats}" varStatus="i">
 						<tr>
 							<td class="text-left">
 								${i.index + 1}
 							</td>
 							<td class="text-left">
-								<c:out value="${activityDTO.qbQuestion.name}" escapeXml="false"/>			
+								<c:out value="${activityDTO.qbQuestion.name}" escapeXml="false"/>
 							</td>
 							<td class="text-center">
 								<c:out value="${activityDTO.participantCount}" />
@@ -379,7 +384,7 @@
 								</c:otherwise>
 							</c:choose>
 						</tr>
-					</c:forEach>	
+					</c:forEach>
 				</table>
 			</div>
 		</div>
@@ -388,4 +393,4 @@
 </c:otherwise>
 </c:choose>
 
-<%@ include file="parts/toolOutput.jsp"%>
+<%@ include file="parts/toolOutput.jsp"%>
\ No newline at end of file