Add a way to show vehicle journey frequency

9 files changed, 48 insertions, 27 deletions

diff --git a/app/helpers/vehicle_journey_frequencies_helper.rb b/app/helpers/vehicle_journey_frequencies_helper.rb
index 237c9b371..1c603e4b1 100644
--- a/app/helpers/vehicle_journey_frequencies_helper.rb
+++ b/app/helpers/vehicle_journey_frequencies_helper.rb
@@ -3,7 +3,7 @@ module VehicleJourneyFrequenciesHelper
     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
+    width = (right < left ? 100 - left : right - left)
     [left.round(2), width.round(2)]
   end
 end
diff --git a/app/views/routes/_route.html.erb b/app/views/routes/_route.html.erb
index 0fee47cd1..179f06a25 100644
--- a/app/views/routes/_route.html.erb
+++ b/app/views/routes/_route.html.erb
@@ -22,26 +22,33 @@
     </div>                          
   </div>
   <div class="panel-body">
-     <p>
-  <% if route.journey_patterns.size > 0 %>
-    <i class="fa fa-clock-o"></i><%= link_to t("vehicle_journeys.actions.index"), referential_line_route_vehicle_journeys_path(@referential, @line, route) %>
-  <% else %> 
-    <%= t('.no_journey_pattern')%>	
-  <% end%>
-  </p>
-  <p>
-    <% if route.opposite_route %>
-      <%= fonticon_wayback(route.opposite_route.wayback) %><%= link_to truncate(route.opposite_route.name, :length => 30), referential_line_route_path( @referential, @line, route.opposite_route) %>
-    <% else %>
-    <%= t('.no_opposite') %>
+    <p>
+      <% if route.journey_patterns.size > 0 %>
+        <i class="fa fa-clock-o"></i>
+        <%= link_to t("vehicle_journeys.actions.index"), referential_line_route_vehicle_journeys_path(@referential, @line, route) %>
+      <% else %>
+        <%= t('.no_journey_pattern')%>
+      <% end%>
+    </p>
+    <% if @line.vehicle_journey_frequencies? %>
+      <p>
+        <i class="fa fa-clock-o"></i>
+        <%= link_to t("vehicle_journey_frequencies.actions.index"), referential_line_route_vehicle_journey_frequencies_path(@referential, @line, route) %>
+      </p>
     <% end %>
-  </p>
-  <p>
-    <% if ! route.direction.blank? %>
-    <%= route.human_attribute_name('direction_code') %> : <%= t('directions.label.'+route.direction_code) %>
-    <% else %>
-    <br>  
-    <% end %>
-  </p>
+    <p>
+      <% if route.opposite_route %>
+        <%= fonticon_wayback(route.opposite_route.wayback) %><%= link_to truncate(route.opposite_route.name, :length => 30), referential_line_route_path( @referential, @line, route.opposite_route) %>
+      <% else %>
+        <%= t('.no_opposite') %>
+      <% end %>
+    </p>
+    <p>
+      <% if ! route.direction.blank? %>
+        <%= route.human_attribute_name('direction_code') %> : <%= t('directions.label.'+route.direction_code) %>
+      <% else %>
+        <br>
+      <% end %>
+    </p>
   </div>
 </div>
diff --git a/app/views/vehicle_journeys/_vehicle_journeys.html.erb b/app/views/vehicle_journeys/_vehicle_journeys.html.erb
index 9d553e48b..3bff10b59 100644
--- a/app/views/vehicle_journeys/_vehicle_journeys.html.erb
+++ b/app/views/vehicle_journeys/_vehicle_journeys.html.erb
@@ -1,6 +1,14 @@
 <div class="page_info">
   <span class="search"><%= t("will_paginate.page_entries_info.search") %></span>
   <%= page_entries_info @vehicle_journeys %>
+  <span class="pull-right">
+    <i class="fa fa-clock-o"></i>
+    <% if controller_name == 'vehicle_journey_frequencies' %>
+      <%= link_to t("vehicle_journeys.actions.show"), referential_line_route_vehicle_journeys_path(@referential, @line, @route) %>
+    <% else %>
+      <%= link_to t("vehicle_journey_frequencies.actions.show"), referential_line_route_vehicle_journey_frequencies_path(@referential, @line, @route) %>
+    <% end %>
+  </span>
 </div>
 <div class="pagination">
   <%= will_paginate @vehicle_journeys, :container => false, renderer: RemoteBootstrapPaginationLinkRenderer %>
diff --git a/config/locales/lines_en.yml b/config/locales/lines_en.yml
index baaad6bbf..b0200240b 100644
--- a/config/locales/lines_en.yml
+++ b/config/locales/lines_en.yml
@@ -37,7 +37,7 @@ en:
       deselect_all: "Deselect all"
       unset: "undefined"
       advanced_search: "Advanced Search"
-      color: "Colors"
+      color: "Color"
     form:
       group_of_lines: "Associated groups of lines"
       no_group_of_line: "No group of line"
diff --git a/config/locales/lines_fr.yml b/config/locales/lines_fr.yml
index 3661f6856..ad0bee6c2 100644
--- a/config/locales/lines_fr.yml
+++ b/config/locales/lines_fr.yml
@@ -37,7 +37,7 @@ fr:
       deselect_all: "Tout désélectionner"
       unset: "non défini"
       advanced_search: "Recherche avancée"
-      color: "Couleurs"
+      color: "Couleur"
     form:
       group_of_lines: "Groupes de lignes associés"
       no_group_of_line: "Aucun groupe de lignes"
diff --git a/config/locales/vehicle_journey_frequencies.en.yml b/config/locales/vehicle_journey_frequencies.en.yml
index 13c6d4e03..f502ff0ab 100644
--- a/config/locales/vehicle_journey_frequencies.en.yml
+++ b/config/locales/vehicle_journey_frequencies.en.yml
@@ -1,4 +1,7 @@
 en:
   vehicle_journey_frequencies:
     vehicle_journeys_matrix:
-      line_routes: "Séquences d'arrêts de la ligne"
+      line_routes: "Line's routes"
+    actions:
+      index: "Vehicle journey frequency"
+      show: "Show frequency vehicle journey"
diff --git a/config/locales/vehicle_journey_frequencies.fr.yml b/config/locales/vehicle_journey_frequencies.fr.yml
index cc1d003f3..d8bc48b4b 100644
--- a/config/locales/vehicle_journey_frequencies.fr.yml
+++ b/config/locales/vehicle_journey_frequencies.fr.yml
@@ -2,5 +2,6 @@ fr:
   vehicle_journey_frequencies:
     vehicle_journeys_matrix:
       line_routes: Séquences d'arrêts de la ligne
-    vehicle_journeys_page_info:
-      with_matrix_size: "générant %{matrix_size} courses à fréquences"
+    actions:
+      index: "Courses à fréquence"
+      show: "Voir les courses à fréquence"
diff --git a/config/locales/vehicle_journeys.en.yml b/config/locales/vehicle_journeys.en.yml
index 6e8aba661..6d51cc8bf 100644
--- a/config/locales/vehicle_journeys.en.yml
+++ b/config/locales/vehicle_journeys.en.yml
@@ -17,6 +17,7 @@ en:
       edit_frequency: "Edit this frequency vehicle journey"
       destroy: "Remove this vehicle journey"
       destroy_confirm: "Are you sure you want destroy this vehicle journey?"
+      show: "Show timed vehicle journeys"
     new:
       title: "Add a new vehicle journey"
       title_frequency: "Add a new frequency vehicle journey"
diff --git a/config/locales/vehicle_journeys.fr.yml b/config/locales/vehicle_journeys.fr.yml
index b9f155153..98d6c7eb4 100644
--- a/config/locales/vehicle_journeys.fr.yml
+++ b/config/locales/vehicle_journeys.fr.yml
@@ -6,7 +6,7 @@ fr:
       title_stopless: "Course %{name}"
       title: "Course partant de %{stop} à %{time}"
     vehicle_journey_frequency:
-      title_stopless: "Course à fréquence %{name}"
+      title_stopless: "Course à fréquences %{name}"
       title: "Course à fréquence partant de %{stop} à %{time}"
       title_frequency: "Course à fréquence de %{interval}min partant de %{stop} de %{time_first} à %{time_last}"
     actions:
@@ -17,6 +17,7 @@ fr:
       edit_frequency: "Modifier cette course à fréquence"
       destroy: "Supprimer cette course"
       destroy_confirm: "Etes vous sûr de supprimer cette course ?"
+      show: "Voir les courses à horaire"
     new:
       title: "Ajouter une course à horaire"
       title_frequency: "Ajouter une course à fréquence"