Merge remote-tracking branch 'origin/OpenOLAT_14.1'

src/main/java/org/olat/ims/qti21/ui/statistics/interactions/MatchStatisticsController.java

@@ -110,7 +110,7 @@ public class MatchStatisticsController extends BasicController {
 
 	@Override
 	protected void event(UserRequest ureq, Component source, Event event) {
-		
+		//
 	}
 	
 	private void renderMatch() {
@@ -206,15 +206,15 @@ public class MatchStatisticsController extends BasicController {
 				return 0;
 			}
 			
-			long val = 0;
+			double val = 0;
 			if(statistics.getNumOfCorrect() > 0) {
 				val = statistics.getNumOfCorrect();
 			} else if(statistics.getNumOfIncorrect() > 0) {
 				val = statistics.getNumOfIncorrect();
 			}
 			
-			long point = ref / max;
-			return point * val;
+			double point = (double)ref / (double)max;
+			return Math.round(point * val);
 		}
 		
 		public long getRelativeBorder(int ref) {
@@ -223,7 +223,7 @@ public class MatchStatisticsController extends BasicController {
 		}
 		
 		public long getRelativeMargin(int ref) {
-			long val = this.getRelative(ref);
+			long val = getRelative(ref);
 			return val == 0 ? ref : (ref - val) / 2;
 		}
 	}

src/main/java/org/olat/ims/qti21/ui/statistics/interactions/_content/match_interaction.html

@@ -3,16 +3,16 @@
 	<table class="table matchInteraction score">
 		<thead>
 			<tr>
-				<th></th>
+				<td></td>
 				#foreach($targetChoice in $targetChoices)
-					<th>$r.render(${targetChoice.getSummary()})</th>
+					<th scope='col'>$r.render(${targetChoice.getSummary()})</th>
 				#end
 			</tr>
 		</thead>
 		<tbody>
 		#foreach($sourceChoice in $sourceChoices)
 			<tr>
-				<th>$r.render(${sourceChoice.getSummary()})</th>
+				<th scope='row'>$r.render(${sourceChoice.getSummary()})</th>
 				#foreach($targetChoice in $targetChoices)
 					<td>
 					#set($scoreWrapper = $r.get("${sourceChoice.getChoiceIdentifier().toString()}-${targetChoice.getChoiceIdentifier().toString()}"))