diff --git a/app/assets/javascripts/events.js.coffee b/app/assets/javascripts/events.js.coffee index 360a857..8570f69 100644 --- a/app/assets/javascripts/events.js.coffee +++ b/app/assets/javascripts/events.js.coffee @@ -35,22 +35,13 @@ 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 + $('.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) + $('#duplicateEventModal #originalId').val($(this).data('event').id) + $('#duplicateEventModal').modal("show") eventAfterAllRender: (view) -> @@ -103,6 +94,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 = { @@ -119,7 +131,7 @@ initDraggableOldEvent = -> $(this).draggable appendTo: "body" zIndex: 999 - revert: "invalid" + #revert: "invalid" helper: "clone" ready = -> 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 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| %> + +<% 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 @@ <%= 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" %>
<%= render :partial => "events/recurrence" , :locals => {:recurrences => @recurrences} %> -