Overlapping event support

1 files changed, 29 insertions, 22 deletions

diff --git a/calendars/default.ics b/calendars/default.ics
index d49b0d2..2a5a524 100644
--- a/calendars/default.ics
+++ b/calendars/default.ics
@@ -1,42 +1,42 @@
 BEGIN:VCALENDAR
 CALSCALE:GREGORIAN
+X-WR-TIMEZONE;VALUE=TEXT:US/Pacific
+METHOD:PUBLISH
 PRODID:-//Apple Computer\, Inc//iCal 1.0//EN
 X-WR-CALNAME;VALUE=TEXT:default
-X-WR-TIMEZONE;VALUE=TEXT:US/Pacific
 VERSION:2.0
-METHOD:PUBLISH
 BEGIN:VEVENT
-DTSTART;TZID=US/Pacific:20020822T170000
 SEQUENCE:3
-UID:488045FC-CB94-11D6-9F54-003065C59510
 DTSTAMP:20020919T050934Z
 SUMMARY:Stef in town
 DTEND;TZID=US/Pacific:20020822T200000
+DTSTART;TZID=US/Pacific:20020822T170000
+UID:8423D878-CF69-11D6-AA0F-003065C59510
 END:VEVENT
 BEGIN:VEVENT
-DTSTART;TZID=US/Pacific:20020918T121500
 SEQUENCE:1
-UID:48804C17-CB94-11D6-9F54-003065C59510
 DTSTAMP:20020919T050934Z
 SUMMARY:This is a space \n\n\nOption return and a really long line of 
  text that will be inserted into the  event text box. Let's all see what 
  really happens when iCals start being real.
+DTSTART;TZID=US/Pacific:20020918T121500
+UID:8423DEE2-CF69-11D6-AA0F-003065C59510
 DURATION:PT2H
 END:VEVENT
 BEGIN:VEVENT
 SEQUENCE:3
+DTSTART;TZID=US/Pacific:20020919T120000
 DTSTAMP:20020919T050934Z
 SUMMARY:Recurring Monthly
+UID:8423E3D2-CF69-11D6-AA0F-003065C59510
 DTEND;TZID=US/Pacific:20020919T133000
-UID:4880521A-CB94-11D6-9F54-003065C59510
-DTSTART;TZID=US/Pacific:20020919T120000
 RRULE:FREQ=MONTHLY;INTERVAL=1;BYMONTHDAY=19
 END:VEVENT
 BEGIN:VEVENT
 SEQUENCE:2
 DTSTAMP:20020919T050934Z
 SUMMARY:Recurring Weekly
-UID:48805838-CB94-11D6-9F54-003065C59510
+UID:8423E8AF-CF69-11D6-AA0F-003065C59510
 DTSTART;TZID=US/Pacific:20020920T120000
 DURATION:PT1H30M
 RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=FR
@@ -45,7 +45,7 @@ BEGIN:VEVENT
 SEQUENCE:3
 DTSTAMP:20020919T050934Z
 SUMMARY:Recurring Daily
-UID:48805D10-CB94-11D6-9F54-003065C59510
+UID:8423ED44-CF69-11D6-AA0F-003065C59510
 DTSTART;TZID=US/Pacific:20020921T100000
 DURATION:PT1H30M
 RRULE:FREQ=DAILY;INTERVAL=1
@@ -55,17 +55,17 @@ SEQUENCE:4
 DTSTAMP:20020919T050934Z
 SUMMARY:Monthly UNTIL 5 times
 DTSTART;TZID=US/Pacific:20020919T140000
-UID:48806191-CB94-11D6-9F54-003065C59510
+UID:8423F6F4-CF69-11D6-AA0F-003065C59510
 DURATION:PT1H30M
 RRULE:FREQ=MONTHLY;COUNT=5;INTERVAL=1;BYMONTHDAY=19
 END:VEVENT
 BEGIN:VEVENT
 SEQUENCE:11
+UID:8423FBDA-CF69-11D6-AA0F-003065C59510
 DTSTAMP:20020919T050934Z
 SUMMARY:Monthly UNTiL date
-DTEND;TZID=US/Pacific:20020919T180000
 DTSTART;TZID=US/Pacific:20020919T160000
-UID:488065F8-CB94-11D6-9F54-003065C59510
+DTEND;TZID=US/Pacific:20020919T180000
 RRULE:FREQ=MONTHLY;UNTIL=20021223T075959;INTERVAL=1;BYMONTHDAY=19
 END:VEVENT
 BEGIN:VEVENT
@@ -74,35 +74,42 @@ DTSTAMP:20020919T050934Z
 SUMMARY:Every two weeks on certain days
 DTSTART;TZID=US/Pacific:20020920T150000
 STATUS:CONFIRMED
-UID:48806A14-CB94-11D6-9F54-003065C59510
+UID:84240098-CF69-11D6-AA0F-003065C59510
 DURATION:PT1H30M
 RRULE:FREQ=WEEKLY;INTERVAL=2;BYDAY=TU,WE,FR
 END:VEVENT
 BEGIN:VEVENT
 SEQUENCE:5
+UID:8424052A-CF69-11D6-AA0F-003065C59510
 DTSTAMP:20020919T051005Z
 SUMMARY:Montly all day
-UID:48806EB9-CB94-11D6-9F54-003065C59510
 RRULE:FREQ=MONTHLY;INTERVAL=1;BYMONTHDAY=19,20,21
 DTSTART;VALUE=DATE:20020919
 DTEND;VALUE=DATE:20020920
 END:VEVENT
 BEGIN:VEVENT
 SEQUENCE:3
+UID:842409DC-CF69-11D6-AA0F-003065C59510
 DTSTAMP:20020919T055403Z
 SUMMARY:Yearly all day
-UID:488073A9-CB94-11D6-9F54-003065C59510
 RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=9
 DTSTART;VALUE=DATE:20020918
 DTEND;VALUE=DATE:20020919
 END:VEVENT
 BEGIN:VEVENT
-SEQUENCE:3
-DTSTAMP:20020922T213437Z
-SUMMARY:Recurring every 3 days
-DTSTART;TZID=US/Central:20020929T100000
-UID:0D5B7786-CE73-11D6-8DC2-0003930896FC
+SEQUENCE:4
+DTSTAMP:20020924T025812Z
+RECURRENCE-ID;TZID=US/Pacific:20020923T100000
+DTSTART;TZID=US/Pacific:20020923T113000
+UID:8423ED44-CF69-11D6-AA0F-003065C59510
 DURATION:PT1H30M
-RRULE:FREQ=DAILY;INTERVAL=3
+END:VEVENT
+BEGIN:VEVENT
+SEQUENCE:3
+DTSTAMP:20020924T025816Z
+SUMMARY:New Event
+DTEND;TZID=US/Pacific:20020923T133000
+UID:84241032-CF69-11D6-AA0F-003065C59510
+DTSTART;TZID=US/Pacific:20020923T113000
 END:VEVENT
 END:VCALENDAR