Improved scheduler

app/controllers/application_controller.rb

@@ -568,8 +568,6 @@ class ApplicationController < LinguaFrancaApplicationController
 
 		@schedule = @schedule.sort.to_h
 
-		# return unless do_analyze
-
 		@schedule.each do | day, data |
 			@schedule[day][:times] = data[:times].sort.to_h
 			if do_analyze || @schedule[day][:locations].empty?

app/controllers/conferences_controller.rb

@@ -1127,6 +1127,7 @@ class ConferencesController < ApplicationController
 				@time = @workshop_blocks[@block]['time'].to_f
 				@day = (Date.parse params[:day])
 				@location = params[:location]
+				@event_location = @location.present? && @location.to_i > 0 ? EventLocation.find(@location.to_i) : nil
 
 				@workshops.sort { |a, b| a.title.downcase <=> b.title.downcase }.each do | workshop |
 					@ordered_workshops[workshop.id] = workshop