inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALF-11994 Support the Outlook 2010 style of repeating monthly events, with tests

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32716 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Nick Burch
2011-12-13 03:22:35 +00:00
parent dc665385f5
commit 9451b7f974
2 changed files with 144 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
source/java/org/alfresco/service/cmr/calendar/CalendarRecurrenceHelper.java
View File

@@ -398,28 +398,42 @@ public class CalendarRecurrenceHelper
}
else if (params.get("BYSETPOS") != null)
{
// eg the first Thursday of the month
int dayOfWeek = DAY_NAMES_TO_CALENDAR_DAYS.get(params.get("BYSETPOS"));
if (currentDate.get(Calendar.DAY_OF_MONTH) > 8)
// eg the first Thursday of the month, or the third Saturday
int dayOfWeek = -1;
int instanceInMonth = 1;
// There are two forms...
if (params.containsKey("BYDAY"))
{
// Move to start, in next month
addMonthToFirstDayOfWeek(currentDate, dayOfWeek, monthInterval);
dayOfWeek = DAY_NAMES_TO_CALENDAR_DAYS.get(params.get("BYDAY"));
instanceInMonth = Integer.parseInt(params.get("BYSETPOS"));
}
else if (currentDate.get(Calendar.DAY_OF_WEEK) != dayOfWeek)
else
{
// Move forward to start
Date t = currentDate.getTime();
currentDate.set(Calendar.DAY_OF_WEEK, dayOfWeek);
if (currentDate.getTime().before(t))
{
currentDate.add(Calendar.DATE, 7);
}
// Implies the first one in the month
dayOfWeek = DAY_NAMES_TO_CALENDAR_DAYS.get(params.get("BYSETPOS"));
instanceInMonth = 1;
}
// Move to the date in this month
Date origDate = currentDate.getTime();
toDayOfWeekInMonth(currentDate, dayOfWeek, instanceInMonth);
// If the instance in this month is in the past, go
// forward to the point in the next month
if (currentDate.getTime().before(origDate))
{
addMonthToFirstDayOfWeek(currentDate, dayOfWeek, monthInterval);
toDayOfWeekInMonth(currentDate, dayOfWeek, instanceInMonth);
}
// Move forward to the required date
while (currentDate.getTime().before(onOrAfter))
{
addMonthToFirstDayOfWeek(currentDate, dayOfWeek, monthInterval);
toDayOfWeekInMonth(currentDate, dayOfWeek, instanceInMonth);
}
// Roll on until we get valid matches
while (true)
{
if (until != null)
@@ -437,6 +451,7 @@ public class CalendarRecurrenceHelper
}
addMonthToFirstDayOfWeek(currentDate, dayOfWeek, monthInterval);
toDayOfWeekInMonth(currentDate, dayOfWeek, instanceInMonth);
}
}
}
@@ -516,6 +531,19 @@ public class CalendarRecurrenceHelper
addMonthToDayOfMonth(c, 1, monthInterval);
// Set the day of the week
toDayOfWeekInMonth(c, dayOfWeek, 1);
}
/**
* Takes you to eg the 2nd Thursday in the month, which may
* involve going back before the current date
*/
private static void toDayOfWeekInMonth(Calendar c, int dayOfWeek, int weekInMonth)
{
// First up, move to the start of the month
c.set(Calendar.DATE, 1);
// Now, move to the 1st instance of the day of the week
Date t = c.getTime();
c.set(Calendar.DAY_OF_WEEK, dayOfWeek);
// If we went back, go forward a week
@@ -523,5 +551,11 @@ public class CalendarRecurrenceHelper
{
c.add(Calendar.DATE, 7);
}
// Now move to the required week
if (weekInMonth > 1)
{
c.add(Calendar.DATE, 7 * (weekInMonth-1));
}
}
}