bike/BikeBikeBike
1
0
Fork 0
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Fixed NPE on schedule

Browse Source
This commit is contained in:
Godwin
2016-12-11 21:30:08 -08:00
parent c85d6c7d75
commit b89fa43b0e
4 changed files with 63 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/application_controller.rb
+10 -8
View File
@@ -586,14 +586,16 @@ class ApplicationController < LinguaFrancaApplicationController
end
@events.each do | event |
day = event.start_time.midnight.to_date
time = event.start_time.hour.to_f + (event.start_time.min / 60.0)
@schedule[day] ||= {}
@schedule[day][:times] ||= {}
@schedule[day][:times][time] ||= {}
@schedule[day][:times][time][:type] = :event
@schedule[day][:times][time][:length] = (event.end_time - event.start_time) / 3600.0
@schedule[day][:times][time][:item] = event
if event.present? && event.start_time.present? && event.end_time.present?
day = event.start_time.midnight.to_date
time = event.start_time.hour.to_f + (event.start_time.min / 60.0)
@schedule[day] ||= {}
@schedule[day][:times] ||= {}
@schedule[day][:times][time] ||= {}
@schedule[day][:times][time][:type] = :event
@schedule[day][:times][time][:length] = (event.end_time - event.start_time) / 3600.0
@schedule[day][:times][time][:item] = event
end
end
@schedule = @schedule.sort.to_h