Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/ManageModels.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/ManageModels.java (revision d2c78cf0bd13b79a250bd133026907a229ab5529) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/ManageModels.java (revision 73f981c2bc732fc9cba092f13d7a771444acdfdf) @@ -11,5 +11,5 @@ import dblearnstar.webapp.annotations.AdministratorPage; import dblearnstar.webapp.services.GenericService; -import dblearnstar.webapp.services.UsefulMethods; +import dblearnstar.webapp.services.TestManager; @AdministratorPage @@ -18,4 +18,7 @@ @Inject private GenericService genericService; + + @Inject + private TestManager testManager; @Property @@ -27,5 +30,5 @@ public List getAllModels() { - return UsefulMethods.castList(Model.class, genericService.getAll(Model.class)); + return testManager.getAllModels(); } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/TestAdminPage.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/TestAdminPage.java (revision d2c78cf0bd13b79a250bd133026907a229ab5529) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/TestAdminPage.java (revision 73f981c2bc732fc9cba092f13d7a771444acdfdf) @@ -151,6 +151,5 @@ public Object getModelTestTypes() { - return selectModelFactory.create(UsefulMethods.castList(TestType.class, genericService.getAll(TestType.class)), - "title"); + return selectModelFactory.create(testManager.getAllTestTypes(), "title"); } @@ -356,4 +355,8 @@ whereToPutNewTask = null; creatingANewTask = null; + } else { + TaskIsOfType type = editedTask.getTaskIsOfTypes().get(0); + type.setTaskType(chosentaskType); + genericService.saveOrUpdate(type); } @@ -381,5 +384,5 @@ public SelectModel getAllTaskTypes() { - return selectModelFactory.create(genericService.getAll(TaskType.class), "title"); + return selectModelFactory.create(testManager.getAllTaskTypes(), "title"); } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManager.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManager.java (revision d2c78cf0bd13b79a250bd133026907a229ab5529) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManager.java (revision 73f981c2bc732fc9cba092f13d7a771444acdfdf) @@ -23,4 +23,5 @@ import java.util.List; +import dblearnstar.model.entities.Model; import dblearnstar.model.entities.SolutionAssessment; import dblearnstar.model.entities.Student; @@ -29,8 +30,23 @@ import dblearnstar.model.entities.Task; import dblearnstar.model.entities.TaskInTestInstance; +import dblearnstar.model.entities.TaskType; import dblearnstar.model.entities.TestCollection; import dblearnstar.model.entities.TestInstance; +import dblearnstar.model.entities.TestType; public interface TestManager { + + public boolean accessToTaskInTestInstanceAllowed(Student student, TaskInTestInstance tti); + + public List getAllCurrentlyAvailableTestInstancesByTestType(long testTypeId); + + public List getAllEvaluationsOfSolutionsForTaskInTestInstance(long studentId, + long taskInTestInstanceId); + + public List getAllModels(); + + public List getAllTaskTypes(); + + public List getAllTaskTypesDefinedOverModel(Model chosenModel); public List getAllTestInstances(); @@ -40,5 +56,49 @@ public List getAllTestInstancesByTestTypeAndCollection(long testTypeId, long testCollectionId); - public List getAllCurrentlyAvailableTestInstancesByTestType(long testTypeId); + public List getAllTestTypes(); + + public String getCodeType(StudentSubmitSolution submittedSolution); + + public List getCorrectSolutionsByStudentAndTaskInTestInstance(long studentId, + long taskInTestInstanceId); + + public List getEvaluatedSolutionsForTaskInTestInstance(long studentId, + long taskInTestInstanceId); + + public Float getGradeForTaskInTestInstanceByStudent(long taskInTestInstanceId, long studentId); + + public List getHistoryOfSolutions(long taskInTestInstanceId, Boolean filterNotForEvalution, + long studentId); + + public List getIncorrectSolutionsByStudentAndTaskInTestInstance(long studentId, + long taskInTestInstanceId); + + public Long getNumPersonsSuccessfulForTaskInTestInstance(long taskInTestInstanceId); + + public Long getNumPersonsTriedToSolveTaskInTestInstance(long taskInTestInstanceId); + + public List getSolutionsByStudent(long studentId); + + public List getSolutionsOfTaskInTestInstanceByOtherStudents(long taskInTestInstanceId, + long studentId); + + public List getStudentsSolving(); + + public List getStudentsWhoStartedTestInstance(TestInstance testInstance); + + public List getTaskInTestInstancesByModel(long modelId); + + public List getTaskInTestInstancesByTaskType(TaskType taskType); + + public List getTaskInTestInstancesByTestInstance(long testInstanceId); + + public List getTasksByModel(long modelId); + + public List getTestCollectionsWithTestInstances(); + + public List getTestInstanceResultsByStudentSortedByTaskName(Student student, TestInstance testInstance); + + + public List getTestInstancesByTestType(long testTypeId); public List getTestInstancesForStudent(long studentId); @@ -49,52 +109,9 @@ long testCollectionId); + public Float getTotalPoints(long studentId, long testInstanceId); + public Boolean isTaskInTestInstanceSolvedByStudent(long taskInTestInstanceId, long studentId); - - public Float getGradeForTaskInTestInstanceByStudent(long taskInTestInstanceId, long studentId); - - public Long getNumPersonsSuccessfulForTaskInTestInstance(long taskInTestInstanceId); - - public Long getNumPersonsTriedToSolveTaskInTestInstance(long taskInTestInstanceId); - - public List getStudentsSolving(); - - public List getHistoryOfSolutions(long taskInTestInstanceId, Boolean filterNotForEvalution, - long studentId); public StudentStartedTest studentStartTest(long studentId, long testInstanceId); - public List getSolutionsByStudent(long studentId); - - public List getSolutionsOfTaskInTestInstanceByOtherStudents(long taskInTestInstanceId, - long studentId); - - public List getTestInstancesByTestType(long testTypeId); - - public List getTasksByModel(long modelId); - - public List getCorrectSolutionsByStudentAndTaskInTestInstance(long studentId, - long taskInTestInstanceId); - - public List getIncorrectSolutionsByStudentAndTaskInTestInstance(long studentId, - long taskInTestInstanceId); - - public List getTaskInTestInstancesByTestInstance(long testInstanceId); - - public List getStudentsWhoStartedTestInstance(TestInstance testInstance); - - public List getEvaluatedSolutionsForTaskInTestInstance(long studentId, - long taskInTestInstanceId); - - public List getAllEvaluationsOfSolutionsForTaskInTestInstance(long studentId, - long taskInTestInstanceId); - - public Float getTotalPoints(long studentId, long testInstanceId); - - public boolean accessToTaskInTestInstanceAllowed(Student student, TaskInTestInstance tti); - - public String getCodeType(StudentSubmitSolution submittedSolution); - - public List getTestCollectionsWithTestInstances(); - - public List getTestInstanceResultsByStudentSortedByTaskName(Student student, TestInstance testInstance); } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManagerImpl.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManagerImpl.java (revision d2c78cf0bd13b79a250bd133026907a229ab5529) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManagerImpl.java (revision 73f981c2bc732fc9cba092f13d7a771444acdfdf) @@ -27,4 +27,5 @@ import java.util.List; +import javax.persistence.EntityManager; import javax.persistence.Query; @@ -33,6 +34,5 @@ import org.slf4j.Logger; -import dblearnstar.model.entities.ActivityInTask; -import dblearnstar.model.entities.Person; +import dblearnstar.model.entities.Model; import dblearnstar.model.entities.SolutionAssessment; import dblearnstar.model.entities.Student; @@ -42,6 +42,8 @@ import dblearnstar.model.entities.TaskInTestInstance; import dblearnstar.model.entities.TaskIsOfType; +import dblearnstar.model.entities.TaskType; import dblearnstar.model.entities.TestCollection; import dblearnstar.model.entities.TestInstance; +import dblearnstar.model.entities.TestType; public class TestManagerImpl implements TestManager { @@ -51,8 +53,79 @@ @Inject + private GenericService genericService; + + @Inject private Session session; - private Session getEntityManager() { - return session.getSession(); + @Override + public boolean accessToTaskInTestInstanceAllowed(Student student, TaskInTestInstance tti) { + // need a more appropriate implementation + return getTestInstancesForStudentByTestType(student.getStudentId(), + tti.getTestInstance().getTestTemplate().getTestType().getTestTypeId()).stream() + .anyMatch(ti -> ti.getTestInstanceId() == tti.getTestInstance().getTestInstanceId()); + } + + @Override + public List getAllCurrentlyAvailableTestInstancesByTestType(long testTypeId) { + return UsefulMethods.castList(TestInstance.class, getEntityManager().createQuery(""" + from TestInstance t + where + (t.scheduledFor is null or t.scheduledFor<=current_timestamp()) and + t.testTemplate.testType.testTypeId = :testTypeId + order by t.title desc + """).setParameter("testTypeId", testTypeId).getResultList()); + } + + @Override + public List getAllEvaluationsOfSolutionsForTaskInTestInstance(long studentId, + long taskInTestInstanceId) { + try { + Query q = getEntityManager().createQuery(""" + select sa + from SolutionAssessment sa + where + sa.studentSubmitSolution.studentStartedTest.student.studentId = :studentId and + sa.studentSubmitSolution.taskInTestInstance.taskInTestInstanceId = :taskInTestInstanceId + order by sa.evaluatedOn desc, sa.studentSubmitSolution.submittedOn desc + """); + q.setParameter("studentId", studentId); + q.setParameter("taskInTestInstanceId", taskInTestInstanceId); + List output = UsefulMethods.castList(SolutionAssessment.class, q.getResultList()); + return output; + } catch (Exception e) { + logger.error("getAllEvaluationsOfSolutionsForTaskInTestInstance failed {}", e); + return null; + } + } + + @Override + public List getAllModels() { + return UsefulMethods.castList(Model.class, genericService.getAll(Model.class)); + } + + @Override + public List getAllTaskTypes() { + return UsefulMethods.castList(TaskType.class, genericService.getAll(TaskType.class)).stream() + .sorted((o1, o2) -> { + return o1.getTitle().compareTo(o2.getTitle()); + }).toList(); + } + + @Override + public List getAllTaskTypesDefinedOverModel(Model chosenModel) { + List list = UsefulMethods.castList(TaskType.class, + getEntityManager() + .createQuery( + """ + select distinct tiot.taskType + from TaskInTestInstance tti + join tti.task.taskIsOfTypes tiot + where + (tti.task.model.modelId is not null and tti.task.model.modelId=:modelId) or + (tti.testInstance.testTemplate.model.modelId is not null and tti.testInstance.testTemplate.model.modelId=:modelId) + order by tiot.taskType.title asc + """) + .setParameter("modelId", chosenModel.getModelId()).getResultList()); + return list; } @@ -62,4 +135,346 @@ getEntityManager().createQuery("from TestInstance order by title desc").getResultList()); return testInstances; + } + + @Override + public List getAllTestInstancesByTestType(long testTypeId) { + String query = """ + from TestInstance t + where + t.testTemplate.testType.testTypeId = :testTypeId + 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()); + } + + @Override + public List getAllTestTypes() { + return UsefulMethods.castList(TestType.class, genericService.getAll(TestType.class)).stream() + .sorted((o1, o2) -> { + return o1.getTitle().compareTo(o2.getTitle()); + }).toList(); + } + + @Override + public String getCodeType(StudentSubmitSolution submittedSolution) { + List listTypes = submittedSolution.getTaskInTestInstance().getTask().getTaskIsOfTypes(); + if (listTypes != null && listTypes.size() > 0) { + return listTypes.get(0).getTaskType().getCodetype(); + } else { + return "/"; + } + } + + @Override + public List getCorrectSolutionsByStudentAndTaskInTestInstance(long studentId, + long taskInTestInstanceId) { + try { + Query q = getEntityManager().createQuery(""" + select sss + from StudentSubmitSolution sss + left outer join sss.evaluations eval + where + ((eval.solutionAssessmentId is not null) or + (sss.evaluationSimple=true and sss.evaluationComplex=true)) and + sss.studentStartedTest.student.studentId=:studentId and + sss.taskInTestInstance.taskInTestInstanceId=:taskInTestInstanceId + order by sss.submittedOn desc + """); + q.setParameter("studentId", studentId); + q.setParameter("taskInTestInstanceId", taskInTestInstanceId); + return UsefulMethods.castList(StudentSubmitSolution.class, q.getResultList()); + } catch (Exception e) { + logger.error("getCorrectSolutionsByStudentAndTaskInTestInstance failed {}", e); + return null; + } + } + + private EntityManager getEntityManager() { + return session.getEntityManagerFactory().createEntityManager(); + } + + @Override + public List getEvaluatedSolutionsForTaskInTestInstance(long studentId, + long taskInTestInstanceId) { + try { + Query q = getEntityManager().createQuery(""" + select sss + from StudentSubmitSolution sss + left outer join sss.evaluations eval + where + sss.studentStartedTest.student.studentId = :studentId and + sss.taskInTestInstance.taskInTestInstanceId = :taskInTestInstanceId + order by eval.evaluatedOn desc, sss.submittedOn desc + """); + q.setParameter("studentId", studentId); + q.setParameter("taskInTestInstanceId", taskInTestInstanceId); + List output = UsefulMethods.castList(StudentSubmitSolution.class, q.getResultList()); + return output; + } catch (Exception e) { + logger.error("getEvaluatedSolutionsForTaskInTestInstance failed {}", e); + return null; + } + } + + @Override + public Float getGradeForTaskInTestInstanceByStudent(long taskInTestInstanceId, long studentId) { + try { + return (Float) getEntityManager().createQuery(""" + select max(sa.grade) from SolutionAssessment sa join sa.studentSubmitSolution sss + where + sss.taskInTestInstance.taskInTestInstanceId = :taskInTestInstanceId and + sss.studentStartedTest.student.studentId = :studentId + """).setParameter("taskInTestInstanceId", taskInTestInstanceId).setParameter("studentId", studentId) + .getSingleResult(); + } catch (Exception e) { + return null; + } + } + + @Override + public List getHistoryOfSolutions(long taskInTestInstanceId, Boolean filterNotForEvalution, + long studentId) { + return UsefulMethods.castList(StudentSubmitSolution.class, getEntityManager().createQuery(""" + from StudentSubmitSolution sss + where + sss.taskInTestInstance.taskInTestInstanceId=:taskInTestInstanceId and + sss.notForEvaluation=:filterNotForEvalution and + sss.studentStartedTest.student.studentId=:studentId + order by sss.submittedOn desc + """).setParameter("taskInTestInstanceId", taskInTestInstanceId).setParameter("studentId", studentId) + .setParameter("filterNotForEvalution", filterNotForEvalution).getResultList()); + } + + @Override + public List getIncorrectSolutionsByStudentAndTaskInTestInstance(long studentId, + long taskInTestInstanceId) { + try { + Query q = getEntityManager().createQuery(""" + from StudentSubmitSolution sss + where + not(sss.evaluationSimple=true and sss.evaluationComplex=true) and + sss.studentStartedTest.student.studentId=:studentId and + sss.taskInTestInstance.taskInTestInstanceId=:taskInTestInstanceId + order by sss.submittedOn desc + """); + q.setParameter("studentId", studentId); + q.setParameter("taskInTestInstanceId", taskInTestInstanceId); + return UsefulMethods.castList(StudentSubmitSolution.class, q.getResultList()); + } catch (Exception e) { + logger.error("getIncorrectSolutionsByStudentAndTaskInTestInstance failed {}", e); + return null; + } + } + + @Override + public Long getNumPersonsSuccessfulForTaskInTestInstance(long taskInTestInstanceId) { + try { + return (Long) getEntityManager().createQuery(""" + select count(distinct sss.studentStartedTest.student.studentId) + from StudentSubmitSolution sss + where + sss.evaluationSimple=true and sss.evaluationComplex=true and + sss.taskInTestInstance.taskInTestInstanceId=:taskInTestInstanceId + """).setParameter("taskInTestInstanceId", taskInTestInstanceId).getSingleResult(); + } catch (Exception e) { + return null; + } + } + + @Override + public Long getNumPersonsTriedToSolveTaskInTestInstance(long taskInTestInstanceId) { + try { + return (Long) getEntityManager().createQuery(""" + select count(distinct sss.studentStartedTest.student.studentId) + from StudentSubmitSolution sss + where sss.taskInTestInstance.taskInTestInstanceId=:taskInTestInstanceId + """).setParameter("taskInTestInstanceId", taskInTestInstanceId).getSingleResult(); + } catch (Exception e) { + return Long.valueOf(0); + } + } + + @Override + public List getSolutionsByStudent(long studentId) { + javax.persistence.Query q = getEntityManager().createQuery( + "from StudentSubmitSolution sss where sss.studentStartedTest.student.studentId = :studentId"); + q.setParameter("studentId", studentId); + return UsefulMethods.castList(StudentSubmitSolution.class, q.getResultList()); + } + + @Override + public List getSolutionsOfTaskInTestInstanceByOtherStudents(long taskInTestInstanceId, + long studentId) { + javax.persistence.Query q = getEntityManager().createQuery(""" + from StudentSubmitSolution sss + where sss.evaluationSimple=true and + sss.evaluationComplex=true and + sss.studentStartedTest.student.studentId!=:studentId and + sss.taskInTestInstance.taskInTestInstanceId=:taskInTestInstanceId + order by sss.submittedOn desc + """); + q.setParameter("studentId", studentId); + q.setParameter("taskInTestInstanceId", taskInTestInstanceId); + return UsefulMethods.castList(StudentSubmitSolution.class, q.getResultList()); + } + + @Override + public List getStudentsSolving() { + try { + Query query = getEntityManager().createQuery(""" + select p, count(distinct sss.taskInTestInstance.taskInTestInstanceId) + from StudentSubmitSolution sss + join sss.studentStartedTest sst + join sst.student s join s.person p + where + sss.evaluationExam=true and sss.submittedOn>:datum + group by p + order by count(distinct sss.taskInTestInstance.taskInTestInstanceId) desc + """); + Calendar cal = Calendar.getInstance(); + cal.add(Calendar.MONTH, -3); + Date datum = cal.getTime(); + query.setParameter("datum", datum); + return query.getResultList(); + } catch (Exception e) { + return null; + } + } + + @Override + public List getStudentsWhoStartedTestInstance(TestInstance testInstance) { + try { + return UsefulMethods.castList(Student.class, getEntityManager().createQuery(""" + select s + from StudentStartedTest sst join sst.student s + where sst.testInstance.testInstanceId = :testInstanceId + order by s.person.lastName, s.person.firstName + """).setParameter("testInstanceId", testInstance.getTestInstanceId()).getResultList()); + } catch (Exception e) { + logger.error("Error {}", e.getMessage()); + return new ArrayList(); + } + } + + @Override + public List getTaskInTestInstancesByModel(long modelId) { + List tasks = UsefulMethods.castList(TaskInTestInstance.class, + getEntityManager() + .createQuery( + """ + from TaskInTestInstance tti + where + (tti.task.model.modelId is not null and tti.task.model.modelId=:modelId) or + (tti.testInstance.testTemplate.model.modelId is not null and tti.testInstance.testTemplate.model.modelId=:modelId) + order by tti.testInstance.title, tti.task.title + """) + .setParameter("modelId", modelId).getResultList()); + return tasks; + } + + @Override + public List getTaskInTestInstancesByTaskType(TaskType taskType) { + List tasks = UsefulMethods.castList(TaskInTestInstance.class, + getEntityManager().createQuery(""" + select tti + from TaskInTestInstance tti + join tti.task.taskIsOfTypes tiot + where + tiot.taskType.taskTypeId=:taskTypeId + order by tti.testInstance.title, tti.task.title + """).setParameter("taskTypeId", taskType.getTaskTypeId()).getResultList()); + return tasks; + } + + @Override + public List getTaskInTestInstancesByTestInstance(long testInstanceId) { + return UsefulMethods.castList(TaskInTestInstance.class, getEntityManager().createQuery(""" + from TaskInTestInstance tti + where tti.testInstance.testInstanceId = :testInstanceId + order by tti.task.title + """).setParameter("testInstanceId", testInstanceId).getResultList()); + } + + @Override + public List getTasksByModel(long modelId) { + List tasks = UsefulMethods.castList(Task.class, + getEntityManager().createQuery("from Task where model.modelId=:modelId") + .setParameter("modelId", modelId).getResultList()); + return tasks; + } + + @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; + } + } + + @Override + public List getTestInstanceResultsByStudentSortedByTaskName(Student student, TestInstance testInstance) { + try { + return getEntityManager() + .createNativeQuery( + """ + select + cast(max(sa.grade) as integer) max_grade, + max(case when sss.student_submit_solution_id is null then null when sss.evaluation_simple and sss.evaluation_complex + then 1 else 0 end)>0 should_pass, + max(case when sa.passed is not null and sa.passed then 1 when sa.passed is not null and not(sa.passed) then 0 else null end )>0 passed + from + task_in_test_instance titi + join task t on titi.task_id=t.task_id + left join student_started_test sst on sst.student_id=? + left join student_submit_solution sss on sss.task_in_test_instance_id=titi.task_in_test_instance_id and sss.student_started_test_id=sst.student_started_test_id + left join solution_assessment sa on sss.student_submit_solution_id=sa.student_submit_solution_id + where titi.test_instance_id=? + group by titi.task_in_test_instance_id, t.task_id, t.title, sst.student_id + order by t.title + """) + .setParameter(1, student.getStudentId()).setParameter(2, testInstance.getTestInstanceId()) + .getResultList(); + } catch (Exception e) { + logger.error(e.getMessage()); + return null; + } + } + + @Override + public List getTestInstancesByTestType(long testTypeId) { + javax.persistence.Query query = getEntityManager().createQuery( + "from TestInstance t where t.testTemplate.testType.testTypeId = :testTypeId order by t.title desc") + .setParameter("testTypeId", testTypeId); + return UsefulMethods.castList(TestInstance.class, query.getResultList()); } @@ -133,38 +548,27 @@ @Override - public List getAllTestInstancesByTestType(long testTypeId) { - String query = """ - from TestInstance t - where - t.testTemplate.testType.testTypeId = :testTypeId - 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()); - } - - @Override - public List getAllCurrentlyAvailableTestInstancesByTestType(long testTypeId) { - return UsefulMethods.castList(TestInstance.class, getEntityManager().createQuery(""" - from TestInstance t - where - (t.scheduledFor is null or t.scheduledFor<=current_timestamp()) and - t.testTemplate.testType.testTypeId = :testTypeId - order by t.title desc - """).setParameter("testTypeId", testTypeId).getResultList()); + public Float getTotalPoints(long studentId, long testInstanceId) { + try { + Query q = getEntityManager().createQuery(""" + select max(sa.grade) as maksot + from SolutionAssessment sa + join sa.studentSubmitSolution sss + where + sss.taskInTestInstance.testInstance.testInstanceId = :testInstanceId and + sss.studentStartedTest.student.studentId = :studentId + group by sss.taskInTestInstance.taskInTestInstanceId + """); + q.setParameter("studentId", studentId); + q.setParameter("testInstanceId", testInstanceId); + Float total = (float) 0; + for (Float sa : UsefulMethods.castList(Float.class, q.getResultList())) { + if (sa != null) { + total += sa; + } + } + return total; + } catch (Exception e) { + return null; + } } @@ -197,84 +601,4 @@ } } - } - - @Override - public Float getGradeForTaskInTestInstanceByStudent(long taskInTestInstanceId, long studentId) { - try { - return (Float) getEntityManager().createQuery(""" - select max(sa.grade) from SolutionAssessment sa join sa.studentSubmitSolution sss - where - sss.taskInTestInstance.taskInTestInstanceId = :taskInTestInstanceId and - sss.studentStartedTest.student.studentId = :studentId - """).setParameter("taskInTestInstanceId", taskInTestInstanceId).setParameter("studentId", studentId) - .getSingleResult(); - } catch (Exception e) { - return null; - } - } - - @Override - public Long getNumPersonsSuccessfulForTaskInTestInstance(long taskInTestInstanceId) { - try { - return (Long) getEntityManager().createQuery(""" - select count(distinct sss.studentStartedTest.student.studentId) - from StudentSubmitSolution sss - where - sss.evaluationSimple=true and sss.evaluationComplex=true and - sss.taskInTestInstance.taskInTestInstanceId=:taskInTestInstanceId - """).setParameter("taskInTestInstanceId", taskInTestInstanceId).getSingleResult(); - } catch (Exception e) { - return null; - } - } - - @Override - public Long getNumPersonsTriedToSolveTaskInTestInstance(long taskInTestInstanceId) { - try { - return (Long) getEntityManager().createQuery(""" - select count(distinct sss.studentStartedTest.student.studentId) - from StudentSubmitSolution sss - where sss.taskInTestInstance.taskInTestInstanceId=:taskInTestInstanceId - """).setParameter("taskInTestInstanceId", taskInTestInstanceId).getSingleResult(); - } catch (Exception e) { - return Long.valueOf(0); - } - } - - @Override - public List getStudentsSolving() { - try { - Query query = getEntityManager().createQuery(""" - select p, count(distinct sss.taskInTestInstance.taskInTestInstanceId) - from StudentSubmitSolution sss - join sss.studentStartedTest sst - join sst.student s join s.person p - where - sss.evaluationExam=true and sss.submittedOn>:datum - group by p - order by count(distinct sss.taskInTestInstance.taskInTestInstanceId) desc - """); - Calendar cal = Calendar.getInstance(); - cal.add(Calendar.MONTH, -3); - Date datum = cal.getTime(); - query.setParameter("datum", datum); - return query.getResultList(); - } catch (Exception e) { - return null; - } - } - - @Override - public List getHistoryOfSolutions(long taskInTestInstanceId, Boolean filterNotForEvalution, - long studentId) { - return UsefulMethods.castList(StudentSubmitSolution.class, getEntityManager().createQuery(""" - from StudentSubmitSolution sss - where - sss.taskInTestInstance.taskInTestInstanceId=:taskInTestInstanceId and - sss.notForEvaluation=:filterNotForEvalution and - sss.studentStartedTest.student.studentId=:studentId - order by sss.submittedOn desc - """).setParameter("taskInTestInstanceId", taskInTestInstanceId).setParameter("studentId", studentId) - .setParameter("filterNotForEvalution", filterNotForEvalution).getResultList()); } @@ -305,254 +629,3 @@ } - @Override - public List getSolutionsByStudent(long studentId) { - javax.persistence.Query q = getEntityManager().createQuery( - "from StudentSubmitSolution sss where sss.studentStartedTest.student.studentId = :studentId"); - q.setParameter("studentId", studentId); - return UsefulMethods.castList(StudentSubmitSolution.class, q.getResultList()); - } - - @Override - public List getSolutionsOfTaskInTestInstanceByOtherStudents(long taskInTestInstanceId, - long studentId) { - javax.persistence.Query q = getEntityManager().createQuery(""" - from StudentSubmitSolution sss - where sss.evaluationSimple=true and - sss.evaluationComplex=true and - sss.studentStartedTest.student.studentId!=:studentId and - sss.taskInTestInstance.taskInTestInstanceId=:taskInTestInstanceId - order by sss.submittedOn desc - """); - q.setParameter("studentId", studentId); - q.setParameter("taskInTestInstanceId", taskInTestInstanceId); - return UsefulMethods.castList(StudentSubmitSolution.class, q.getResultList()); - } - - @Override - public List getTestInstancesByTestType(long testTypeId) { - javax.persistence.Query query = getEntityManager().createQuery( - "from TestInstance t where t.testTemplate.testType.testTypeId = :testTypeId order by t.title desc") - .setParameter("testTypeId", testTypeId); - return UsefulMethods.castList(TestInstance.class, query.getResultList()); - } - - @Override - public List getTasksByModel(long modelId) { - List tasks = UsefulMethods.castList(Task.class, - getEntityManager().createQuery("from Task where model.modelId=:modelId") - .setParameter("modelId", modelId).getResultList()); - logger.info("model {} \n tasks {}", modelId, tasks.size()); - return tasks; - } - - @Override - public List getCorrectSolutionsByStudentAndTaskInTestInstance(long studentId, - long taskInTestInstanceId) { - try { - Query q = getEntityManager().createQuery(""" - select sss - from StudentSubmitSolution sss - left outer join sss.evaluations eval - where - ((eval.solutionAssessmentId is not null) or - (sss.evaluationSimple=true and sss.evaluationComplex=true)) and - sss.studentStartedTest.student.studentId=:studentId and - sss.taskInTestInstance.taskInTestInstanceId=:taskInTestInstanceId - order by sss.submittedOn desc - """); - q.setParameter("studentId", studentId); - q.setParameter("taskInTestInstanceId", taskInTestInstanceId); - return UsefulMethods.castList(StudentSubmitSolution.class, q.getResultList()); - } catch (Exception e) { - logger.error("getCorrectSolutionsByStudentAndTaskInTestInstance failed {}", e); - return null; - } - } - - @Override - public List getIncorrectSolutionsByStudentAndTaskInTestInstance(long studentId, - long taskInTestInstanceId) { - try { - Query q = getEntityManager().createQuery(""" - from StudentSubmitSolution sss - where - not(sss.evaluationSimple=true and sss.evaluationComplex=true) and - sss.studentStartedTest.student.studentId=:studentId and - sss.taskInTestInstance.taskInTestInstanceId=:taskInTestInstanceId - order by sss.submittedOn desc - """); - q.setParameter("studentId", studentId); - q.setParameter("taskInTestInstanceId", taskInTestInstanceId); - return UsefulMethods.castList(StudentSubmitSolution.class, q.getResultList()); - } catch (Exception e) { - logger.error("getIncorrectSolutionsByStudentAndTaskInTestInstance failed {}", e); - return null; - } - } - - @Override - public List getTaskInTestInstancesByTestInstance(long testInstanceId) { - return UsefulMethods.castList(TaskInTestInstance.class, getEntityManager().createQuery(""" - from TaskInTestInstance tti - where tti.testInstance.testInstanceId = :testInstanceId - order by tti.task.title - """).setParameter("testInstanceId", testInstanceId).getResultList()); - } - - @Override - public List getStudentsWhoStartedTestInstance(TestInstance testInstance) { - try { - return UsefulMethods.castList(Student.class, getEntityManager().createQuery(""" - select s - from StudentStartedTest sst join sst.student s - where sst.testInstance.testInstanceId = :testInstanceId - order by s.person.lastName, s.person.firstName - """).setParameter("testInstanceId", testInstance.getTestInstanceId()).getResultList()); - } catch (Exception e) { - logger.error("Error {}", e.getMessage()); - return new ArrayList(); - } - } - - @Override - public List getEvaluatedSolutionsForTaskInTestInstance(long studentId, - long taskInTestInstanceId) { - try { - Query q = getEntityManager().createQuery(""" - select sss - from StudentSubmitSolution sss - left outer join sss.evaluations eval - where - sss.studentStartedTest.student.studentId = :studentId and - sss.taskInTestInstance.taskInTestInstanceId = :taskInTestInstanceId - order by eval.evaluatedOn desc, sss.submittedOn desc - """); - q.setParameter("studentId", studentId); - q.setParameter("taskInTestInstanceId", taskInTestInstanceId); - List output = UsefulMethods.castList(StudentSubmitSolution.class, q.getResultList()); - return output; - } catch (Exception e) { - logger.error("getEvaluatedSolutionsForTaskInTestInstance failed {}", e); - return null; - } - } - - @Override - public List getAllEvaluationsOfSolutionsForTaskInTestInstance(long studentId, - long taskInTestInstanceId) { - try { - Query q = getEntityManager().createQuery(""" - select sa - from SolutionAssessment sa - where - sa.studentSubmitSolution.studentStartedTest.student.studentId = :studentId and - sa.studentSubmitSolution.taskInTestInstance.taskInTestInstanceId = :taskInTestInstanceId - order by sa.evaluatedOn desc, sa.studentSubmitSolution.submittedOn desc - """); - q.setParameter("studentId", studentId); - q.setParameter("taskInTestInstanceId", taskInTestInstanceId); - List output = UsefulMethods.castList(SolutionAssessment.class, q.getResultList()); - return output; - } catch (Exception e) { - logger.error("getAllEvaluationsOfSolutionsForTaskInTestInstance failed {}", e); - return null; - } - } - - @Override - public Float getTotalPoints(long studentId, long testInstanceId) { - try { - Query q = getEntityManager().createQuery(""" - select max(sa.grade) as maksot - from SolutionAssessment sa - join sa.studentSubmitSolution sss - where - sss.taskInTestInstance.testInstance.testInstanceId = :testInstanceId and - sss.studentStartedTest.student.studentId = :studentId - group by sss.taskInTestInstance.taskInTestInstanceId - """); - q.setParameter("studentId", studentId); - q.setParameter("testInstanceId", testInstanceId); - Float total = (float) 0; - for (Float sa : UsefulMethods.castList(Float.class, q.getResultList())) { - if (sa != null) { - total += sa; - } - } - return total; - } catch (Exception e) { - return null; - } - } - - @Override - public boolean accessToTaskInTestInstanceAllowed(Student student, TaskInTestInstance tti) { - // TODO: need a more appropriate implementation - return getTestInstancesForStudentByTestType(student.getStudentId(), - tti.getTestInstance().getTestTemplate().getTestType().getTestTypeId()).stream() - .anyMatch(ti -> ti.getTestInstanceId() == tti.getTestInstance().getTestInstanceId()); - } - - @Override - public String getCodeType(StudentSubmitSolution submittedSolution) { - List listTypes = submittedSolution.getTaskInTestInstance().getTask().getTaskIsOfTypes(); - if (listTypes != null && listTypes.size() > 0) { - return listTypes.get(0).getTaskType().getCodetype(); - } else { - return "/"; - } - } - - @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; - } - } - - @Override - public List getTestInstanceResultsByStudentSortedByTaskName(Student student, TestInstance testInstance) { - try { - return getEntityManager() - .createNativeQuery( - """ - select - cast(max(sa.grade) as integer) max_grade, - max(case when sss.student_submit_solution_id is null then null when sss.evaluation_simple and sss.evaluation_complex - then 1 else 0 end)>0 should_pass, - max(case when sa.passed is not null and sa.passed then 1 when sa.passed is not null and not(sa.passed) then 0 else null end )>0 passed - from - task_in_test_instance titi - join task t on titi.task_id=t.task_id - left join student_started_test sst on sst.student_id=? - left join student_submit_solution sss on sss.task_in_test_instance_id=titi.task_in_test_instance_id and sss.student_started_test_id=sst.student_started_test_id - left join solution_assessment sa on sss.student_submit_solution_id=sa.student_submit_solution_id - where titi.test_instance_id=? - group by titi.task_in_test_instance_id, t.task_id, t.title, sst.student_id - order by t.title - """) - .setParameter(1, student.getStudentId()).setParameter(2, testInstance.getTestInstanceId()) - .getResultList(); - } catch (Exception e) { - logger.error(e.getMessage()); - return null; - } - } - }