3 files changed, 64 insertions, 0 deletions
diff --git a/app/controllers/journey_pattern_stop_points_controller.rb b/app/controllers/journey_pattern_stop_points_controller.rb
new file mode 100644
index 000000000..c4fc9b08f
--- /dev/null
+++ b/app/controllers/journey_pattern_stop_points_controller.rb
@@ -0,0 +1,18 @@
+class JourneyPatternStopPointsController < ChouetteController
+  defaults :resource_class => Chouette::JourneyPattern
+
+  respond_to :html
+
+  belongs_to :referential do
+    belongs_to :line, :parent_class => Chouette::Line do
+      belongs_to :route, :parent_class => Chouette::Route do
+        belongs_to :journey_pattern, :parent_class => Chouette::JourneyPattern
+      end
+    end
+  end
+
+  def stops_selection
+    redirect_to referential_line_route_journey_pattern_path( @referential, @line, @route, @journey_pattern)
+  end
+end
+
diff --git a/app/controllers/journey_patterns_controller.rb b/app/controllers/journey_patterns_controller.rb
new file mode 100644
index 000000000..1ec15f7e8
--- /dev/null
+++ b/app/controllers/journey_patterns_controller.rb
@@ -0,0 +1,19 @@
+class JourneyPatternsController < ChouetteController
+  defaults :resource_class => Chouette::JourneyPattern
+
+  respond_to :html
+
+  belongs_to :referential do
+    belongs_to :line, :parent_class => Chouette::Line do
+      belongs_to :route, :parent_class => Chouette::Route
+    end
+  end
+
+  alias_method :route, :parent
+
+  def show
+    #@map = RouteMap.new referential, route
+    @stop_points = resource.stop_points.paginate(:page => params[:page], :per_page => 10)
+    show!
+  end
+end
diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb
new file mode 100644
index 000000000..3a99d531b
--- /dev/null
+++ b/app/controllers/vehicle_journeys_controller.rb
@@ -0,0 +1,27 @@
+class VehicleJourneysController < ChouetteController
+  defaults :resource_class => Chouette::VehicleJourney
+
+  belongs_to :referential do
+    belongs_to :line, :parent_class => Chouette::Line do
+      belongs_to :route, :parent_class => Chouette::Route
+    end
+  end
+
+  protected
+
+  def collection
+    @q = parent.vehicle_journeys.search(params[:q])
+    @vehicle_journeys ||= @q.result(:distinct => true).paginate(:page => params[:page], :per_page => 10)
+    @matrix ||= matrix 
+  end
+
+  def matrix
+    {}.tap do |hash|
+      @vehicle_journeys.each do |vj|
+        vj.vehicle_journey_at_stops.each do |vjas|
+          hash[ "#{vj.id}-#{vjas.stop_point_id}"] = vjas 
+        end
+      end
+    end
+  end
+end