Add vehicle journey frequency

7 files changed, 249 insertions, 229 deletions

diff --git a/config/locales/breadcrumbs.yml b/config/locales/breadcrumbs.yml
index ccf97c414..ba3b4d8b2 100644
--- a/config/locales/breadcrumbs.yml
+++ b/config/locales/breadcrumbs.yml
@@ -1,10 +1,12 @@
 en:
   breadcrumbs:
     vehicle_journeys: "Passing times"
+    vehicle_journeys_frequencies: "Times bands"
     referentials: "Home"
     users: "Users"
 fr:
   breadcrumbs:
     vehicle_journeys: "Horaires"
+    vehicle_journeys_frequencies: "Plages horaires"
     referentials: "Accueil"
     users: "Utilisateurs"
diff --git a/config/locales/frequencies.en.yml b/config/locales/frequencies.en.yml
new file mode 100644
index 000000000..b32da80c9
--- /dev/null
+++ b/config/locales/frequencies.en.yml
@@ -0,0 +1,5 @@
+en:
+  frequencies:
+    time_band: Time band
+    form:
+      add_frequency_line: Add a line
diff --git a/config/locales/frequencies.fr.yml b/config/locales/frequencies.fr.yml
new file mode 100644
index 000000000..337a00ae9
--- /dev/null
+++ b/config/locales/frequencies.fr.yml
@@ -0,0 +1,5 @@
+fr:
+  frequencies:
+    time_band: Plages horaires
+    form:
+      add_frequency_line: Ajouter une ligne
diff --git a/config/locales/vehicle_journeys.en.yml b/config/locales/vehicle_journeys.en.yml
new file mode 100644
index 000000000..cb4c9d649
--- /dev/null
+++ b/config/locales/vehicle_journeys.en.yml
@@ -0,0 +1,118 @@
+en:
+  vehicle_journeys:
+    vehicle_journeys:  
+      line_routes: "Line's routes"      
+    vehicle_journey:
+      title_stopless: "Vehicle journey %{name}"
+      title: "Vehicle journey leaving from %{stop} at %{time}"
+    actions:
+      index: "Vehicle time's board"
+      new: "Add a new vehicle journey"
+      new_frequency: "Add a new vehicle frequency journey"
+      edit: "Edit this vehicle journey"
+      edit_frequency: "Edit this vehicle frequency journey"
+      destroy: "Remove this vehicle journey"
+      destroy_confirm: "Are you sure you want destroy this vehicle journey?"
+    new:
+      title: "Add a new vehicle journey"
+      title_frequency: "Add a new vehicle frequency journey"
+    edit:
+      title_stopless: "Update vehicle journey %{name}"
+      title: "Update vehicle journey %{name} leaving from %{stop} at %{time}"
+    form:
+      stop_title: "Stop"
+      departure: "Departure"
+      arrival: "Arrival"
+      to_arrivals: "Copy departures to arrivals"
+      to_departures: "Copy arrivals to departures"
+      time_tables: "Associated calendars to vehicle journey"
+      slide: "Shift"
+      slide_title: "Shift all vehicle passing times"
+      set: "Set"
+      to: "at"
+      slide_departure: "departure time at first stop"
+      slide_arrival: "arrival time at first stop"
+      submit: "Create vehicle journey"
+      submit_frequency: "Create vehicle frequency journey"
+    timeless:
+      title: "Timeless vehicle journeys"
+      vehicle_journeys: "Vehicle journeys with times at stop"
+      vehicles_list: "Vehicle journeys list"
+    show:
+      title: "Vehicle Journey %{vehicle journey}"
+      stop_title: "Stop"
+      departure: "Departure"
+      arrival: "Arrival"
+      time_tables: "Calendars list"
+      bounding: "From %{start} to %{end}"
+      translation_form: "Vehicle journey translations"
+    index:
+      title: "Vehicle journeys on route %{route}"
+      vehicle_journeys: "Departure's times"
+      selection: "Filter on"
+      selection_all: "All"
+      select_journey_patterns: "Select journey pattern"
+      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"
+  activerecord:
+    models:
+      vehicle_journey:
+        zero:  "vehicle journey"
+        one:   "vehicle journey"
+        other: "vehicle journeys"
+    attributes:
+      vehicle_journey:
+        line: "Line"
+        route: "Route"
+        journey_pattern: "Journey Pattern"
+        time_tables: "Calendars"
+        time_slot: "Time Slot"
+        company: "Company"
+        number: "Number"
+        comment: "Comments"
+        status_value: "Status Value"
+        transport_mode_name: "Transport Mode"
+        mobility_restricted_suitability: "PRM accessibility"
+        flexible_service: "On demond transportation"
+        unspecified_mrs: "Not specified"
+        accessible: "Accessible"
+        not_accessible: "Not accessible"
+        unspecified_fs: "Not specified"
+        on_demand_fs: "On demand service"
+        regular_fs: "Regular service"
+        published_journey_name: "Published Name"
+        published_journey_identifier: "Published Identifier"
+        facility: "Facility"
+        vehicletypeidentifier: "Vehicle Type Identifier"
+        time_table_ids: "Calendar list"
+        vehicle_journey_at_stop_ids: "Time list"
+        objectid: "Neptune identifier"
+        object_version: "Version"
+        creation_time: "Created on"
+        creator_id: "Created by"
+        footnote_ids: "Footnotes"
+    errors:
+      models:
+        vehicle_journey:
+          invalid_times: "Invalid times"
+  formtastic:
+    titles:
+      vehicle_journey:
+        objectid: "[prefix]:VehicleJourney:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character"
+      neptune:
+        vehicle_journey:
+          objectid: "[prefix]:VehicleJourney:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character"
+      netex:
+        vehicle_journey:
+          objectid: "[prefix]:VehicleJourney:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character"
+      gtfs:
+        vehicle_journey:
+          objectid: "[prefix]:VehicleJourney:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character"
+      hub:
+        vehicle_journey:
+          objectid: "[prefix]:VehicleJourney:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character. Maximum length of the unique key = 8."
diff --git a/config/locales/vehicle_journeys.fr.yml b/config/locales/vehicle_journeys.fr.yml
new file mode 100644
index 000000000..9d16adff8
--- /dev/null
+++ b/config/locales/vehicle_journeys.fr.yml
@@ -0,0 +1,118 @@
+fr:
+  vehicle_journeys:
+    vehicle_journeys:
+      line_routes: "Séquences d'arrêts de la ligne"
+    vehicle_journey:
+      title_stopless: "Course %{name}"
+      title: "Course partant de %{stop} à %{time}"
+    actions:
+      index: "Horaires des courses"
+      new: "Ajouter une course"
+      new_frequency: "Ajouter une course à fréquence"
+      edit: "Modifier cette course"
+      edit_frequency: "Modifier cette course à fréquence"
+      destroy: "Supprimer cette course"
+      destroy_confirm: "Etes vous sûr de supprimer cette course ?"
+    new:
+      title: "Ajouter une course"
+      title_frequency: "Ajouter une course à fréquence"
+    edit:
+      title_stopless: "Modifier la course %{name}"
+      title: "Modifier la course partant de %{stop} à %{time}"
+    form:
+      stop_title: "Arrêt"
+      departure: "Départ"
+      arrival: "Arrivée"
+      to_arrivals: "Copie départs vers arrivées"
+      to_departures: "Copie arrivées vers départs"
+      time_tables: "Calendriers associés à la course"
+      slide: "Décaler"
+      slide_title: "Décaler l'ensemble des horaires de course"
+      set: "Fixer"
+      to: "à"
+      slide_departure: "horaire de départ au 1° arrêt à"
+      slide_arrival: "horaire d'arrivée au 1° arrêt à"
+      submit: "Créer course"
+      submit_frequency: "Créer course à fréquence"
+    timeless:
+      title: "Courses sans horaire"
+      vehicle_journeys: "Courses ayant des horaires"
+      vehicles_list: "Liste des courses"
+    show:
+      title: "Course au départ de %{stop} à %{time} sur la séquence %{route}"
+      stop_title: "Arrêt"
+      departure: "Départ"
+      arrival: "Arrivée"
+      time_tables: "Liste des calendriers"
+      bounding: "De %{start} à %{end}"
+      translation_form: "Cloner la course"
+    index:
+      title: "Horaires de la séquence d'arrêts %{route}"
+      vehicle_journeys: "Horaires de départ aux arrêts"
+      selection: "Filtrer sur"
+      selection_all: "Tous"
+      select_journey_patterns: "Sélectionner une mission"
+      select_time_tables: "Saisir un calendrier"
+      time_range: "Seuil horaire au départ"
+      advanced_search: "Recherche avancée"
+    time_filter:
+      time_range_filter: "Filtrer"
+    sidebar:
+      timeless: "Courses sans horaire"
+  activerecord:
+    models:
+      vehicle_journey:
+        zero:  "course"
+        one:   "course"
+        other: "courses"
+    attributes:
+      vehicle_journey:
+        line: "Ligne"
+        route: "Séquence d'arrêt"
+        journey_pattern: "Mission"
+        time_tables: "Calendriers"
+        time_slot: "Fréquence"
+        company: "Transporteur"
+        number: "Numéro"
+        comment: "Commentaires"
+        status_value: "Etat de trafic"
+        transport_mode_name: "Mode de transport"
+        mobility_restricted_suitability: "Accessibilité PMR"
+        flexible_service: "Transport à la demande"
+        unspecified_mrs: "Non spécifié"
+        accessible: "Accessible"
+        not_accessible: "Non accessible"
+        unspecified_fs: "Non spécifié"
+        on_demand_fs: "Service à la demande"
+        regular_fs: "Service régulier"
+        published_journey_name: "Nom public"
+        published_journey_identifier: "Identifiant public"
+        facility: "Equipement"
+        vehicle_type_identifier: "Type d'identifiant du véhicule"
+        time_table_ids: "Liste des calendriers"
+        vehicle_journey_at_stop_ids: "Liste des horaires"
+        objectid: "Identifiant Neptune"
+        object_version: "Version"
+        creation_time: "Créé le"
+        creator_id: "Créé par"
+        footnote_ids: "Notes de bas de page"
+    errors:
+      models:
+        vehicle_journey:
+          invalid_times: "Horaires invalides"
+  formtastic:
+    titles:
+      vehicle_journey:
+        objectid: "[prefixe]:VehicleJourney:[clé_unique]  caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'"
+      neptune:
+        vehicle_journey:
+          objectid: "[prefixe]:VehicleJourney:[clé_unique]  caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'"
+      netex:
+        vehicle_journey:
+          objectid: "[prefixe]:VehicleJourney:[clé_unique]  caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'"
+      gtfs:
+        vehicle_journey:
+          objectid: "[prefixe]:VehicleJourney:[clé_unique]  caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'"
+      hub:
+        vehicle_journey:
+          objectid: "[prefixe]:VehicleJourney:[clé_unique]  caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'. Longueur maximale de la clé unique = 8."
diff --git a/config/locales/vehicle_journeys.yml b/config/locales/vehicle_journeys.yml
deleted file mode 100644
index 3b18447f4..000000000
--- a/config/locales/vehicle_journeys.yml
+++ /dev/null
@@ -1,228 +0,0 @@
-en:
-  vehicle_journeys:
-    vehicle_journeys:  
-      line_routes: "Line's routes"      
-    vehicle_journey:
-      title_stopless: "Vehicle journey %{name}"
-      title: "Vehicle journey leaving from %{stop} at %{time}"
-    actions:
-      index: "Vehicle time's board"
-      new: "Add a new vehicle journey"
-      edit: "Edit this vehicle journey"
-      destroy: "Remove this vehicle journey"
-      destroy_confirm: "Are you sure you want destroy this vehicle journey?"
-    new:
-      title: "Add a new vehicle journey"
-    edit:
-      title_stopless: "Update vehicle journey %{name}"
-      title: "Update vehicle journey %{name} leaving from %{stop} at %{time}"
-    form:
-      stop_title: "Stop"
-      departure: "Departure"
-      arrival: "Arrival"
-      to_arrivals: "Copy departures to arrivals"
-      to_departures: "Copy arrivals to departures"
-      time_tables: "Associated calendars to vehicle journey"
-      slide: "Shift"
-      slide_title: "Shift all vehicle passing times"
-      set: "Set"
-      to: "at"
-      slide_departure: "departure time at first stop"
-      slide_arrival: "arrival time at first stop"
-    timeless:
-      title: "Timeless vehicle journeys"
-      vehicle_journeys: "Vehicle journeys with times at stop"
-      vehicles_list: "Vehicle journeys list"
-    show:
-      title: "Vehicle Journey %{vehicle journey}"
-      stop_title: "Stop"
-      departure: "Departure"
-      arrival: "Arrival"
-      time_tables: "Calendars list"
-      bounding: "From %{start} to %{end}"
-      translation_form: "Vehicle journey translations"
-    index:
-      title: "Vehicle journeys on route %{route}"
-      vehicle_journeys: "Departure's times"
-      selection: "Filter on"
-      selection_all: "All"
-      select_journey_patterns: "Select journey pattern"
-      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"
-  activerecord:
-    models:
-      vehicle_journey:
-        zero:  "vehicle journey"
-        one:   "vehicle journey"
-        other: "vehicle journeys"
-    attributes:
-      vehicle_journey:
-        line: "Line"
-        route: "Route"
-        journey_pattern: "Journey Pattern"
-        time_tables: "Calendars"
-        time_slot: "Time Slot"
-        company: "Company"
-        number: "Number"
-        comment: "Comments"
-        status_value: "Status Value"
-        transport_mode_name: "Transport Mode"
-        mobility_restricted_suitability: "PRM accessibility"
-        flexible_service: "On demond transportation"
-        unspecified_mrs: "Not specified"
-        accessible: "Accessible"
-        not_accessible: "Not accessible"
-        unspecified_fs: "Not specified"
-        on_demand_fs: "On demand service"
-        regular_fs: "Regular service"
-        published_journey_name: "Published Name"
-        published_journey_identifier: "Published Identifier"
-        facility: "Facility"
-        vehicletypeidentifier: "Vehicle Type Identifier"
-        time_table_ids: "Calendar list"
-        vehicle_journey_at_stop_ids: "Time list"
-        objectid: "Neptune identifier"
-        object_version: "Version"
-        creation_time: "Created on"
-        creator_id: "Created by"
-        footnote_ids: "Footnotes"
-    errors:
-      models:
-        vehicle_journey:
-          invalid_times: "Invalid times"
-  formtastic:
-    titles:
-      vehicle_journey:
-        objectid: "[prefix]:VehicleJourney:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character"
-      neptune:
-        vehicle_journey:
-          objectid: "[prefix]:VehicleJourney:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character"
-      netex:
-        vehicle_journey:
-          objectid: "[prefix]:VehicleJourney:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character"
-      gtfs:
-        vehicle_journey:
-          objectid: "[prefix]:VehicleJourney:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character"
-      hub:
-        vehicle_journey:
-          objectid: "[prefix]:VehicleJourney:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character. Maximum length of the unique key = 8."
-
-fr:
-  vehicle_journeys:
-    vehicle_journeys:  
-      line_routes: "Séquences d'arrêts de la ligne"  
-    vehicle_journey:
-      title_stopless: "Course %{name}"
-      title: "Course partant de %{stop} à %{time}"
-    actions:
-      index: "Horaires des courses"
-      new: "Ajouter une course"
-      edit: "Modifier cette course"
-      destroy: "Supprimer cette course"
-      destroy_confirm: "Etes vous sûr de supprimer cette course ?"
-    new:
-      title: "Ajouter une course"
-    edit:
-      title_stopless: "Modifier la course %{name}"
-      title: "Modifier la course partant de %{stop} à %{time}"
-    form:
-      stop_title: "Arrêt"
-      departure: "Départ"
-      arrival: "Arrivée"
-      to_arrivals: "Copie départs vers arrivées"
-      to_departures: "Copie arrivées vers départs"
-      time_tables: "Calendriers associés à la course"
-      slide: "Décaler"
-      slide_title: "Décaler l'ensemble des horaires de course"
-      set: "Fixer"
-      to: "à"
-      slide_departure: "horaire de départ au 1° arrêt à"
-      slide_arrival: "horaire d'arrivée au 1° arrêt à"
-    timeless:
-      title: "Courses sans horaire"
-      vehicle_journeys: "Courses ayant des horaires"
-      vehicles_list: "Liste des courses"
-    show:
-      title: "Course au départ de %{stop} à %{time} sur la séquence %{route}"
-      stop_title: "Arrêt"
-      departure: "Départ"
-      arrival: "Arrivée"
-      time_tables: "Liste des calendriers"
-      bounding: "De %{start} à %{end}"
-      translation_form: "Cloner la course"
-    index:
-      title: "Horaires de la séquence d'arrêts %{route}"
-      vehicle_journeys: "Horaires de départ aux arrêts"
-      selection: "Filtrer sur"
-      selection_all: "Tous"
-      select_journey_patterns: "Sélectionner une mission"
-      select_time_tables: "Saisir un calendrier"
-      time_range: "Seuil horaire au départ"
-      advanced_search: "Recherche avancée"
-    time_filter:
-      time_range_filter: "Filtrer"
-    sidebar:
-      timeless: "Courses sans horaire"
-  activerecord:
-    models:
-      vehicle_journey:
-        zero:  "course"
-        one:   "course"
-        other: "courses"
-    attributes:
-      vehicle_journey:
-        line: "Ligne"
-        route: "Séquence d'arrêt"
-        journey_pattern: "Mission"
-        time_tables: "Calendriers"
-        time_slot: "Fréquence"
-        company: "Transporteur"
-        number: "Numéro"
-        comment: "Commentaires"
-        status_value: "Etat de trafic"
-        transport_mode_name: "Mode de transport"
-        mobility_restricted_suitability: "Accessibilité PMR"
-        flexible_service: "Transport à la demande"
-        unspecified_mrs: "Non spécifié"
-        accessible: "Accessible"
-        not_accessible: "Non accessible"
-        unspecified_fs: "Non spécifié"
-        on_demand_fs: "Service à la demande"
-        regular_fs: "Service régulier"
-        published_journey_name: "Nom public"
-        published_journey_identifier: "Identifiant public"
-        facility: "Equipement"
-        vehicle_type_identifier: "Type d'identifiant du véhicule"
-        time_table_ids: "Liste des calendriers"
-        vehicle_journey_at_stop_ids: "Liste des horaires"
-        objectid: "Identifiant Neptune"
-        object_version: "Version"
-        creation_time: "Créé le"
-        creator_id: "Créé par"
-        footnote_ids: "Notes de bas de page"
-    errors:
-      models:
-        vehicle_journey:
-          invalid_times: "Horaires invalides"
-  formtastic:
-    titles:
-      vehicle_journey:
-        objectid: "[prefixe]:VehicleJourney:[clé_unique]  caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'"
-      neptune:
-        vehicle_journey:
-          objectid: "[prefixe]:VehicleJourney:[clé_unique]  caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'"
-      netex:
-        vehicle_journey:
-          objectid: "[prefixe]:VehicleJourney:[clé_unique]  caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'"
-      gtfs:
-        vehicle_journey:
-          objectid: "[prefixe]:VehicleJourney:[clé_unique]  caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'"
-      hub:
-        vehicle_journey:
-          objectid: "[prefixe]:VehicleJourney:[clé_unique]  caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'. Longueur maximale de la clé unique = 8."
-
diff --git a/config/routes.rb b/config/routes.rb
index 29ef9eff1..b03f6ebac 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -70,7 +70,7 @@ ChouetteIhm::Application.routes.draw do
             get 'new_vehicle_journey'
           end
         end
-        resources :vehicle_journeys do
+        resources :vehicle_journeys, :vehicle_journeys_frequencies do
           get 'select_journey_pattern', :on => :member
           resources :vehicle_translations
           resources :time_tables