From c118a4f6cafbd4e7ef9d30b0c41c81a104f26bf8 Mon Sep 17 00:00:00 2001
From: uhensler <urs.hensler@frentix.com>
Date: Wed, 23 Dec 2020 12:04:55 +0100
Subject: [PATCH] OO-5173: RS if searching for questionnaire
---
.../manager/QualityDataCollectionDAO.java | 21 ++++++++++++-------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/olat/modules/quality/manager/QualityDataCollectionDAO.java b/src/main/java/org/olat/modules/quality/manager/QualityDataCollectionDAO.java
index 0d6cb0195c3..8a00b8b6176 100644
--- a/src/main/java/org/olat/modules/quality/manager/QualityDataCollectionDAO.java
+++ b/src/main/java/org/olat/modules/quality/manager/QualityDataCollectionDAO.java
@@ -382,14 +382,19 @@ public class QualityDataCollectionDAO {
QueryBuilder sb = new QueryBuilder();
sb.append("select count(collection)");
sb.append(" from qualitydatacollection as collection");
- if (searchParams != null && (StringHelper.containsNonWhitespace(searchParams.getTopic())
- || StringHelper.containsNonWhitespace(searchParams.getSearchString()))) {
- sb.append(" left join collection.topicIdentity.user as user");
- sb.append(" left join collection.topicOrganisation as organisation");
- sb.append(" left join collection.topicCurriculum as curriculum");
- sb.append(" left join collection.topicCurriculumElement as curriculumElement");
- sb.append(" left join curriculumElement.type as curriculumElementType");
- sb.append(" left join collection.topicRepositoryEntry as repository");
+ if (searchParams != null) {
+ if (searchParams.getFormEntryRefs() != null) {
+ sb.append(" join survey.formEntry as form");
+ }
+ if (StringHelper.containsNonWhitespace(searchParams.getTopic())
+ || StringHelper.containsNonWhitespace(searchParams.getSearchString())) {
+ sb.append(" left join collection.topicIdentity.user as user");
+ sb.append(" left join collection.topicOrganisation as organisation");
+ sb.append(" left join collection.topicCurriculum as curriculum");
+ sb.append(" left join collection.topicCurriculumElement as curriculumElement");
+ sb.append(" left join curriculumElement.type as curriculumElementType");
+ sb.append(" left join collection.topicRepositoryEntry as repository");
+ }
}
appendWhereClause(sb, searchParams);
--
GitLab