Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/ExamsAndTasksOverviewPage.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/ExamsAndTasksOverviewPage.java (revision e96fbd37458d5fb4b59dfda0a6d00800095c298a) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/ExamsAndTasksOverviewPage.java (revision c1fe4e186716eff250058fcc5078d5146508c403) @@ -44,4 +44,5 @@ import org.slf4j.Logger; +import dblearnstar.model.entities.Task; import dblearnstar.model.entities.TaskInTestInstance; import dblearnstar.model.entities.TaskIsOfType; @@ -77,4 +78,6 @@ @Inject private AjaxResponseRenderer ajaxResponseRenderer; + @Inject + private DigestService digestService; @SessionState @@ -93,4 +96,6 @@ @InjectPage private QueryTest queryTest; + @InjectPage + private SubmissionEvaluations submissionEvaluations; @Property @@ -113,6 +118,7 @@ public void onActivate() { studentId = pm.getStudentsByPersonId(userInfo.getPersonId()).get(0).getStudentId(); - if (testCollection == null) + if (testCollection == null) { testCollection = getTestCollections().stream().findFirst().orElse(null); + } } @@ -125,7 +131,4 @@ } - @Inject - private DigestService digestService; - public String getHashedTestInstanceId() { return digestService.obfuscate(Long.toString(testInstance.getTestInstanceId())); @@ -135,10 +138,5 @@ public List getTestCollections() { - List list = (UsefulMethods.castList(TestCollection.class, - genericService.getAll(TestCollection.class))) - .stream() - .filter(p -> (p.getTestInstances() != null && p.getTestInstances().size() > 0) - || (p.getSubCollections() != null && p.getSubCollections().size() > 0)) - .collect(Collectors.toList()); + List list = testManager.getTestCollectionsWithTestInstances(); ComparatorTestCollection c = new ComparatorTestCollection(); Collections.sort(list, c); @@ -166,18 +164,21 @@ List list; if (userInfo.isAdministrator()) { - list = testManager.getAllTestInstancesByTestType(testType.getTestTypeId()); + if (testCollection == null) { + list = testManager.getAllTestInstancesByTestType(testType.getTestTypeId()); + } else { + list = testManager.getAllTestInstancesByTestTypeAndCollection(testType.getTestTypeId(), + testCollection.getTestCollectionId()); + } } else if (userInfo.isStudent()) { - list = testManager.getTestInstancesForStudentByTestType(studentId, testType.getTestTypeId()); + if (testCollection == null) { + list = testManager.getTestInstancesForStudentByTestType(studentId, testType.getTestTypeId()); + } else { + list = testManager.getTestInstancesForStudentByTestTypeAndCollection(studentId, + testType.getTestTypeId(), testCollection.getTestCollectionId()); + } } else { list = new ArrayList(); } - if (testCollection == null) { - return list; - } else { - return list.stream() - .filter(ti -> ti.getTestCollection() != null - && ti.getTestCollection().getTestCollectionId() == testCollection.getTestCollectionId()) - .collect(Collectors.toList()); - } + return list; } @@ -225,11 +226,11 @@ public String getTranslateTestInstanceTitle() { - String translated = translationService.getTranslation("TestInstance", "title", testInstance.getTestInstanceId(), - persistentLocale.get().getLanguage().toLowerCase()); + String translated = translationService.getTranslation(TestInstance.class.getSimpleName(), "title", + testInstance.getTestInstanceId(), persistentLocale.get().getLanguage().toLowerCase()); return (translated != null ? translated : testInstance.getTitle()); } public String getTranslatedTestInstanceDescription() { - String translated = translationService.getTranslation("TestInstance", "description", + String translated = translationService.getTranslation(TestInstance.class.getSimpleName(), "description", testInstance.getTestInstanceId(), persistentLocale.get().getLanguage().toLowerCase()); return (translated != null ? translated : testInstance.getDescription()); @@ -237,12 +238,12 @@ public String getTranslateTestTypeTitle() { - String translated = translationService.getTranslation("TestType", "title", testType.getTestTypeId(), - persistentLocale.get().getLanguage().toLowerCase()); + String translated = translationService.getTranslation(TestType.class.getSimpleName(), "title", + testType.getTestTypeId(), persistentLocale.get().getLanguage().toLowerCase()); return (translated != null ? translated : testType.getTitle()); } public String getTranslatedTaskInTestInstanceTaskTitle() { - String translated = translationService.getTranslation("Task", "title", taskInTestInstance.getTask().getTaskId(), - persistentLocale.get().getLanguage().toLowerCase()); + String translated = translationService.getTranslation(Task.class.getSimpleName(), "title", + taskInTestInstance.getTask().getTaskId(), persistentLocale.get().getLanguage().toLowerCase()); return (translated != null ? translated : taskInTestInstance.getTask().getTitle()); } @@ -277,7 +278,4 @@ } - @InjectPage - private SubmissionEvaluations submissionEvaluations; - public Object onEvaluate(TestInstance ti) { submissionEvaluations.onValueChangedFromSelectTestInstance(ti); Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManager.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManager.java (revision e96fbd37458d5fb4b59dfda0a6d00800095c298a) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManager.java (revision c1fe4e186716eff250058fcc5078d5146508c403) @@ -30,4 +30,5 @@ import dblearnstar.model.entities.Task; import dblearnstar.model.entities.TaskInTestInstance; +import dblearnstar.model.entities.TestCollection; import dblearnstar.model.entities.TestInstance; @@ -38,4 +39,6 @@ public List getAllTestInstancesByTestType(long testTypeId); + public List getAllTestInstancesByTestTypeAndCollection(long testTypeId, long testCollectionId); + public List getAllCurrentlyAvailableTestInstancesByTestType(long testTypeId); @@ -43,4 +46,7 @@ public List getTestInstancesForStudentByTestType(long studentId, long testTypeId); + + public List getTestInstancesForStudentByTestTypeAndCollection(long studentId, long testTypeId, + long testCollectionId); public Boolean isTaskInTestInstanceSolvedByStudent(long taskInTestInstanceId, long studentId); @@ -91,3 +97,5 @@ public String getCodeType(StudentSubmitSolution submittedSolution); + + public List getTestCollectionsWithTestInstances(); } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManagerImpl.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManagerImpl.java (revision e96fbd37458d5fb4b59dfda0a6d00800095c298a) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManagerImpl.java (revision c1fe4e186716eff250058fcc5078d5146508c403) @@ -42,4 +42,5 @@ import dblearnstar.model.entities.TaskInTestInstance; import dblearnstar.model.entities.TaskIsOfType; +import dblearnstar.model.entities.TestCollection; import dblearnstar.model.entities.TestInstance; @@ -96,4 +97,38 @@ @Override + public List getTestInstancesForStudentByTestTypeAndCollection(long studentId, long testTypeId, + long testCollectionId) { + String query = """ + from TestInstance ti + join t.testTemplate ttem + join ttem.testType tt + join t.testCollection tc + where + tt.testTypeId = :testTypeId and + tc.testCollectionId = :testCollectionId and + ( + ti.openToAllStudents=true or + ti in ( + select ti2 + from GroupMember gm + join gm.student s + join s.person p + join gm.group g + join g.groupFocusOnTests gft + join gft.testInstance ti2 + where + s.studentId=:studentId and + now() between ti2.scheduledFor and ti2.scheduledUntil + ) + ) + order by t.title desc + """; + return UsefulMethods.castList(TestInstance.class, + getEntityManager().createQuery(query).setParameter("studentId", studentId) + .setParameter("testTypeId", testTypeId).setParameter("testCollectionId", testCollectionId) + .getResultList()); + } + + @Override public List getAllTestInstancesByTestType(long testTypeId) { String query = """ @@ -101,8 +136,22 @@ where t.testTemplate.testType.testTypeId = :testTypeId - order by t.title desc + order by t.ordering asc, t.title desc """; return UsefulMethods.castList(TestInstance.class, getEntityManager().createQuery(query).setParameter("testTypeId", testTypeId).getResultList()); + } + + @Override + public List getAllTestInstancesByTestTypeAndCollection(long testTypeId, long testCollectionId) { + String query = """ + from TestInstance t + where + t.testTemplate.testType.testTypeId = :testTypeId and + t.testCollection.testCollectionId = :testCollectionId + order by t.ordering asc, t.title desc + """; + return UsefulMethods.castList(TestInstance.class, + getEntityManager().createQuery(query).setParameter("testTypeId", testTypeId) + .setParameter("testCollectionId", testCollectionId).getResultList()); } @@ -464,3 +513,25 @@ } + @Override + public List getTestCollectionsWithTestInstances() { + try { + // TestCollections that have TestInstances + List list = UsefulMethods.castList(TestCollection.class, getEntityManager().createQuery(""" + select distinct ti.testCollection + from TestInstance ti + """).getResultList()); + // Add to them TestCollectionts that are Parents to another, or that have subCollections + List listAdded = UsefulMethods.castList(TestCollection.class, + getEntityManager().createQuery(""" + select distinct tc.parentCollection + from TestCollection tc + """).getResultList()); + list.addAll(listAdded); + return list; + } catch (Exception e) { + logger.error("Error {}", e.getMessage()); + return null; + } + } + } Index: dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/ExamsAndTasksOverviewPage.tml =================================================================== --- dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/ExamsAndTasksOverviewPage.tml (revision e96fbd37458d5fb4b59dfda0a6d00800095c298a) +++ dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/ExamsAndTasksOverviewPage.tml (revision c1fe4e186716eff250058fcc5078d5146508c403) @@ -20,96 +20,98 @@
+
+
-
+
-
+

${translateTestTypeTitle}

-

${translateTestTypeTitle}

+
-
+
-
- - - -
- -
- - - ${message:solutionComparator-pagelink} - - ${message:OpenDiscussions-pagelink} - + -

${message:scheduledFor-label}: - ${testInstance.scheduledFor} - - ${message:scheduledUntil-label}: ${testInstance.scheduledUntil} -

-

- -

- - - - - - - - - - - - - - - - - -
${message:task-label}${message:task-points-label}${message:description-label}${message:task-status-label}
${translatedTaskInTestInstanceTaskTitle} - ${taskInTestInstance.points}

${message:numPersonsTriedToSolve-label}: - ${numPersonsTriedToSolve}
- ${message:numPersonsSuccessful-label}: ${numPersonsSuccessful} -
+
+ +
+ + + ${message:solutionComparator-pagelink} + + ${message:OpenDiscussions-pagelink} + +
+ +

${message:scheduledFor-label}: + ${testInstance.scheduledFor} + - ${message:scheduledUntil-label}: ${testInstance.scheduledUntil} +

+

+ +

+ + + + + + + + + + + + + + + + + +
${message:task-label}${message:task-points-label}${message:description-label}${message:task-status-label}
${translatedTaskInTestInstanceTaskTitle} + ${taskInTestInstance.points}

${message:numPersonsTriedToSolve-label}: + ${numPersonsTriedToSolve}
+ ${message:numPersonsSuccessful-label}: + ${numPersonsSuccessful} +
+
@@ -118,3 +120,4 @@
+