OO-4825: exclude cancelled from statistics, wording

src/main/java/org/olat/ims/qti21/manager/QTI21StatisticsManagerImpl.java

@@ -108,7 +108,8 @@ public class QTI21StatisticsManagerImpl implements QTI21StatisticsManager {
 		}
 		
 		sb.append(" and asession.lastModified = (select max(a2session.lastModified) from qtiassessmenttestsession a2session")
-		  .append("   where asession.testEntry.key=a2session.testEntry.key and a2session.repositoryEntry.key=asession.repositoryEntry.key");
+		  .append("   where asession.testEntry.key=a2session.testEntry.key and a2session.repositoryEntry.key=asession.repositoryEntry.key")
+		  .append("   and a2session.exploded=false and a2session.cancelled=false");
 		if(searchParams.getNodeIdent() != null ) {
 			sb.append(" and a2session.subIdent=asession.subIdent");
 		} else {
@@ -125,7 +126,7 @@ public class QTI21StatisticsManagerImpl implements QTI21StatisticsManager {
 			sb.append(" and asession.identity.key in (select data.identity.key from assessmententry data")
 			  .append("   where data.repositoryEntry.key=asession.repositoryEntry.key")
 			  .append(" )");
-		} else if(searchParams.getLimitToGroups() != null && searchParams.getLimitToGroups().size() > 0) {
+		} else if(searchParams.getLimitToGroups() != null && !searchParams.getLimitToGroups().isEmpty()) {
 			sb.append(" and asession.identity.key in ( select membership.identity.key from bgroupmember membership")
 			  .append("   where membership.group in (:baseGroups) and membership.role='").append(GroupRole.participant).append("'")
 			  .append(" )");
@@ -164,7 +165,7 @@ public class QTI21StatisticsManagerImpl implements QTI21StatisticsManager {
 			//
 		} else if(searchParams.isViewAllUsers()) {
 			//
-		} else if(searchParams.getLimitToGroups() != null && searchParams.getLimitToGroups().size() > 0) {
+		} else if(searchParams.getLimitToGroups() != null && !searchParams.getLimitToGroups().isEmpty()) {
 			query.setParameter("baseGroups", searchParams.getLimitToGroups());
 		}
 	}
@@ -236,7 +237,7 @@ public class QTI21StatisticsManagerImpl implements QTI21StatisticsManager {
 			}
 			dataPos++;
 		}
-		if (rawDatas.size() == 0) {
+		if (rawDatas.isEmpty()) {
 			minScore = 0;
 		}
 		
@@ -344,7 +345,7 @@ public class QTI21StatisticsManagerImpl implements QTI21StatisticsManager {
 		}
 
 		for(RawData result:results) {
-			Long numOfAnswers = result.getCount();;
+			Long numOfAnswers = result.getCount();
 			if(numOfAnswers != null && numOfAnswers.longValue() > 0) {
 				String stringuifiedResponse = result.getStringuifiedResponse();
 				for(int i=simpleChoices.size(); i-->0; ) {
@@ -377,7 +378,7 @@ public class QTI21StatisticsManagerImpl implements QTI21StatisticsManager {
 		}
 
 		for(RawData result:results) {
-			Long numOfAnswers = result.getCount();;
+			Long numOfAnswers = result.getCount();
 			if(numOfAnswers != null && numOfAnswers.longValue() > 0) {
 				String stringuifiedResponse = result.getStringuifiedResponse();
 				for(int i=hottexts.size(); i-->0; ) {
@@ -410,7 +411,7 @@ public class QTI21StatisticsManagerImpl implements QTI21StatisticsManager {
 		}
 
 		for(RawData result:results) {
-			Long numOfAnswers = result.getCount();;
+			Long numOfAnswers = result.getCount();
 			if(numOfAnswers != null && numOfAnswers.longValue() > 0) {
 				String stringuifiedResponse = result.getStringuifiedResponse();
 				for(int i=hotspotChoices.size(); i-->0; ) {
@@ -583,7 +584,7 @@ public class QTI21StatisticsManagerImpl implements QTI21StatisticsManager {
 			correctResponse = solution.toString();
 		}
 		
-		double points = Double.NaN;
+		double points;
 		if(numericalEntry.getScore() == null) {
 			points = 0.0d;//all score
 		} else  {

src/main/java/org/olat/ims/qti21/ui/QTI21AssessmentTestSessionTableModel.java

@@ -122,17 +122,19 @@ public class QTI21AssessmentTestSessionTableModel extends DefaultFlexiTableDataM
 				}
 				return "";
 			}
-			case open: {
-				Date finished = session.getTestSession().getFinishTime();
-				return finished == null ? Boolean.FALSE : Boolean.TRUE;
-			}
+			case open: return Boolean.valueOf(!isTestSessionOpen(session));
 			case correction: return (lastSession != null && lastSession.equals(session.getTestSession()));
-			case invalidate: return !session.getTestSession().isCancelled() && !session.getTestSession().isExploded();
+			case invalidate: return !isTestSessionOpen(session) && !session.getTestSession().isCancelled() && !session.getTestSession().isExploded();
 			case tools: return session.getToolsLink();
 			default: return "ERROR";
 		}
 	}
 	
+	private boolean isTestSessionOpen(QTI21AssessmentTestSessionDetails session) {
+		Date finished = session.getTestSession().getFinishTime();
+		return finished == null;
+	}
+	
 	private Date getTerminationTime(QTI21AssessmentTestSessionDetails session) {
 		Date endTime = session.getTestSession().getTerminationTime();
 		if(endTime == null) {

src/main/java/org/olat/ims/qti21/ui/_i18n/LocalStrings_de.properties

@@ -142,7 +142,7 @@ interaction.order.target=Ziel
 invalidate=Annullieren
 invalidate.overwrite=Annullieren und Resultat \u00FCbertragen
 invalidate.test.confirm.title=Annullieren
-invalidate.test.confirm.text=Wollen Sie den Test Session ung\u00FCltig machen? Die Daten werden nicht gel\u00F6scht.
+invalidate.test.confirm.text=Wollen Sie diese Test-Session als ung\u00FCltig markieren? Die Daten werden nicht gel\u00F6scht.
 item.comment=Kommentar
 kprim.minus=Falsch
 kprim.plus=Richtig

src/main/java/org/olat/ims/qti21/ui/_i18n/LocalStrings_en.properties

@@ -142,7 +142,7 @@ interaction.order.target=Target
 invalidate=Invalidate
 invalidate.overwrite=Invalidate and transfer result
 invalidate.test.confirm.title=Invalidate
-invalidate.test.confirm.text=Do you want to invalidate this test session? The date will not be deleted.
+invalidate.test.confirm.text=Do you want to mark this test session as invalid? The data will not be deleted.
 item.comment=Comment
 kprim.minus=False
 kprim.plus=True