diff --git a/src/main/java/org/olat/course/nodes/SurveyCourseNode.java b/src/main/java/org/olat/course/nodes/SurveyCourseNode.java index 1ecb8b32b3c7b78b5cea6aaa74e0b43166c47066..e26a87842f201fb9f5831e95161cbd0f184464e3 100644 --- a/src/main/java/org/olat/course/nodes/SurveyCourseNode.java +++ b/src/main/java/org/olat/course/nodes/SurveyCourseNode.java @@ -259,7 +259,7 @@ public class SurveyCourseNode extends AbstractAccessableCourseNode { RepositoryEntry ores = RepositoryManager.getInstance().lookupRepositoryEntry(course, true); EvaluationFormSurvey survey = evaluationFormManager.loadSurvey(ores, getIdent()); - SessionFilter filter = SessionFilterFactory.create(survey); + SessionFilter filter = SessionFilterFactory.createSelectDone(survey); Form form = evaluationFormManager.loadForm(survey.getFormEntry()); LegendNameGenerator legendNameGenerator = new SessionInformationLegendNameGenerator(filter); diff --git a/src/main/java/org/olat/course/nodes/survey/SurveyReportingController.java b/src/main/java/org/olat/course/nodes/survey/SurveyReportingController.java index 5c085382548d02a703fab0dfddead16f16b7dd7f..139c08094e13ea639480b1ca00210adbc8b6bb9f 100644 --- a/src/main/java/org/olat/course/nodes/survey/SurveyReportingController.java +++ b/src/main/java/org/olat/course/nodes/survey/SurveyReportingController.java @@ -51,7 +51,7 @@ public class SurveyReportingController extends BasicController { mainVC = createVelocityContainer("reporting"); Form form = evaluationFormManager.loadForm(survey.getFormEntry()); - SessionFilter filter = SessionFilterFactory.create(survey); + SessionFilter filter = SessionFilterFactory.createSelectDone(survey); EvaluationFormReportsController reportsCtrl = new EvaluationFormReportsController(ureq, wControl, form, filter); mainVC.put("report", reportsCtrl.getInitialComponent()); diff --git a/src/main/java/org/olat/modules/forms/SessionFilterFactory.java b/src/main/java/org/olat/modules/forms/SessionFilterFactory.java index 13ec7ef79c1d8b3191577ad2f419b7cdbd01735c..3563040a1e9085c2131f677d700dafdcc31837a6 100644 --- a/src/main/java/org/olat/modules/forms/SessionFilterFactory.java +++ b/src/main/java/org/olat/modules/forms/SessionFilterFactory.java @@ -42,7 +42,7 @@ public class SessionFilterFactory { return new SessionRefFilter(sessionRefs); } - public static SessionFilter create(EvaluationFormSurvey survey) { + public static SessionFilter createSelectDone(EvaluationFormSurvey survey) { return new SurveyFilter(survey); } diff --git a/src/main/java/org/olat/modules/portfolio/ui/MultiEvaluationFormController.java b/src/main/java/org/olat/modules/portfolio/ui/MultiEvaluationFormController.java index 491ef1a05400f31c60e177422bf214068d809263..6f366a14e315bc4223a4d83a99e723c792a712f0 100644 --- a/src/main/java/org/olat/modules/portfolio/ui/MultiEvaluationFormController.java +++ b/src/main/java/org/olat/modules/portfolio/ui/MultiEvaluationFormController.java @@ -310,7 +310,7 @@ public class MultiEvaluationFormController extends BasicController { private EvaluationFormReportController createReportController(UserRequest ureq) { Form form = evaluationFormManager.loadForm(survey.getFormEntry()); - SessionFilter surveyFilter = SessionFilterFactory.create(survey); + SessionFilter surveyFilter = SessionFilterFactory.createSelectDone(survey); List<EvaluationFormSession> sessions = evaluationFormManager.loadSessionsFiltered(surveyFilter, 0, -1); sessions.removeIf(session -> notEvaluator(session)); SessionFilter filter = SessionFilterFactory.create(sessions); diff --git a/src/main/java/org/olat/modules/quality/analysis/manager/AnalysisFilterDAO.java b/src/main/java/org/olat/modules/quality/analysis/manager/AnalysisFilterDAO.java index 4980ebd27bd1fb399a770f24930ee12364b87e13..890c032840b92d62d52790a30014cfcf8cabaef3 100644 --- a/src/main/java/org/olat/modules/quality/analysis/manager/AnalysisFilterDAO.java +++ b/src/main/java/org/olat/modules/quality/analysis/manager/AnalysisFilterDAO.java @@ -210,6 +210,7 @@ public class AnalysisFilterDAO { } static void appendSelectSessionKeys(QueryBuilder sb, AnalysisSearchParameter searchParams) { + // Only done sessions have an entry in context.evaluationFormSession sb.append("select distinct context.evaluationFormSession.key"); appendFrom(sb, searchParams); appendWhere(sb, searchParams); diff --git a/src/main/java/org/olat/modules/quality/generator/provider/courselectures/CourseLecturesFollowUpProvider.java b/src/main/java/org/olat/modules/quality/generator/provider/courselectures/CourseLecturesFollowUpProvider.java index 395187f29fcf8b94dc4bbdf2c2270b56c96eb5a3..f965af403271cb636b70aaa508bd610809c6e80b 100644 --- a/src/main/java/org/olat/modules/quality/generator/provider/courselectures/CourseLecturesFollowUpProvider.java +++ b/src/main/java/org/olat/modules/quality/generator/provider/courselectures/CourseLecturesFollowUpProvider.java @@ -331,7 +331,7 @@ public class CourseLecturesFollowUpProvider implements QualityGeneratorProvider // Load evaluation form and sessions EvaluationFormSurvey survey = qualityService.loadSurvey(dataCollection); org.olat.modules.forms.model.xml.Form evaluationForm = evaluationFormManager.loadForm(survey.getFormEntry()); - SessionFilter filter = SessionFilterFactory.create(survey); + SessionFilter filter = SessionFilterFactory.createSelectDone(survey); // Load results and calculate if grade is sufficient long numberResponses = 0; diff --git a/src/main/java/org/olat/modules/quality/ui/DataCollectionReportController.java b/src/main/java/org/olat/modules/quality/ui/DataCollectionReportController.java index dff45196401841b8647f534feb1915e3949a2912..81921a6706cd0ce6b092db43658cfd01eae0dbdd 100644 --- a/src/main/java/org/olat/modules/quality/ui/DataCollectionReportController.java +++ b/src/main/java/org/olat/modules/quality/ui/DataCollectionReportController.java @@ -86,7 +86,7 @@ public class DataCollectionReportController extends AbstractDataCollectionEditCo EvaluationFormSurvey survey = evaluationFormManager.loadSurvey(dataCollection, null); Form form = evaluationFormManager.loadForm(survey.getFormEntry()); - SessionFilter filter = SessionFilterFactory.create(survey); + SessionFilter filter = SessionFilterFactory.createSelectDone(survey); reportsCtrl = new EvaluationFormReportsController(ureq, getWindowControl(), form, filter, ReportSegment.OVERVIEW, reportHeaderCtrl.getInitialComponent(), figures);