Author: vdegtyarev
Date: Thu Apr 10 05:22:54 2014
New Revision: 1586217
URL: http://svn.apache.org/r1586217
Log:
OPENMEETINGS-975 minor changes. Reminder range is corrected.
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java?rev=1586217&r1=1586216&r2=1586217&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java
Thu Apr 10 05:22:54 2014
@@ -200,10 +200,15 @@ public class AppointmentLogic {
return;
}
+ long milliseconds = (minutesReminderSend * 60 * 1000);
Calendar start = Calendar.getInstance();
- start.add(Calendar.DATE, -3);
+ if (milliseconds < 0) {
+ start.setTimeInMillis(start.getTimeInMillis() +
milliseconds);
+ }
Calendar end = Calendar.getInstance();
- end.add(Calendar.DATE, 3);
+ if (milliseconds > 0) {
+ end.setTimeInMillis(end.getTimeInMillis() +
milliseconds);
+ }
for (Appointment a :
appointmentDao.getAppointmentsInRange(start, end)) {
// Prevent email from being send twice, even if the
cycle takes