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

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
57078: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56565: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         56238:  Merged DEV to V4.1-BUG-FIX (4.1.7)
            50368: MNT-9500: After editing one occurrence of recurrent event the recurrence disappears
              - Implemented the new functionality that allow update occurrences in a recurrence event. Now we have ability to update the following properties through outlook: start, end, subject, location. Calendar web script was updated to display event\events information correctly. Also appropriate unit tests were added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61709 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 19:19:04 +00:00
parent 78c78f13b1
commit a03e4305d7
4 changed files with 90 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,15 +19,23 @@
package org.alfresco.service.cmr.calendar;
import java.text.DateFormatSymbols;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import org.alfresco.repo.calendar.CalendarModel;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.namespace.QName;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.extensions.surf.util.I18NUtil;
@@ -205,11 +213,11 @@ public class CalendarRecurrenceHelper
* @return The next recurrence on or after the given date, or null if there aren't any
*/
public static List<Date> getRecurrencesOnOrAfter(CalendarEntry entry, Date onOrAfter,
Date until, boolean firstOnly)
Date until, boolean firstOnly, Set<Date> ignoredDates)
{
return getRecurrencesOnOrAfter(
entry.getRecurrenceRule(), entry.getStart(), entry.getEnd(),
entry.getLastRecurrence(), onOrAfter, until, firstOnly);
entry.getLastRecurrence(), onOrAfter, until, firstOnly, ignoredDates);
}
/**
@@ -223,7 +231,8 @@ public class CalendarRecurrenceHelper
*/
public static List<Date> getRecurrencesOnOrAfter(String recurrenceRule, Date eventStart,
Date eventEnd, Date lastRecurrence,
Date onOrAfter, Date until, boolean firstOnly)
Date onOrAfter, Date until, boolean firstOnly,
Set<Date> ignoredDates)
{
if (recurrenceRule == null)
{
@@ -318,7 +327,22 @@ public class CalendarRecurrenceHelper
{
logger.warn("Unsupported recurrence frequency " + freq);
}
SimpleDateFormat fmt = new SimpleDateFormat("yyyyMMdd");
for (Date ignoredDate : ignoredDates)
{
Iterator<Date> i = dates.iterator();
while (i.hasNext())
{
Date date = i.next();
if (fmt.format(date).equals(fmt.format(ignoredDate)))
{
// occurrence is on the same day to ignore
i.remove();
}
}
}
// Return what we've got
return dates;
}