Skip to content

Commit

Permalink
Add initialize in GoogleCalendarEvent class
Browse files Browse the repository at this point in the history
  • Loading branch information
kjtbw committed Jun 26, 2017
1 parent 079c5da commit 99f72d4
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 12 deletions.
2 changes: 1 addition & 1 deletion app/controllers/events_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ def list
events = kvs.load(month)
if events != nil then
events["items"].each do |event|
collection << GoogleCalendarEvent.to_fullcalendar(event)
collection << GoogleCalendarEvent.new(event).to_fullcalendar
end
end
end
Expand Down
26 changes: 15 additions & 11 deletions app/models/google_calendar_event.rb
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
class GoogleCalendarEvent < Event
def self.to_fullcalendar(e)
event = {}
event["id"] = e["id"]
event["title"] = e["summary"]
event["start"] = e["start"]["dateTime"] || e["start"]["date"]
event["end"] = e["end"]["dateTime"] || e["end"]["date"]
if e["start"]["date"] then
event["allDay"] = true
class GoogleCalendarEvent
def initialize(event)
@event = event
end

def to_fullcalendar
full_event = {}
full_event["id"] = @event["id"]
full_event["title"] = @event["summary"]
full_event["start"] = @event["start"]["dateTime"] || @event["start"]["date"]
full_event["end"] = @event["end"]["dateTime"] || @event["end"]["date"]
if @event["start"]["date"] then
full_event["allDay"] = true
else
event["allDay"] = false
full_event["allDay"] = false
end
return event
return full_event
end
end

0 comments on commit 99f72d4

Please sign in to comment.