rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-01 12:24:28 +01:00
Code Issues Releases Activity

fix space slot status in API

Browse Source
This commit is contained in:
Sylvain 2017-02-27 13:48:35 +01:00
parent 03d922e214
commit af5f3c777d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/api/availabilities_controller.rb
View File

@ -177,7 +177,7 @@ class API::AvailabilitiesController < API::ApiController
((a.end_at - a.start_at)/SLOT_DURATION.minutes).to_i.times do |i| ((a.end_at - a.start_at)/SLOT_DURATION.minutes).to_i.times do |i|
if (a.start_at + (i * SLOT_DURATION).minutes) > Time.now if (a.start_at + (i * SLOT_DURATION).minutes) > Time.now
slot = Slot.new(start_at: a.start_at + (i*SLOT_DURATION).minutes, end_at: a.start_at + (i*SLOT_DURATION).minutes + SLOT_DURATION.minutes, availability_id: a.id, availability: a, space: @space, title: '') slot = Slot.new(start_at: a.start_at + (i*SLOT_DURATION).minutes, end_at: a.start_at + (i*SLOT_DURATION).minutes + SLOT_DURATION.minutes, availability_id: a.id, availability: a, space: @space, title: '')
slot = verify_space_is_reserved(slot, @reservations, current_user, @current_user_role) slot = verify_space_is_reserved(slot, @reservations, @user, @current_user_role)
@slots << slot @slots << slot
end end
end end
@ -218,7 +218,7 @@ class API::AvailabilitiesController < API::ApiController
slot.is_reserved = true slot.is_reserved = true
slot.title = "#{slot.machine.name} - #{t('availabilities.not_available')}" slot.title = "#{slot.machine.name} - #{t('availabilities.not_available')}"
slot.can_modify = true if user_role === 'admin' slot.can_modify = true if user_role === 'admin'
slot.reservation = r slot.reservations.push r
end end
if s.start_at == slot.start_at and r.user == user and s.canceled_at == nil if s.start_at == slot.start_at and r.user == user and s.canceled_at == nil
slot.title = "#{slot.machine.name} - #{t('availabilities.i_ve_reserved')}" slot.title = "#{slot.machine.name} - #{t('availabilities.i_ve_reserved')}"
@ -238,7 +238,7 @@ class API::AvailabilitiesController < API::ApiController
if s.start_at == slot.start_at and s.canceled_at == nil if s.start_at == slot.start_at and s.canceled_at == nil
slot.id = s.id slot.id = s.id
slot.can_modify = true if user_role === 'admin' slot.can_modify = true if user_role === 'admin'
slot.reservation = r slot.reservations.push r
end end
if s.start_at == slot.start_at and r.user == user and s.canceled_at == nil if s.start_at == slot.start_at and r.user == user and s.canceled_at == nil
slot.title = t('availabilities.i_ve_reserved') slot.title = t('availabilities.i_ve_reserved')