Update for frequencies

8 files changed, 23 insertions, 9 deletions

diff --git a/app/views/shared/_form_messages.html.erb b/app/views/shared/_form_messages.html.erb
new file mode 100644
index 000000000..6eca2e69f
--- /dev/null
+++ b/app/views/shared/_form_messages.html.erb
@@ -0,0 +1,7 @@
+<% if errors.any? %>
+  <% errors.full_messages.each do |message| %>
+    <div class="alert alert-danger" role="alert">
+      <%= message %>
+    </div>
+  <% end %>
+<% end %>
diff --git a/app/views/vehicle_journeys/_form.html.erb b/app/views/vehicle_journeys/_form.html.erb
index b7781d019..71f653b5c 100644
--- a/app/views/vehicle_journeys/_form.html.erb
+++ b/app/views/vehicle_journeys/_form.html.erb
@@ -1,4 +1,5 @@
 <%= semantic_form_for vehicle_journey, url: form_url do |form| %>
+  <%= render 'shared/form_messages', { errors: vehicle_journey.errors } %>
   <%= form.inputs do %>
     <%= form.input :journey_pattern, :as => :select, :collection => @route.journey_patterns, :member_label => Proc.new { |jp| journey_name(jp) }  %>
     <%= form.input :number %>
@@ -20,7 +21,7 @@
   <% end %>
 
   <%= form.actions do %>
-    <%= form.action :submit, as: :button, label: t(".submit_#{vehicle_journey.journey_category}#{'_edit' unless form.object.new_record?}") %>
+    <%= form.action :submit, as: :button, label: t(".submit_#{vehicle_journey.journey_category}#{'_edit' unless form.object.new_record?}"), button_html: { class: 'btn btn-primary' } %>
     <%= form.action :cancel, as: :link %>
   <% end %>
 <% end %>
diff --git a/config/locales/journey_frequencies.en.yml b/config/locales/journey_frequencies.en.yml
index ad4a92432..b6303c248 100644
--- a/config/locales/journey_frequencies.en.yml
+++ b/config/locales/journey_frequencies.en.yml
@@ -2,7 +2,7 @@ en:
   journey_frequencies:
     time_band: Time band
     form:
-      add_line: Add a line
+      add_line: Add a timeband
   activerecord:
     attributes:
       journey_frequency:
diff --git a/config/locales/journey_frequencies.fr.yml b/config/locales/journey_frequencies.fr.yml
index a168117d5..7c5a25c73 100644
--- a/config/locales/journey_frequencies.fr.yml
+++ b/config/locales/journey_frequencies.fr.yml
@@ -2,7 +2,7 @@ fr:
   journey_frequencies:
     time_band: Créneaux horaires
     form:
-      add_line: Ajouter une ligne
+      add_line: Ajouter un créneau
   activerecord:
     attributes:
       journey_frequency:
diff --git a/config/locales/vehicle_journey_frequencies.en.yml b/config/locales/vehicle_journey_frequencies.en.yml
index f502ff0ab..a89110872 100644
--- a/config/locales/vehicle_journey_frequencies.en.yml
+++ b/config/locales/vehicle_journey_frequencies.en.yml
@@ -5,3 +5,5 @@ en:
     actions:
       index: "Vehicle journey frequency"
       show: "Show frequency vehicle journey"
+  vehicle_journey_frequency:
+    require_at_least_one_frequency: "You must specify at least one timeslot"
diff --git a/config/locales/vehicle_journey_frequencies.fr.yml b/config/locales/vehicle_journey_frequencies.fr.yml
index 20b0a6eac..16eb43fa0 100644
--- a/config/locales/vehicle_journey_frequencies.fr.yml
+++ b/config/locales/vehicle_journey_frequencies.fr.yml
@@ -5,3 +5,5 @@ fr:
     actions:
       index: "Courses en fréquence"
       show: "Voir les courses en fréquence"
+  vehicle_journey_frequency:
+    require_at_least_one_frequency: "Vous devez spécifier au moins un créneau horaire"
diff --git a/config/locales/vehicle_journeys.en.yml b/config/locales/vehicle_journeys.en.yml
index 6d51cc8bf..4f5f763b4 100644
--- a/config/locales/vehicle_journeys.en.yml
+++ b/config/locales/vehicle_journeys.en.yml
@@ -39,6 +39,8 @@ en:
       slide_arrival: "arrival time at first stop"
       submit_timed: "Create vehicle journey"
       submit_frequency: "Create frequency vehicle journey"
+      submit_timed_edit: "Edit vehicle journey"
+      submit_frequency_edit: "Edit frequency vehicle journey"
     timeless:
       title: "Timeless vehicle journeys"
       vehicle_journeys: "Vehicle journeys with times at stop"
@@ -51,7 +53,7 @@ en:
       time_tables: "Calendars list"
       bounding: "From %{start} to %{end}"
       translation_form: "Vehicle journey translations"
-      journey_frequencies: "Interval time duration"
+      journey_frequencies: "Timeband"
     index:
       title: "Vehicle journeys on route %{route}"
       vehicle_journeys: "Departure's times"
@@ -61,10 +63,10 @@ en:
       select_time_tables: "Enter a timetable"
       time_range: "Departure time threshold"
       advanced_search: "Advanced Search"
-    sidebar:
-      timeless: "Timeless vehicle journeys"
     time_filter:
       time_range_filter: "Filter"
+    sidebar:
+      timeless: "Timeless vehicle journeys"
   activerecord:
     models:
       vehicle_journey:
@@ -97,7 +99,7 @@ en:
         vehicletypeidentifier: "Vehicle Type Identifier"
         time_table_ids: "Calendar list"
         vehicle_journey_at_stop_ids: "Time list"
-        journey_frequency_ids: "Interval time duration"
+        journey_frequency_ids: "Timeband"
         objectid: "Neptune identifier"
         object_version: "Version"
         creation_time: "Created on"
diff --git a/config/locales/vehicle_journeys.fr.yml b/config/locales/vehicle_journeys.fr.yml
index 2adcde6a7..30a4bf081 100644
--- a/config/locales/vehicle_journeys.fr.yml
+++ b/config/locales/vehicle_journeys.fr.yml
@@ -53,7 +53,7 @@ fr:
       time_tables: "Liste des calendriers"
       bounding: "De %{start} à %{end}"
       translation_form: "Cloner la course"
-      journey_frequencies: "Durée d'intervalle du trajet"
+      journey_frequencies: "Créneau horaire"
     index:
       title: "Horaires de la séquence d'arrêts %{route}"
       vehicle_journeys: "Horaires de départ aux arrêts"
@@ -99,7 +99,7 @@ fr:
         vehicle_type_identifier: "Type d'identifiant du véhicule"
         time_table_ids: "Liste des calendriers"
         vehicle_journey_at_stop_ids: "Liste des horaires"
-        journey_frequency_ids: "Durée d'intervalle du trajet"
+        journey_frequency_ids: "Créneau horaire"
         objectid: "Identifiant Neptune"
         object_version: "Version"
         creation_time: "Créé le"