diff --git a/src/main/java/org/olat/modules/quality/manager/QualityJob.java b/src/main/java/org/olat/modules/quality/manager/QualityJob.java index 36c5b2b4e861d29442138f13bcb411f21b143edd..f258179eb3a751c5a050bff6de7f44a569ae9569 100644 --- a/src/main/java/org/olat/modules/quality/manager/QualityJob.java +++ b/src/main/java/org/olat/modules/quality/manager/QualityJob.java @@ -51,6 +51,7 @@ public class QualityJob extends JobWithDB { QualityService qualityService = CoreSpringFactory.getImpl(QualityService.class); qualityService.startDataCollection(until); qualityService.stopDataCollections(until); + DBFactory.getInstance().commitAndCloseSession(); qualityService.sendReminders(until); } diff --git a/src/main/java/org/olat/modules/quality/manager/QualityServiceImpl.java b/src/main/java/org/olat/modules/quality/manager/QualityServiceImpl.java index 4657296b6a4d278245790a680cd140508fa28657..70cb9a9fe80a5ebec79f27af9732f2af24c21fb2 100644 --- a/src/main/java/org/olat/modules/quality/manager/QualityServiceImpl.java +++ b/src/main/java/org/olat/modules/quality/manager/QualityServiceImpl.java @@ -254,7 +254,7 @@ public class QualityServiceImpl } @Override - public void stopDataCollections(Date until) { + public void startDataCollection(Date until) { Collection<QualityDataCollection> dataCollections = dataCollectionDao.loadWithPendingStart(until); log.debug("Update status to RUNNING. Number of pending data collections: " + dataCollections.size()); for (QualityDataCollection dataCollection: dataCollections) { @@ -263,7 +263,7 @@ public class QualityServiceImpl } @Override - public void startDataCollection(Date until) { + public void stopDataCollections(Date until) { Collection<QualityDataCollection> dataCollections = dataCollectionDao.loadWithPendingDeadline(until); log.debug("Update status to FINISHED. Number of pending data collections: " + dataCollections.size()); for (QualityDataCollection dataCollection: dataCollections) { diff --git a/src/main/java/org/olat/modules/quality/ui/DataCollectionListController.java b/src/main/java/org/olat/modules/quality/ui/DataCollectionListController.java index 58b1fe37a3a66490e79718bed04bec85694ef53c..bef3772ee5b2871369712ade9a298fd5df453746 100644 --- a/src/main/java/org/olat/modules/quality/ui/DataCollectionListController.java +++ b/src/main/java/org/olat/modules/quality/ui/DataCollectionListController.java @@ -141,6 +141,7 @@ public class DataCollectionListController extends FormBasicController implements Long key = entry.getOLATResourceable().getResourceableId(); DataCollectionRow row = dataModel.getObjectByKey(key); if (row == null) { + dataModel.clear(); dataModel.load(null, null, null, 0, -1); row = dataModel.getObjectByKey(key); if (row != null) { diff --git a/src/main/java/org/olat/modules/quality/ui/ExecutorParticipationsListController.java b/src/main/java/org/olat/modules/quality/ui/ExecutorParticipationsListController.java index 3b42006005336f4cbadfb765cf094f887bd6b70a..e76fed4b09a56fa627889f3b95293c48fb70fc60 100644 --- a/src/main/java/org/olat/modules/quality/ui/ExecutorParticipationsListController.java +++ b/src/main/java/org/olat/modules/quality/ui/ExecutorParticipationsListController.java @@ -123,6 +123,7 @@ public class ExecutorParticipationsListController extends FormBasicController im Long key = entry.getOLATResourceable().getResourceableId(); ExecutorParticipationRow row = dataModel.getObjectByParticipationKey(key); if (row == null) { + dataModel.clear(); dataModel.load(null, null, null, 0, -1); row = dataModel.getObjectByParticipationKey(key); if (row != null) {