Merge pull request #329 from af83/5995-update-display-on-vjs-index

Change ReferentialVJs#index when filtered by stops. Refs #5995. Refs #5996. Refs #5852 

1 files changed, 11 insertions, 6 deletions

diff --git a/app/views/referential_vehicle_journeys/index.html.slim b/app/views/referential_vehicle_journeys/index.html.slim
index 04c01cc12..00f63cb65 100644
--- a/app/views/referential_vehicle_journeys/index.html.slim
+++ b/app/views/referential_vehicle_journeys/index.html.slim
@@ -39,15 +39,20 @@
                 ), \
                 TableBuilderHelper::Column.new( \
                   key: :departure_time, \
-                  attribute: Proc.new {|v| v.vehicle_journey_at_stops.first&.departure }, \
-                  sortable: false, \
-                  name: @starting_stop&.name, \
+                  attribute: Proc.new {|v| v.vehicle_journey_at_stops.first&.departure_local }, \
+                  sortable: true \
                 ), \
+                [@starting_stop, @ending_stop].compact.map{|stop| \
+                  TableBuilderHelper::Column.new( \
+                    attribute: Proc.new {|v| v.vehicle_journey_at_stops.where("stop_points.stop_area_id" => stop.id).last&.arrival_local }, \
+                    sortable: false, \
+                    name: stop.name \
+                  )\
+                }, \
                 TableBuilderHelper::Column.new( \
                   key: :arrival_time, \
-                  attribute: Proc.new {|v| v.vehicle_journey_at_stops.last&.arrival }, \
-                  sortable: false, \
-                  name: @ending_stop&.name, \
+                  attribute: Proc.new {|v| v.vehicle_journey_at_stops.last&.arrival_local }, \
+                  sortable: true, \
                 ), \
               ].flatten.compact,
               cls: 'table has-filter has-search'