From 3582926f6734cec9b13baa4cbbad214f93bf12ee Mon Sep 17 00:00:00 2001
From: uhensler <urs.hensler@frentix.com>
Date: Mon, 8 Oct 2018 11:55:04 +0200
Subject: [PATCH] OO-3304: Avoid RS when switching between pages in quality
analysis
---
.../quality/analysis/manager/EvaluationFormDAO.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/olat/modules/quality/analysis/manager/EvaluationFormDAO.java b/src/main/java/org/olat/modules/quality/analysis/manager/EvaluationFormDAO.java
index fc2ad532563..6f75b1c7caa 100644
--- a/src/main/java/org/olat/modules/quality/analysis/manager/EvaluationFormDAO.java
+++ b/src/main/java/org/olat/modules/quality/analysis/manager/EvaluationFormDAO.java
@@ -54,16 +54,17 @@ public class EvaluationFormDAO {
sb.append(" , count(distinct collection) as numberDataCollections");
sb.append(" , min(collection.start) as soonestDataCollectionDate");
sb.append(" , max(collection.deadline) as latestDataCollectionDate");
- sb.append(" , count(session) as numberParticipants");
+ sb.append(" , count(session.key) as numberParticipants");
sb.append(" )");
- sb.append(" from qualitydatacollection as collection");
+ sb.append(" from repositoryentry form");
sb.append(" inner join evaluationformsurvey survey");
- sb.append(" on survey.resName = '").append(QualityDataCollectionLight.RESOURCEABLE_TYPE_NAME).append("'");
- sb.append(" and survey.resId = collection.key");
- sb.append(" inner join survey.formEntry as form");
+ sb.append(" on survey.formEntry.key = form.key");
sb.append(" left join evaluationformsession session");
sb.append(" on session.survey.key = survey.key");
sb.append(" and session.status ='").append(EvaluationFormSessionStatus.done).append("'");
+ sb.append(" inner join qualitydatacollection as collection");
+ sb.append(" on survey.resName = '").append(QualityDataCollectionLight.RESOURCEABLE_TYPE_NAME).append("'");
+ sb.append(" and survey.resId = collection.key");
sb.append(" ");
appendWhere(sb, searchParams);
sb.append(" group by form.key");
--
GitLab