From 24255411c9d5907ebb6e8fcb39b6bca1833559d9 Mon Sep 17 00:00:00 2001 From: Skud Date: Mon, 16 Sep 2013 17:04:39 +1000 Subject: [PATCH] added dates created/modified to crops csv --- app/controllers/crops_controller.rb | 4 ++-- app/views/crops/index.csv.shaper | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/controllers/crops_controller.rb b/app/controllers/crops_controller.rb index 0892dbc4c..0892acb33 100644 --- a/app/controllers/crops_controller.rb +++ b/app/controllers/crops_controller.rb @@ -14,8 +14,8 @@ class CropsController < ApplicationController format.json { render :json => @crops } format.rss { render :layout => false } format.csv do - @filename = "Growstuff-Crops-#{Time.zone.now.to_s(:number)}" - @crops = Crop.all + @filename = "Growstuff-Crops-#{Time.zone.now.to_s(:number)}.csv" + @crops = Crop.includes(:scientific_names, :plantings, :seeds) render :csv => @crops end end diff --git a/app/views/crops/index.csv.shaper b/app/views/crops/index.csv.shaper index 0954592a1..456e2cb7e 100644 --- a/app/views/crops/index.csv.shaper +++ b/app/views/crops/index.csv.shaper @@ -19,7 +19,9 @@ csv.headers :id, :system_name, :planted_from_bare_root_plant, :planted_from_advanced_plant, :planted_from_graft, - :planted_from_layering + :planted_from_layering, + :date_added, + :last_modified @crops.each do |c| csv.row c do |csv, crop| @@ -65,5 +67,8 @@ csv.headers :id, :system_name, csv.cell :planted_from_graft, planted_from['graft'] csv.cell :planted_from_layering, planted_from['layering'] + csv.cell :date_added, c.created_at.to_s(:db) + csv.cell :last_modified, c.updated_at.to_s(:db) + end end