Merge vehicle_frequencies

1 files changed, 20 insertions, 9 deletions

diff --git a/app/helpers/vehicle_journeys_helper.rb b/app/helpers/vehicle_journeys_helper.rb
index 95741f441..c5f3242be 100644
--- a/app/helpers/vehicle_journeys_helper.rb
+++ b/app/helpers/vehicle_journeys_helper.rb
@@ -16,18 +16,29 @@ module VehicleJourneysHelper
     return "missing" if (is_present && is_present.departure_time.nil?)
   end
   
-  def vehicle_departure(vehicle)
-    first_vjas = vehicle.vehicle_journey_at_stops.first
-    return "" unless first_vjas.departure_time
-    l(first_vjas.departure_time, :format => :hour).gsub( /  /, ' ') 
+  def vehicle_departure(vehicle, departure_time=nil)
+    unless departure_time
+      first_vjas = vehicle.vehicle_journey_at_stops.first
+      return '' unless first_vjas.departure_time
+      departure_time = first_vjas.departure_time
+    end
+    l(departure_time, :format => :hour).gsub( /  /, ' ')
   end
   
-  def vehicle_title( vehicle)
-    return t('vehicle_journeys.vehicle_journey.title_stopless', :name => vehicle_name( vehicle)) if vehicle.vehicle_journey_at_stops.empty?
+  def vehicle_title(vehicle, journey_frequency=nil)
+    return t("vehicle_journeys.vehicle_journey#{'_frequency' if vehicle.frequency?}.title_stopless", :name => vehicle_name( vehicle)) if vehicle.vehicle_journey_at_stops.empty?
     first_vjas = vehicle.vehicle_journey_at_stops.first
-    t('vehicle_journeys.vehicle_journey.title', 
-          :stop => first_vjas.stop_point.stop_area.name,
-          :time => vehicle_departure(vehicle))
+    if vehicle.frequency? && journey_frequency
+      t("vehicle_journeys.vehicle_journey_frequency.title_frequency",
+        :interval => l(journey_frequency.scheduled_headway_interval, format: :hour),
+        :stop => first_vjas.stop_point.stop_area.name,
+        :time_first => vehicle_departure(nil, journey_frequency.first_departure_time),
+        :time_last => vehicle_departure(nil, journey_frequency.last_departure_time))
+    else
+      t("vehicle_journeys.vehicle_journey#{'_frequency' if vehicle.frequency?}.title",
+            :stop => first_vjas.stop_point.stop_area.name,
+            :time => vehicle_departure(vehicle, (journey_frequency ? journey_frequency.first_departure_time : nil )))
+    end
   end
   
   def edit_vehicle_title( vehicle)