Index: lams_tool_scratchie/web/pages/learning/results.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/learning/results.jsp,v
diff -u -r1.13.2.6 -r1.13.2.7
--- lams_tool_scratchie/web/pages/learning/results.jsp	7 Mar 2016 23:22:53 -0000	1.13.2.6
+++ lams_tool_scratchie/web/pages/learning/results.jsp	5 Apr 2016 17:24:32 -0000	1.13.2.7
@@ -18,62 +18,131 @@
 <lams:head>
 	<title><fmt:message key="label.learning.title" /></title>
 	<%@ include file="/common/header.jsp"%>
-
+	
 	<link type="text/css" href="${lams}css/jquery-ui-redmond-theme.css" rel="stylesheet">
 	<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet" />
+	<link rel="stylesheet" href="<lams:LAMSURL />/includes/font-awesome/css/font-awesome.min.css">
 	<style media="screen,projection" type="text/css">
-#reflections-div {
-	padding: 10px 0 20px;
-}
+		#reflections-div {
+			padding: 10px 0 20px;
+		}
+		.burning-question-dto {
+			padding-bottom: 5px; 
+		}
+		.ui-jqgrid tr.jqgrow td {
+		    white-space: normal !important;
+		    height:auto;
+		    vertical-align:text-top;
+		    padding-top:2px;
+		}
+		.ui-jqgrid tr.jqgrow td {vertical-align:middle !important}
+	</style>
 
-.burning-question-dto {
-	padding-bottom: 5px;
-}
-
-.ui-jqgrid tr.jqgrow td {
-	white-space: normal !important;
-	height: auto;
-	vertical-align: text-top;
-	padding-top: 2px;
-}
-</style>
-
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
 	<script type="text/javascript">
+		function likeEntry(burningQuestionUid) {
+
+			var isLike = $( '#like-'+burningQuestionUid ).hasClass( 'fa-thumbs-o-up' );
+
+			if (isLike) {
+				$.ajax({
+				    url: '<c:url value="/learning/like.do"/>',
+					data: {
+						sessionMapID: "${sessionMapID}",
+						burningQuestionUid: burningQuestionUid
+					}
+				})
+			    .done(function (response) {	       		
+		    		if ( ! burningQuestionUid ) {
+						alert('<fmt:message key="error.cannot.redisplay.please.refresh"/>');
+		  			} else if ( response.added ) {
+		  				var currentCount = eval($('#count-'+burningQuestionUid).html());
+		  				currentCount += 1;
+			       		$('#count-'+burningQuestionUid).html(currentCount);
+					}
+				});
+				
+				$( '#like-'+burningQuestionUid ).removeClass( 'fa-thumbs-o-up' ).addClass( 'fa-thumbs-up' );
+				
+			} else {
+				$.ajax({
+				    url: '<c:url value="/learning/removeLike.do"/>',
+					data: {
+						sessionMapID: "${sessionMapID}",
+						burningQuestionUid: burningQuestionUid
+					}
+				})
+			    .done(function (response) {
+		    		if ( ! burningQuestionUid ) {
+						alert('<fmt:message key="error.cannot.redisplay.please.refresh"/>');
+		  			} else {
+		  				var currentCount = eval($('#count-'+burningQuestionUid).html());
+		  				currentCount -= 1;
+			       		$('#count-'+burningQuestionUid).html(currentCount);
+					}
+				});
+		
+				$( '#like-'+burningQuestionUid ).removeClass( 'fa-thumbs-up' ).addClass( 'fa-thumbs-o-up' );
+			}
+
+		}
+	
 		$(document).ready(function(){
 			
-			<!-- Display burningQuestionDtos -->
-			<c:forEach var="burningQuestionDto" items="${burningQuestionDtos}" varStatus="i">
-				jQuery("#burningQuestions${burningQuestionDto.item.uid}").jqGrid({
+			<!-- Display burningQuestionItemDtos -->
+			<c:forEach var="burningQuestionItemDto" items="${burningQuestionItemDtos}" varStatus="i">
+				<c:set var="scratchieItem" value="${burningQuestionItemDto.scratchieItem}"/>
+			
+				jQuery("#burningQuestions${scratchieItem.uid}").jqGrid({
 					datatype: "local",
 					rowNum: 10000,
 					height: 'auto',
 					autowidth: true,
 					shrinkToFit: false,
-				   	colNames:['#',
-							"<fmt:message key='label.monitoring.summary.user.name' />",
-						    "<fmt:message key='label.burning.questions' />"
+				   	colNames:[
+						'#',
+						"<fmt:message key='label.monitoring.summary.user.name' />",
+						"<fmt:message key='label.burning.questions' />",
+						"<fmt:message key='label.like' />",
+						"<fmt:message key='label.count' />"
 					],
 				   	colModel:[
 				   		{name:'id', index:'id', width:0, sorttype:"int", hidden: true},
 				   		{name:'groupName', index:'groupName', width:200},
-				   		{name:'feedback', index:'feedback', width:522}
+				   		{name:'feedback', index:'feedback', width:374},
+				   		{name:'like', index:'like', width:60, align: "center"},
+				   		{name:'count', index:'count', width:50, align:"right"}
 				   	],
-				   	caption: "${burningQuestionDto.item.title}"
+				   	caption: "${scratchieItem.title}"
 				});
-			    <c:forEach var="entry" items="${burningQuestionDto.groupNameToBurningQuestion}" varStatus="i">
-			    	<c:set var="groupName" value="${entry.key}"/>
-			    	<c:set var="burningQuestion" value="${entry.value}"/>
-			    
-			    	jQuery("#burningQuestions${burningQuestionDto.item.uid}").addRowData(${i.index + 1}, {
+				
+			    <c:forEach var="burningQuestionDto" items="${burningQuestionItemDto.burningQuestionDtos}" varStatus="i">			    
+			    	jQuery("#burningQuestions${scratchieItem.uid}").addRowData(${i.index + 1}, {
 			   			id:"${i.index + 1}",
-			   	     	groupName:"${groupName}",
-				   	    feedback:"<lams:out value='${burningQuestion}' escapeHtml='true' />"
+			   	     	groupName:"${burningQuestionDto.sessionName}",
+				   	    feedback:"<lams:out value='${burningQuestionDto.escapedBurningQuestion}' escapeHtml='true' />",
+				   	 	<c:choose>
+				   			<c:when test="${!isUserLeader && burningQuestionDto.userLiked}">
+				   				like:'<span class="fa fa-thumbs-up fa-2x"></span>',
+				   			</c:when>
+					   		<c:when test="${!isUserLeader}">
+				   				like:'',
+				   			</c:when>
+							<c:when test="${burningQuestionDto.userLiked}">
+								like:'<span class="fa fa-thumbs-up fa-2x" title="<fmt:message key="label.unlike"/>"' +
+										'onclick="javascript:likeEntry(${burningQuestionDto.burningQuestion.uid});" id="like-${burningQuestionDto.burningQuestion.uid}" />',
+							</c:when>
+							<c:otherwise>
+								like:'<span class="fa fa-thumbs-o-up fa-2x" title="<fmt:message key="label.like"/>"' +
+										'onclick="javascript:likeEntry(${burningQuestionDto.burningQuestion.uid});" id="like-${burningQuestionDto.burningQuestion.uid}" />',
+							</c:otherwise>
+						</c:choose>
+				   	 	count:'<span id="count-${burningQuestionDto.burningQuestion.uid}">${burningQuestionDto.likeCount}</span>'
 			   	   	});
 		        </c:forEach>
 
-		        jQuery("#burningQuestions${burningQuestionDto.item.uid}").jqGrid('sortGrid','groupName', false, 'asc');
+		        jQuery("#burningQuestions${scratchieItem.uid}").jqGrid('sortGrid','groupName', false, 'asc');
 	        </c:forEach>
 			
 			<!-- Display reflection entries -->
@@ -116,26 +185,29 @@
 		    
 		})
 	
-		function finishSession(){
+		function finishSession() {
 			document.getElementById("finishButton").disabled = true;
 			document.location.href ='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}"/>';
 			return false;
 		}
-		function continueReflect(){
+		function continueReflect() {
 			document.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
 		}
-		function editBurningQuestions(){
+		function editBurningQuestions() {
 			document.location.href='<c:url value="/learning/showBurningQuestions.do?sessionMapID=${sessionMapID}"/>';
 		}
+		function refresh() {
+			location.reload();
+			return false;
+		}
     </script>
 </lams:head>
 
 <body class="stripes">
 
 	<c:set var="title">
-	${scratchie.title} / <fmt:message key='label.score' />
+		${scratchie.title} / <fmt:message key='label.score' />
 	</c:set>
-
 	<lams:Page type="learner" title="${title}">
 
 		<c:if test="${not empty sessionMap.submissionDeadline}">
@@ -155,26 +227,27 @@
 				<strong><fmt:param>${score}%</fmt:param></strong>
 			</fmt:message>
 		</lams:Alert>
+	
+		<div class="row voffset5" >
+				<html:button property="refreshButton" onclick="return refresh();" styleClass="btn btn-default voffset5 roffset5 pull-right">
+					<fmt:message key="label.refresh" />
+				</html:button>
+		</div>
 
-		<!-- Display burningQuestionDtos -->
+		<!-- Display burningQuestionItemDtos -->
 
 		<c:if test="${sessionMap.isBurningQuestionsEnabled}">
 			<div class="voffset5">
 				<div class="lead">
 					<fmt:message key="label.burning.questions" />
 				</div>
 
-				<c:forEach var="burningQuestionDto" items="${burningQuestionDtos}" varStatus="i">
+				<c:forEach var="burningQuestionItemDto" items="${burningQuestionItemDtos}" varStatus="i">
 					<div class="burning-question-dto">
-						<table id="burningQuestions${burningQuestionDto.item.uid}" class="scroll" cellpadding="0" cellspacing="0"></table>
+						<table id="burningQuestions${burningQuestionItemDto.scratchieItem.uid}" class="scroll" cellpadding="0" cellspacing="0"></table>
 					</div>
 				</c:forEach>
 
-				<!-- General burning question's table -->
-				<div class="burning-question-dto">
-					<table id="burningQuestions0" class="scroll" cellpadding="0" cellspacing="0"></table>
-				</div>
-
 				<c:if test="${(mode != 'teacher') && isUserLeader}">
 					<html:button property="finishButton" onclick="return editBurningQuestions()" styleClass="btn btn-sm btn-default">
 						<fmt:message key="label.edit" />