OO-1088, OO-716: wording, split the QTI statistics in test statistics and survey statistics

src/main/java/org/olat/course/nodes/CourseNode.java

@@ -52,6 +52,7 @@ import org.olat.course.run.userview.TreeEvaluation;
 import org.olat.course.run.userview.UserCourseEnvironment;
 import org.olat.course.statistic.StatisticResourceOption;
 import org.olat.course.statistic.StatisticResourceResult;
+import org.olat.ims.qti.statistics.QTIType;
 import org.olat.modules.ModuleConfiguration;
 import org.olat.repository.RepositoryEntry;
 
@@ -261,9 +262,9 @@ public interface CourseNode extends INode, ShortName {
 	 * @return
 	 */
 	public StatisticResourceResult createStatisticNodeResult(UserRequest ureq, WindowControl wControl,
-			UserCourseEnvironment userCourseEnv, StatisticResourceOption options);
+			UserCourseEnvironment userCourseEnv, StatisticResourceOption options, QTIType... type);
 	
-	public boolean isStatisticNodeResultAvailable(UserCourseEnvironment userCourseEnv);
+	public boolean isStatisticNodeResultAvailable(UserCourseEnvironment userCourseEnv, QTIType... type);
 	
 	/**
 	 * this method must generate a nodeevaluation and take care of (if any) child

src/main/java/org/olat/course/nodes/GenericCourseNode.java

@@ -64,6 +64,7 @@ import org.olat.course.statistic.StatisticResourceOption;
 import org.olat.course.statistic.StatisticResourceResult;
 import org.olat.group.model.BGAreaReference;
 import org.olat.group.model.BusinessGroupReference;
+import org.olat.ims.qti.statistics.QTIType;
 import org.olat.modules.ModuleConfiguration;
 
 /**
@@ -151,12 +152,12 @@ public abstract class GenericCourseNode extends GenericNode implements CourseNod
 	
 	@Override
 	public StatisticResourceResult createStatisticNodeResult(UserRequest ureq, WindowControl wControl,
-			UserCourseEnvironment userCourseEnv, StatisticResourceOption options) {
+			UserCourseEnvironment userCourseEnv, StatisticResourceOption options, QTIType... types) {
 		return null;
 	}
 
 	@Override
-	public boolean isStatisticNodeResultAvailable(UserCourseEnvironment userCourseEnv) {
+	public boolean isStatisticNodeResultAvailable(UserCourseEnvironment userCourseEnv, QTIType... types) {
 		return false;
 	}
 

src/main/java/org/olat/course/nodes/IQSURVCourseNode.java

@@ -70,6 +70,7 @@ import org.olat.ims.qti.export.QTIExportManager;
 import org.olat.ims.qti.process.AssessmentInstance;
 import org.olat.ims.qti.statistics.QTIStatisticResourceResult;
 import org.olat.ims.qti.statistics.QTIStatisticSearchParams;
+import org.olat.ims.qti.statistics.QTIType;
 import org.olat.ims.qti.statistics.ui.QTI12StatisticsToolController;
 import org.olat.modules.ModuleConfiguration;
 import org.olat.repository.RepositoryEntry;
@@ -133,7 +134,10 @@ public class IQSURVCourseNode extends AbstractAccessableCourseNode implements QT
 	}
 
 	@Override
-	public StatisticResourceResult createStatisticNodeResult(UserRequest ureq, WindowControl wControl, UserCourseEnvironment userCourseEnv, StatisticResourceOption options) {
+	public StatisticResourceResult createStatisticNodeResult(UserRequest ureq, WindowControl wControl,
+			UserCourseEnvironment userCourseEnv, StatisticResourceOption options, QTIType... types) {
+		if(!isQTITypeAllowed(types)) return null;
+		
 		Long courseId = userCourseEnv.getCourseEnvironment().getCourseResourceableId();
 		OLATResourceable courseOres = OresHelper.createOLATResourceableInstance("CourseModule", courseId);
 		
@@ -155,8 +159,20 @@ public class IQSURVCourseNode extends AbstractAccessableCourseNode implements QT
 	}
 	
 	@Override
-	public boolean isStatisticNodeResultAvailable(UserCourseEnvironment userCourseEnv) {
-		return true;
+	public boolean isStatisticNodeResultAvailable(UserCourseEnvironment userCourseEnv, QTIType... types) {
+		return isQTITypeAllowed(types);
+	}
+	
+	private boolean isQTITypeAllowed(QTIType... types) {
+		if(types == null) return true;
+		if(types.length == 0 || (types.length == 1 && types[0] == null)) return true;
+		
+		for(QTIType type:types) {
+			if(QTIType.survey.equals(type)) {
+				return true;
+			}
+		}
+		return false;
 	}
 
 	/**

src/main/java/org/olat/course/nodes/IQTESTCourseNode.java

@@ -75,6 +75,7 @@ import org.olat.ims.qti.export.QTIExportManager;
 import org.olat.ims.qti.process.AssessmentInstance;
 import org.olat.ims.qti.statistics.QTIStatisticResourceResult;
 import org.olat.ims.qti.statistics.QTIStatisticSearchParams;
+import org.olat.ims.qti.statistics.QTIType;
 import org.olat.ims.qti.statistics.ui.QTI12StatisticsToolController;
 import org.olat.modules.ModuleConfiguration;
 import org.olat.repository.RepositoryEntry;
@@ -147,7 +148,10 @@ public class IQTESTCourseNode extends AbstractAccessableCourseNode implements As
 	}
 
 	@Override
-	public StatisticResourceResult createStatisticNodeResult(UserRequest ureq, WindowControl wControl, UserCourseEnvironment userCourseEnv, StatisticResourceOption options) {
+	public StatisticResourceResult createStatisticNodeResult(UserRequest ureq, WindowControl wControl,
+			UserCourseEnvironment userCourseEnv, StatisticResourceOption options, QTIType... types) {
+		if(!isQTITypeAllowed(types)) return null;
+		
 		Long courseId = userCourseEnv.getCourseEnvironment().getCourseResourceableId();
 		OLATResourceable courseOres = OresHelper.createOLATResourceableInstance("CourseModule", courseId);
 		
@@ -169,8 +173,20 @@ public class IQTESTCourseNode extends AbstractAccessableCourseNode implements As
 	}
 	
 	@Override
-	public boolean isStatisticNodeResultAvailable(UserCourseEnvironment userCourseEnv) {
-		return true;
+	public boolean isStatisticNodeResultAvailable(UserCourseEnvironment userCourseEnv, QTIType... types) {
+		return isQTITypeAllowed(types);
+	}
+	
+	private boolean isQTITypeAllowed(QTIType... types) {
+		if(types == null) return true;
+		if(types.length == 0 || (types.length == 1 && types[0] == null)) return true;
+		
+		for(QTIType type:types) {
+			if(QTIType.test.equals(type) || QTIType.onyx.equals(type)) {
+				return true;
+			}
+		}
+		return false;
 	}
 
 	/**

src/main/java/org/olat/course/run/RunMainController.java

@@ -119,6 +119,7 @@ import org.olat.course.statistic.StatisticMainController;
 import org.olat.group.BusinessGroup;
 import org.olat.group.BusinessGroupService;
 import org.olat.group.ui.edit.BusinessGroupModifiedEvent;
+import org.olat.ims.qti.statistics.QTIType;
 import org.olat.instantMessaging.InstantMessagingModule;
 import org.olat.instantMessaging.InstantMessagingService;
 import org.olat.instantMessaging.OpenInstantMessageEvent;
@@ -694,8 +695,10 @@ public class RunMainController extends MainLayoutBasicController implements Gene
 			boolean vip = isCourseCoach || isCourseAdmin;
 			OpenInstantMessageEvent event = new OpenInstantMessageEvent(ureq, course, courseTitle, vip);
 			ureq.getUserSession().getSingleUserEventCenter().fireEventToListenersOf(event, InstantMessagingService.TOWER_EVENT_ORES);
-		} else if (cmd.equals("qtistatistic")) {
-			launchAssessmentStatistics(ureq, null);
+		} else if (cmd.equals("teststatistic")) {
+			launchAssessmentStatistics(ureq, "command.openteststatistic", "TestStatistics", QTIType.test, QTIType.onyx);
+		} else if (cmd.equals("surveystatistic")) {
+			launchAssessmentStatistics(ureq, "command.opensurveystatistic", "SurveyStatistics", QTIType.survey);
 		} else if (cmd.equals("customDb")) {
 			if (hasCourseRight(CourseRights.RIGHT_DB) || isCourseAdmin) {
 				currentToolCtr = new CustomDBMainController(ureq, getWindowControl(), course);
@@ -855,22 +858,15 @@ public class RunMainController extends MainLayoutBasicController implements Gene
 		} else throw new OLATSecurityException("clicked groupmanagement, but no according right");
 	}
 
-	private Activateable2 launchAssessmentStatistics(UserRequest ureq, List<ContextEntry> entries) {
-		OLATResourceable ores = OresHelper.createOLATResourceableType("assessmentStatistics");
+	private Activateable2 launchAssessmentStatistics(UserRequest ureq, String i18nCrumbKey, String typeName, QTIType... types) {
+		OLATResourceable ores = OresHelper.createOLATResourceableType(typeName);
 		ThreadLocalUserActivityLogger.addLoggingResourceInfo(LoggingResourceable.wrapBusinessPath(ores));
 		WindowControl swControl = addToHistory(ureq, ores, null);
-		if (hasCourseRight(CourseRights.RIGHT_STATISTICS) || isCourseAdmin) {
-			StatisticCourseNodesController statsToolCtr = new StatisticCourseNodesController(ureq, swControl, courseRepositoryEntry, uce);
+		if (hasCourseRight(CourseRights.RIGHT_STATISTICS) || isCourseAdmin || isCourseCoach) {
+			StatisticCourseNodesController statsToolCtr = new StatisticCourseNodesController(ureq, swControl, courseRepositoryEntry, uce, types);
 			currentToolCtr = statsToolCtr;
 			listenTo(statsToolCtr);
-			all.pushController(translate("command.openstatistic"), statsToolCtr);
-			return statsToolCtr;
-		}
-		if (isCourseCoach) {
-			StatisticCourseNodesController statsToolCtr = new StatisticCourseNodesController(ureq, swControl, courseRepositoryEntry, uce);
-			currentToolCtr = statsToolCtr;
-			listenTo(statsToolCtr);
-			all.pushController(translate("command.openstatistic"), statsToolCtr);
+			all.pushController(translate(i18nCrumbKey), statsToolCtr);
 			return statsToolCtr;
 		}
 		return null;
@@ -1063,17 +1059,23 @@ public class RunMainController extends MainLayoutBasicController implements Gene
 				myTool.addLink("assessment", translate("command.openassessment"));
 			}
 			if (hasCourseRight(CourseRights.RIGHT_STATISTICS) || isCourseAdmin || isCourseCoach) {
-				final AtomicInteger qtiNodes = new AtomicInteger();
+				final AtomicInteger testNodes = new AtomicInteger();
+				final AtomicInteger surveyNodes = new AtomicInteger();
 				new TreeVisitor(new Visitor() {
 					@Override
 					public void visit(INode node) {
-						if(((CourseNode)node).isStatisticNodeResultAvailable(uce)) {
-							qtiNodes.incrementAndGet();
+						if(((CourseNode)node).isStatisticNodeResultAvailable(uce, QTIType.test, QTIType.onyx)) {
+							testNodes.incrementAndGet();
+						} else if(((CourseNode)node).isStatisticNodeResultAvailable(uce, QTIType.survey)) {
+							surveyNodes.incrementAndGet();
 						}
 					}
 				}, course.getRunStructure().getRootNode(), true).visitAll();
-				if(qtiNodes.intValue() > 0) {
-					myTool.addLink("qtistatistic", translate("command.openqtistatistic"));
+				if(testNodes.intValue() > 0) {
+					myTool.addLink("teststatistic", translate("command.openteststatistic"));
+				}
+				if(surveyNodes.intValue() > 0) {
+					myTool.addLink("surveystatistic", translate("command.opensurveystatistic"));
 				}
 			}
 			if (hasCourseRight(CourseRights.RIGHT_STATISTICS) || isCourseAdmin) {
@@ -1290,11 +1292,16 @@ public class RunMainController extends MainLayoutBasicController implements Gene
 					//the wrong link to the wrong person
 				}
 			}
-		}  else if ("assessmentStatistics".equals(type)) {
+		}  else if ("TestStatistics".equalsIgnoreCase(type) || "SurveyStatistics".equalsIgnoreCase(type)) {
 			//check the security before, the link is perhaps in the wrong hands
 			if(hasCourseRight(CourseRights.RIGHT_ASSESSMENT) || isCourseAdmin || isCourseCoach) {
 				try {
-					Activateable2 assessmentCtrl = launchAssessmentStatistics(ureq, null);
+					Activateable2 assessmentCtrl;
+					if("TestStatistics".equalsIgnoreCase(type)) {
+						assessmentCtrl = launchAssessmentStatistics(ureq, "command.openteststatistic", "TestStatistics", QTIType.test, QTIType.onyx);
+					} else {
+						assessmentCtrl = launchAssessmentStatistics(ureq, "command.opensurveystatistic", "SurveyStatistics", QTIType.survey);
+					}
 					
 					List<ContextEntry> subEntries;
 					if(entries.size() > 1 && entries.get(1).getOLATResourceable().getResourceableTypeName().equals(type)) {

src/main/java/org/olat/course/run/_i18n/LocalStrings_de.properties

@@ -20,7 +20,8 @@ command.opengroupmngt=Gruppenmanagement
 command.opensimplegroupmngt=Mitgliederverwaltung
 command.openrightmngt=Rechtemanagement
 command.openstatistic=Kurs Statistiken
-command.openqtistatistic=QTI Test Statistiken
+command.openteststatistic=Test Statistiken
+command.opensurveystatistic=Fragebogen Statistiken
 command.personalnote=Notizen
 course.closed = Dieser Kurs wurde beendet und wird nicht l\u00e4nger bearbeitet oder aktualisiert.
 course.disposed.command.restart=Den Kurs beenden und neu starten

src/main/java/org/olat/course/run/_i18n/LocalStrings_en.properties

@@ -17,7 +17,8 @@ command.openassessment=Assessment tool
 command.opendb=Course DB
 command.openeditor=Course editor
 command.opengroupmngt=Group management
-command.openqtistatistic=QTI Test Statistics
+command.openteststatistic=Test statistics
+command.opensurveystatistic=Survey statistics
 command.openrightmngt=Rights management
 command.opensimplegroupmngt=Members management
 command.openstatistic=Course Statistics

src/main/java/org/olat/course/run/_i18n/LocalStrings_fr.properties

@@ -17,7 +17,8 @@ command.openassessment=Outil d'\u00E9valuation
 command.opendb=Base de donn\u00E9es du cours
 command.openeditor=Editeur de cours
 command.opengroupmngt=Gestion des groupes
-command.openqtistatistic=Statistique des tests QTI
+command.openteststatistic=Statistique des tests
+command.opensurveystatistic=Statistique des sondages
 command.openrightmngt=Gestion des droits
 command.opensimplegroupmngt=Administration des membres
 command.openstatistic=Statistique

src/main/java/org/olat/course/run/_i18n/LocalStrings_pl.properties

@@ -15,7 +15,7 @@ command.openarchiver=Archiwizacja
 command.openassessment=Ocenianie
 command.openeditor=Edytor
 command.opengroupmngt=Grupy
-command.openqtistatistic=Statystyki QTI
+command.openteststatistic=Statystyki QTI
 command.openrightmngt=Uprawnienia
 command.opensimplegroupmngt=Cz\u0142onkowie
 command.openstatistic=Statystyki

src/main/java/org/olat/course/run/_i18n/LocalStrings_pt_BR.properties

@@ -17,7 +17,7 @@ command.openassessment=Ferramenta de avalia\u00E7\u00E3o
 command.opendb=Banco de dados do Curso
 command.openeditor=Editor do curso
 command.opengroupmngt=Gerenciamento de grupo
-command.openqtistatistic=Estat\u00EDsticas de Test QTI
+command.openteststatistic=Estat\u00EDsticas de Test
 command.openrightmngt=Gerenciamento de direitos
 command.opensimplegroupmngt=Gest\u00E3o de membros
 command.openstatistic=Ajuda sobre as configura\u00E7\u00F5es das descri\u00E7\u00F5es

src/main/java/org/olat/course/statistic/StatisticCourseNodesController.java

@@ -49,6 +49,7 @@ import org.olat.course.nodes.CourseNode;
 import org.olat.course.run.userview.UserCourseEnvironment;
 import org.olat.course.run.userview.UserCourseEnvironmentImpl;
 import org.olat.group.BusinessGroup;
+import org.olat.ims.qti.statistics.QTIType;
 import org.olat.repository.RepositoryEntry;
 
 /**
@@ -61,11 +62,14 @@ public class StatisticCourseNodesController extends BasicController implements A
 	private final LayoutMain3ColsController layoutCtr;
 	private Controller currentCtrl;
 	
+	private final QTIType[] types;
 	private final StatisticResourceOption options;
 	
-	public StatisticCourseNodesController(UserRequest ureq, WindowControl wControl, RepositoryEntry courseRe, UserCourseEnvironment userCourseEnv) {
+	public StatisticCourseNodesController(UserRequest ureq, WindowControl wControl,
+			RepositoryEntry courseRe, UserCourseEnvironment userCourseEnv, QTIType ... types) {
 		super(ureq, wControl);
 
+		this.types = types;
 		options = new StatisticResourceOption();
 		
 		boolean admin = userCourseEnv.isAdmin();
@@ -109,7 +113,7 @@ public class StatisticCourseNodesController extends BasicController implements A
 			@Override
 			public void visit(INode node) {
 				CourseNode courseNode = (CourseNode)node;
-				StatisticResourceResult result = courseNode.createStatisticNodeResult(ureq, getWindowControl(), userCourseEnv, options);
+				StatisticResourceResult result = courseNode.createStatisticNodeResult(ureq, getWindowControl(), userCourseEnv, options, types);
 				if(result != null) {
 					StatisticResourceNode courseNodeTreeNode = new StatisticResourceNode(courseNode, result);
 					rootTreeNode.addChild(courseNodeTreeNode);

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

@@ -3,15 +3,14 @@ menu.title=Test Statistiken
 splash.choosetest=Whlen Sie einen Test aus
 splash.notenoughresults=Fr diesen Test/Umfrage gibt es noch zu wenig Resultate ({0} Teilnehmer)
 
-
-chart.answer.averageScoreQuestions.y=Durschnittliche Punkte
+chart.answer.averageScoreQuestions.y=Durchschnittliche Punkte
 chart.percent.participants=% Teilnehmer
 chart.percent.participants.num=Anzahl Teilnehmer
 
 chart.score.histogramm=Punkteverteilung
 chart.duration.histogramm=Bearbeitungsdauer
 chart.duration.histogramm.legend=Bearbeitungsdauer (Min.)
-chart.averagescore.peritem=Durschnittliche Punkte pro Frage
+chart.averagescore.peritem=Durchschnittliche Punkte pro Frage
 chart.rightanswers.peritem=Richtige Antworten pro Frage in Prozenten
 chart.responses=Antworten
 chart.survey.overview=bersicht