Add vehicle journey frequency

4 files changed, 46 insertions, 3 deletions

diff --git a/app/controllers/breadcrumb_controller.rb b/app/controllers/breadcrumb_controller.rb
index 143651b52..c1bb4289c 100644
--- a/app/controllers/breadcrumb_controller.rb
+++ b/app/controllers/breadcrumb_controller.rb
@@ -27,7 +27,7 @@ class BreadcrumbController < InheritedResources::Base
   end
 
   def new
-    new! do 
+    new! do
       build_breadcrumb :new
     end
   end
diff --git a/app/controllers/journey_patterns_controller.rb b/app/controllers/journey_patterns_controller.rb
index ce59d00b6..13018771d 100644
--- a/app/controllers/journey_patterns_controller.rb
+++ b/app/controllers/journey_patterns_controller.rb
@@ -36,7 +36,7 @@ class JourneyPatternsController < ChouetteController
   def new_vehicle_journey
     @vehicle_journey = Chouette::VehicleJourney.new(:route_id => route.id)
     @vehicle_journey.update_journey_pattern(resource)
-    render "vehicle_journeys/select_journey_pattern"
+    render "vehicle_journeys#{"_#{params[:suffix]}" if params[:suffix]}/select_journey_pattern"
   end
 
   # overwrite inherited resources to use delete instead of destroy
diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb
index ace7aff5e..03dfbedc2 100644
--- a/app/controllers/vehicle_journeys_controller.rb
+++ b/app/controllers/vehicle_journeys_controller.rb
@@ -87,7 +87,20 @@ class VehicleJourneysController < ChouetteController
   private
 
   def vehicle_journey_params
-    params.require(:vehicle_journey).permit( { footnote_ids: [] } , :journey_pattern_id, :number, :published_journey_name, :published_journey_identifier, :comment, :transport_mode_name, :mobility_restricted_suitability, :flexible_service, :status_value, :facility, :vehicle_type_identifier, :objectid, :time_table_tokens, { date: [ :hour, :minute ] }, :button, :referential_id, :line_id, :route_id, :id, { vehicle_journey_at_stops_attributes: [ :arrival_time, :id, :_destroy, :stop_point_id, :departure_time ] } )
+    params.require(:vehicle_journey).permit( { footnote_ids: [] } , :journey_pattern_id, :number, :published_journey_name,
+                                             :published_journey_identifier, :comment, :transport_mode_name,
+                                             :mobility_restricted_suitability, :flexible_service, :status_value,
+                                             :facility, :vehicle_type_identifier, :objectid, :time_table_tokens,
+                                             { date: [ :hour, :minute ] }, :button, :referential_id, :line_id,
+                                             :route_id, :id, { vehicle_journey_at_stops_attributes: [ :arrival_time,
+                                                                                                      :id, :_destroy,
+                                                                                                      :stop_point_id,
+                                                                                                      :departure_time,
+                                                                                                      :is_frequency] },
+                                             { frequency: [ :scheduled_headway_interval, :first_departure_time,
+                                                            :last_departure_time,
+                                                            :exact_time ] },
+                                             :is_frequency )
   end
 
 end
diff --git a/app/controllers/vehicle_journeys_frequencies_controller.rb b/app/controllers/vehicle_journeys_frequencies_controller.rb
new file mode 100644
index 000000000..a16523316
--- /dev/null
+++ b/app/controllers/vehicle_journeys_frequencies_controller.rb
@@ -0,0 +1,30 @@
+class VehicleJourneysFrequenciesController < VehicleJourneysController
+
+  defaults :resource_class => Chouette::VehicleJourney, :collection_name => 'vehicle_journeys', :instance_name => 'vehicle_journey'
+
+  def new
+    new! do
+      resource.frequencies.build
+    end
+  end
+
+  protected
+
+  def build_resource
+    set_frequency(super)
+  end
+
+  def resource
+    set_frequency(super)
+  end
+
+  private
+
+  def set_frequency(s)
+    s.tap do |vehicle_journey|
+      vehicle_journey.is_frequency = true
+    end
+  end
+
+end
+