From 2ddafc19cfff37e679b59ff0c8b65a0eeeec4d7e Mon Sep 17 00:00:00 2001 From: sean kenny Date: Tue, 19 Aug 2014 13:16:56 +0100 Subject: [PATCH 1/4] Adding resources --- demos/json/events.json | 82 ++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 39 deletions(-) diff --git a/demos/json/events.json b/demos/json/events.json index ffef7f0..111abde 100644 --- a/demos/json/events.json +++ b/demos/json/events.json @@ -1,39 +1,43 @@ -[ - { - "title": "All Day Event", - "start": "2014-06-01" - }, - { - "title": "Long Event", - "start": "2014-06-07", - "end": "2014-06-10" - }, - { - "id": "999", - "title": "Repeating Event", - "start": "2014-06-09T16:00:00-05:00" - }, - { - "id": "999", - "title": "Repeating Event", - "start": "2014-06-16T16:00:00-05:00" - }, - { - "title": "Meeting", - "start": "2014-06-12T10:30:00-05:00", - "end": "2014-06-12T12:30:00-05:00" - }, - { - "title": "Lunch", - "start": "2014-06-12T12:00:00-05:00" - }, - { - "title": "Birthday Party", - "start": "2014-06-13T07:00:00-05:00" - }, - { - "title": "Click for Google", - "url": "http://google.com/", - "start": "2014-06-28" - } -] +[{ + title: 'R1-R2: Lunch 12.15-14.45', + start: new Date(y, m, d, 12, 15), + end: new Date(y, m, d, 14, 45), + allDay: false, + resources: ['resource1', 'resource2'] + }, { + title: 'R1: All day', + start: new Date(y, m, d, 10, 30), + end: new Date(y, m, d, 11, 0), + allDay: true, + resources: 'resource1' + }, { + title: 'R2: Meeting 11.00', + start: new Date(y, m, d, 11, 0), + allDay: true, + resources: 'resource2' + }, { + title: 'R1/R2: Lunch 12-14', + start: new Date(y, m, d, 12, 0), + end: new Date(y, m, d, 14, 0), + allDay: false, + resources: ['resource1', 'resource2'] + }, { + id: 777, + title: 'Lunch', + start: new Date(y, m, d, 12, 0), + end: new Date(y, m, d, 14, 0), + allDay: false, + resources: ['resource1'] + }, { + id: 999, + title: 'Repeating Event', + start: new Date(y, m, d - 3, 16, 0), + allDay: false, + resources: 'resource2' + }, { + id: 999, + title: 'Repeating Event', + start: new Date(y, m, d + 4, 16, 0), + allDay: false, + resources: 'resource2' + }] From a2fdb4e37e7958be68cfd0a0dfdb57b1de931136 Mon Sep 17 00:00:00 2001 From: sean kenny Date: Tue, 19 Aug 2014 13:26:01 +0100 Subject: [PATCH 2/4] Update events.json --- demos/json/events.json | 60 ++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 37 deletions(-) diff --git a/demos/json/events.json b/demos/json/events.json index 111abde..aec739f 100644 --- a/demos/json/events.json +++ b/demos/json/events.json @@ -1,43 +1,29 @@ [{ - title: 'R1-R2: Lunch 12.15-14.45', - start: new Date(y, m, d, 12, 15), - end: new Date(y, m, d, 14, 45), - allDay: false, - resources: ['resource1', 'resource2'] + "title": "R1-R2: Lunch 12.15-14.45", + "start": "2014-06-01T12:15:00", + "end": "2014-06-01T14:45:00", + "resources": ["resource1", "resource2"] }, { - title: 'R1: All day', - start: new Date(y, m, d, 10, 30), - end: new Date(y, m, d, 11, 0), - allDay: true, - resources: 'resource1' + "title": "R1: All day", + "start": "2014-06-01T10:30:00", + "resources": "resource1" }, { - title: 'R2: Meeting 11.00', - start: new Date(y, m, d, 11, 0), - allDay: true, - resources: 'resource2' + "title": "R2: All Day", + "start": "2014-06-01T11:00:00", + "resources": "resource2" }, { - title: 'R1/R2: Lunch 12-14', - start: new Date(y, m, d, 12, 0), - end: new Date(y, m, d, 14, 0), - allDay: false, - resources: ['resource1', 'resource2'] + "title": "R1/R2: Lunch 12-14", + "start": "2014-06-01T12:00:00", + "end": "2014-06-01T14:00:00", + "resources": ["resource1", "resource2"] }, { - id: 777, - title: 'Lunch', - start: new Date(y, m, d, 12, 0), - end: new Date(y, m, d, 14, 0), - allDay: false, - resources: ['resource1'] + "id": 999, + "title": "Repeating Event", + "start": "2014-06-16T16:00:00-05:00", + "resources": "resource2" }, { - id: 999, - title: 'Repeating Event', - start: new Date(y, m, d - 3, 16, 0), - allDay: false, - resources: 'resource2' - }, { - id: 999, - title: 'Repeating Event', - start: new Date(y, m, d + 4, 16, 0), - allDay: false, - resources: 'resource2' - }] + "id": 999, + "title": "Repeating Event", + "start": "2014-06-16T16:00:00-05:00", + "resources": "resource2" +}] From 545faa5eb811979447033d2590f1be15bebe57fa Mon Sep 17 00:00:00 2001 From: sean kenny Date: Tue, 19 Aug 2014 13:29:51 +0100 Subject: [PATCH 3/4] Update events.json --- demos/json/events.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/demos/json/events.json b/demos/json/events.json index aec739f..b35b58a 100644 --- a/demos/json/events.json +++ b/demos/json/events.json @@ -1,29 +1,29 @@ [{ "title": "R1-R2: Lunch 12.15-14.45", - "start": "2014-06-01T12:15:00", - "end": "2014-06-01T14:45:00", + "start": "2014-08-19T12:15:00", + "end": "2014-08-19T14:45:00", "resources": ["resource1", "resource2"] }, { "title": "R1: All day", - "start": "2014-06-01T10:30:00", + "start": "2014-08-19T10:30:00", "resources": "resource1" }, { "title": "R2: All Day", - "start": "2014-06-01T11:00:00", + "start": "2014-08-19T11:00:00", "resources": "resource2" }, { "title": "R1/R2: Lunch 12-14", - "start": "2014-06-01T12:00:00", - "end": "2014-06-01T14:00:00", + "start": "2014-08-19T12:00:00", + "end": "2014-08-19T14:00:00", "resources": ["resource1", "resource2"] }, { "id": 999, "title": "Repeating Event", - "start": "2014-06-16T16:00:00-05:00", + "start": "2014-08-19T16:00:00-05:00", "resources": "resource2" }, { "id": 999, "title": "Repeating Event", - "start": "2014-06-16T16:00:00-05:00", + "start": "2014-08-19T16:00:00-05:00", "resources": "resource2" }] From 8be921ef71be5f5e6c9d4a03dccdc26e23105380 Mon Sep 17 00:00:00 2001 From: sean kenny Date: Tue, 19 Aug 2014 13:41:58 +0100 Subject: [PATCH 4/4] Update events.json --- demos/json/events.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/demos/json/events.json b/demos/json/events.json index b35b58a..4a71a12 100644 --- a/demos/json/events.json +++ b/demos/json/events.json @@ -2,6 +2,7 @@ "title": "R1-R2: Lunch 12.15-14.45", "start": "2014-08-19T12:15:00", "end": "2014-08-19T14:45:00", + "allDay": false, "resources": ["resource1", "resource2"] }, { "title": "R1: All day", @@ -15,15 +16,20 @@ "title": "R1/R2: Lunch 12-14", "start": "2014-08-19T12:00:00", "end": "2014-08-19T14:00:00", + "allDay": false, "resources": ["resource1", "resource2"] }, { "id": 999, "title": "Repeating Event", "start": "2014-08-19T16:00:00-05:00", + "end": "2014-08-19T17:00:00-05:00", + "allDay": false, "resources": "resource2" }, { "id": 999, "title": "Repeating Event", "start": "2014-08-19T16:00:00-05:00", + "end": "2014-08-19T17:00:00-05:00", + "allDay": false, "resources": "resource2" }]