From 57256983210269e8849e61a0866bae4be5033d47 Mon Sep 17 00:00:00 2001
From: LiamClark <L.A.Clark@student.tudelft.nl>
Date: Wed, 31 May 2017 12:52:00 +0200
Subject: [PATCH] Abillity to collapse rubrics when grading

fixes #460
---
 pom.xml                                        |  2 +-
 .../assignments/group-delivery-review.ftl      | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index be4016e2..8c5948bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
 		<jackson.version>2.4.4</jackson.version>
 		<jetty.version>9.2.10.v20150310</jetty.version>
 		<resteasy.version>3.0.10.Final</resteasy.version>
-		<freemarker.version>2.3.21</freemarker.version>
+		<freemarker.version>2.3.23</freemarker.version>
 		<slf4j.version>1.7.7</slf4j.version>
 		<httpclient.version>4.3.6</httpclient.version>
 		<h2.version>1.3.173</h2.version>
diff --git a/src/main/resources/templates/courses/assignments/group-delivery-review.ftl b/src/main/resources/templates/courses/assignments/group-delivery-review.ftl
index 56575669..4e4a6f16 100644
--- a/src/main/resources/templates/courses/assignments/group-delivery-review.ftl
+++ b/src/main/resources/templates/courses/assignments/group-delivery-review.ftl
@@ -80,12 +80,12 @@
 								[#list assignment.getTasks() as task]
 								<tbody class="task" data-id="${task.id?c}">
 									<tr class="active">
-										<td colspan="2"><strong>${task.description}</strong></td>
+										<td colspan="2"><span><strong>${task.description}<p class="octicon octicon-chevron-down" data-toggle="collapse" data-target=".collapse-target-${task?index}"></p></strong></span></td>
 										<td><strong>${task.getTotalWeight()?c}</strong></td>
 										<td><strong id="lbl-total-task-${task.id?c}">0</strong></td>
 									</tr>
 									[#list task.getCharacteristics() as characteristic]
-									<tr data-id="${characteristic.id?c}" data-weight="${characteristic.weight?c}" class="characteristic">
+									<tr data-id="${characteristic.id?c}" data-weight="${characteristic.weight?c}" class="characteristic collapse-target-${task?index}">
 										<td>${characteristic.description}</td>
 										<td>
 											[#list characteristic.getLevels() as level]
@@ -170,6 +170,20 @@
 	$(computeTotals)
 	$('[type="radio"]').on('change', computeTotals)
     $('[type="radio"]').on('change', persistMasteries)
+
+	var down = "octicon-chevron-down"
+	var right ="octicon-chevron-right"
+
+	$('[data-target*="collapse-target"]').click(function() {
+	    var tableRow = $(this);
+	    if(tableRow.hasClass(down)) {
+	        tableRow.removeClass(down).addClass(right)
+		} else {
+            tableRow.removeClass(right).addClass(down)
+		}
+
+	})
+
 </script>
 
 [/@macros.renderScripts]