DTSTART and DTEND for Free/Busy is in UTC

This commit is contained in:
Andrew Ruthven 2021-09-19 01:28:19 +12:00
parent 255e8bf463
commit 04f2da406e
10 changed files with 20 additions and 18 deletions

View File

@ -9,7 +9,7 @@ VERSION:2.0
CALSCALE:GREGORIAN CALSCALE:GREGORIAN
BEGIN:VFREEBUSY BEGIN:VFREEBUSY
DTSTAMP:yyyymmddThhmmssZ DTSTAMP:yyyymmddThhmmssZ
DTSTART:20060930T110000Z DTSTART:correct
DTEND:correct DTEND:correct
FREEBUSY:20031231T230000Z/20100217T000000Z FREEBUSY:20031231T230000Z/20100217T000000Z
FREEBUSY:20061001T210000Z/20061001T220000Z FREEBUSY:20061001T210000Z/20061001T220000Z

View File

@ -6,8 +6,8 @@ URL=http://regression.host/freebusy.php/user1@example.net?start=20061001T000000&
HEAD HEAD
REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/ REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/
REPLACE=/^DTSTART:20060930T120000Z\r?$/DTSTART:correct/ REPLACE=/^DTSTART:20061001T000000Z\r?$/DTSTART:correct/
REPLACE=/^DTEND:20070630T115959Z\r?$/DTEND:correct/ REPLACE=/^DTEND:20070630T235959Z\r?$/DTEND:correct/
QUERY QUERY
SELECT calendar_item.rrule, status, SELECT calendar_item.rrule, status,
@ -15,7 +15,7 @@ SELECT calendar_item.rrule, status,
to_char(calendar_item.dtend at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS finish to_char(calendar_item.dtend at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS finish
FROM caldav_data INNER JOIN calendar_item USING(dav_id,user_no,dav_name) FROM caldav_data INNER JOIN calendar_item USING(dav_id,user_no,dav_name)
WHERE caldav_data.user_no = 10 WHERE caldav_data.user_no = 10
AND rrule_event_overlaps( dtstart, dtend, rrule, '20061001T000000', '20070630T235959') AND rrule_event_overlaps( dtstart, dtend, rrule, '20061001T000000Z', '20070630T235959Z')
AND caldav_data.caldav_type IN ( 'VEVENT', 'VFREEBUSY' ) AND caldav_data.caldav_type IN ( 'VEVENT', 'VFREEBUSY' )
AND (calendar_item.status != 'CANCELLED' OR calendar_item.status IS NULL) AND (calendar_item.status != 'CANCELLED' OR calendar_item.status IS NULL)
AND (calendar_item.class != 'PRIVATE' OR calendar_item.class IS NULL) AND (calendar_item.class != 'PRIVATE' OR calendar_item.class IS NULL)

View File

@ -9,8 +9,8 @@ VERSION:2.0
CALSCALE:GREGORIAN CALSCALE:GREGORIAN
BEGIN:VFREEBUSY BEGIN:VFREEBUSY
DTSTAMP:yyyymmddThhmmssZ DTSTAMP:yyyymmddThhmmssZ
DTSTART:20060930T110000Z DTSTART:correct
DTEND:20061028T230000Z DTEND:correct
END:VFREEBUSY END:VFREEBUSY
END:VCALENDAR END:VCALENDAR

View File

@ -8,6 +8,8 @@ HEAD
AUTH=manager1:manager1 AUTH=manager1:manager1
REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/ REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/
REPLACE=/^DTSTART:20061001T000000Z\r?$/DTSTART:correct/
REPLACE=/^DTEND:20061029T120000Z\r?$/DTEND:correct/
QUERY QUERY
SELECT calendar_item.rrule, calendar_item.status, SELECT calendar_item.rrule, calendar_item.status,

View File

@ -9,8 +9,8 @@ VERSION:2.0
CALSCALE:GREGORIAN CALSCALE:GREGORIAN
BEGIN:VFREEBUSY BEGIN:VFREEBUSY
DTSTAMP:yyyymmddThhmmssZ DTSTAMP:yyyymmddThhmmssZ
DTSTART:20060930T110000Z DTSTART:correct
DTEND:20070630T115959Z DTEND:correct
FREEBUSY:20031231T230000Z/20100217T000000Z FREEBUSY:20031231T230000Z/20100217T000000Z
FREEBUSY:20061001T210000Z/20061001T220000Z FREEBUSY:20061001T210000Z/20061001T220000Z
FREEBUSY:20061002T210000Z/20061002T220000Z FREEBUSY:20061002T210000Z/20061002T220000Z

View File

@ -8,8 +8,8 @@ URL=http://regression.host/freebusy.php/user1@example.net?start=20061001T000000&
HEAD HEAD
REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/ REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/
REPLACE=/^DTSTART:20061001T000000Z$/DTSTART:correct/ REPLACE=/^DTSTART:20061001T000000Z\r?$/DTSTART:correct/
REPLACE=/^DTEND:20070630T235959Z$/DTEND:correct/ REPLACE=/^DTEND:20070630T235959Z\r?$/DTEND:correct/
QUERY QUERY
SELECT calendar_item.rrule, calendar_item.status, SELECT calendar_item.rrule, calendar_item.status,

View File

@ -9,8 +9,8 @@ VERSION:2.0
CALSCALE:GREGORIAN CALSCALE:GREGORIAN
BEGIN:VFREEBUSY BEGIN:VFREEBUSY
DTSTAMP:yyyymmddThhmmssZ DTSTAMP:yyyymmddThhmmssZ
DTSTART:20060930T110000Z DTSTART:correct
DTEND:20070630T115959Z DTEND:correct
FREEBUSY:20031231T230000Z/20100217T000000Z FREEBUSY:20031231T230000Z/20100217T000000Z
FREEBUSY:20061001T210000Z/20061001T220000Z FREEBUSY:20061001T210000Z/20061001T220000Z
FREEBUSY:20061002T210000Z/20061002T220000Z FREEBUSY:20061002T210000Z/20061002T220000Z

View File

@ -8,8 +8,8 @@ URL=http://regression.host/freebusy.php/user1@example.net?start=20061001T000000&
HEAD HEAD
REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/ REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/
REPLACE=/^DTSTART:20061001T000000Z$/DTSTART:correct/ REPLACE=/^DTSTART:20061001T000000Z\r?$/DTSTART:correct/
REPLACE=/^DTEND:20070630T235959Z$/DTEND:correct/ REPLACE=/^DTEND:20070630T235959Z\r?$/DTEND:correct/
QUERY QUERY
SELECT calendar_item.rrule, calendar_item.status, SELECT calendar_item.rrule, calendar_item.status,

View File

@ -9,8 +9,8 @@ VERSION:2.0
CALSCALE:GREGORIAN CALSCALE:GREGORIAN
BEGIN:VFREEBUSY BEGIN:VFREEBUSY
DTSTAMP:yyyymmddThhmmssZ DTSTAMP:yyyymmddThhmmssZ
DTSTART:20060930T110000Z DTSTART:correct
DTEND:20070630T115959Z DTEND:correct
FREEBUSY:20031231T230000Z/20100217T000000Z FREEBUSY:20031231T230000Z/20100217T000000Z
FREEBUSY:20061001T210000Z/20061001T220000Z FREEBUSY:20061001T210000Z/20061001T220000Z
FREEBUSY:20061002T210000Z/20061002T220000Z FREEBUSY:20061002T210000Z/20061002T220000Z

View File

@ -9,8 +9,8 @@ VERSION:2.0
CALSCALE:GREGORIAN CALSCALE:GREGORIAN
BEGIN:VFREEBUSY BEGIN:VFREEBUSY
DTSTAMP:yyyymmddThhmmssZ DTSTAMP:yyyymmddThhmmssZ
DTSTART:20060930T110000Z DTSTART:correct
DTEND:20070630T115959Z DTEND:correct
FREEBUSY:20031231T230000Z/20100217T000000Z FREEBUSY:20031231T230000Z/20100217T000000Z
FREEBUSY:20061001T210000Z/20061001T220000Z FREEBUSY:20061001T210000Z/20061001T220000Z
FREEBUSY:20061002T210000Z/20061002T220000Z FREEBUSY:20061002T210000Z/20061002T220000Z