Refs #5455 @6h; Add time and distance between stops in Journey Patterns

- Adds a `JSON` attribute in the model
- Adds the fields in the editor

1 files changed, 36 insertions, 26 deletions

diff --git a/app/controllers/journey_patterns_collections_controller.rb b/app/controllers/journey_patterns_collections_controller.rb
index 5fe78766c..6b661da0c 100644
--- a/app/controllers/journey_patterns_collections_controller.rb
+++ b/app/controllers/journey_patterns_collections_controller.rb
@@ -17,35 +17,45 @@ class JourneyPatternsCollectionsController < ChouetteController
   alias_method :vehicle_journey, :resource
 
   def show
-    @q = route.journey_patterns.search(params[:q]).result(distinct: true).includes(:stop_points)
+    @q = route.journey_patterns
+    if params[:q].present?
+      ids = @q.search(params[:q]).result(distinct: true).pluck(:id)
+      @q = @q.where(id: ids)
+    end
+    @q = @q.includes(:stop_points)
+    # @q = route.journey_patterns.search(params[:q]).result().includes(:stop_points)
     @ppage = 10
     @journey_patterns ||= @q.paginate(page: params[:page], per_page: @ppage).order(:name)
-
-    @stop_points_list = []
-    route.stop_points.each do |sp|
-      @stop_points_list << {
-        :id => sp.stop_area.id,
-        :route_id => sp.try(:route_id),
-        :object_id => sp.try(:objectid),
-        :position => sp.try(:position),
-        :for_boarding => sp.try(:for_boarding),
-        :for_alighting => sp.try(:for_alighting),
-        :name => sp.stop_area.try(:name),
-        :zip_code => sp.stop_area.try(:zip_code),
-        :city_name => sp.stop_area.try(:city_name),
-        :comment => sp.stop_area.try(:comment),
-        :area_type => sp.stop_area.try(:area_type),
-        :registration_number => sp.stop_area.try(:registration_number),
-        :nearest_topic_name => sp.stop_area.try(:nearest_topic_name),
-        :fare_code => sp.stop_area.try(:fare_code),
-        :longitude => sp.stop_area.try(:longitude),
-        :latitude => sp.stop_area.try(:latitude),
-        :long_lat_type => sp.stop_area.try(:long_lat_type),
-        :country_code => sp.stop_area.try(:country_code),
-        :street_name => sp.stop_area.try(:street_name)
-      }
+    respond_to do |format|
+      format.json
+      format.html do
+        @stop_points_list = []
+        route.stop_points.each do |sp|
+          @stop_points_list << {
+            :id => sp.stop_area.id,
+            :route_id => sp.try(:route_id),
+            :object_id => sp.try(:objectid),
+            :position => sp.try(:position),
+            :for_boarding => sp.try(:for_boarding),
+            :for_alighting => sp.try(:for_alighting),
+            :name => sp.stop_area.try(:name),
+            :zip_code => sp.stop_area.try(:zip_code),
+            :city_name => sp.stop_area.try(:city_name),
+            :comment => sp.stop_area.try(:comment),
+            :area_type => sp.stop_area.try(:area_type),
+            :registration_number => sp.stop_area.try(:registration_number),
+            :nearest_topic_name => sp.stop_area.try(:nearest_topic_name),
+            :fare_code => sp.stop_area.try(:fare_code),
+            :longitude => sp.stop_area.try(:longitude),
+            :latitude => sp.stop_area.try(:latitude),
+            :long_lat_type => sp.stop_area.try(:long_lat_type),
+            :country_code => sp.stop_area.try(:country_code),
+            :street_name => sp.stop_area.try(:street_name)
+          }
+        end
+        @stop_points_list = @stop_points_list.sort_by {|a| a[:position] }
+      end
     end
-    @stop_points_list = @stop_points_list.sort_by {|a| a[:position] }
   end
 
   def user_permissions