Skip to content
Snippets Groups Projects
Commit 8d94b1b4 authored by uhensler's avatar uhensler
Browse files

OO-3304: Force reload all surveys before checking if a user can execute

parent 7a225879
No related branches found
No related tags found
No related merge requests found
...@@ -51,6 +51,7 @@ public class QualityJob extends JobWithDB { ...@@ -51,6 +51,7 @@ public class QualityJob extends JobWithDB {
QualityService qualityService = CoreSpringFactory.getImpl(QualityService.class); QualityService qualityService = CoreSpringFactory.getImpl(QualityService.class);
qualityService.startDataCollection(until); qualityService.startDataCollection(until);
qualityService.stopDataCollections(until); qualityService.stopDataCollections(until);
DBFactory.getInstance().commitAndCloseSession();
qualityService.sendReminders(until); qualityService.sendReminders(until);
} }
......
...@@ -254,7 +254,7 @@ public class QualityServiceImpl ...@@ -254,7 +254,7 @@ public class QualityServiceImpl
} }
@Override @Override
public void stopDataCollections(Date until) { public void startDataCollection(Date until) {
Collection<QualityDataCollection> dataCollections = dataCollectionDao.loadWithPendingStart(until); Collection<QualityDataCollection> dataCollections = dataCollectionDao.loadWithPendingStart(until);
log.debug("Update status to RUNNING. Number of pending data collections: " + dataCollections.size()); log.debug("Update status to RUNNING. Number of pending data collections: " + dataCollections.size());
for (QualityDataCollection dataCollection: dataCollections) { for (QualityDataCollection dataCollection: dataCollections) {
...@@ -263,7 +263,7 @@ public class QualityServiceImpl ...@@ -263,7 +263,7 @@ public class QualityServiceImpl
} }
@Override @Override
public void startDataCollection(Date until) { public void stopDataCollections(Date until) {
Collection<QualityDataCollection> dataCollections = dataCollectionDao.loadWithPendingDeadline(until); Collection<QualityDataCollection> dataCollections = dataCollectionDao.loadWithPendingDeadline(until);
log.debug("Update status to FINISHED. Number of pending data collections: " + dataCollections.size()); log.debug("Update status to FINISHED. Number of pending data collections: " + dataCollections.size());
for (QualityDataCollection dataCollection: dataCollections) { for (QualityDataCollection dataCollection: dataCollections) {
......
...@@ -141,6 +141,7 @@ public class DataCollectionListController extends FormBasicController implements ...@@ -141,6 +141,7 @@ public class DataCollectionListController extends FormBasicController implements
Long key = entry.getOLATResourceable().getResourceableId(); Long key = entry.getOLATResourceable().getResourceableId();
DataCollectionRow row = dataModel.getObjectByKey(key); DataCollectionRow row = dataModel.getObjectByKey(key);
if (row == null) { if (row == null) {
dataModel.clear();
dataModel.load(null, null, null, 0, -1); dataModel.load(null, null, null, 0, -1);
row = dataModel.getObjectByKey(key); row = dataModel.getObjectByKey(key);
if (row != null) { if (row != null) {
......
...@@ -123,6 +123,7 @@ public class ExecutorParticipationsListController extends FormBasicController im ...@@ -123,6 +123,7 @@ public class ExecutorParticipationsListController extends FormBasicController im
Long key = entry.getOLATResourceable().getResourceableId(); Long key = entry.getOLATResourceable().getResourceableId();
ExecutorParticipationRow row = dataModel.getObjectByParticipationKey(key); ExecutorParticipationRow row = dataModel.getObjectByParticipationKey(key);
if (row == null) { if (row == null) {
dataModel.clear();
dataModel.load(null, null, null, 0, -1); dataModel.load(null, null, null, 0, -1);
row = dataModel.getObjectByParticipationKey(key); row = dataModel.getObjectByParticipationKey(key);
if (row != null) { if (row != null) {
......
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