Skip to content
Snippets Groups Projects
Commit 48aea7d8 authored by uhensler's avatar uhensler
Browse files

OO-4718: Notify only if really a relevant value was changed

parent 24b2babe
No related branches found
No related tags found
No related merge requests found
...@@ -346,9 +346,9 @@ public class AssessmentNotificationsHandler implements NotificationsHandler { ...@@ -346,9 +346,9 @@ public class AssessmentNotificationsHandler implements NotificationsHandler {
for (AssessableCourseNode test:testNodes) { for (AssessableCourseNode test:testNodes) {
List<AssessmentEntry> assessments = courseNodeAssessmentDao.loadAssessmentEntryBySubIdent(cgm.getCourseEntry(), test.getIdent()); List<AssessmentEntry> assessments = courseNodeAssessmentDao.loadAssessmentEntryBySubIdent(cgm.getCourseEntry(), test.getIdent());
for(AssessmentEntry assessment:assessments) { for(AssessmentEntry assessment:assessments) {
Date modDate = assessment.getLastModified(); Date modDate = getLater(assessment.getLastUserModified(), assessment.getLastCoachModified());
Identity assessedIdentity = assessment.getIdentity(); Identity assessedIdentity = assessment.getIdentity();
if (modDate.after(compareDate) && (hasFullAccess || coachedUsers.contains(assessedIdentity))) { if (modDate != null && modDate.after(compareDate) && (hasFullAccess || coachedUsers.contains(assessedIdentity))) {
BigDecimal score = assessment.getScore(); BigDecimal score = assessment.getScore();
if(test instanceof ScormCourseNode) { if(test instanceof ScormCourseNode) {
ScormCourseNode scormTest = (ScormCourseNode)test; ScormCourseNode scormTest = (ScormCourseNode)test;
...@@ -400,6 +400,13 @@ public class AssessmentNotificationsHandler implements NotificationsHandler { ...@@ -400,6 +400,13 @@ public class AssessmentNotificationsHandler implements NotificationsHandler {
} }
} }
private Date getLater(Date date1, Date date2) {
if (date1 == null) return date2;
if (date2 == null) return date1;
return date1.after(date2)? date1: date2;
}
private void checkPublisher(Publisher p) { private void checkPublisher(Publisher p) {
try { try {
if(!NotificationsUpgradeHelper.checkCourse(p)) { if(!NotificationsUpgradeHelper.checkCourse(p)) {
......
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