From e31ec7ca8106c1efc96c7caf7d44d1c95dc9a2d3 Mon Sep 17 00:00:00 2001
From: morungos <stuart@morungos.com>
Date: Wed, 17 Apr 2013 21:33:44 -0400
Subject: [PATCH] Added guards to prevent accessing arrays when there isn't any
 data. Resolves #52

---
 grails-app/views/report/assignments.gsp |  8 +++++++-
 grails-app/views/report/course.gsp      | 15 +++++++++++----
 grails-app/views/report/students.gsp    |  9 ++++++++-
 grails-app/views/report/tutors.gsp      |  9 ++++++++-
 4 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/grails-app/views/report/assignments.gsp b/grails-app/views/report/assignments.gsp
index a155218..d4fad35 100644
--- a/grails-app/views/report/assignments.gsp
+++ b/grails-app/views/report/assignments.gsp
@@ -12,13 +12,17 @@
             <h2><g:message code="report.assignment.label" args="[entityName]" /></h2>
             
             <g:each var="band" in="${bands}" status="i">
-            <h3>${band}: ${bandLabels[band]}</h3>
             <g:set var="bandData" value="${summary.filter([null, band])}" />
             
             <g:set var="data" value="${bandData.data}" />
             <g:set var="keys" value="${data.keySet() as List}" />
             <g:set var="idealValues" value="${keys.collect { val -> data.get(val)?.ideal ?: 0 }}" />
             <g:set var="actualValues" value="${keys.collect { val -> data.get(val)?.actual ?: 0 }}" />
+            
+            <g:if test="${keys.size() > 0}">
+            
+            <h3>${band}: ${bandLabels[band]}</h3>
+
             <table id="assignment_placeholder-${i}-table" class="actual-ideal table table-striped table-condensed">
                 <thead>
                     <tr> 
@@ -37,6 +41,8 @@
                 </g:each>
                 </tbody>
             </table>
+            
+            </g:if>
 
             </g:each>
         </div>
diff --git a/grails-app/views/report/course.gsp b/grails-app/views/report/course.gsp
index c63011d..0cf76f4 100644
--- a/grails-app/views/report/course.gsp
+++ b/grails-app/views/report/course.gsp
@@ -17,14 +17,17 @@
             course ${entityName}.
             </p>
             
-            <p>
-            The following chart shows the expected versus actual comment counts for this course.
-            </p>
-                        
             <g:set var="data" value="${summary.data}" />
             <g:set var="keys" value="${data.keySet() as List}" />
             <g:set var="idealValues" value="${keys.collect { val -> data.get(val)?.ideal ?: 0 }}" />
             <g:set var="actualValues" value="${keys.collect { val -> data.get(val)?.actual ?: 0 }}" />
+
+            <g:if test="${keys.size() > 0}">
+            
+            <p>
+            The following chart shows the expected versus actual comment counts for this course.
+            </p>
+                        
             <table id="course_placeholder-table" class="actual-ideal table table-striped table-condensed">
                 <thead>
                     <tr> 
@@ -43,10 +46,14 @@
                 </g:each>
                 </tbody>
             </table>
+            
 
             <g:if test="${summary.submissionCount > 0}">
             <h4><g:link action="course_details" params="${[id: params.id]}">See detailed information</g:link></h4>
             </g:if>
+
+            </g:if>
+
         </div>
         </div>
         <g:javascript>
diff --git a/grails-app/views/report/students.gsp b/grails-app/views/report/students.gsp
index dde2bee..a71b3a0 100644
--- a/grails-app/views/report/students.gsp
+++ b/grails-app/views/report/students.gsp
@@ -12,13 +12,18 @@
             <h2><g:message code="report.student.label" args="[entityName]" /></h2>
             
             <g:each var="band" in="${bands}" status="i">
-            <h3>${band}: ${bandLabels[band]}</h3>
+
             <g:set var="bandData" value="${summary.filter([null, band])}" />
             
             <g:set var="data" value="${bandData.data}" />
             <g:set var="keys" value="${data.keySet() as List}" />
             <g:set var="idealValues" value="${keys.collect { val -> data.get(val)?.ideal ?: 0 }}" />
             <g:set var="actualValues" value="${keys.collect { val -> data.get(val)?.actual ?: 0 }}" />
+
+            <g:if test="${keys.size() > 0}">
+
+            <h3>${band}: ${bandLabels[band]}</h3>
+
             <table id="tutor_placeholder-${i}-table" class="actual-ideal table table-striped table-condensed">
                 <thead>
                     <tr> 
@@ -37,6 +42,8 @@
                 </g:each>
                 </tbody>
             </table>
+            
+            </g:if>
 
             </g:each>
         </div>
diff --git a/grails-app/views/report/tutors.gsp b/grails-app/views/report/tutors.gsp
index 74a4d1b..e218f6c 100644
--- a/grails-app/views/report/tutors.gsp
+++ b/grails-app/views/report/tutors.gsp
@@ -12,13 +12,18 @@
             <h2><g:message code="report.tutor.label" args="[entityName]" /></h2>
             
             <g:each var="band" in="${bands}" status="i">
-            <h3>${band}: ${bandLabels[band]}</h3>
+            
             <g:set var="bandData" value="${summary.filter([null, band])}" />
             
             <g:set var="data" value="${bandData.data}" />
             <g:set var="keys" value="${data.keySet() as List}" />
             <g:set var="idealValues" value="${keys.collect { val -> data.get(val)?.ideal ?: 0 }}" />
             <g:set var="actualValues" value="${keys.collect { val -> data.get(val)?.actual ?: 0 }}" />
+            
+            <g:if test="${keys.size() > 0}">
+
+            <h3>${band}: ${bandLabels[band]}</h3>
+
             <table id="tutor_placeholder-${i}-table" class="actual-ideal table table-striped table-condensed">
                 <thead>
                     <tr> 
@@ -37,6 +42,8 @@
                 </g:each>
                 </tbody>
             </table>
+            
+            </g:if>
 
             </g:each>
         </div>