Skip to content
Snippets Groups Projects
Commit cea451eb authored by srosse's avatar srosse
Browse files

OO-4289: exclude more people to qualify as "not member" of a course

parent 24b891f1
No related branches found
No related tags found
No related merge requests found
...@@ -603,7 +603,7 @@ public class AssessmentToolManagerImpl implements AssessmentToolManager { ...@@ -603,7 +603,7 @@ public class AssessmentToolManagerImpl implements AssessmentToolManager {
@Override @Override
public List<AssessmentEntry> getAssessmentEntries(Identity coach, SearchAssessedIdentityParams params, AssessmentEntryStatus status) { public List<AssessmentEntry> getAssessmentEntries(Identity coach, SearchAssessedIdentityParams params, AssessmentEntryStatus status) {
StringBuilder sb = new StringBuilder(); QueryBuilder sb = new QueryBuilder();
sb.append("select aentry from assessmententry aentry") sb.append("select aentry from assessmententry aentry")
.append(" inner join fetch aentry.identity as assessedIdentity") .append(" inner join fetch aentry.identity as assessedIdentity")
.append(" inner join fetch assessedIdentity.user as assessedUser") .append(" inner join fetch assessedIdentity.user as assessedUser")
...@@ -625,7 +625,8 @@ public class AssessmentToolManagerImpl implements AssessmentToolManager { ...@@ -625,7 +625,8 @@ public class AssessmentToolManagerImpl implements AssessmentToolManager {
.append(" )"); .append(" )");
if(params.isNonMembers()) { if(params.isNonMembers()) {
sb.append(" or assessedIdentity.key not in (select membership.identity.key from repoentrytogroup as rel, bgroupmember as membership") sb.append(" or assessedIdentity.key not in (select membership.identity.key from repoentrytogroup as rel, bgroupmember as membership")
.append(" where rel.entry.key=:repoEntryKey and rel.group=membership.group and membership.identity=aentry.identity") .append(" where rel.entry.key=:repoEntryKey and rel.group.key=membership.group.key and membership.identity.key=aentry.identity.key")
.append(" and membership.role ").in(GroupRoles.participant, GroupRoles.coach, GroupRoles.owner)
.append(" )"); .append(" )");
} }
} else if(params.isCoach()) { } else if(params.isCoach()) {
......
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