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

OO-4718: Use utility method (refactoring)

parent 5f86bfa6
No related branches found
No related tags found
No related merge requests found
...@@ -55,6 +55,7 @@ import org.olat.core.id.Identity; ...@@ -55,6 +55,7 @@ import org.olat.core.id.Identity;
import org.olat.core.id.context.BusinessControlFactory; import org.olat.core.id.context.BusinessControlFactory;
import org.olat.core.logging.AssertException; import org.olat.core.logging.AssertException;
import org.olat.core.logging.Tracing; import org.olat.core.logging.Tracing;
import org.olat.core.util.DateUtils;
import org.olat.core.util.Util; import org.olat.core.util.Util;
import org.olat.core.util.nodes.INode; import org.olat.core.util.nodes.INode;
import org.olat.course.CourseFactory; import org.olat.course.CourseFactory;
...@@ -351,7 +352,7 @@ public class AssessmentNotificationsHandler implements NotificationsHandler { ...@@ -351,7 +352,7 @@ public class AssessmentNotificationsHandler implements NotificationsHandler {
for (CourseNode test:testNodes) { for (CourseNode 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 = getLater(assessment.getLastUserModified(), assessment.getLastCoachModified()); Date modDate = DateUtils.getLater(assessment.getLastUserModified(), assessment.getLastCoachModified());
Identity assessedIdentity = assessment.getIdentity(); Identity assessedIdentity = assessment.getIdentity();
if (modDate != null && 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();
...@@ -405,13 +406,6 @@ public class AssessmentNotificationsHandler implements NotificationsHandler { ...@@ -405,13 +406,6 @@ 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