diff --git a/dev/ical/event_recu.txt b/dev/ical/event_recu.txt new file mode 100644 index 0000000000000000000000000000000000000000..d9e62dccbdbbd5450a7a959f25e9265af41e5553 --- /dev/null +++ b/dev/ical/event_recu.txt @@ -0,0 +1,57 @@ +Example fo recurring event, 1 week, no end, exported by Google + +# The recurring event were recorded every monday the 20150518. This is the Recurrence-id, but then +# first occurence was moved on tuesday. So this record were added. +BEGIN:VEVENT +DTSTART;TZID=Europe/Paris:20150519T100000 +DTEND;TZID=Europe/Paris:20150519T110000 +DTSTAMP:20150517T175754Z +UID:9026chuafli29ns5soshvckamc@google.com +RECURRENCE-ID;TZID=Europe/Paris:20150518T100000 +CREATED:20150517T174404Z +DESCRIPTION: +LAST-MODIFIED:20150517T175008Z +LOCATION: +SEQUENCE:1 +STATUS:CONFIRMED +SUMMARY:aaa +TRANSP:OPAQUE +END:VEVENT + +# The recurring event were recorded every monday the 20150518. +BEGIN:VEVENT +DTSTART;TZID=Europe/Paris:20150518T100000 +DTEND;TZID=Europe/Paris:20150518T110000 +RRULE:FREQ=WEEKLY;BYDAY=MO +DTSTAMP:20150517T175754Z +UID:9026chuafli29ns5soshvckamc@google.com +CREATED:20150517T174404Z +DESCRIPTION: +LAST-MODIFIED:20150517T174404Z +LOCATION: +SEQUENCE:0 +STATUS:CONFIRMED +SUMMARY:aaa +TRANSP:OPAQUE +END:VEVENT + + + + +Example fo recurring event, every 2 month, no end, exported by Google + +BEGIN:VEVENT +DTSTART;TZID=Europe/Paris:20150519T080000 +DTEND;TZID=Europe/Paris:20150519T090000 +RRULE:FREQ=MONTHLY;INTERVAL=2;BYMONTHDAY=19 +DTSTAMP:20150517T175754Z +UID:urkq3ih1mlaqeu4dbkpdh4i61s@google.com +CREATED:20150517T175658Z +DESCRIPTION: +LAST-MODIFIED:20150517T175658Z +LOCATION: +SEQUENCE:0 +STATUS:CONFIRMED +SUMMARY:bbbbb +TRANSP:OPAQUE +END:VEVENT diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql index 62657944a317f10e439c400d60f965037bad335c..74133f977c8e8b6fdeb335133f0bede6b4a98319 100755 --- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql +++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql @@ -626,6 +626,8 @@ ALTER TABLE llx_actioncomm ADD COLUMN email_sender varchar(256); ALTER TABLE llx_actioncomm ADD COLUMN email_to varchar(256); ALTER TABLE llx_actioncomm ADD COLUMN errors_to varchar(256); ALTER TABLE llx_actioncomm ADD COLUMN recurid varchar(128); +ALTER TABLE llx_actioncomm ADD COLUMN recurrule varchar(128); +ALTER TABLE llx_actioncomm ADD COLUMN ecurdateend datetime; ALTER TABLE llx_stcomm ADD COLUMN picto varchar(128); diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql index e2279f3075d8b3251d1bcea201aa0461bdf1a471..a555d37c84dc08130567a3314fa8b2c9d885a227 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.sql @@ -61,7 +61,9 @@ create table llx_actioncomm errors_to varchar(256), -- when event was an email, we store here the erros_to recurid varchar(128), -- used to store event id to link all recurring event records each other - + recurrule varchar(128), -- contains string with ical format recurring rule like "FREQ=MONTHLY;INTERVAL=2;BYMONTHDAY=19" or "FREQ=WEEKLY;BYDAY=MO" + recurdateend datetime, + fk_element integer DEFAULT NULL, elementtype varchar(32) DEFAULT NULL