Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions app/assets/javascripts/events.js.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,15 @@ ready = ->
)
$('#calendar').css('width','80%')

$('.event_view_switch').click ->
if $(this).is(':checked')
$('.' + selectorEscape($(this).val())).show()
else
$('.' + selectorEscape($(this).val())).hide()

selectorEscape = (val) ->
val.replace /[ !"#$%&'()*+,.\/:;<=>?@\[\\\]^`{|}~]/g, '\\$&'

$('#allDay').on
mouseleave: ->
$('#eventStartTime').datetimepicker
Expand Down
2 changes: 1 addition & 1 deletion app/models/google_calendar/calendar.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def scan(date_start, date_end)
color = @calendars["#{calendar_id}"]["background_color"]
events = JSON.parse(@data_store.load(key))
events["items"].each do |event|
collection << GoogleCalendar::Event.new(event,color).to_fullcalendar
collection << GoogleCalendar::Event.new(event,color,calendar_id).to_fullcalendar
end
end
end
Expand Down
4 changes: 3 additions & 1 deletion app/models/google_calendar/event.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
module GoogleCalendar
class Event
def initialize(event,color)
def initialize(event,color,calendar_id)
@event = event
@color = color
@calendar_id = calendar_id
end

def to_fullcalendar
Expand All @@ -17,6 +18,7 @@ def to_fullcalendar
else
full_event["allDay"] = false
end
full_event["className"] = @calendar_id
return full_event
end# method to_fullcalendar
end# class Event
Expand Down
4 changes: 1 addition & 3 deletions app/views/events/_calendar_list.html.erb
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<div id="external-calendars">
<% calendars["items"].each do |c| %>
<div>
<font color=<%= c["background_color"] %>>■</font><%= c["summary"] %>
<input type="checkbox" value=<%= c["id"]%> class="event_view_switch" checked><font color=<%= c["background_color"] %>><%= c["summary"] %></font>
</div>
<% end %>
<input type="checkbox" id="cbox1" value="first_checkbox" checked><font color=#16a765> calendar1</font><br>
<input type="checkbox" id="cbox2" value="second_checkbox" checked> calendar2
<div align="right">
<%= link_to "他のカレンダーをインポート",
:controller => "calendars",
Expand Down