From ee43920ecdecf969bee8e42d8b0744f3b9271490 Mon Sep 17 00:00:00 2001
From: Hisashi Yoshida <hisashi.918.leafup@gmail.com>
Date: Thu, 16 Mar 2017 15:41:06 +0900
Subject: [PATCH 1/3] Create duplicate modal

---
 app/assets/javascripts/events.js.coffee       | 43 ++++++++++-------
 .../events/_duplicate_form_of_modal.html.erb  | 48 +++++++++++++++++++
 app/views/events/index.html.erb               |  2 +-
 3 files changed, 76 insertions(+), 17 deletions(-)
 create mode 100644 app/views/events/_duplicate_form_of_modal.html.erb

diff --git a/app/assets/javascripts/events.js.coffee b/app/assets/javascripts/events.js.coffee
index 360a857..f0b77a4 100644
--- a/app/assets/javascripts/events.js.coffee
+++ b/app/assets/javascripts/events.js.coffee
@@ -35,22 +35,12 @@ fullCalendar = ->
         dtstart = moment(dtstart).hour(moment(origin_dtstart).hour())
         dtstart = moment(dtstart).minute(moment(origin_dtstart).minute())
         dtend = moment(dtstart).add(duration,'seconds')
-        data = {
-          event:
-            summary: $(this).data('event').title
-            dtstart: new Date(dtstart)
-            dtend: new Date(dtend)
-            origin_event_id: $(this).data('event').id
-        }
-
-        $ . ajax
-          type: 'POST'
-          url: '/events/ajax_create_event_from_old_event'
-          data: data
-          timeout: 9000
-          success: ->
-          error: ->
-            alert "error"
+        summary = $(this).data('event').title
+        $('#duplicateEventModal #startTime').val(moment(dtstart).format("YYYY/MM/DD H:mm"))
+        $('#duplicateEventModal #endTime').val(moment(dtend).format("YYYY/MM/DD H:mm"))
+        $('#duplicateEventModal #duplicateEventSummary').val(summary)
+        $('#duplicateEventModal #originalId').val($(this).data('event').id)
+        $('#duplicateEventModal').modal("show")
 
     eventAfterAllRender:
       (view) ->
@@ -103,6 +93,27 @@ doSubmit = ->
       error: ->
         alert "error"
 
+  $('#duplicateButton').on 'click', (e) ->
+    e.preventDefault()
+    $("#duplicateEventModal").modal('hide')
+
+    data = {
+      event:
+        summary: $('#duplicateEventSummary').val()
+        dtstart: new Date($('#startTime').val())
+        dtend: new Date($('#endTime').val())
+        origin_event_id: $('#originalId').val()
+    }
+
+    $ . ajax
+      type: 'POST'
+      url: '/events/ajax_create_event_from_old_event'
+      data: data
+      timeout: 9000
+      success: ->
+      error: ->
+        alert "error"
+
 initDraggableOldEvent = ->
   $('.fc-event').each ->
     event = {
diff --git a/app/views/events/_duplicate_form_of_modal.html.erb b/app/views/events/_duplicate_form_of_modal.html.erb
new file mode 100644
index 0000000..3e7c1cb
--- /dev/null
+++ b/app/views/events/_duplicate_form_of_modal.html.erb
@@ -0,0 +1,48 @@
+<%= form_for @event , :url => {:action => 'new'} do |f| %>
+<div id="duplicateEventModal" class="modal fade">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h4 class="modal-title">Duplicate Event</h4>
+      </div>
+      <form id="createEventForm" class="modal-body">
+        <div class="modal-body">
+          <table>
+            <tbody>
+              <tr>
+                <th class="event-form-key">
+                  When:
+                </th>
+                <td class="event-form-val">
+                    <%= f.text_field :dtstart, :id => 'startTime' %>  to  <%= f.text_field :dtend, :id => 'endTime' %>
+                </td>
+              </tr>
+              <tr>
+                <th class="event-form-key">
+                  What:
+                </th>
+                <td class="event-form-val">
+                  <%= f.text_field :summary, :id => 'duplicateEventSummary' %>
+                </td>
+              </tr>
+              <tr>
+                <th class="event-form-key">
+                  Calendar:
+                </th>
+                <td class="event-form-val">
+                  <select></select>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+          <%= f.hidden_field :recurrence, :id => 'originalId' %>
+        </div>
+      </form>
+      <div class="modal-footer">
+        <button type="submit" class="btn set-left" id="duplicateButton">Duplicate event</button>
+      </div>
+    </div>
+  </div>
+</div>
+<% end %>
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index 4c2d56e..e4eea8e 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -8,6 +8,6 @@
 </div>
 <%= render :partial => "events/side_menu" , :locals => {:events => @events, :point_event => @point_event} %>
 <%= render :partial => "events/create_form_of_modal" %>
+<%= render :partial => "events/duplicate_form_of_modal" %>
 <div id="calendar"></div>
 <%= render :partial => "events/recurrence" , :locals => {:recurrences => @recurrences} %>
-

From 5b9682478b55f6a6d8e2c310d6e7d1f6195991a4 Mon Sep 17 00:00:00 2001
From: Hisashi Yoshida <hisashi.918.leafup@gmail.com>
Date: Thu, 16 Mar 2017 15:42:46 +0900
Subject: [PATCH 2/3] Change default recurrence_id from inbox to object_id

---
 app/controllers/events_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index 9f37f13..70faaba 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -46,7 +46,7 @@ def edit
   # POST /events.json
   def create
     @event = Event.new(event_params)
-    @event.recurrence_id = Recurrence.inbox.id
+    @event.recurrence_id = @event.object_id
     if params[:clam_id] != nil
       @clam = Clam.find(params[:clam_id])
       @clam.events << @event

From 465194b8d5e58f74b870172b5ede1477025eb5b3 Mon Sep 17 00:00:00 2001
From: Tomoki Tsubokawa <tsubokawa@swlab.cs.okayama-u.ac.jp>
Date: Thu, 16 Mar 2017 18:05:07 +0900
Subject: [PATCH 3/3] Remove dragging object

---
 app/assets/javascripts/events.js.coffee | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/events.js.coffee b/app/assets/javascripts/events.js.coffee
index f0b77a4..8570f69 100644
--- a/app/assets/javascripts/events.js.coffee
+++ b/app/assets/javascripts/events.js.coffee
@@ -36,6 +36,7 @@ fullCalendar = ->
         dtstart = moment(dtstart).minute(moment(origin_dtstart).minute())
         dtend = moment(dtstart).add(duration,'seconds')
         summary = $(this).data('event').title
+        $('.ui-draggable-dragging').remove()
         $('#duplicateEventModal #startTime').val(moment(dtstart).format("YYYY/MM/DD H:mm"))
         $('#duplicateEventModal #endTime').val(moment(dtend).format("YYYY/MM/DD H:mm"))
         $('#duplicateEventModal #duplicateEventSummary').val(summary)
@@ -130,7 +131,7 @@ initDraggableOldEvent = ->
     $(this).draggable
       appendTo: "body"
       zIndex: 999
-      revert: "invalid"
+      #revert: "invalid"
       helper: "clone"
 
 ready = ->