Index: lams_monitoring/web/WEB-INF/tags/Rating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/tags/Attic/Rating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_monitoring/web/WEB-INF/tags/Rating.tag	30 May 2016 11:46:05 -0000	1.1.2.1
+++ lams_monitoring/web/WEB-INF/tags/Rating.tag	27 Apr 2017 04:40:37 -0000	1.1.2.2
@@ -24,6 +24,7 @@
 <%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="showComments" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowRetries" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty disabled}">
@@ -61,6 +62,10 @@
 	</c:forEach>
 </c:if>
 
+<c:if test="${empty allowRetries}">
+	<c:set var="allowRetries" value="false" scope="request"/>
+</c:if>
+
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
@@ -77,7 +82,7 @@
 		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
 	
 		<c:choose>
-			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
+			<c:when test='${disabled || isItemAuthoredByUser || ((maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating) || !(isCriteriaNotRatedByUser || allowRetries)}'>
 				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
 			</c:when>
 			<c:otherwise>
Index: lams_tool_assessment/.classpath
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/.classpath,v
diff -u -r1.11.2.13 -r1.11.2.14
--- lams_tool_assessment/.classpath	13 Apr 2016 09:22:11 -0000	1.11.2.13
+++ lams_tool_assessment/.classpath	27 Apr 2017 04:39:47 -0000	1.11.2.14
@@ -13,7 +13,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.0.Final.jar"/>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/hibernate/main/hibernate-core-4.3.7.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/hibernate-core">
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/hibernate/main/hibernate-core-4.3.11.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/hibernate-core">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.jboss.org/hibernate/orm/4.3/javadocs/"/>
 		</attributes>
Index: lams_tool_assessment/web/WEB-INF/tags/Rating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/WEB-INF/tags/Attic/Rating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_assessment/web/WEB-INF/tags/Rating.tag	1 Jun 2016 14:05:16 -0000	1.1.2.1
+++ lams_tool_assessment/web/WEB-INF/tags/Rating.tag	27 Apr 2017 04:39:47 -0000	1.1.2.2
@@ -24,6 +24,7 @@
 <%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="showComments" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowRetries" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty disabled}">
@@ -61,6 +62,10 @@
 	</c:forEach>
 </c:if>
 
+<c:if test="${empty allowRetries}">
+	<c:set var="allowRetries" value="false" scope="request"/>
+</c:if>
+
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
@@ -77,7 +82,7 @@
 		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
 	
 		<c:choose>
-			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
+			<c:when test='${disabled || isItemAuthoredByUser || ((maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating) || !(isCriteriaNotRatedByUser || allowRetries)}'>
 				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
 			</c:when>
 			<c:otherwise>
Index: lams_tool_assessment/web/pages/learning/results/attemptsummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/learning/results/Attic/attemptsummary.jsp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_assessment/web/pages/learning/results/attemptsummary.jsp	17 Mar 2017 18:03:02 -0000	1.1.2.1
+++ lams_tool_assessment/web/pages/learning/results/attemptsummary.jsp	27 Apr 2017 04:39:47 -0000	1.1.2.2
@@ -1,5 +1,5 @@
-<lams:Alert id="attempt-summary" type="info" close="false">
-	<table class="table table-hover">
+<%-- *LKC* commented out the following paragraph --%>
+<!--
 		<tr>
 			<th style="width: 130px;">
 				<fmt:message key="label.learning.summary.started.on" />
@@ -8,7 +8,7 @@
 				<lams:Date value="${result.startDate}"/>
 			</td>
 		</tr>
-			
+		
 		<tr>
 			<th>
 				<fmt:message key="label.learning.summary.completed.on" />
@@ -17,24 +17,24 @@
 				<lams:Date value="${result.finishDate}" />
 			</td>
 		</tr>
-			
 		<tr>
 			<th>
 				<fmt:message key="label.learning.summary.time.taken" />
 			</th>
 			<td>
-				<fmt:formatDate value="${result.timeTaken}" pattern="H" timeZone="GMT" />&nbsp;<fmt:message key="label.learning.summary.hours" />&nbsp;
-				<fmt:formatDate value="${result.timeTaken}" pattern="m" timeZone="GMT" />&nbsp;<fmt:message key="label.learning.summary.minutes" />
+				<fmt:formatDate value="${result.timeTaken}" pattern="H" timeZone="GMT" /> <fmt:message key="label.learning.summary.hours" />
+				<fmt:formatDate value="${result.timeTaken}" pattern="m" timeZone="GMT" /> <fmt:message key="label.learning.summary.minutes" />
 			</td>
 		</tr>
-			
-		<c:if test="${assessment.allowGradesAfterAttempt}">
+-->
+<c:if test="${assessment.allowGradesAfterAttempt}">
+<lams:Alert id="attempt-summary" type="info" close="false">
+	<table class="table table-hover">
 			<tr>
 				<th>
 					<fmt:message key="label.learning.summary.grade" />:&thinsp;
 				</th>
-				<td style="padding-left: 5px">
-					
+				<td>
 					<c:choose>
 						<c:when  test="${result.maximumGrade == 0}">
 							<c:set var="resultPercentage" value="0"/>
@@ -45,23 +45,28 @@
 							</c:set>
 						</c:otherwise>
 					</c:choose>
-					
+				
 					<fmt:formatNumber value="${result.grade}" maxFractionDigits="3"/>
 					&thinsp;<fmt:message key="label.learning.summary.out.of.maximum" />
 					&thinsp;${result.maximumGrade} (${resultPercentage}%)
 				</td>
 			</tr>
-		</c:if>
-			
-		<c:if test="${assessment.allowOverallFeedbackAfterQuestion && (result.overallFeedback != null)}">
-			<tr>
-				<th>
-					<fmt:message key="label.learning.summary.feedback" />
-				</th>
-				<td>
-					<c:out value="${result.overallFeedback}" escapeXml="true"/>
-				</td>
-			</tr>			
-		</c:if>				
+        </table>
+        <br><br>
+</lams:Alert>
+</c:if>
+<c:if test="${assessment.allowOverallFeedbackAfterQuestion && (result.overallFeedback != null)}">
+<lams:Alert id="attempt-summary" type="info" close="false">
+        <table class="table table-hover">
+		<tr>
+			<th>
+				<fmt:message key="label.learning.summary.feedback" />
+			</th>
+			<td>
+				<c:out value="${result.overallFeedback}" escapeXml="true"/>
+			</td>
+		</tr>			
 	</table>
+	<br><br>
 </lams:Alert>
+</c:if>
Index: lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp,v
diff -u -r1.12.2.10 -r1.12.2.11
--- lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	11 Nov 2016 15:52:08 -0000	1.12.2.10
+++ lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	27 Apr 2017 04:39:47 -0000	1.12.2.11
@@ -1,4 +1,6 @@
 <!DOCTYPE html>
+		
+
 <%@ include file="/common/taglibs.jsp"%>
 
 <lams:html>
@@ -9,8 +11,8 @@
 		<c:set var="assessment" value="${sessionMap.assessment}"/>
 		<c:set var="sessionDtos" value="${sessionMap.sessionDtos}"/>
 		
-		<link type="text/css" href="${lams}css/jquery-ui-smoothness-theme.css" rel="stylesheet">
-		<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet" />
+		<link type="text/css" href="<lams:LAMSURL />css/jquery-ui-redmond-theme.css" rel="stylesheet">
+		<link type="text/css" href="<lams:LAMSURL />css/jquery.jqGrid.css" rel="stylesheet" />
 		<style media="screen,projection" type="text/css">
 			.ui-jqgrid tr.jqgrow td {
 			    white-space: normal !important;
@@ -20,8 +22,11 @@
 			}
 		</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" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+		<%-- *LKC* added the following line --%>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.jqGrid.locale-en.js"></script>
+	 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.jqGrid.js"></script>
   	    <script>
   	    	var isEdited = false;
   	    	var previousCellValue = "";
@@ -47,7 +52,8 @@
 	  				   	colModel:[
 							{name:'questionResultUid', index:'questionResultUid', width:0, hidden: true},
 							{name:'maxMark', index:'maxMark', width:0, hidden: true},
-							{name:'userName',index:'userName', width:120, searchoptions: { clearSearch: false }},
+							<%-- *LKC* modified the following line --%>
+							{name:'userName',index:'userName', width:120, searchoptions: { clearSearch: false }, hidden: ${questionSummary.question.type == 6}},
 	  				   		{name:'response', index:'response', width:427, sortable:false, search:false},
 	  				   		{name:'grade', index:'grade', width:80, sorttype:"float", search:false, editable:true, editoptions: {size:4, maxlength: 4}, align:"right" }		
 	  				   	],
@@ -58,6 +64,10 @@
 	  				  	beforeEditCell: function (rowid,name,val,iRow,iCol){
 	  				  		previousCellValue = val;
 	  				  	},
+	  				  	<%-- *LKC* added the following 3 lines --%>
+	  				  	loadComplete : function (data){
+	  				  		$(".ui-jqgrid-titlebar").hide();
+  						},
 	  					beforeSaveCell : function(rowid, name, val, iRow, iCol) {
 	  						if (isNaN(val)) {
 	  	  						return null;
@@ -116,7 +126,20 @@
 	  		            });
 	  		        }
 	  			});
-	  			setTimeout(function(){ window.dispatchEvent(new Event('resize')); }, 300);
+  				
+  				<%-- *LKC* added the following paragraph --%>
+	  			$("#display-name-column-switcher").button();
+  				$("#display-name-column-switcher").click(function() {
+  					if ($("#display-name-column-switcher").is(':checked')) {
+  						$("table[id^=session]").showCol("userName");
+  					} else {
+  						$("table[id^=session]").hideCol("userName");
+  					}
+  					$("table[id^=session]").trigger("resize");
+  					
+  					$(".ui-jqgrid-titlebar").toggle();
+  				});
+
 	  		});  	    	
 	  		
     		function refreshSummaryPage()  { 
@@ -127,23 +150,22 @@
         		}
     		}
   		</script>
+		
+		
 	</lams:head>
 	
-<body class="stripes">
-
-	<div class="panel panel-default">
-		<div class="panel-heading">
-			<div class="panel-title">
-				<fmt:message key="label.monitoring.question.summary.history.responses" />
-			</div>
-		</div>
-			
-		<div class="panel-body">
+	<body class="stripes">
+		<div id="content" >
+		
+			<h1>
+				XX<fmt:message key="label.monitoring.question.summary.history.responses" />
+			</h1>
+			<br><br>		
 			<%@ include file="/common/messages.jsp"%>
 			
-			<table class="table table-condensed table-striped">
+			<table class="forum">
 				<tr>
-					<th style="width: 180px;" >
+					<th style="width: 180px; border-left: none; padding-top:0px; " >
 						<fmt:message key="label.monitoring.question.summary.title" />
 					</th>
 					<td >
@@ -152,7 +174,7 @@
 				</tr>
 				
 				<tr>
-					<th>
+					<th style="width: 180px;" >
 						<fmt:message key="label.monitoring.question.summary.question" />
 					</th>
 					<td>
@@ -162,7 +184,7 @@
 				
 				<c:if test="${questionSummary.question.type == 1}">
 					<tr>
-						<th>
+						<th style="width: 180px;" >
 							<fmt:message key="label.incorrect.answer.nullifies.mark" />
 						</th>
 						<td>
@@ -171,8 +193,10 @@
 					</tr>
 				</c:if>
 					
+				<%-- *LKC* commented out the following paragraph --%>
+				<!--	
 				<tr>
-					<th>
+					<th style="width: 180px;" >
 						<fmt:message key="label.monitoring.question.summary.default.mark" />
 					</th>
 					<td>
@@ -181,32 +205,51 @@
 				</tr>
 					
 				<tr>
-					<th>
+					<th style="width: 180px;" >
 						<fmt:message key="label.monitoring.question.summary.penalty" />
 					</th>
 					<td>
 						<c:out value="${questionSummary.question.penaltyFactor}" escapeXml="true"/>
 					</td>
 				</tr>			
+-->
 			</table>
+			<br><br>
 			
+			<%-- *LKC* added the following paragraph --%>
+			<c:if test="${questionSummary.question.type == 6}">
+				<p class="float-right" style="margin-top: 0px;">
+					<input type="checkbox" id="display-name-column-switcher" />
+					<label for="display-name-column-switcher">
+						<fmt:message key="label.display.name.column" />
+					</label>
+				</p>
+				<br><br><br>
+			</c:if>
+			
 			<c:forEach var="sessionDto" items="${sessionDtos}" varStatus="status">
-				<div class="voffset20">
-					<table id="session${sessionDto.sessionId}"></table>
-					<div id="pager${sessionDto.sessionId}"></div>
+				<div style="padding-left: 0px; padding-bottom: 30px; width:99%;">
+					<div style="font-size: small; padding-bottom: 5px;">
+						<fmt:message key="label.monitoring.question.summary.group" /> ${sessionDto.sessionName}
+					</div>
+					
+					<table id="session${sessionDto.sessionId}" class="scroll" cellpadding="0" cellspacing="0" ></table>
+					<div id="pager${sessionDto.sessionId}" class="scroll"></div>
 				</div>	
 			</c:forEach>
-			
-			<a href="#nogo" onclick="refreshSummaryPage();" class="btn btn-default btn-sm voffset10 pull-right">
-				<fmt:message key="label.monitoring.question.summary.ok" /> 
-			</a>
 
+			<lams:ImgButtonWrapper>
+				<a href="#" onclick="refreshSummaryPage();" class="button space-left" style="float:right; margin-right:10px; padding-top:5px;">
+					<fmt:message key="label.monitoring.question.summary.ok" /> 
+				</a>
+			</lams:ImgButtonWrapper>
+
 		</div>
 		<!--closes content-->
 	
 		<div id="footer">
 		</div>
 		<!--closes footer-->		
-	</div>
-</body>
+		
+	</body>
 </lams:html>
Index: lams_tool_bbb/web/WEB-INF/tags/Rating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/WEB-INF/tags/Attic/Rating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_bbb/web/WEB-INF/tags/Rating.tag	1 Jul 2016 06:47:00 -0000	1.1.2.1
+++ lams_tool_bbb/web/WEB-INF/tags/Rating.tag	27 Apr 2017 04:39:49 -0000	1.1.2.2
@@ -24,6 +24,7 @@
 <%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="showComments" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowRetries" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty disabled}">
@@ -61,6 +62,10 @@
 	</c:forEach>
 </c:if>
 
+<c:if test="${empty allowRetries}">
+	<c:set var="allowRetries" value="false" scope="request"/>
+</c:if>
+
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
@@ -77,7 +82,7 @@
 		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
 	
 		<c:choose>
-			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
+			<c:when test='${disabled || isItemAuthoredByUser || ((maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating) || !(isCriteriaNotRatedByUser || allowRetries)}'>
 				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
 			</c:when>
 			<c:otherwise>
Index: lams_tool_chat/web/WEB-INF/tags/Rating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/Attic/Rating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_chat/web/WEB-INF/tags/Rating.tag	25 May 2016 12:46:56 -0000	1.1.2.1
+++ lams_tool_chat/web/WEB-INF/tags/Rating.tag	27 Apr 2017 04:39:49 -0000	1.1.2.2
@@ -24,6 +24,7 @@
 <%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="showComments" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowRetries" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty disabled}">
@@ -61,6 +62,10 @@
 	</c:forEach>
 </c:if>
 
+<c:if test="${empty allowRetries}">
+	<c:set var="allowRetries" value="false" scope="request"/>
+</c:if>
+
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
@@ -77,7 +82,7 @@
 		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
 	
 		<c:choose>
-			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
+			<c:when test='${disabled || isItemAuthoredByUser || ((maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating) || !(isCriteriaNotRatedByUser || allowRetries)}'>
 				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
 			</c:when>
 			<c:otherwise>
Index: lams_tool_daco/web/WEB-INF/tags/Rating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/tags/Attic/Rating.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_daco/web/WEB-INF/tags/Rating.tag	29 Jun 2016 05:54:07 -0000	1.1.2.1
+++ lams_tool_daco/web/WEB-INF/tags/Rating.tag	27 Apr 2017 04:39:50 -0000	1.1.2.2
@@ -24,6 +24,7 @@
 <%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="showComments" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowRetries" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty disabled}">
@@ -61,6 +62,10 @@
 	</c:forEach>
 </c:if>
 
+<c:if test="${empty allowRetries}">
+	<c:set var="allowRetries" value="false" scope="request"/>
+</c:if>
+
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
@@ -77,7 +82,7 @@
 		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
 	
 		<c:choose>
-			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
+			<c:when test='${disabled || isItemAuthoredByUser || ((maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating) || !(isCriteriaNotRatedByUser || allowRetries)}'>
 				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
 			</c:when>
 			<c:otherwise>