Update vehicle_journey view and prepare to the matrix

6 files changed, 23 insertions, 5 deletions

diff --git a/app/assets/stylesheets/main/vehicle_journey_frequencies.scss b/app/assets/stylesheets/main/vehicle_journey_frequencies.scss
index a60fa5218..00b68f263 100644
--- a/app/assets/stylesheets/main/vehicle_journey_frequencies.scss
+++ b/app/assets/stylesheets/main/vehicle_journey_frequencies.scss
@@ -97,4 +97,7 @@
       margin-top: 10px;
     }
   }
+  td.ce-VehicleJourneyBlock-frequency {
+    background-color: rgba(95, 95, 95, 0.2);
+  }
 }
diff --git a/app/helpers/vehicle_journeys_helper.rb b/app/helpers/vehicle_journeys_helper.rb
index 95741f441..3b2649b34 100644
--- a/app/helpers/vehicle_journeys_helper.rb
+++ b/app/helpers/vehicle_journeys_helper.rb
@@ -23,9 +23,9 @@ module VehicleJourneysHelper
   end
   
   def vehicle_title( vehicle)
-    return t('vehicle_journeys.vehicle_journey.title_stopless', :name => vehicle_name( vehicle)) if vehicle.vehicle_journey_at_stops.empty?
+    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', 
+    t("vehicle_journeys.vehicle_journey#{'_frequency' if vehicle.frequency?}.title",
           :stop => first_vjas.stop_point.stop_area.name,
           :time => vehicle_departure(vehicle))
   end
diff --git a/app/views/vehicle_journey_frequencies/_journey_frequency_fields.html.erb b/app/views/vehicle_journey_frequencies/_journey_frequency_fields.html.erb
index 3a944e53e..9370fc8d3 100644
--- a/app/views/vehicle_journey_frequencies/_journey_frequency_fields.html.erb
+++ b/app/views/vehicle_journey_frequencies/_journey_frequency_fields.html.erb
@@ -1,6 +1,6 @@
 <div class="nested-fields">
   <ul class="ce-FrequencyFormFields">
-    <%= f.input :timeband, collection: Chouette::Timeband.all, label: false %>
+    <%= f.input :timeband, collection: Chouette::Timeband.all.map{ |timeband| [timeband.fullname, timeband.id] }, label: false %>
     <%= f.input :first_departure_time, label: false %>
     <%= f.input :last_departure_time, label: false %>
     <%= f.input :scheduled_headway_interval, label: false %>
diff --git a/app/views/vehicle_journeys/_vehicle_journeys.html.erb b/app/views/vehicle_journeys/_vehicle_journeys.html.erb
index ecdb12c6e..b810ae71d 100644
--- a/app/views/vehicle_journeys/_vehicle_journeys.html.erb
+++ b/app/views/vehicle_journeys/_vehicle_journeys.html.erb
@@ -13,7 +13,16 @@
       </th>
       <% @vehicle_journeys.each do |vj| %>
       <th class="vehicle_journey">
-        <button data-style="primary" data-container="body" rel="popover" data-toggle="popover" data-title='<%= link_to(vehicle_title(vj), [@referential, @line, @route, vj] ) %> <%= link_to('<span class="fa fa-pencil"></span>'.html_safe, ["edit", @referential, @line, @route, vj], :class => "btn btn-default btn-sm" ) %>' data-placement= "top" data-content='<%= render( partial: "show_popover", :locals => { :vehicle_journey => vj }) %>' class="vehicle_journey_popover btn btn-default btn-sm"><i class='fa fa-search'></i></button>
+        <button data-style="primary" data-container="body" rel="popover" data-toggle="popover"
+                data-title='<%= link_to(vehicle_title(vj), [@referential, @line, @route, vj] ) %>
+                <%= link_to('<span class="fa fa-pencil"></span>'.html_safe,
+                            send("edit_referential_line_route_vehicle_journey#{'_frequency' if vj.frequency?}_path", @referential, @line, @route, vj),
+                            :class => "btn btn-default btn-sm" ) %>'
+                data-placement= "top"
+                data-content='<%= render( partial: "show_popover", :locals => { :vehicle_journey => vj }) %>'
+                class="vehicle_journey_popover btn btn-default btn-sm">
+          <i class='fa fa-search'></i>
+        </button>
       </th>
       <% end %>
     </tr>
@@ -23,7 +32,7 @@
   <tr class="<%= cycle('odd', 'even') %>">
     <td class="stop_area"><%= sp.stop_area.name %></td>
     <% @vehicle_journeys.each do |vj| %>
-      <td class="hours <%= missing_time_check(@matrix["#{vj.id}-#{sp.id}"]) %>">
+      <td class="hours <%= missing_time_check(@matrix["#{vj.id}-#{sp.id}"]) %><%= ' ce-VehicleJourneyBlock-frequency' if vj.frequency? %>">
         <%= (@matrix["#{vj.id}-#{sp.id}"] && @matrix["#{vj.id}-#{sp.id}"].departure_time) ? l( @matrix["#{vj.id}-#{sp.id}"].departure_time, :format => :hour) : "--" %>
       </td>
     <% end %>
diff --git a/config/locales/vehicle_journeys.en.yml b/config/locales/vehicle_journeys.en.yml
index 83e758394..b0314105c 100644
--- a/config/locales/vehicle_journeys.en.yml
+++ b/config/locales/vehicle_journeys.en.yml
@@ -5,6 +5,9 @@ en:
     vehicle_journey:
       title_stopless: "Vehicle journey %{name}"
       title: "Vehicle journey leaving from %{stop} at %{time}"
+    vehicle_journey_frequency:
+      title_stopless: "Vehicle journey frequency %{name}"
+      title: "Vehicle journey frequency leaving from %{stop} at %{time}"
     actions:
       index: "Vehicle time's board"
       new: "Add a new timed vehicle journey"
diff --git a/config/locales/vehicle_journeys.fr.yml b/config/locales/vehicle_journeys.fr.yml
index ea223ea06..984a3ce7a 100644
--- a/config/locales/vehicle_journeys.fr.yml
+++ b/config/locales/vehicle_journeys.fr.yml
@@ -5,6 +5,9 @@ fr:
     vehicle_journey:
       title_stopless: "Course %{name}"
       title: "Course partant de %{stop} à %{time}"
+    vehicle_journey_frequency:
+      title_stopless: "Course à fréquence %{name}"
+      title: "Course à fréquence partant de %{stop} à %{time}"
     actions:
       index: "Horaires des courses"
       new: "Ajouter une course à horaire"