From 76fa1d4fba9472dfeeb4354b254a114d831f6e80 Mon Sep 17 00:00:00 2001
From: Eiji Yamamoto <yamamoto-e@swlab.cs.okayama-u.ac.jp>
Date: Thu, 14 Dec 2017 15:10:38 +0900
Subject: [PATCH] Add a funtion that toggle event display

---
 app/assets/javascripts/events.js.coffee  | 9 +++++++++
 app/models/google_calendar/calendar.rb   | 2 +-
 app/models/google_calendar/event.rb      | 4 +++-
 app/views/events/_calendar_list.html.erb | 4 +---
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/events.js.coffee b/app/assets/javascripts/events.js.coffee
index d21b90a..b2d86b9 100644
--- a/app/assets/javascripts/events.js.coffee
+++ b/app/assets/javascripts/events.js.coffee
@@ -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
diff --git a/app/models/google_calendar/calendar.rb b/app/models/google_calendar/calendar.rb
index e7c5fa5..8de5315 100644
--- a/app/models/google_calendar/calendar.rb
+++ b/app/models/google_calendar/calendar.rb
@@ -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
diff --git a/app/models/google_calendar/event.rb b/app/models/google_calendar/event.rb
index 5c73472..34feb61 100644
--- a/app/models/google_calendar/event.rb
+++ b/app/models/google_calendar/event.rb
@@ -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
@@ -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
diff --git a/app/views/events/_calendar_list.html.erb b/app/views/events/_calendar_list.html.erb
index 33336d6..0f57c94 100644
--- a/app/views/events/_calendar_list.html.erb
+++ b/app/views/events/_calendar_list.html.erb
@@ -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",