aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Donnet2014-08-20 16:32:46 +0200
committerLuc Donnet2014-08-20 16:32:46 +0200
commit6a60bd6dd570c62956929aa5f51abb974e190260 (patch)
tree1d13184fee6589c08d680fe1a314e6adfdd7e947
parente1a2fdfe09aef372d164bcf41a89c54815608011 (diff)
downloadchouette-core-6a60bd6dd570c62956929aa5f51abb974e190260.tar.bz2
Quick fix vehicle journey at stops export when no times for a stop_area, need to add spec
-rw-r--r--app/models/vehicle_journey_export.rb12
1 files changed, 9 insertions, 3 deletions
diff --git a/app/models/vehicle_journey_export.rb b/app/models/vehicle_journey_export.rb
index 653e339d9..7f5577e22 100644
--- a/app/models/vehicle_journey_export.rb
+++ b/app/models/vehicle_journey_export.rb
@@ -15,13 +15,19 @@ class VehicleJourneyExport
def persisted?
false
end
+
+ def vehicle_journey_at_stops_matrix
+ (vehicle_journeys.collect{ |vj| vj.vehicle_journey_at_stops.collect(&:departure_time).collect{|time| time.strftime("%H:%M")} }).transpose
+ end
def to_csv(options = {})
- CSV.generate(options) do |csv|
- vehicle_journey_at_stops_matrix = (vehicle_journeys.collect{ |vj| vj.vehicle_journey_at_stops.collect(&:departure_time).collect{|time| time.strftime("%H:%M")} }).transpose
+ CSV.generate(options) do |csv|
csv << column_names
route.stop_points.each_with_index do |stop_point, index|
- csv << [stop_point.id, stop_point.stop_area.name] + vehicle_journey_at_stops_matrix[index]
+ puts vehicle_journey_at_stops_matrix[index].inspect
+
+ times = vehicle_journey_at_stops_matrix[index].present? ? vehicle_journey_at_stops_matrix[index] : []
+ csv << [stop_point.id, stop_point.stop_area.name] + times
end
end
end