app/controllers/reports_controller.rb app/views/graphs/running_month.xml.builder app/views/graphs/running_year.xml.builder app/views/graphs/spending_month.xml.builder app/views/graphs/spending_year.xml.builder app/views/reports/index.html.haml spec/controllers/graphs_controller_spec.rb spec/controllers/reports_controller_spec.rb @@ -1,19 +1,35 @@ class GraphsController < ApplicationController - # GET /graphs/running.xml - def running + # GET /graphs/running_month + def running_month @period = (Time.now.to_date - 30)..Time.now.to_date respond_to do |format| format.xml end end - # GET /graphs/spending.xml - def spending + # GET /graphs/running_year + def running_year + @period = (Time.now.to_date - 365)..Time.now.to_date + respond_to do |format| + format.xml + 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 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 + end + end + end \ No newline at end of file app/controllers/graphs_controller.rb @@ -19,5 +19,6 @@ %li= link_to 'recurring', recurrings_path %li= link_to 'tags', tags_path %li= link_to 'vendors', vendors_path + %li= link_to 'reports', reports_path %li= link_to 'settings', edit_user_path(current_user) %li= link_to 'goodbye', session_path(current_user), :method=>:delete \ No newline at end of file app/views/layouts/application.html.haml @@ -21,16 +21,16 @@ #Graphs - #Spending + #SpendingMonth %script{:type=>'text/javascript'} var spending = new FusionCharts("/flash/MSArea.swf", "Spending", "430", "250", "0", "0"); - = "spending.setDataURL(\"#{spending_graph_url(:format=>'xml')}\");" - spending.render("Spending"); - #Running + = "spending.setDataURL(\"#{spending_month_url(: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_graph_url(:format=>'xml')}\");" - running.render("Running"); + = "running.setDataURL(\"#{running_month_url(:format=>'xml')}\");" + running.render("RunningMonth"); .clear = render :partial=>'things', :object=>@things \ No newline at end of file app/views/things/index.html.haml @@ -2,6 +2,7 @@ ActionController::Routing::Routes.draw do |map| map.resources :items map.resources :notes map.resources :recurrings + map.resources :reports map.resources :runs map.resources :sessions map.resources :tags @@ -11,9 +12,11 @@ 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', :requirements=>{:format=>/xml/} do |g| - g.running_graph 'graphs/running', :action=>'running' - g.spending_graph 'graphs/spending', :action=>'spending' + 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' end map.root :controller=>'things' config/routes.rb @@ -34,7 +34,7 @@ ActiveRecord::Schema.define(:version => 20090617051501) do create_table "jobs", :force => true do |t| t.integer "user_id", :null => false - t.string "name", :null => false + t.string "name", :default => "", :null => false t.boolean "active", :default => true t.datetime "created_at" t.decimal "rate", :precision => 6, :scale => 2, :default => 0.0, :null => false @@ -130,9 +130,9 @@ ActiveRecord::Schema.define(:version => 20090617051501) do end create_table "users", :force => true do |t| - t.string "email", :null => false - t.string "password_salt", :null => false - t.string "password_hash", :null => false + t.string "email", :default => "", :null => false + t.string "password_salt", :default => "", :null => false + t.string "password_hash", :default => "", :null => false t.string "time_zone" t.datetime "created_at", :default => '2007-05-24 15:49:54' t.string "twitter_username" db/schema.rb @@ -111,7 +111,7 @@ textarea { #Graphs { margin-left: -45px; } -#Graphs #Spending { +#Graphs #SpendingMonth { float: left; width: 430px; } public/stylesheets/application.css app/views/graphs/running.xml.builder app/views/graphs/spending.xml.builder e6395ffa236444da77b00b7768452b0f5b590c09 Jordan McKible jordan@mckible.com http://github.com/jmckible/stardate/commit/af47369660de25e9929c0125cafaf0e578f842ad af47369660de25e9929c0125cafaf0e578f842ad 2009-07-04T12:19:38-07:00 2009-07-04T12:19:38-07:00 Year long report graphs. 75f911f44ae8853ecf8666c2bd0a398e3f3f69eb Jordan McKible jordan@mckible.com