Index: lams_monitoring/web/tblmonitor/teams.jsp
===================================================================
diff -u -r87c236112358ed9c229876a63816b5e14b17f2af -r76a9b6401f527e6b1701261cebe945a9658c22a7
--- lams_monitoring/web/tblmonitor/teams.jsp	(.../teams.jsp)	(revision 87c236112358ed9c229876a63816b5e14b17f2af)
+++ lams_monitoring/web/tblmonitor/teams.jsp	(.../teams.jsp)	(revision 76a9b6401f527e6b1701261cebe945a9658c22a7)
@@ -3,27 +3,27 @@
 <c:set var="ALPHABET_CAPITAL_LETTERS" value="${fn:split('A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z', ',')}" scope="request"/>
 
 <style>
-	
+
 	#tbl-teams-tab-content .card-header,
 	#tbl-teams-tab-content a.card-title,
 	#tbl-teams-tab-content a.ira-modal-link,
 	#question-results-panel th a,
 	#question-results-panel .question-results-question-row a {
-	   	cursor: pointer;
+		cursor: pointer;
 	}
-	
+
 	#tbl-teams-tab-content .fa-arrow-circle-down {
 		color: var(--bs-red);
 	}
-	
+
 	#tbl-teams-tab-content .fa-arrow-circle-up {
 		color: var(--bs-green);
 	}
-	
+
 	#tbl-teams-tab-content .fa-arrow-circle-left {
 		visibility: hidden;
 	}
-	
+
 	.question-results-cell {
 		width: 15%;
 		text-align: center;
@@ -36,8 +36,8 @@
 		initializePortraitPopover(LAMS_URL);
 
 		<c:if test="${not empty chartNamesDataset}">
-			// summary chart
-			var summaryChartIraDataset = JSON.parse('${chartIraDataset}'),
+		// summary chart
+		var summaryChartIraDataset = JSON.parse('${chartIraDataset}'),
 				summaryChartTraDataset = JSON.parse('${chartTraDataset}'),
 				summaryChartNamesDataset = JSON.parse('${chartNamesDataset}'),
 				ctx = $('#summary-chart')[0].getContext('2d'),
@@ -48,14 +48,14 @@
 							label: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.ira' /></spring:escapeBody>",
 							data : summaryChartIraDataset,
 							backgroundColor : 'rgba(249, 248, 113, 0.85)'
-											  
+
 						},
-						{
-							label: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.tra' /></spring:escapeBody>",
-							data : summaryChartTraDataset,
-							backgroundColor : 'rgba(1, 117, 226, 0.85)'
-											  
-						}],
+							{
+								label: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.tra' /></spring:escapeBody>",
+								data : summaryChartTraDataset,
+								backgroundColor : 'rgba(1, 117, 226, 0.85)'
+
+							}],
 						labels : summaryChartNamesDataset
 					},
 					options : {
@@ -68,7 +68,7 @@
 						scales : {
 							yAxes : [
 								{
-								    ticks : {
+									ticks : {
 										beginAtZero   : true
 									},
 									scaleLabel : {
@@ -82,12 +82,12 @@
 					}
 				});
 		</c:if>
-		
 
+
 		//Comparison button modal window
 		var chart;
 		$('#comparison-modal').on('shown.bs.modal', function (event) {
-			
+
 			var link = $(event.relatedTarget);
 			var iraScores = link.data('ira-scores').split(',');
 			for (var i = 0; i < iraScores.length; i++) {
@@ -107,10 +107,10 @@
 			var title = groupName + ": <spring:escapeBody javaScriptEscape='true'><fmt:message key='label.ira.tra.correct.count'/></spring:escapeBody>";
 
 			var userNames = [];
-			$(".belong-to-group-" + groupId).each(function() { 
+			$(".belong-to-group-" + groupId).each(function() {
 				userNames.push($(this).html().trim().replace("&nbsp;", " "));
-			 });
-			
+			});
+
 			var canvas = $(this).find('.modal-body canvas');
 			$(this).find('.modal-title').html(title);
 
@@ -123,14 +123,14 @@
 						label: "iRAT",
 						data : iraScores,
 						backgroundColor : 'rgba(249, 248, 113, 0.85)'
-										  
+
 					},
-					{
-						label: "tRAT",
-						data : traScores,
-						backgroundColor : 'rgba(1, 117, 226, 0.85)'
-										  
-					}],
+						{
+							label: "tRAT",
+							data : traScores,
+							backgroundColor : 'rgba(1, 117, 226, 0.85)'
+
+						}],
 					labels : userNames
 				},
 				options : {
@@ -143,15 +143,15 @@
 					scales : {
 						yAxes : [
 							{
-							    ticks : {
+								ticks : {
 									beginAtZero   : true
 								}
 							}
 						]
 					}
 				}
 			});
-		//on hiding chart modal window
+			//on hiding chart modal window
 		}).on('hidden.bs.modal', function (event) {
 			var canvas = $(this).find('.modal-body canvas');
 			canvas.attr('width', '568px');
@@ -176,16 +176,16 @@
 
 			//load modal dialog content using Ajax
 			$('#ira-modal .modal-body').load(
-				"<lams:LAMSURL/>tool/laasse10/tblmonitoring/getModalDialogForTeamsTab.do", 
-				{
-					toolContentID: "${iraToolContentId}",
-					userID: userId
-				},
-				function( response, status, xhr ) {
-					if ( status == "error" ) {
-						alert("Unable to load iRA modal dialog: " + xhr.status);
-					} 
-				}
+					"<lams:LAMSURL/>tool/laasse10/tblmonitoring/getModalDialogForTeamsTab.do",
+					{
+						toolContentID: "${iraToolContentId}",
+						userID: userId
+					},
+					function( response, status, xhr ) {
+						if ( status == "error" ) {
+							alert("Unable to load iRA modal dialog: " + xhr.status);
+						}
+					}
 			);
 		});
 
@@ -205,42 +205,42 @@
 
 			//load modal dialog content using Ajax
 			$('#tra-modal .modal-body').load(
-				"<lams:LAMSURL/>tool/lascrt11/tblmonitoring/getModalDialogForTeamsTab.do", {
-					toolContentID: "${traToolContentId}",
-					userID: userId
-				},
-				function( response, status, xhr ) {
-					if ( status == "error" ) {
-						alert("Unable to load tRA modal dialog: " + xhr.status);
-					} 
-				}
+					"<lams:LAMSURL/>tool/lascrt11/tblmonitoring/getModalDialogForTeamsTab.do", {
+						toolContentID: "${traToolContentId}",
+						userID: userId
+					},
+					function( response, status, xhr ) {
+						if ( status == "error" ) {
+							alert("Unable to load tRA modal dialog: " + xhr.status);
+						}
+					}
 			);
 		});
 
 		loadTeamsQuestionResults('default');
-		
+
 		$('[data-toggle="tooltip"]').tooltip();
 
 		if (sequenceSearchedLearner) {
-			 $('html,body').animate({scrollTop: $('#user-name-' + sequenceSearchedLearner).offset().top},'slow');
+			$('html,body').animate({scrollTop: $('#user-name-' + sequenceSearchedLearner).offset().top},'slow');
 		}
-		
+
 	});
 
 	function showChangeLeaderModal(groupID) {
 		var modalContainer = $('#change-leader-modals');
 		modalContainer.empty()
-		.load('<lams:LAMSURL/>tool/lalead11/monitoring/displayChangeLeaderForGroupDialog.do',{
-			leaderSelectionToolContentId : '${leaderSelectionToolContentId}',
-			groupId : groupID
-		}, function(){
-			modalContainer.children('.modal').modal('show');
-		});
+				.load('<lams:LAMSURL/>tool/lalead11/monitoring/displayChangeLeaderForGroupDialog.do',{
+					leaderSelectionToolContentId : '${leaderSelectionToolContentId}',
+					groupId : groupID
+				}, function(){
+					modalContainer.children('.modal').modal('show');
+				});
 	}
 
 	function onChangeLeaderCallback(response){
-        if (response.isSuccessful) {
-        	alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.leader.successfully.changed'/></spring:escapeBody>");
+		if (response.isSuccessful) {
+			alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.leader.successfully.changed'/></spring:escapeBody>");
 			loadTab("teams");
 		} else {
 			alert("Leader was not changed.");
@@ -250,18 +250,18 @@
 	var teamsQuestionResultsOrder = '';
 	function loadTeamsQuestionResults(order) {
 		let iraToolContentId = '${iraToolContentId}',
-			traToolContentId = '${traToolContentId}';
+				traToolContentId = '${traToolContentId}';
 		if (iraToolContentId || traToolContentId) {
 			if (order == teamsQuestionResultsOrder) {
 				order += 'Reversed';
 			}
 			teamsQuestionResultsOrder = order;
-			
-			$('#question-results-panel').load(LAMS_URL + 'monitoring/tblmonitor/questionResults.do?iraToolContentId=' + iraToolContentId + 
-				'&traToolContentId=' + traToolContentId + '&order=' + order);
+
+			$('#question-results-panel').load(LAMS_URL + 'monitoring/tblmonitor/questionResults.do?iraToolContentId=' + iraToolContentId +
+					'&traToolContentId=' + traToolContentId + '&order=' + order);
 		}
 	}
-</script>            
+</script>
 
 
 <div id="tbl-teams-tab-content" class="container-fluid">
@@ -271,7 +271,7 @@
 		<div class="col-10 offset-1">
 			<div class="float-end">
 				<c:if test="${not empty groupsSetupUrl}">
-					<a href="<lams:LAMSURL/>${groupsSetupUrl}" class="btn btn-secondary" target="_blank">
+					<a href="<lams:LAMSURL/>${groupsSetupUrl}&displayReturnToMonitoringLink=true" class="btn btn-secondary">
 						<fmt:message key="label.teams.setup"/>
 					</a>
 				</c:if>
@@ -286,51 +286,51 @@
 			<c:if test="${not empty chartNamesDataset}">
 				<canvas id="summary-chart" class="mt-3"></canvas>
 			</c:if>
-			
+
 			<div class="card mt-5 mb-3">
 				<h5 class="card-header" data-bs-toggle="collapse" data-bs-target="#collapse-0">
 					<a class="text-decoration-none">
 						<fmt:message key="label.ira.tra.summary"/>
 					</a>
-				</h4>
-		
-				<div id="collapse-0" class="card-body collapse show">
-					<div class="table-responsive">
-						<table class="table table-hover table-condensed">
-							<thead>
+					</h4>
+
+					<div id="collapse-0" class="card-body collapse show">
+						<div class="table-responsive">
+							<table class="table table-hover table-condensed">
+								<thead>
 								<tr>
 									<th style="width: 30%">
 										<fmt:message key="label.teams"/>
 									</th>
-									
+
 									<c:if test="${isIraAvailable}">
 										<th class="text-center">
 											<fmt:message key="label.ira.correct.count.average"/>
 										</th>
 									</c:if>
-									
+
 									<c:if test="${isScratchieAvailable}">
 										<th class="text-center">
 											<fmt:message key="label.tra.correct.count"/>
 										</th>
-										
+
 										<c:if test="${isIraAvailable}">
 											<th class="text-center">
 												<fmt:message key="label.ira.tra.delta"/>
 											</th>
 										</c:if>
 									</c:if>
 								</tr>
-							</thead>
-	
-							<tbody>
+								</thead>
+
+								<tbody>
 								<c:forEach var="groupDto" items="${groupDtos}">
-								
+
 									<tr>
 										<td>
 											<a href="#teams-panel-${groupDto.groupID}"><c:out value="${groupDto.groupName}" /></a>
 										</td>
-										
+
 										<c:if test="${isIraAvailable}">
 											<td class="text-center">
 												<c:choose>
@@ -349,14 +349,14 @@
 															<c:otherwise>
 																&nbsp;<i class="fa fa-arrow-circle-left"></i>
 															</c:otherwise>
-														</c:choose>		
+														</c:choose>
 													</c:otherwise>
 												</c:choose>
 											</td>
 										</c:if>
-										
+
 										<c:if test="${isScratchieAvailable}">
-											
+
 											<td class="text-center">
 												<c:choose>
 													<c:when test="${empty groupDto.traCorrectAnswerCount}">
@@ -374,11 +374,11 @@
 															<c:otherwise>
 																&nbsp;<i class="fa fa-arrow-circle-left"></i>
 															</c:otherwise>
-														</c:choose>		
+														</c:choose>
 													</c:otherwise>
 												</c:choose>
 											</td>
-											
+
 											<c:if test="${isIraAvailable}">
 												<td class="text-center">
 													<c:choose>
@@ -387,8 +387,8 @@
 														</c:when>
 														<c:otherwise>
 															${groupDto.correctAnswerCountPercentDelta}%
-															
-															<c:choose>					 
+
+															<c:choose>
 																<c:when test="${not empty highestCorrectAnswerCountDelta && groupDto.correctAnswerCountPercentDelta >= highestCorrectAnswerCountDelta}">
 																	&nbsp;<i class="fa fa-arrow-circle-up" data-toggle="tooltip" title="<fmt:message key="label.ira.tra.highest"/>"></i>
 																</c:when>
@@ -398,19 +398,19 @@
 																<c:otherwise>
 																	&nbsp;<i class="fa fa-arrow-circle-left"></i>
 																</c:otherwise>
-															</c:choose>	
+															</c:choose>
 														</c:otherwise>
 													</c:choose>
 												</td>
 											</c:if>
 										</c:if>
 									</tr>
 								</c:forEach>
-								
+
 								<c:if test="${not empty averageIraCorrectAnswerCountAverage or not empty averageTraCorrectAnswerCount}">
 									<tr>
 										<th><fmt:message key="label.ira.tra.average"/></th>
-										
+
 										<c:if test="${isIraAvailable}">
 											<td class="text-center">
 												<c:choose>
@@ -423,7 +423,7 @@
 												</c:choose>
 											</td>
 										</c:if>
-										
+
 										<c:if test="${isScratchieAvailable}">
 											<td class="text-center">
 												<c:choose>
@@ -435,7 +435,7 @@
 													</c:otherwise>
 												</c:choose>
 											</td>
-											
+
 											<c:if test="${isIraAvailable}">
 												<td class="text-center">
 													<c:choose>
@@ -451,292 +451,292 @@
 										</c:if>
 									</tr>
 								</c:if>
-							</tbody>
-						</table>
+								</tbody>
+							</table>
+						</div>
 					</div>
-				</div>
 			</div>
-			
+
 			<div id="question-results-panel"></div>
-		
+
 			<c:forEach var="groupDto" items="${groupDtos}">
 				<div class="card mb-3" id="teams-panel-${groupDto.groupID}" tabindex="0">
 					<h5 class="card-header" data-bs-toggle="collapse" data-bs-target="#collapse-${groupDto.groupID}">
 						<a class="text-decoration-none" id="group-name-${groupDto.groupID}">
 							<c:out value="${groupDto.groupName}" />
 						</a>
 					</h5>
-			
+
 					<div id="collapse-${groupDto.groupID}" class="card-body collapse show">
-							<c:if test="${isScratchieAvailable}">
-								<c:choose>
-									<c:when test="${empty groupDto.traCorrectAnswerCount}">
-										-
-									</c:when>
-									<c:when test="${empty groupDto.groupLeader}">
-										<h5 class="card-title"><fmt:message key="label.tra.correct.count"/>: ${groupDto.traCorrectAnswerCount}</h5>
-									</c:when>
-									<c:otherwise>
-										<a data-bs-toggle="modal" data-bs-target="#tra-modal"
-										   data-user-id="${groupDto.groupLeader.userID}"
-										   data-tra-correct-answer-count="${groupDto.traCorrectAnswerCount}"
-										   class="card-title text-decoration-none">
-										   <h5><fmt:message key="label.tra.correct.count"/>:
+						<c:if test="${isScratchieAvailable}">
+							<c:choose>
+								<c:when test="${empty groupDto.traCorrectAnswerCount}">
+									-
+								</c:when>
+								<c:when test="${empty groupDto.groupLeader}">
+									<h5 class="card-title"><fmt:message key="label.tra.correct.count"/>: ${groupDto.traCorrectAnswerCount}</h5>
+								</c:when>
+								<c:otherwise>
+									<a data-bs-toggle="modal" data-bs-target="#tra-modal"
+									   data-user-id="${groupDto.groupLeader.userID}"
+									   data-tra-correct-answer-count="${groupDto.traCorrectAnswerCount}"
+									   class="card-title text-decoration-none">
+										<h5><fmt:message key="label.tra.correct.count"/>:
 												${groupDto.traCorrectAnswerCount}
-										   </h5>
-										</a>
-									</c:otherwise>
-								</c:choose>
-							</c:if>
-							
-							<c:if test="${isIraAvailable}">
-								<div class="table-responsive">
-									<table class="table table-hover table-condensed">
-										<thead>
-											<tr>
-												<th>
-													<fmt:message key="label.student"/>
-												</th>
-												
-												<th class="text-center">
-													<fmt:message key="label.ira.correct.count"/>
-												</th>
-												
-												<c:if test="${isScratchieAvailable}">
-																							
-													<th class="text-center">
-														<fmt:message key="label.ira.tra.delta"/>
-													</th>
-												</c:if>
-											</tr>
-										</thead>
-				
-										<tbody>
-											<c:set var="iraHighestCorrectAnswerCount" value="${groupDto.iraHighestCorrectAnswerCount}" />
-											<c:set var="iraLowestCorrectAnswerCount" value="${groupDto.iraLowestCorrectAnswerCount}" />
-											<c:set var="highestCorrectAnswerCountPercentDelta" value="${groupDto.highestCorrectAnswerCountPercentDelta}" />
-											<c:set var="lowestCorrectAnswerCountPercentDelta" value="${groupDto.lowestCorrectAnswerCountPercentDelta}" />
-											
-											<c:forEach var="userDto" items="${groupDto.userList}">
-											
-												<tr>
-													<td>
-														<c:choose>
-															<c:when test="${empty userDto.iraCorrectAnswerCount}">
-																<c:out value="${userDto.lastName}" />,&nbsp;<c:out value="${userDto.firstName}" />
-															</c:when>
-															<c:otherwise>
-																<a class="text-decoration-none ira-modal-link" data-bs-toggle="modal" data-bs-target="#ira-modal"
-																   data-user-id="${userDto.userID}"
-																   data-ira-correct-answer-count="${userDto.iraCorrectAnswerCount}">
-																	<span id="user-name-${userDto.userID}" class="belong-to-group-${groupDto.groupID} new-popover <c:if test="${userDto.groupLeader}">fw-bold</c:if>" 
-																			data-portrait="${userDto.portraitUuid}" data-fullname="${userDto.lastName},&nbsp;${userDto.firstName}">
+										</h5>
+									</a>
+								</c:otherwise>
+							</c:choose>
+						</c:if>
+
+						<c:if test="${isIraAvailable}">
+							<div class="table-responsive">
+								<table class="table table-hover table-condensed">
+									<thead>
+									<tr>
+										<th>
+											<fmt:message key="label.student"/>
+										</th>
+
+										<th class="text-center">
+											<fmt:message key="label.ira.correct.count"/>
+										</th>
+
+										<c:if test="${isScratchieAvailable}">
+
+											<th class="text-center">
+												<fmt:message key="label.ira.tra.delta"/>
+											</th>
+										</c:if>
+									</tr>
+									</thead>
+
+									<tbody>
+									<c:set var="iraHighestCorrectAnswerCount" value="${groupDto.iraHighestCorrectAnswerCount}" />
+									<c:set var="iraLowestCorrectAnswerCount" value="${groupDto.iraLowestCorrectAnswerCount}" />
+									<c:set var="highestCorrectAnswerCountPercentDelta" value="${groupDto.highestCorrectAnswerCountPercentDelta}" />
+									<c:set var="lowestCorrectAnswerCountPercentDelta" value="${groupDto.lowestCorrectAnswerCountPercentDelta}" />
+
+									<c:forEach var="userDto" items="${groupDto.userList}">
+
+										<tr>
+											<td>
+												<c:choose>
+													<c:when test="${empty userDto.iraCorrectAnswerCount}">
+														<c:out value="${userDto.lastName}" />,&nbsp;<c:out value="${userDto.firstName}" />
+													</c:when>
+													<c:otherwise>
+														<a class="text-decoration-none ira-modal-link" data-bs-toggle="modal" data-bs-target="#ira-modal"
+														   data-user-id="${userDto.userID}"
+														   data-ira-correct-answer-count="${userDto.iraCorrectAnswerCount}">
+																	<span id="user-name-${userDto.userID}" class="belong-to-group-${groupDto.groupID} new-popover <c:if test="${userDto.groupLeader}">fw-bold</c:if>"
+																		  data-portrait="${userDto.portraitUuid}" data-fullname="${userDto.lastName},&nbsp;${userDto.firstName}">
 																		<c:out value="${userDto.lastName}" />,&nbsp;<c:out value="${userDto.firstName}" />
 																	</span>
-																</a>
-															</c:otherwise>
-														</c:choose>
-														<c:if test="${userDto.groupLeader}">
-															<abbr title="Leader" class="fa fa-user-plus" style="color: var(--bs-red)"></abbr>
-														</c:if>
-													</td>
-													
-													<td class="text-center">
-														<c:choose>
-															<c:when test="${empty userDto.iraCorrectAnswerCount}">
-																-													
-															</c:when>
-															<c:otherwise>
-																<a class="text-decoration-none ira-modal-link" data-bs-toggle="modal" data-bs-target="#ira-modal"
-																		data-user-id="${userDto.userID}"
-																		data-ira-correct-answer-count="${userDto.iraCorrectAnswerCount}">
-																	${userDto.iraCorrectAnswerCount}
-																</a>
-																
-																<c:if test="${fn:length(groupDto.userList) > 1}">
-																	<c:choose>
-																		<c:when test="${not empty iraHighestCorrectAnswerCount && userDto.iraCorrectAnswerCount >= iraHighestCorrectAnswerCount}">
-																			&nbsp;<i class="fa fa-arrow-circle-up" data-toggle="tooltip" title="<fmt:message key="label.ira.tra.highest"/>"></i>
-																		</c:when>
-																		<c:when test="${not empty iraLowestCorrectAnswerCount && userDto.iraCorrectAnswerCount <= iraLowestCorrectAnswerCount}">
-																			&nbsp;<i class="fa fa-arrow-circle-down" data-toggle="tooltip" title="<fmt:message key="label.ira.tra.lowest"/>"></i>
-																		</c:when>
-																		<c:otherwise>
-																			&nbsp;<i class="fa fa-arrow-circle-left"></i>
-																		</c:otherwise>
-																	</c:choose>		
-																</c:if>
-															</c:otherwise>
-														</c:choose>
-													</td>
-													
-													
-													<c:if test="${isScratchieAvailable}">
-																								
-														<td class="text-center">
+														</a>
+													</c:otherwise>
+												</c:choose>
+												<c:if test="${userDto.groupLeader}">
+													<abbr title="Leader" class="fa fa-user-plus" style="color: var(--bs-red)"></abbr>
+												</c:if>
+											</td>
+
+											<td class="text-center">
+												<c:choose>
+													<c:when test="${empty userDto.iraCorrectAnswerCount}">
+														-
+													</c:when>
+													<c:otherwise>
+														<a class="text-decoration-none ira-modal-link" data-bs-toggle="modal" data-bs-target="#ira-modal"
+														   data-user-id="${userDto.userID}"
+														   data-ira-correct-answer-count="${userDto.iraCorrectAnswerCount}">
+																${userDto.iraCorrectAnswerCount}
+														</a>
+
+														<c:if test="${fn:length(groupDto.userList) > 1}">
 															<c:choose>
-																<c:when test="${empty userDto.correctAnswerCountPercentDelta}">
-																	-													
+																<c:when test="${not empty iraHighestCorrectAnswerCount && userDto.iraCorrectAnswerCount >= iraHighestCorrectAnswerCount}">
+																	&nbsp;<i class="fa fa-arrow-circle-up" data-toggle="tooltip" title="<fmt:message key="label.ira.tra.highest"/>"></i>
 																</c:when>
+																<c:when test="${not empty iraLowestCorrectAnswerCount && userDto.iraCorrectAnswerCount <= iraLowestCorrectAnswerCount}">
+																	&nbsp;<i class="fa fa-arrow-circle-down" data-toggle="tooltip" title="<fmt:message key="label.ira.tra.lowest"/>"></i>
+																</c:when>
 																<c:otherwise>
-																	${userDto.correctAnswerCountPercentDelta}%
-																	
-																	<c:if test="${fn:length(groupDto.userList) > 1}">
-																		<c:choose>
-																			<c:when test="${not empty highestCorrectAnswerCountPercentDelta && userDto.correctAnswerCountPercentDelta >= highestCorrectAnswerCountPercentDelta}">
-																				&nbsp;<i class="fa fa-arrow-circle-up" data-toggle="tooltip" title="<fmt:message key="label.ira.tra.highest"/>"></i>
-																			</c:when>
-																			<c:when test="${not empty lowestCorrectAnswerCountPercentDelta && userDto.correctAnswerCountPercentDelta <= lowestCorrectAnswerCountPercentDelta}">
-																				&nbsp;<i class="fa fa-arrow-circle-down" data-toggle="tooltip" title="<fmt:message key="label.ira.tra.lowest"/>"></i>
-																			</c:when>
-																			<c:otherwise>
-																				&nbsp;<i class="fa fa-arrow-circle-left"></i>
-																			</c:otherwise>
-																		</c:choose>		
-																	</c:if>
+																	&nbsp;<i class="fa fa-arrow-circle-left"></i>
 																</c:otherwise>
 															</c:choose>
-														</td>
-													</c:if>
-												</tr>
-											</c:forEach>
-											
-											<c:if test="${fn:length(groupDto.userList) > 1}">
-												<tr>
-													<th><fmt:message key="label.ira.tra.average"/></th>
-													
-													<td class="text-center">
-														<fmt:formatNumber type="number" minFractionDigits="0" maxFractionDigits="2" value="${groupDto.iraCorrectAnswerCountAverage}" />
-													</td>
-													
-													<td class="text-center">
-														<fmt:formatNumber type="number" minFractionDigits="0" maxFractionDigits="2" value="${groupDto.correctAnswerCountPercentDeltaAverage}" />%
-													</td>
-												</tr>
+														</c:if>
+													</c:otherwise>
+												</c:choose>
+											</td>
+
+
+											<c:if test="${isScratchieAvailable}">
+
+												<td class="text-center">
+													<c:choose>
+														<c:when test="${empty userDto.correctAnswerCountPercentDelta}">
+															-
+														</c:when>
+														<c:otherwise>
+															${userDto.correctAnswerCountPercentDelta}%
+
+															<c:if test="${fn:length(groupDto.userList) > 1}">
+																<c:choose>
+																	<c:when test="${not empty highestCorrectAnswerCountPercentDelta && userDto.correctAnswerCountPercentDelta >= highestCorrectAnswerCountPercentDelta}">
+																		&nbsp;<i class="fa fa-arrow-circle-up" data-toggle="tooltip" title="<fmt:message key="label.ira.tra.highest"/>"></i>
+																	</c:when>
+																	<c:when test="${not empty lowestCorrectAnswerCountPercentDelta && userDto.correctAnswerCountPercentDelta <= lowestCorrectAnswerCountPercentDelta}">
+																		&nbsp;<i class="fa fa-arrow-circle-down" data-toggle="tooltip" title="<fmt:message key="label.ira.tra.lowest"/>"></i>
+																	</c:when>
+																	<c:otherwise>
+																		&nbsp;<i class="fa fa-arrow-circle-left"></i>
+																	</c:otherwise>
+																</c:choose>
+															</c:if>
+														</c:otherwise>
+													</c:choose>
+												</td>
 											</c:if>
-										</tbody>
-									</table>
-								</div>
-							</c:if>	
-							
-							<!-- Change leader and Compare buttons -->
-							<div class="row">
-								<div class="col-xs-12 col-md-12 col-lg-12">
-									<c:if test="${isIraAvailable and isScratchieAvailable and not empty groupDto.userList and not empty groupDto.traCorrectAnswerCount}">
-										<button href="#" data-bs-toggle="modal" data-bs-target="#comparison-modal" type="button" class="btn btn-sm btn-secondary float-end"
-												data-ira-scores="
+										</tr>
+									</c:forEach>
+
+									<c:if test="${fn:length(groupDto.userList) > 1}">
+										<tr>
+											<th><fmt:message key="label.ira.tra.average"/></th>
+
+											<td class="text-center">
+												<fmt:formatNumber type="number" minFractionDigits="0" maxFractionDigits="2" value="${groupDto.iraCorrectAnswerCountAverage}" />
+											</td>
+
+											<td class="text-center">
+												<fmt:formatNumber type="number" minFractionDigits="0" maxFractionDigits="2" value="${groupDto.correctAnswerCountPercentDeltaAverage}" />%
+											</td>
+										</tr>
+									</c:if>
+									</tbody>
+								</table>
+							</div>
+						</c:if>
+
+						<!-- Change leader and Compare buttons -->
+						<div class="row">
+							<div class="col-xs-12 col-md-12 col-lg-12">
+								<c:if test="${isIraAvailable and isScratchieAvailable and not empty groupDto.userList and not empty groupDto.traCorrectAnswerCount}">
+									<button href="#" data-bs-toggle="modal" data-bs-target="#comparison-modal" type="button" class="btn btn-sm btn-secondary float-end"
+											data-ira-scores="
 												<c:forEach var="userDto" items="${groupDto.userList}">
 													<c:if test="${userDto.iraCorrectAnswerCount != null}">
 														${userDto.iraCorrectAnswerCount},
 													</c:if>
-												</c:forEach>" 
-												data-tra-scores="${groupDto.traCorrectAnswerCount}" 
-												data-group-id="${groupDto.groupID}"
-												data-user-names="">
-											<i class="fa fa-bar-chart"></i> 
-											<fmt:message key="label.comparison"/>
-										</button>
-									</c:if>
-		
-									<c:if test="${not empty leaderselectionToolActivityId and not empty groupDto.userList}">
-										<button onClick="javascript:showChangeLeaderModal(${groupDto.groupID})" type="button"
-											    class="btn btn-sm btn-secondary float-end me-2">
-											<fmt:message key="label.change.leader"/>
-										</button>
-									</c:if>
-								</div>
+												</c:forEach>"
+											data-tra-scores="${groupDto.traCorrectAnswerCount}"
+											data-group-id="${groupDto.groupID}"
+											data-user-names="">
+										<i class="fa fa-bar-chart"></i>
+										<fmt:message key="label.comparison"/>
+									</button>
+								</c:if>
+
+								<c:if test="${not empty leaderselectionToolActivityId and not empty groupDto.userList}">
+									<button onClick="javascript:showChangeLeaderModal(${groupDto.groupID})" type="button"
+											class="btn btn-sm btn-secondary float-end me-2">
+										<fmt:message key="label.change.leader"/>
+									</button>
+								</c:if>
 							</div>
-							<!-- End change leader -->                       
-			
-			
+						</div>
+						<!-- End change leader -->
+
+
 					</div>
 				</div>
-			</c:forEach>     
-		
+			</c:forEach>
+
 		</div>
 		<div class="col-2"></div>
 	</div>
 </div>
 
 <!-- modal chart -->
 <div class="modal fade" id="comparison-modal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
-<div class="modal-dialog">
-<div class="modal-content">
-	<div class="modal-header">
-		<h4 class="modal-title" id="exampleModalLabel">
-			<fmt:message key="label.bar.chart"/>
-		</h4>
-		<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h4 class="modal-title" id="exampleModalLabel">
+					<fmt:message key="label.bar.chart"/>
+				</h4>
+				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+			</div>
+
+			<div class="modal-body">
+				<canvas id="canvas" width="568" height="300"></canvas>
+			</div>
+		</div>
 	</div>
-          
-	<div class="modal-body">
-		<canvas id="canvas" width="568" height="300"></canvas>
-	</div>
 </div>
-</div>
-</div>
 <!-- end modal chart -->
 
 <!-- iRA Modal -->
 <div class="modal fade" id="ira-modal">
-<div class="modal-dialog modal-lg">
-<div class="modal-content">
+	<div class="modal-dialog modal-lg">
+		<div class="modal-content">
 
-	<div class="modal-header">
-		<div class="modal-title">
-			<h4>
-				<fmt:message key="label.ira.responses.for"/>: <span id="ira-user-name-label"></span> 
-			</h4>
-			<fmt:message key="label.ira.correct.count"/>: <span id="ira-correct-answer-count"></span>
+			<div class="modal-header">
+				<div class="modal-title">
+					<h4>
+						<fmt:message key="label.ira.responses.for"/>: <span id="ira-user-name-label"></span>
+					</h4>
+					<fmt:message key="label.ira.correct.count"/>: <span id="ira-correct-answer-count"></span>
+				</div>
+				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+			</div>
+
+			<div class="modal-body">
+			</div>
+
+			<div class="modal-footer">
+				<a href="#" data-bs-dismiss="modal" class="btn btn-primary">
+					<fmt:message key="button.ok"/>
+				</a>
+			</div>
+
 		</div>
-		<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 	</div>
-          
-	<div class="modal-body">
-	</div>
-	
-	<div class="modal-footer">	
-		<a href="#" data-bs-dismiss="modal" class="btn btn-primary">
-			<fmt:message key="button.ok"/>
-		</a>
-	</div>
-
 </div>
-</div>
-</div>
 <!-- End iRA Modal -->
 
 <!-- tRA Modal -->
 <div class="modal fade" id="tra-modal">
-<div class="modal-dialog modal-lg">
-<div class="modal-content">
+	<div class="modal-dialog modal-lg">
+		<div class="modal-content">
 
-	<div class="modal-header">
-		<div class="modal-title">
-			<h4>
-				<fmt:message key="label.tra.responses.for"/>: <span id="tra-user-name-label"></span> 
-			</h4>
-			<fmt:message key="label.tra.correct.count"/>: <span id="tra-correct-answer-count"></span>
+			<div class="modal-header">
+				<div class="modal-title">
+					<h4>
+						<fmt:message key="label.tra.responses.for"/>: <span id="tra-user-name-label"></span>
+					</h4>
+					<fmt:message key="label.tra.correct.count"/>: <span id="tra-correct-answer-count"></span>
+				</div>
+				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+			</div>
+
+			<!-- Begin -->
+			<div class="modal-body">
+			</div>
+			<!-- end -->
+
+			<div class="modal-footer">
+				<a href="#" data-bs-dismiss="modal" class="btn btn-primary">
+					<fmt:message key="button.ok"/>
+				</a>
+			</div>
+
 		</div>
-		<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 	</div>
-          
-	<!-- Begin -->
-	<div class="modal-body">
-	</div>
-	<!-- end -->  
-	
-	<div class="modal-footer">	
-		<a href="#" data-bs-dismiss="modal" class="btn btn-primary">
-			<fmt:message key="button.ok"/>
-		</a>
-	</div>
-
 </div>
-</div>
-</div>
 <!-- End tRA Modal -->
 
 <!-- container for Change Leader modals -->
 <div id="change-leader-modals">
-</div>
+</div>
\ No newline at end of file