diff options
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/time_tables_controller.rb | 16 | ||||
| -rw-r--r-- | app/controllers/vehicle_journeys_controller.rb | 7 |
2 files changed, 20 insertions, 3 deletions
diff --git a/app/controllers/time_tables_controller.rb b/app/controllers/time_tables_controller.rb index dbecde0eb..b860d2948 100644 --- a/app/controllers/time_tables_controller.rb +++ b/app/controllers/time_tables_controller.rb @@ -6,8 +6,24 @@ class TimeTablesController < ChouetteController belongs_to :referential + def comment_filter + respond_to do |format| + format.json { render :json => filtered_time_tables_maps} + end + + end + protected + def filtered_time_tables_maps + filtered_time_tables.collect do |time_table| + { :id => time_table.id.to_s, :name => time_table.comment } + end + end + def filtered_time_tables + referential.time_tables.select{ |t| t.comment =~ /#{params[:q]}/i } + end + def collection @q = referential.time_tables.search(params[:q]) @time_tables ||= @q.result(:distinct => true).order(:comment).paginate(:page => params[:page], :per_page => 10) diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb index 215677382..596a7f90c 100644 --- a/app/controllers/vehicle_journeys_controller.rb +++ b/app/controllers/vehicle_journeys_controller.rb @@ -23,14 +23,15 @@ class VehicleJourneysController < ChouetteController alias_method :vehicle_journey, :resource def collection - @q = parent.vehicle_journeys.search(params[:q]) - @vehicle_journeys ||= @q.result(:distinct => true).paginate(:page => params[:page], :per_page => 10) + @q = parent.sorted_vehicle_journeys.search(params[:q]) + @vehicle_journeys ||= @q.result(:distinct => true).order( "vehicle_journey_at_stops.departure_time").paginate(:page => params[:page], :per_page => 10) @matrix ||= matrix end def matrix {}.tap do |hash| - @vehicle_journeys.each do |vj| + Chouette::VehicleJourney.find( @vehicle_journeys.map { |v| v.id } ). + each do |vj| vj.vehicle_journey_at_stops.each do |vjas| hash[ "#{vj.id}-#{vjas.stop_point_id}"] = vjas end |