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

OO-3071: fix braces in query of the assessment tool

parent 8da3fb1e
No related branches found
No related tags found
No related merge requests found
...@@ -93,7 +93,7 @@ public class AssessmentToolManagerImpl implements AssessmentToolManager { ...@@ -93,7 +93,7 @@ public class AssessmentToolManagerImpl implements AssessmentToolManager {
sb.append("select participant.identity.key from repoentrytogroup as rel") sb.append("select participant.identity.key from repoentrytogroup as rel")
.append(" inner join rel.group as bGroup") .append(" inner join rel.group as bGroup")
.append(" inner join bGroup.members as participant on (participant.role='").append(GroupRoles.participant.name()).append("')") .append(" inner join bGroup.members as participant on (participant.role='").append(GroupRoles.participant.name()).append("')")
.append(" where rel.entry.key=:repoEntryKey)"); .append(" where rel.entry.key=:repoEntryKey");
List<Long> keys = dbInstance.getCurrentEntityManager() List<Long> keys = dbInstance.getCurrentEntityManager()
.createQuery(sb.toString(), Long.class) .createQuery(sb.toString(), Long.class)
...@@ -122,7 +122,7 @@ public class AssessmentToolManagerImpl implements AssessmentToolManager { ...@@ -122,7 +122,7 @@ public class AssessmentToolManagerImpl implements AssessmentToolManager {
.append(" inner join rel.group as bGroup") .append(" inner join rel.group as bGroup")
.append(" inner join bGroup.members as coach on (coach.identity.key=:identityKey and coach.role='").append(GroupRoles.coach.name()).append("')") .append(" inner join bGroup.members as coach on (coach.identity.key=:identityKey and coach.role='").append(GroupRoles.coach.name()).append("')")
.append(" inner join bGroup.members as participant on (participant.role='").append(GroupRoles.participant.name()).append("')") .append(" inner join bGroup.members as participant on (participant.role='").append(GroupRoles.participant.name()).append("')")
.append(" where rel.entry.key=:repoEntryKey)"); .append(" where rel.entry.key=:repoEntryKey");
List<Long> keys = dbInstance.getCurrentEntityManager() List<Long> keys = dbInstance.getCurrentEntityManager()
.createQuery(sb.toString(), Long.class) .createQuery(sb.toString(), Long.class)
......
...@@ -40,6 +40,7 @@ import org.olat.group.manager.BusinessGroupRelationDAO; ...@@ -40,6 +40,7 @@ import org.olat.group.manager.BusinessGroupRelationDAO;
import org.olat.modules.assessment.AssessmentEntry; import org.olat.modules.assessment.AssessmentEntry;
import org.olat.modules.assessment.manager.AssessmentEntryDAO; import org.olat.modules.assessment.manager.AssessmentEntryDAO;
import org.olat.modules.assessment.model.AssessmentEntryStatus; import org.olat.modules.assessment.model.AssessmentEntryStatus;
import org.olat.modules.assessment.model.AssessmentMembersStatistics;
import org.olat.modules.assessment.ui.AssessmentToolSecurityCallback; import org.olat.modules.assessment.ui.AssessmentToolSecurityCallback;
import org.olat.repository.RepositoryEntry; import org.olat.repository.RepositoryEntry;
import org.olat.restapi.repository.course.CoursesWebService; import org.olat.restapi.repository.course.CoursesWebService;
...@@ -122,6 +123,12 @@ public class AssessmentToolManagerTest extends OlatTestCase { ...@@ -122,6 +123,12 @@ public class AssessmentToolManagerTest extends OlatTestCase {
//number of assessed identities //number of assessed identities
int numOfAssessedIdentities = assessmentToolManager.getNumberOfAssessedIdentities(coach, params); int numOfAssessedIdentities = assessmentToolManager.getNumberOfAssessedIdentities(coach, params);
Assert.assertEquals(2, numOfAssessedIdentities); Assert.assertEquals(2, numOfAssessedIdentities);
//check only the queries
AssessmentMembersStatistics participantStatistics = assessmentToolManager.getNumberOfParticipants(coach, params);
Assert.assertNotNull(participantStatistics);
int numOfInitialLanches = assessmentToolManager.getNumberOfInitialLaunches(coach, params);
Assert.assertEquals(0, numOfInitialLanches);//not launched, only simulated
List<IdentityShort> assessedShortIdentities = assessmentToolManager.getShortAssessedIdentities(coach, params, 120); List<IdentityShort> assessedShortIdentities = assessmentToolManager.getShortAssessedIdentities(coach, params, 120);
Assert.assertNotNull(assessedShortIdentities); Assert.assertNotNull(assessedShortIdentities);
......
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