Add journey_frequencies fields, locales and some other little update

27 files changed, 195 insertions, 150 deletions

diff --git a/app/views/vehicle_journey_frequencies/_form_footer.html.erb b/app/views/vehicle_journey_frequencies/_form_footer.html.erb
new file mode 100644
index 000000000..35c797a46
--- /dev/null
+++ b/app/views/vehicle_journey_frequencies/_form_footer.html.erb
@@ -0,0 +1,5 @@
+<% if vehicle_journey.new_record? %>
+  <%= javascript_include_tag new_referential_line_route_vehicle_journey_frequency_path(@referential, @line, @route, :format => :js) %>
+<% else %>
+  <%= javascript_include_tag edit_referential_line_route_vehicle_journey_frequency_path(@referential, @line, @route, vehicle_journey, :format => :js) %>
+<% end %>
diff --git a/app/views/vehicle_journey_frequencies/_form_vehicle_journey_at_stops.html.erb b/app/views/vehicle_journey_frequencies/_form_vehicle_journey_at_stops.html.erb
new file mode 100644
index 000000000..558abf0cf
--- /dev/null
+++ b/app/views/vehicle_journey_frequencies/_form_vehicle_journey_at_stops.html.erb
@@ -0,0 +1,59 @@
+<li class="input">
+  <%= form.label vehicle_journey.human_attribute_name(:vehicle_journey_at_stop_ids), :class => "label" %>
+  <table class="table-striped ce-TimeBandFormTable">
+    <thead>
+      <tr>
+        <th>
+          <%= t('vehicle_journeys.form.stop_title') %>
+        </th>
+        <th></th>
+        <th>
+          <%= t('vehicle_journeys.form.arrival') %>
+        </th>
+        <th>
+          <%= t('vehicle_journeys.form.departure') %>
+        </th>
+      </tr>
+    </thead>
+    <tbody class="journey_pattern_dependent_list">
+      <%= render :partial => 'vehicle_journey_at_stop_fields',
+                 :collection => vehicle_journey.vehicle_journey_at_stops, :as => :vehicle_journey_at_stop,
+                 :locals => { :vehicle_journey_at_stops_size => vehicle_journey.vehicle_journey_at_stops.size } %>
+    </tbody>
+    <tfoot>
+      <tr>
+        <td></td>
+        <td></td>
+        <td>
+          <%= button_tag 'data-ce-action' => 'to_departures', class: 'ce-hide btn btn-primary' do %>
+            <%= t('vehicle_journeys.form.to_departures').html_safe %>
+            <i class="fa fa-angle-double-right"></i>
+          <% end %>
+        <td>
+          <%= button_tag 'data-ce-action' => 'to_arrivals', class: 'ce-hide btn btn-primary' do %>
+            <i class="fa fa-angle-double-left"></i>
+            <%= t('vehicle_journeys.form.to_arrivals').html_safe %>
+          <% end %>
+        </td>
+      </tr>
+    </tfoot>
+  </table>
+</li>
+
+<li class="input">
+  <%= form.label vehicle_journey.human_attribute_name(:journey_frequency_ids), :class => "label" %>
+  <ul class="ce-FrequencyFormFields">
+    <li>Plages horaires</li>
+    <li><%= t('activerecord.attributes.journey_frequency.first_departure_time') %></li>
+    <li><%= t('activerecord.attributes.journey_frequency.last_departure_time') %></li>
+    <li><%= t('activerecord.attributes.journey_frequency.scheduled_headway_interval') %></li>
+    <li></li>
+    <li></li>
+  </ul>
+  <% form.semantic_fields_for :journey_frequencies do |journey_frequency| %>
+      <%= render 'journey_frequency_fields', f: journey_frequency %>
+  <% end %>
+  <div class="actions-add-fields">
+    <%= link_to_add_association t('journey_frequencies.form.add_line'), form, :journey_frequencies, class: 'btn btn-primary' %>
+  </div>
+</li>
diff --git a/app/views/vehicle_journey_frequencies/_journey_frequency_fields.html.erb b/app/views/vehicle_journey_frequencies/_journey_frequency_fields.html.erb
new file mode 100644
index 000000000..5d1f923c9
--- /dev/null
+++ b/app/views/vehicle_journey_frequencies/_journey_frequency_fields.html.erb
@@ -0,0 +1,15 @@
+<div class="nested-fields">
+  <ul class="ce-FrequencyFormFields">
+    <li>...</li>
+    <%= f.input :first_departure_time, label: false %>
+    <%= f.input :last_departure_time, label: false %>
+    <%= f.input :scheduled_headway_interval, label: false %>
+    <%= f.input :exact_time, label: t('activerecord.attributes.journey_frequency.exact_time') %>
+    <li>
+      <label class="label"></label>
+      <%= link_to_remove_association f do %>
+        <i class="fa fa-trash"></i>
+      <% end %>
+    </li>
+  </ul>
+</div>
diff --git a/app/views/vehicle_journeys_frequencies/_show_sidebar.html.erb b/app/views/vehicle_journey_frequencies/_show_sidebar.html.erb
index 7be0e4d63..4d89785e0 100644
--- a/app/views/vehicle_journeys_frequencies/_show_sidebar.html.erb
+++ b/app/views/vehicle_journey_frequencies/_show_sidebar.html.erb
@@ -1,8 +1,8 @@
 <% content_for :sidebar do %>
   <ul class="actions">
     <li><%= link_to t('vehicle_journeys.actions.new'), new_referential_line_route_vehicle_journey_path(@referential, @line, @route), :class => "add" %></li>
-    <li><%= link_to t('vehicle_journeys.actions.new_frequency'), new_referential_line_route_vehicle_journeys_frequency_path(@referential, @line, @route), :class => "add" %></li>
-    <li><%= link_to t('vehicle_journeys.actions.edit_frequency'), edit_referential_line_route_vehicle_journeys_frequency_path(@referential, @line, @route, @vehicle_journey), :class => "edit" %></li>
+    <li><%= link_to t('vehicle_journeys.actions.new_frequency'), new_referential_line_route_vehicle_journey_frequency_path(@referential, @line, @route), :class => "add" %></li>
+    <li><%= link_to t('vehicle_journeys.actions.edit_frequency'), edit_referential_line_route_vehicle_journey_frequency_path(@referential, @line, @route, @vehicle_journey), :class => "edit" %></li>
     <li><%= link_to t('vehicle_journeys.actions.destroy'), referential_line_route_vehicle_journey_path(@referential, @line, @route, @vehicle_journey), :method => :delete, :data => {:confirm =>  t('vehicle_journeys.actions.destroy_confirm')}, :class => "remove" %></li>
     <% unless @vehicle_journey.vehicle_journey_at_stops.empty? %>
       <li>
diff --git a/app/views/vehicle_journeys_frequencies/_show_vehicle_journey_at_stops.html.erb b/app/views/vehicle_journey_frequencies/_show_vehicle_journey_at_stops.html.erb
index e69de29bb..e69de29bb 100644
--- a/app/views/vehicle_journeys_frequencies/_show_vehicle_journey_at_stops.html.erb
+++ b/app/views/vehicle_journey_frequencies/_show_vehicle_journey_at_stops.html.erb
diff --git a/app/views/vehicle_journey_frequencies/_vehicle_journey_at_stop_fields.html.erb b/app/views/vehicle_journey_frequencies/_vehicle_journey_at_stop_fields.html.erb
new file mode 100644
index 000000000..e99392a38
--- /dev/null
+++ b/app/views/vehicle_journey_frequencies/_vehicle_journey_at_stop_fields.html.erb
@@ -0,0 +1,48 @@
+<% vjas = vehicle_journey_at_stop
+   tab_counter_arrival = 2 * vehicle_journey_at_stop_counter + 100
+   tab_counter_departure = (vehicle_journey_at_stops_size * 2) + 2 * vehicle_journey_at_stop_counter + 100
+%>
+<tr class="time input optional <%= vjas._destroy ? "no_stop" : "" %> <%= (vehicle_journey_at_stop_counter%2==0) ? "odd" : "even" %>" >
+  <td>
+    <%= {
+          id: vjas.id,
+          _destroy: (vjas._destroy ? 1 : 0),
+          stop_point_id: vjas.stop_point_id,
+          is_frequency: true,
+          :'departure_time(3i)' => 1,
+          :'departure_time(2i)' => 1,
+          :'departure_time(1i)' => 1,
+          :'arrival_time(3i)' => 1,
+          :'arrival_time(2i)' => 1,
+          :'arrival_time(1i)' => 2000
+        }.map{ |k, v|
+          "<input name=\"vehicle_journey[vehicle_journey_at_stops_attributes][#{vehicle_journey_at_stop_counter}][#{k}]\"
+                  type=\"hidden\" value=\"#{v}\">" }.join("\n").html_safe %>
+
+    <%= vjas.stop_point.stop_area.name %>
+  </td>
+  <td class="ce-TimeBandFormTable-circleLine">
+    <span class="ce-TimeBandFormTable-circle"></span>
+    <span class="ce-TimeBandFormTable-line"></span>
+  </td>
+  <td class="arrival_time <%= vjas.arrival_time.nil? ? "missing" : "" %> <%= vjas.errors[:arrival_time].blank? ? "" : "invalid_position" %>">
+    <%= select_hour(vjas.arrival_time ? vjas.arrival_time.hour : 0,
+                    { :prefix => "vehicle_journey",
+                      :field_name => "vehicle_journey_at_stops_attributes[#{vehicle_journey_at_stop_counter}][arrival_time(4i)]" },
+                    :class => "hour", tabindex: tab_counter_arrival + 1) %>
+    <%= select_minute(vjas.arrival_time ? vjas.arrival_time.min : 0,
+                      { :prefix => "vehicle_journey",
+                        :field_name => "vehicle_journey_at_stops_attributes[#{vehicle_journey_at_stop_counter}][arrival_time(5i)]" },
+                      :class => "minute", tabindex: tab_counter_arrival + 2) %>
+  </td>
+  <td class="departure_time <%= vjas.departure_time.nil? ? "missing" : "" %> <%= vjas.errors[:departure_time].blank? ? "" : "invalid_position" %>">
+    <%= select_hour(vjas.departure_time ? vjas.departure_time.hour : 0,
+                    { :prefix => 'vehicle_journey',
+                      :field_name => "vehicle_journey_at_stops_attributes[#{vehicle_journey_at_stop_counter}][departure_time(4i)]" },
+                    :class => 'hour', tabindex: tab_counter_departure + 1) %>
+    <%= select_minute(vjas.departure_time ? vjas.departure_time.min : 0,
+                      { :prefix => 'vehicle_journey',
+                        :field_name => "vehicle_journey_at_stops_attributes[#{vehicle_journey_at_stop_counter}][departure_time(5i)]" },
+                      :class => 'minute', tabindex: tab_counter_departure + 2) %>
+  </td>
+</tr>
diff --git a/app/views/vehicle_journey_frequencies/edit.html.erb b/app/views/vehicle_journey_frequencies/edit.html.erb
new file mode 100644
index 000000000..233f2f18d
--- /dev/null
+++ b/app/views/vehicle_journey_frequencies/edit.html.erb
@@ -0,0 +1,3 @@
+<%= title_tag edit_vehicle_title(@vehicle_journey_frequency) %>
+
+<%= render 'vehicle_journeys/form', vehicle_journey: @vehicle_journey_frequency form_url: referential_line_route_vehicle_journey_frequency_path(@referential, @line, @route, id: @vehicle_journey_frequency) %>
diff --git a/app/views/vehicle_journey_frequencies/new.html.erb b/app/views/vehicle_journey_frequencies/new.html.erb
new file mode 100644
index 000000000..354f49169
--- /dev/null
+++ b/app/views/vehicle_journey_frequencies/new.html.erb
@@ -0,0 +1,3 @@
+<%= title_tag t('vehicle_journeys.new.title_frequency') %>
+
+<%= render 'vehicle_journeys/form', vehicle_journey: @vehicle_journey_frequency, form_url: referential_line_route_vehicle_journey_frequencies_path(@referential, @line, @route) %>
diff --git a/app/views/vehicle_journey_frequencies/new.js.erb b/app/views/vehicle_journey_frequencies/new.js.erb
new file mode 100644
index 000000000..6310d14b3
--- /dev/null
+++ b/app/views/vehicle_journey_frequencies/new.js.erb
@@ -0,0 +1,13 @@
+$(document).ready(function() {
+  $("#vehicle_journey_frequency_journey_pattern_id").change(
+      function(){
+        var vehicle_journey_journey_pattern_id = $("#vehicle_journey_frequency_journey_pattern_input select option:selected").attr("value");
+        if (vehicle_journey_journey_pattern_id > 0) {
+          var url = "<%= referential_line_route_journey_patterns_path(@referential.id,@line.id,@route.id) %>";
+          url = url + "/" + vehicle_journey_journey_pattern_id +
+              "/new_vehicle_journey?journey_category=frequency";
+          $.get(url);
+        }
+      }
+  )
+});
diff --git a/app/views/vehicle_journeys_frequencies/select_journey_pattern.js.erb b/app/views/vehicle_journey_frequencies/select_journey_pattern.js.erb
index 59e9e2f4a..0f287cc27 100644
--- a/app/views/vehicle_journeys_frequencies/select_journey_pattern.js.erb
+++ b/app/views/vehicle_journey_frequencies/select_journey_pattern.js.erb
@@ -1,5 +1,7 @@
-$('.journey_pattern_dependent_list').html('<%= escape_javascript(
-  render(:partial => "vehicle_journeys_frequencies/vehicle_journey_at_stop_fields",
+var $selector = $('.journey_pattern_dependent_list');
+$selector.html('<%= escape_javascript(
+  render(:partial => "vehicle_journey_frequencies/vehicle_journey_at_stop_fields",
          :collection => @vehicle_journey.vehicle_journey_at_stops,
          :as => :vehicle_journey_at_stop,
          :locals => { :vehicle_journey_at_stops_size => @vehicle_journey.vehicle_journey_at_stops.size })).html_safe %>');
+$selector.closest('table').show();
diff --git a/app/views/vehicle_journeys/_form.html.erb b/app/views/vehicle_journeys/_form.html.erb
index 627b2fa60..10d9bfeee 100644
--- a/app/views/vehicle_journeys/_form.html.erb
+++ b/app/views/vehicle_journeys/_form.html.erb
@@ -1,32 +1,28 @@
-<%= semantic_form_for @vehicle_journey, url: form_url do |form| %>
+<%= semantic_form_for vehicle_journey, url: form_url do |form| %>
   <%= form.inputs do %>
-    <%= form.input :is_frequency, as: :hidden %>
     <%= form.input :journey_pattern, :as => :select, :collection => @route.journey_patterns, :member_label => Proc.new { |jp| journey_name(jp) }  %>
     <%= form.input :number %>
     <%= form.input :published_journey_name %>
     <%= form.input :published_journey_identifier %>
     <%= form.input :comment %>
     <%= form.input :transport_mode_name, :as => :select, :collection => Chouette::Line.transport_modes, :include_blank => true, :member_label => Proc.new { |mode| t("transport_modes.label.#{mode}") }  %>
-    <%= form.input :mobility_restricted_suitability, :as => :select, :collection => [[@vehicle_journey.human_attribute_name("accessible"), true], [@vehicle_journey.human_attribute_name("not_accessible"), false]], :include_blank => true %>
-    <%= form.input :flexible_service, :as => :select, :collection => [[@vehicle_journey.human_attribute_name("on_demand_fs"), true], [@vehicle_journey.human_attribute_name("regular_fs"), false]], :include_blank => true %>
+    <%= form.input :mobility_restricted_suitability, :as => :select, :collection => [[vehicle_journey.human_attribute_name("accessible"), true], [vehicle_journey.human_attribute_name("not_accessible"), false]], :include_blank => true %>
+    <%= form.input :flexible_service, :as => :select, :collection => [[vehicle_journey.human_attribute_name("on_demand_fs"), true], [vehicle_journey.human_attribute_name("regular_fs"), false]], :include_blank => true %>
     <%= form.input :status_value %>
     <%= form.input :facility %>
     <%= form.input :vehicle_type_identifier%>
-    <%= form.input :objectid, :required => !@vehicle_journey.new_record?, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.vehicle_journey.objectid")} %>
-    <%= form.input :time_table_tokens, :label => t('.time_tables'), :as => :search_time_table, :json => referential_autocomplete_time_tables_path(@referential, :format => :json), :hint_text => t('search_hint'), :no_result_text => t('no_result_text'),:searching_text => t('searching_term'),  :input_html => { :"data-pre" => Rabl::Renderer.new( 'autocomplete_time_tables/index', @vehicle_journey.time_tables, :view_path => 'app/views', :format => :json, :scope => :self ).render }  %>
+    <%= form.input :objectid, :required => !vehicle_journey.new_record?, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.vehicle_journey.objectid")} %>
+    <%= form.input :time_table_tokens, :label => t('.time_tables'), :as => :search_time_table, :json => referential_autocomplete_time_tables_path(@referential, :format => :json), :hint_text => t('search_hint'), :no_result_text => t('no_result_text'),:searching_text => t('searching_term'),  :input_html => { :"data-pre" => Rabl::Renderer.new( 'autocomplete_time_tables/index', vehicle_journey.time_tables, :view_path => 'app/views', :format => :json, :scope => :self ).render }  %>
     <%= form.input :footnote_ids, :as => :check_boxes, :collection => @line.footnotes.map { |f| [ "#{f.code}: #{f.label}", f.id.to_s]} %>
-    <li class="input">
-	    <%= form.label @vehicle_journey.human_attribute_name(:vehicle_journey_at_stop_ids), :class => "label" %>
-    </li>
 
-    <%= render 'form_vehicle_journey_at_stops', form: form %>
+    <%= render 'form_vehicle_journey_at_stops', vehicle_journey: vehicle_journey, form: form %>
 
   <% end %>
 
   <%= form.actions do %>
-    <%= form.action :submit, as: :button, label: t(".submit_#{@vehicle_journey.vehicle_journey_type}") %>
+    <%= form.action :submit, as: :button, label: t(".submit_#{vehicle_journey.journey_category}") %>
     <%= form.action :cancel, as: :link %>
   <% end %>
 <% end %>
 
-<%= render 'form_footer' %>
+<%= render 'form_footer', vehicle_journey: vehicle_journey %>
diff --git a/app/views/vehicle_journeys/_form_footer.html.erb b/app/views/vehicle_journeys/_form_footer.html.erb
index 1a5259348..c4c51b2b3 100644
--- a/app/views/vehicle_journeys/_form_footer.html.erb
+++ b/app/views/vehicle_journeys/_form_footer.html.erb
@@ -1,5 +1,5 @@
-<% if @vehicle_journey.new_record? %>
+<% if vehicle_journey.new_record? %>
   <%= javascript_include_tag new_referential_line_route_vehicle_journey_path(@referential, @line, @route, :format => :js) %>
 <% else %>
-  <%= javascript_include_tag edit_referential_line_route_vehicle_journey_path(@referential, @line, @route, @vehicle_journey, :format => :js) %>
+  <%= javascript_include_tag edit_referential_line_route_vehicle_journey_path(@referential, @line, @route, vehicle_journey, :format => :js) %>
 <% end %>
diff --git a/app/views/vehicle_journeys/_form_vehicle_journey_at_stops.html.erb b/app/views/vehicle_journeys/_form_vehicle_journey_at_stops.html.erb
index 826733135..7e9bc1b38 100644
--- a/app/views/vehicle_journeys/_form_vehicle_journey_at_stops.html.erb
+++ b/app/views/vehicle_journeys/_form_vehicle_journey_at_stops.html.erb
@@ -1,4 +1,7 @@
-<% unless @vehicle_journey.vehicle_journey_at_stops.empty? || @vehicle_journey.vehicle_journey_at_stops.any? { |vjas| vjas.departure_time.nil? } %>
+<li class="input">
+  <%= form.label vehicle_journey.human_attribute_name(:vehicle_journey_at_stop_ids), :class => "label" %>
+</li>
+<% unless vehicle_journey.vehicle_journey_at_stops.empty? || vehicle_journey.vehicle_journey_at_stops.any? { |vjas| vjas.departure_time.nil? } %>
   <div class="vehicle_journey_at_stops">
     <div class="well">
       <span class="title"><%= t('vehicle_journeys.form.slide_title') %></span>
@@ -6,8 +9,8 @@
         <span><%= t('vehicle_journeys.form.set') %></span>
         <%= select_tag '', options_for_select( [ [t('vehicle_journeys.form.slide_departure'), "departure"], [t('vehicle_journeys.form.slide_arrival'), "arrival"] ] ), :class => "departure_or_arrival" %>
         <span><%= t('vehicle_journeys.form.to') %></span>
-        <%= select_hour(@vehicle_journey.vehicle_journey_at_stops.first.departure_time.hour) %>
-        <%= select_minute(@vehicle_journey.vehicle_journey_at_stops.first.departure_time.min) %>
+        <%= select_hour(vehicle_journey.vehicle_journey_at_stops.first.departure_time.hour) %>
+        <%= select_minute(vehicle_journey.vehicle_journey_at_stops.first.departure_time.min) %>
         <a class="slide btn btn-default"><%= t('vehicle_journeys.form.slide') %></a>
       </div>
     </div>
@@ -24,14 +27,23 @@
   </thead>
   <tfoot>
     <tr>
-      <td class="title"><a class="to_departures"><%= t('vehicle_journeys.form.to_departures') %></a></td>
+      <td class="title">
+        <%= button_tag 'data-ce-action' => 'to_departures', class: 'ce-hide btn btn-primary' do %>
+          <%= t('vehicle_journeys.form.to_departures').html_safe %>
+          <i class="fa fa-angle-double-right"></i>
+        <% end %>
       <td class="title"></td>
-      <td class="title"><a class="to_arrivals"><%= t('vehicle_journeys.form.to_arrivals') %></a></td>
+      <td class="title">
+        <%= button_tag 'data-ce-action' => 'to_arrivals', class: 'ce-hide btn btn-primary' do %>
+          <i class="fa fa-angle-double-left"></i>
+          <%= t('vehicle_journeys.form.to_arrivals').html_safe %>
+        <% end %>
+      </td>
     </tr>
   </tfoot>
   <tbody class="journey_pattern_dependent_list">
     <%= render :partial => "vehicle_journeys/vehicle_journey_at_stop_fields",
-               :collection => @vehicle_journey.vehicle_journey_at_stops, :as => :vehicle_journey_at_stop,
-               :locals => { :vehicle_journey_at_stops_size => @vehicle_journey.vehicle_journey_at_stops.size } %>
+               :collection => vehicle_journey.vehicle_journey_at_stops, :as => :vehicle_journey_at_stop,
+               :locals => { :vehicle_journey_at_stops_size => vehicle_journey.vehicle_journey_at_stops.size } %>
   </tbody>
 </table>
diff --git a/app/views/vehicle_journeys/_show_sidebar.html.erb b/app/views/vehicle_journeys/_show_sidebar.html.erb
index e649edaef..5ab7d449a 100644
--- a/app/views/vehicle_journeys/_show_sidebar.html.erb
+++ b/app/views/vehicle_journeys/_show_sidebar.html.erb
@@ -1,7 +1,7 @@
 <% content_for :sidebar do %>
   <ul class="actions">
     <li><%= link_to t('vehicle_journeys.actions.new'), new_referential_line_route_vehicle_journey_path(@referential, @line, @route), :class => "add" %></li>
-    <li><%= link_to t('vehicle_journeys.actions.new_frequency'), new_referential_line_route_vehicle_journeys_frequency_path(@referential, @line, @route), :class => "add" %></li>
+    <li><%= link_to t('vehicle_journeys.actions.new_frequency'), new_referential_line_route_vehicle_journey_frequency_path(@referential, @line, @route), :class => "add" %></li>
     <li><%= link_to t('vehicle_journeys.actions.edit'), edit_referential_line_route_vehicle_journey_path(@referential, @line, @route, @vehicle_journey), :class => "edit" %></li>
     <li><%= link_to t('vehicle_journeys.actions.destroy'), referential_line_route_vehicle_journey_path(@referential, @line, @route, @vehicle_journey), :method => :delete, :data => {:confirm =>  t('vehicle_journeys.actions.destroy_confirm')}, :class => "remove" %></li>
     <% unless @vehicle_journey.vehicle_journey_at_stops.empty? %>
diff --git a/app/views/vehicle_journeys/_show_vehicle_journey_at_stops.html.erb b/app/views/vehicle_journeys/_show_vehicle_journey_at_stops.html.erb
index e2e0ef82e..cb4a95263 100644
--- a/app/views/vehicle_journeys/_show_vehicle_journey_at_stops.html.erb
+++ b/app/views/vehicle_journeys/_show_vehicle_journey_at_stops.html.erb
@@ -2,9 +2,9 @@
   <table class="table table-hover table-striped">
     <thead>
     <tr>
-      <th class="hour title"><%= t('.arrival') %></th>
-      <th class="stop title" ><%= t('.stop_title') %></th>
-      <th class="hour title"><%= t('.departure') %></th>
+      <th class="hour title"><%= t('vehicle_journeys.show.arrival') %></th>
+      <th class="stop title" ><%= t('vehicle_journeys.show.stop_title') %></th>
+      <th class="hour title"><%= t('vehicle_journeys.show.departure') %></th>
     </tr>
     <thead>
     <tbody>
diff --git a/app/views/vehicle_journeys/_sidebar.html.erb b/app/views/vehicle_journeys/_sidebar.html.erb
index 4522fa109..11260cd7b 100644
--- a/app/views/vehicle_journeys/_sidebar.html.erb
+++ b/app/views/vehicle_journeys/_sidebar.html.erb
@@ -1,6 +1,6 @@
 <ul class="actions">
   <li><%= link_to t('vehicle_journeys.actions.new'), new_referential_line_route_vehicle_journey_path(@referential, @line, @route), :class => "add" %></li>
-  <li><%= link_to t('vehicle_journeys.actions.new_frequency'), new_referential_line_route_vehicle_journeys_frequency_path(@referential, @line, @route), :class => "add" %></li>
+  <li><%= link_to t('vehicle_journeys.actions.new_frequency'), new_referential_line_route_vehicle_journey_frequency_path(@referential, @line, @route), :class => "add" %></li>
   <li><%= link_to t('vehicle_journey_imports.new.title'), new_referential_line_route_vehicle_journey_import_path( @referential, @line, @route ), :class => "import" %></li>
   <li><%= link_to t('vehicle_journey_exports.new.title'), referential_line_route_vehicle_journey_exports_path(@referential, @line, @route, :format => :zip), :class => "export" %></li>
 </ul>
diff --git a/app/views/vehicle_journeys/edit.html.erb b/app/views/vehicle_journeys/edit.html.erb
index 2d87ffe57..0d3a2db96 100644
--- a/app/views/vehicle_journeys/edit.html.erb
+++ b/app/views/vehicle_journeys/edit.html.erb
@@ -1,5 +1,5 @@
 <%= title_tag edit_vehicle_title(@vehicle_journey) %>
 
-<%= render 'form', form_url: referential_line_route_vehicle_journey_path(@referential, @line, @route, @vehicle_journey) %>
+<%= render 'form', vehicle_journey: @vehicle_journey, form_url: referential_line_route_vehicle_journey_path(@referential, @line, @route, @vehicle_journey) %>
 
 
diff --git a/app/views/vehicle_journeys/new.html.erb b/app/views/vehicle_journeys/new.html.erb
index 19b31e422..c3354449a 100644
--- a/app/views/vehicle_journeys/new.html.erb
+++ b/app/views/vehicle_journeys/new.html.erb
@@ -1,4 +1,4 @@
 <%= title_tag t('vehicle_journeys.new.title') %>
 
-<%= render partial: 'form', locals: { form_url: referential_line_route_vehicle_journeys_path(@referential, @line, @route, @vehicle_journey) } %>
+<%= render partial: 'form', locals: { vehicle_journey: @vehicle_journey, form_url: referential_line_route_vehicle_journeys_path(@referential, @line, @route, @vehicle_journey) } %>
 
diff --git a/app/views/vehicle_journeys/new.js.erb b/app/views/vehicle_journeys/new.js.erb
index 65e5dfccb..160e7a34b 100644
--- a/app/views/vehicle_journeys/new.js.erb
+++ b/app/views/vehicle_journeys/new.js.erb
@@ -1,10 +1,13 @@
 $(document).ready(function() {
   $("#vehicle_journey_journey_pattern_id").change(
     function(){
-      var url = "<%= referential_line_route_journey_patterns_path(@referential.id,@line.id,@route.id) %>";
-      url = url + "/" + $("#vehicle_journey_journey_pattern_input select option:selected").attr("value") +
-        "/new_vehicle_journey";
-      $.get(url);
+      var vehicle_journey_journey_pattern_id = $("#vehicle_journey_journey_pattern_input select option:selected").attr("value");
+      if (vehicle_journey_journey_pattern_id > 0) {
+        var url = "<%= referential_line_route_journey_patterns_path(@referential.id,@line.id,@route.id) %>";
+        url = url + "/" + vehicle_journey_journey_pattern_id +
+                "/new_vehicle_journey";
+        $.get(url);
+      }
     }
   )
 });
diff --git a/app/views/vehicle_journeys_frequencies/_form_footer.html.erb b/app/views/vehicle_journeys_frequencies/_form_footer.html.erb
deleted file mode 100644
index 1217e2c08..000000000
--- a/app/views/vehicle_journeys_frequencies/_form_footer.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% if @vehicle_journey.new_record? %>
-  <%= javascript_include_tag new_referential_line_route_vehicle_journeys_frequency_path(@referential, @line, @route, :format => :js) %>
-<% else %>
-  <%= javascript_include_tag edit_referential_line_route_vehicle_journeys_frequency_path(@referential, @line, @route, @vehicle_journey, :format => :js) %>
-<% end %>
diff --git a/app/views/vehicle_journeys_frequencies/_form_vehicle_journey_at_stops.html.erb b/app/views/vehicle_journeys_frequencies/_form_vehicle_journey_at_stops.html.erb
deleted file mode 100644
index 4bbb0671d..000000000
--- a/app/views/vehicle_journeys_frequencies/_form_vehicle_journey_at_stops.html.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<li class="input">
-  <label class="label">Durée d'intervalle du trajet</label>
-  <table class="journey_pattern_dependent_list ce-TimeBandFormTable">
-    <%= render :partial => 'vehicle_journey_at_stop_fields',
-               :collection => @vehicle_journey.vehicle_journey_at_stops, :as => :vehicle_journey_at_stop,
-               :locals => { :vehicle_journey_at_stops_size => @vehicle_journey.vehicle_journey_at_stops.size } %>
-  </table>
-</li>
-
-<% form.semantic_fields_for :frequencies do |frequency| %>
-  <%= render 'frequency_fields', f: frequency %>
-<% end %>
-
-<li class="input">
-  <label class="label"></label>
-  <%= link_to_add_association t('frequencies.form.add_frequency_line'), form, :frequencies, class: 'btn btn-primary' %>
-</li>
diff --git a/app/views/vehicle_journeys_frequencies/_frequency.html.erb b/app/views/vehicle_journeys_frequencies/_frequency.html.erb
deleted file mode 100644
index a0d4d3ca5..000000000
--- a/app/views/vehicle_journeys_frequencies/_frequency.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<tr>
-  <td></td>
-  <td><%= frequency.first_departure_time %></td>
-  <td><%= frequency.last_departure_time %></td>
-  <td><%= frequency.scheduled_headway_interval %></td>
-  <td><%= frequency.exact_time %></td>
-  <td><i class="fa fa-trash"></i></td>
-</tr>
diff --git a/app/views/vehicle_journeys_frequencies/_frequency_fields.html.erb b/app/views/vehicle_journeys_frequencies/_frequency_fields.html.erb
deleted file mode 100644
index 57a0baf3d..000000000
--- a/app/views/vehicle_journeys_frequencies/_frequency_fields.html.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<li class="nested-fields">
-  <ul class="ce-FrequencyFormFields">
-    <%= f.input :first_departure_time %>
-    <%= f.input :last_departure_time %>
-    <%= f.input :scheduled_headway_interval %>
-    <%= f.input :exact_time %>
-    <li>
-      <label class="label"></label>
-      <%= link_to_remove_association f do %>
-        <i class="fa fa-trash"></i>
-      <% end %>
-    </li>
-  </ul>
-</li>
diff --git a/app/views/vehicle_journeys_frequencies/_vehicle_journey_at_stop_fields.html.erb b/app/views/vehicle_journeys_frequencies/_vehicle_journey_at_stop_fields.html.erb
deleted file mode 100644
index 44da12328..000000000
--- a/app/views/vehicle_journeys_frequencies/_vehicle_journey_at_stop_fields.html.erb
+++ /dev/null
@@ -1,54 +0,0 @@
-<% vjas = vehicle_journey_at_stop
-   tab_counter_arrival = 2 * vehicle_journey_at_stop_counter + 100
-   tab_counter_departure = (vehicle_journey_at_stops_size * 2) + 2 * vehicle_journey_at_stop_counter + 100
-%>
-<tr>
-  <td>
-    <%= {
-          id: vjas.id,
-          _destroy: (vjas._destroy ? 1 : 0),
-          stop_point_id: vjas.stop_point_id,
-          is_frequency: true,
-          :'departure_time(3i)' => 1,
-          :'departure_time(2i)' => 1,
-          :'departure_time(1i)' => 1,
-          :'arrival_time(3i)' => 1,
-          :'arrival_time(2i)' => 1,
-          :'arrival_time(1i)' => 2000
-        }.map{ |k, v|
-          "<input name=\"vehicle_journey[vehicle_journey_at_stops_attributes][#{vehicle_journey_at_stop_counter}][#{k}]\"
-                  type=\"hidden\" value=\"#{v}\">" }.join("\n").html_safe %>
-
-    <%= vjas.stop_point.stop_area.name %>
-  </td>
-  <td class="ce-TimeBandFormTable-circleLine">
-    <span class="ce-TimeBandFormTable-circle"></span>
-    <span class="ce-TimeBandFormTable-line"></span>
-  </td>
-  <td>
-    <ul class="ce-TimeBandFormTable-subList">
-      <li>
-        <span>Durée d'attente</span>
-        <%= select_hour(vjas.arrival_time ? vjas.arrival_time.hour : 0,
-                        { :prefix => "vehicle_journey",
-                          :field_name => "vehicle_journey_at_stops_attributes[#{vehicle_journey_at_stop_counter}][arrival_time(4i)]" },
-                        :class => "hour") %>
-        <%= select_minute(vjas.arrival_time ? vjas.arrival_time.min : 0,
-                          { :prefix => "vehicle_journey",
-                            :field_name => "vehicle_journey_at_stops_attributes[#{vehicle_journey_at_stop_counter}][arrival_time(5i)]" },
-                          :class => "minute") %>
-      </li>
-      <li>
-        <span>Durée de parcours</span>
-        <%= select_hour(vjas.departure_time ? vjas.departure_time.hour : 0,
-                        { :prefix => 'vehicle_journey',
-                          :field_name => "vehicle_journey_at_stops_attributes[#{vehicle_journey_at_stop_counter}][departure_time(4i)]" },
-                        :class => 'hour') %>
-        <%= select_minute(vjas.departure_time ? vjas.departure_time.min : 0,
-                          { :prefix => 'vehicle_journey',
-                            :field_name => "vehicle_journey_at_stops_attributes[#{vehicle_journey_at_stop_counter}][departure_time(5i)]" },
-                          :class => 'minute') %>
-      </li>
-    </ul>
-  </td>
-</tr>
diff --git a/app/views/vehicle_journeys_frequencies/edit.html.erb b/app/views/vehicle_journeys_frequencies/edit.html.erb
deleted file mode 100644
index 8b9942d95..000000000
--- a/app/views/vehicle_journeys_frequencies/edit.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= title_tag edit_vehicle_title(@vehicle_journey) %>
-
-<%= render 'vehicle_journeys/form', form_url: referential_line_route_vehicle_journeys_frequency_path(@referential, @line, @route, id: @vehicle_journey) %>
diff --git a/app/views/vehicle_journeys_frequencies/new.html.erb b/app/views/vehicle_journeys_frequencies/new.html.erb
deleted file mode 100644
index 67ff079a3..000000000
--- a/app/views/vehicle_journeys_frequencies/new.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= title_tag t('vehicle_journeys.new.title_frequency') %>
-
-<%= render 'vehicle_journeys/form', form_url: referential_line_route_vehicle_journeys_frequencies_path(@referential, @line, @route, @vehicle_journey) %>
diff --git a/app/views/vehicle_journeys_frequencies/new.js.erb b/app/views/vehicle_journeys_frequencies/new.js.erb
deleted file mode 100644
index c6fb98b22..000000000
--- a/app/views/vehicle_journeys_frequencies/new.js.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-$(document).ready(function() {
-  $("#vehicle_journey_journey_pattern_id").change(
-      function(){
-        var url = "<%= referential_line_route_journey_patterns_path(@referential.id,@line.id,@route.id) %>";
-        url = url + "/" + $("#vehicle_journey_journey_pattern_input select option:selected").attr("value") +
-            "/new_vehicle_journey?suffix=frequencies";
-        $.get(url);
-      }
-  )
-});