From bd40914b7171556eec300a669d417ad89a7cae66 Mon Sep 17 00:00:00 2001
From: uhensler <urs.hensler@frentix.com>
Date: Wed, 19 Sep 2018 12:17:05 +0200
Subject: [PATCH] OO-3304: Rename factory methods with more accurate names
---
src/main/java/org/olat/course/nodes/SurveyCourseNode.java | 2 +-
.../org/olat/course/nodes/survey/SurveyReportingController.java | 2 +-
src/main/java/org/olat/modules/forms/SessionFilterFactory.java | 2 +-
.../modules/portfolio/ui/MultiEvaluationFormController.java | 2 +-
.../modules/quality/analysis/manager/AnalysisFilterDAO.java | 1 +
.../provider/courselectures/CourseLecturesFollowUpProvider.java | 2 +-
.../olat/modules/quality/ui/DataCollectionReportController.java | 2 +-
7 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/olat/course/nodes/SurveyCourseNode.java b/src/main/java/org/olat/course/nodes/SurveyCourseNode.java
index 1ecb8b32b3c..e26a87842f2 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 5c085382548..139c08094e1 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 13ec7ef79c1..3563040a1e9 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 491ef1a0540..6f366a14e31 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 4980ebd27bd..890c032840b 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 395187f29fc..f965af40327 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 dff45196401..81921a6706c 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);
--
GitLab