@@ -1,35 +1,49 @@ class GraphsController < ApplicationController - # GET /graphs/running_month - def running_month - @period = (Time.now.to_date - 30)..Time.now.to_date + # GET /graphs/running + def running + set_period respond_to do |format| - format.xml + format.xml do + if @period.to_a.length > 31 + render :action=>'running_year.xml.builder' + else + render :action=>'running_month.xml.builder' + end + end end end - # GET /graphs/running_year - def running_year - @period = (Time.now.to_date - 365)..Time.now.to_date + # GET /graphs/spending + def spending + set_period respond_to do |format| - format.xml + format.xml do + if @period.to_a.length > 31 + render :action=>'spending_year.xml.builder' + else + render :action=>'spending_month.xml.builder' + end + end end end - # GET /graphs/spending_month - def spending_month - @period = (Time.now.to_date - 30)..Time.now.to_date - respond_to do |format| - format.xml + protected + def set_period + begin + @start = Date.parse params[:start] + rescue + @start = Time.now.to_date - 30 end - end - - # GET /graphs/spending_year - def spending_year - @period = (Time.now.to_date - 365)..Time.now.to_date - respond_to do |format| - format.xml + begin + @finish = Date.parse params[:finish] + rescue + @finish = Time.now.to_date end + @period = @start..@finish + logger.info "start: #{@start}" + logger.info "finish: #{@finish}" + logger.info "period: #{@period.first}-#{@period.last}" end end \ No newline at end of file app/controllers/graphs_controller.rb @@ -3,6 +3,8 @@ class ThingsController < ApplicationController # GET / def index @things = current_user.things_during((Time.now.to_date - 4)..Time.now.to_date) + @start = Time.now.to_date - 30 + @finish = Time.now.to_date end # GET /things/new app/controllers/things_controller.rb @@ -13,11 +13,11 @@ #SpendingYear %script{:type=>'text/javascript'} var spending = new FusionCharts("/flash/MSArea.swf", "Spending", "940", "300", "0", "0"); - = "spending.setDataURL(\"#{spending_year_url(:start=>@start, :finish=>@finish, :format=>'xml')}\");" + = "spending.setDataURL(\"#{spending_url(:start=>@start, :finish=>@finish, :format=>'xml')}\");" spending.render("SpendingYear"); #RunningYear %script{:type=>'text/javascript'} var running = new FusionCharts("/flash/MSCombiDY2D.swf", "Running", "940", "300", "0", "0"); - = "running.setDataURL(\"#{running_year_url(:format=>'xml')}\");" + = "running.setDataURL(\"#{running_url(:start=>@start, :finish=>@finish, :format=>'xml')}\");" running.render("RunningYear"); \ No newline at end of file app/views/reports/index.html.haml @@ -24,12 +24,12 @@ #SpendingMonth %script{:type=>'text/javascript'} var spending = new FusionCharts("/flash/MSArea.swf", "Spending", "430", "250", "0", "0"); - = "spending.setDataURL(\"#{spending_month_url(:format=>'xml')}\");" + = "spending.setDataURL(\"#{spending_url(:start=>@start, :finish=>@finish, :format=>'xml')}\");" spending.render("SpendingMonth"); #RunningMonth %script{:type=>'text/javascript'} var running = new FusionCharts("/flash/MSCombiDY2D.swf", "Running", "410", "250", "0", "0"); - = "running.setDataURL(\"#{running_month_url(:format=>'xml')}\");" + = "running.setDataURL(\"#{running_url(:start=>@start, :finish=>@finish, :format=>'xml')}\");" running.render("RunningMonth"); .clear app/views/things/index.html.haml @@ -13,10 +13,8 @@ ActionController::Routing::Routes.draw do |map| map.date 'date/:year/:month/:day', :controller=>'date', :action=>'show', :requirements=>{:year=>/(19|20)\d\d/, :month=>/[01]?\d/, :day=>/[0-3]?\d/} map.with_options :controller=>'graphs' do |g| - g.running_month 'graphs/running_month.:format', :action=>'running_month' - g.running_year 'graphs/running_year.:format', :action=>'running_year' - g.spending_month 'graphs/spending_month.:format', :action=>'spending_month' - g.spending_year 'graphs/spending_year.:format', :action=>'spending_year' + g.running 'graphs/running/:start/:finish.:format', :action=>'running' + g.spending 'graphs/spending/:start/:finish.:format', :action=>'spending' end map.root :controller=>'things' config/routes.rb @@ -6,23 +6,31 @@ describe GraphsController do @request.env['HTTP_ACCEPT'] = 'application/xml' end - it 'handles /graphs/running_month with GET' do - get :running_month + it 'handles /graphs/running with valid date and GET' do + get :running, :start=>'2009-01-01', :finish=>'2009-02-02' + assigns(:start).should == Date.new(2009, 1, 1) + assigns(:finish).should == Date.new(2009, 2, 2) response.should be_success end - it 'handles /graphs/running/:year with GET' do - get :running_year + it 'handles /graphs/running with invalid date and GET' do + get :running, :start=>'2009-01-41', :finish=>'20090230' + assigns(:start).should == (Date.today - 30) + assigns(:finish).should == Date.today response.should be_success end - it 'handles /graphs/spending_month with GET' do - get :spending_month + it 'handles /graphs/spending with valid date and GET' do + get :spending, :start=>'2009-01-01', :finish=>'2009-02-02' + assigns(:start).should == Date.new(2009, 1, 1) + assigns(:finish).should == Date.new(2009, 2, 2) response.should be_success end - it 'handles /graphs/spending/:year with GET' do - get :spending_year + it 'handles /graphs/spending with invalid date and GET' do + get :spending, :start=>'2009-01-41', :finish=>'20090230' + assigns(:start).should == (Date.today - 30) + assigns(:finish).should == Date.today response.should be_success end spec/controllers/graphs_controller_spec.rb 6302ecc8c07b8ef3933f41dd7cee07aa6c674520 Jordan McKible jordan@mckible.com http://github.com/jmckible/stardate/commit/2208182d18de92a54849d5f9f68aec6b87960815 2208182d18de92a54849d5f9f68aec6b87960815 2009-09-24T00:25:35-07:00 2009-09-24T00:25:35-07:00 Variable periods on graphs. f7b837c7d033a2ca4610d9a0b58688a3e2dc3de4 Jordan McKible jordan@mckible.com