diff --git a/ruby/lib/jam_ruby/models/music_session.rb b/ruby/lib/jam_ruby/models/music_session.rb index daa764e7d..81928efde 100644 --- a/ruby/lib/jam_ruby/models/music_session.rb +++ b/ruby/lib/jam_ruby/models/music_session.rb @@ -255,34 +255,33 @@ module JamRuby unless ms.errors.any? ms.reload - rsvp_slot_ids = [] - self_rsvp_slot_ids = [] - options[:rsvp_slots].each do |rs| - rsvp = RsvpSlot.new - rsvp.instrument = Instrument.find(rs[:instrument_id]) - rsvp.proficiency_level = rs[:proficiency_level] - rsvp.music_session = ms - rsvp.save + # rsvp_slot_ids = [] + # self_rsvp_slot_ids = [] + # options[:rsvp_slots].each do |rs| + # rsvp = RsvpSlot.new + # rsvp.instrument = Instrument.find(rs[:instrument_id]) + # rsvp.proficiency_level = rs[:proficiency_level] + # rsvp.music_session = ms + # rsvp.save - ms.rsvp_slots << rsvp + # ms.rsvp_slots << rsvp - if rs[:approved] - self_rsvp_slot_ids.push rsvp.id - else - rsvp_slot_ids.push rsvp.id - end - end if options[:rsvp_slots] - RsvpRequest.create({session_id: ms.id, rsvp_slots: rsvp_slot_ids}, user) - rsvp_rq_ids = RsvpRequest.create({session_id: ms.id, rsvp_slots: self_rsvp_slot_ids}).map(&:id) + # if !rs[:approve].nil? && rs[:approve] == true + # self_rsvp_slot_ids.push rsvp.id + # else + # rsvp_slot_ids.push rsvp.id + # end + # end if options[:rsvp_slots] + # rsvp_rq_ids = RsvpRequest.create({session_id: ms.id, rsvp_slots: self_rsvp_slot_ids}, user).map(&:id) - self_rsvp_rq = [] - rsvp_rq_ids.each do |rsvp_rq| - r = Hash.new - r[:request_slot_id] = rsvp_rq - r[:approved] = true - self_rsvp_rq.push r - end - RsvpRequest.update({session_id: ms.id, rsvp_responses: self_rsvp_rq}) + # self_rsvp_rq = [] + # rsvp_rq_ids.each do |rsvp_rq| + # r = Hash.new + # r[:request_slot_id] = rsvp_rq + # r[:approved] = true + # self_rsvp_rq.push r + # end + # RsvpRequest.update({session_id: ms.id, rsvp_responses: self_rsvp_rq}) options[:invitations].each do |invite_id| invitation = Invitation.new diff --git a/web/app/assets/javascripts/scheduled_session.js b/web/app/assets/javascripts/scheduled_session.js index 1a22134ad..7f00141aa 100644 --- a/web/app/assets/javascripts/scheduled_session.js +++ b/web/app/assets/javascripts/scheduled_session.js @@ -420,21 +420,21 @@ data.rsvp_slots = []; $.each(instrumentSelector.getSelectedInstruments(), function(index, instrument) { var slot = {}; - slot.instrument = instrument.id; + slot.instrument_id = instrument.id; slot.proficiency_level = instrument.level; - slot.approve = false; + slot.approve = true; data.rsvp_slots.push(slot); }); - $.each(instrumentRSVP.getSelectedInstruments(), function(index, instrument) { - for (var i = 0; i < instrument.count; i++) { - var slot = {}; - slot.instrument = instrument.id; - slot.proficiency_level = instrument.level; - slot.approve = true; - data.rsvp_slots.push(slot); - } - }); + // $.each(instrumentRSVP.getSelectedInstruments(), function(index, instrument) { + // for (var i = 0; i < instrument.count; i++) { + // var slot = {}; + // slot.instrument_id = instrument.id; + // slot.proficiency_level = instrument.level; + // slot.approve = true; + // data.rsvp_slots.push(slot); + // } + // }); } var tracks = context.JK.TrackHelpers.getUserTracks(context.jamClient);