aboutsummaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
Diffstat (limited to 'app/models')
-rw-r--r--app/models/referential.rb4
-rw-r--r--app/models/vehicle_filter.rb5
2 files changed, 7 insertions, 2 deletions
diff --git a/app/models/referential.rb b/app/models/referential.rb
index d50694c60..e32c956fb 100644
--- a/app/models/referential.rb
+++ b/app/models/referential.rb
@@ -79,6 +79,10 @@ class Referential < ActiveRecord::Base
Chouette::TimeTable.all
end
+ def timebands
+ Chouette::Timeband.all
+ end
+
def connection_links
Chouette::ConnectionLink.all
end
diff --git a/app/models/vehicle_filter.rb b/app/models/vehicle_filter.rb
index 64cc3e75a..13a302dc6 100644
--- a/app/models/vehicle_filter.rb
+++ b/app/models/vehicle_filter.rb
@@ -1,6 +1,7 @@
class VehicleFilter
attr_accessor :route
attr_accessor :q
+ attr_accessor :journey_category_model
def initialize(attributes = {})
attributes.each do |name, value|
@@ -17,9 +18,9 @@ class VehicleFilter
end
def vehicles_passing_time_filtered
if without_any_passing_time?
- route.vehicle_journeys.without_any_passing_time
+ route.send(journey_category_model).without_any_passing_time
else
- route.sorted_vehicle_journeys
+ route.sorted_vehicle_journeys(journey_category_model)
end
end
def vehicle_journeys