Skip to content
Snippets Groups Projects
Commit bd40914b authored by uhensler's avatar uhensler
Browse files

OO-3304: Rename factory methods with more accurate names

parent 1573db42
No related branches found
No related tags found
No related merge requests found
......@@ -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);
......
......@@ -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());
......
......@@ -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);
}
......
......@@ -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);
......
......@@ -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);
......
......@@ -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;
......
......@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment