Author: vdegtyarev
Date: Thu Apr 10 05:32:19 2014
New Revision: 1586219
URL: http://svn.apache.org/r1586219
Log:
Merged revision(s) 1586217 from
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java:
OPENMEETINGS-975 minor changes. Reminder range is corrected.
........
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
(contents, props changed)
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java?rev=1586219&r1=1586218&r2=1586219&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
(original)
+++
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
Thu Apr 10 05:32:19 2014
@@ -201,10 +201,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
Propchange:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Apr 10 05:32:19 2014
@@ -0,0 +1,5 @@
+/incubator/openmeetings/branches/video-components/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java:1220095-1239505
+/incubator/openmeetings/import/branches/dev/injection/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java:1219598-1219722
+/incubator/openmeetings/import/branches/dev/om_openjpa/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java:1219535-1219562
+/openmeetings/branches/OPENMEETINGS-745/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java:1512528-1512967
+/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java:1586217
