Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 7 additions & 17 deletions app/models/facility_time_slot.rb
Original file line number Diff line number Diff line change
Expand Up @@ -43,23 +43,13 @@ def overlapping_time_slots
return FacilityTimeSlot.none unless [from_hour, from_min, to_hour, to_min].all?(&:present?)

start_i = (from_hour + (from_min/60r)).to_f
end_i = (to_hour + (to_min/60r)).to_f

sql_start_i = Arel.sql("(from_hour + (from_min / 60.0))")
sql_end_i = Arel.sql("(to_hour + (to_min / 60.0))")

query_sql = <<~SQL.squish
(
SELECT ts.*,
#{sql_start_i} as start_i,
#{sql_end_i} as end_i
FROM facility_time_slots ts
WHERE (#{sql_start_i} <= #{end_i})
AND (#{sql_end_i} >= #{start_i})
) as facility_time_slots
SQL

FacilityTimeSlot.from(query_sql).where(id: siblings_time_slots)
end_i = (to_hour + (to_min/60r)).to_f

siblings_time_slots.where(
"(from_hour + (from_min / 60.0)) <= ? AND (to_hour + (to_min / 60.0)) >= ?",
end_i,
start_i
)
end

private
Expand Down
Loading