|
|
|
@ -58,7 +58,10 @@ class Event < ApplicationRecord
|
|
|
|
|
start_date.to_date.end_of_month.end_of_week.end_of_day |
|
|
|
|
end) |
|
|
|
|
scope :period, (lambda do |year, week| |
|
|
|
|
start_date = Date.commercial(year.to_i, week.to_i) |
|
|
|
|
start_date = Date.commercial( |
|
|
|
|
year.to_i, |
|
|
|
|
(week || (Time.zone.today + 7.days).cweek).to_i |
|
|
|
|
) |
|
|
|
|
where '? <= end_time and start_time <= ?', |
|
|
|
|
start_date, start_date.end_of_week.end_of_day |
|
|
|
|
end) |
|
|
|
|