Update IHM for vehicle journey frequency

2 files changed, 19 insertions, 4 deletions

diff --git a/app/helpers/vehicle_journey_frequencies_helper.rb b/app/helpers/vehicle_journey_frequencies_helper.rb
index 5d62aaf7f..237c9b371 100644
--- a/app/helpers/vehicle_journey_frequencies_helper.rb
+++ b/app/helpers/vehicle_journey_frequencies_helper.rb
@@ -1,2 +1,9 @@
 module VehicleJourneyFrequenciesHelper
+  def journey_frequency_percent(journey_frequency)
+    base = 100.0 / 2359.0
+    left = base * journey_frequency.first_departure_time.strftime("%H%M").to_i
+    right = base * journey_frequency.last_departure_time.strftime("%H%M").to_i
+    width = right - left
+    [left.round(2), width.round(2)]
+  end
 end
diff --git a/app/helpers/vehicle_journeys_helper.rb b/app/helpers/vehicle_journeys_helper.rb
index 9b4f055a1..c5f3242be 100644
--- a/app/helpers/vehicle_journeys_helper.rb
+++ b/app/helpers/vehicle_journeys_helper.rb
@@ -25,12 +25,20 @@ module VehicleJourneysHelper
     l(departure_time, :format => :hour).gsub( /  /, ' ')
   end
   
-  def vehicle_title(vehicle, departure_time=nil)
+  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#{'_frequency' if vehicle.frequency?}.title",
-          :stop => first_vjas.stop_point.stop_area.name,
-          :time => vehicle_departure(vehicle, departure_time))
+    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)