rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-21 15:54:22 +01:00
Code Issues Releases Activity

compute right nb of free seats for event reservation

Browse Source 
also: copy nb_total_places to n+1 instances when creating recurrent
availabilities
This commit is contained in:
Sylvain 2019-11-25 10:30:03 +01:00
parent ce366beaa2
commit bbd613f2a5
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/event.rb
View File

@ -98,7 +98,7 @@ class Event < ActiveRecord::Base
else else
nil nil
end end
r = Recurrence.new(every: recurrence, on: on, starts: availability.start_at+1.day, until: recurrence_end_at) r = Recurrence.new(every: recurrence, on: on, starts: availability.start_at + 1.day, until: recurrence_end_at)
r.events.each do |date| r.events.each do |date|
days_diff = availability.end_at.day - availability.start_at.day days_diff = availability.end_at.day - availability.start_at.day
start_at = DateTime.new( start_at = DateTime.new(
@ -110,7 +110,7 @@ class Event < ActiveRecord::Base
availability.start_at.sec, availability.start_at.sec,
availability.start_at.zone availability.start_at.zone
) )
start_at = dst_correction(availability.start_at,start_at) start_at = dst_correction(availability.start_at, start_at)
end_date = date + days_diff.days end_date = date + days_diff.days
end_at = DateTime.new( end_at = DateTime.new(
end_date.year, end_date.year,
@ -121,7 +121,7 @@ class Event < ActiveRecord::Base
availability.end_at.sec, availability.end_at.sec,
availability.end_at.zone availability.end_at.zone
) )
end_at = dst_correction(availability.start_at,end_at) end_at = dst_correction(availability.start_at, end_at)
ei = EventImage.new(attachment: event_image.attachment) if event_image ei = EventImage.new(attachment: event_image.attachment) if event_image
efs = event_files.map do |f| efs = event_files.map do |f|
EventFile.new(attachment: f.attachment) EventFile.new(attachment: f.attachment)

7
app/models/reservation.rb
View File

@ -244,8 +244,11 @@ class Reservation < ActiveRecord::Base
end end
def total_booked_seats def total_booked_seats
total = 0 # cases:
total = nb_reserve_places if slots.first.canceled_at # - machine/training/space reservation => 1 slot = 1 seat (currently not covered by this function)
# - event reservation => seats = nb_reserve_place (normal price) + tickets.booked (other prices)
total = nb_reserve_places
total = 0 if slots.first.canceled_at
total += tickets.map(&:booked).map(&:to_i).reduce(:+) if tickets.count.positive? total += tickets.map(&:booked).map(&:to_i).reduce(:+) if tickets.count.positive?
total total

3
app/services/availabilities/create_availabilities_service.rb
View File

@ -20,7 +20,8 @@ class Availabilities::CreateAvailabilitiesService
machine_ids: availability.machine_ids, machine_ids: availability.machine_ids,
training_ids: availability.training_ids, training_ids: availability.training_ids,
space_ids: availability.space_ids, space_ids: availability.space_ids,
tag_ids: availability.tag_ids tag_ids: availability.tag_ids,
nb_total_places: availability.nb_total_places
).save! ).save!
end end
end end