@@ -3,7 +3,7 @@ module BooksHelper
"#{book_url(book)}-#{book.title.to_slug}"
end
- def pages_graphic(report)
+ def pages_graphic(report,div)
data = ""
labels = ""
colors = ""
@@ -20,8 +20,7 @@ module BooksHelper
labels << "'"
labels << "," unless i == report.last
end
-
- response = ""
+
response = "<script type='text/javascript' charset='utf-8'>
$(function () {
var api = new jGCharts.Api();
@@ -31,7 +30,8 @@ module BooksHelper
colors : [#{colors}],
bg : 'E3D9BD',
bar_width : 20,
- size : '600x300',
+ size : '600x150',
+ bar_spacing : 5,
bg_type : 'stripes',
bg_angle : 90,
bg_offset : 'dfd2b1',
@@ -39,7 +39,7 @@ module BooksHelper
}
jQuery('<img>')
.attr('src', api.make(opt))
- .appendTo('#graph');
+ .appendTo('##{div}');
});
</script>"
response.gsub("FFCC00","968160")
app/helpers/books_helper.rb
@@ -133,6 +133,23 @@ class Book < ActiveRecord::Base
return processed_items
end
+
+ def self.pages_by_year
+ items = Book.pages_by_month
+ processed_items = []
+ {:year => 2007, :items => [1,2,]}
+ items.each do |i|
+ target_year = processed_items.find{|o| o[:year] == Date.parse(i[:month].to_s).year}
+ if target_year
+ target_year[:items] << i
+ else
+ processed_items << {:year => Date.parse(i[:month].to_s).year, :items => [i]}
+ end
+ end
+ return processed_items
+ end
+
+
private
def validate_url
app/models/book.rb
@@ -40,8 +40,25 @@
<% cache do %>
<hr>
<h1>Readed pages per month</h1>
- <div id="graph" > </div>
- <%= pages_graphic(Book.pages_by_month) %>
+ <% reports = Book.pages_by_year.reverse %>
+ <% if reports.size > 1 %>
+ <small>
+ <%= link_to_function "past years", "$('#past').slideDown(); $('#more_info').hide(); $('#less_info').show()", {:id => "more_info", :style => "float: right; margin-top: -35px;"} %>
+ <%= link_to_function "current year", "$('#past').slideUp(); $('#less_info').hide(); $('#more_info').show()", {:id => "less_info", :style => "float: right; margin-top: -35px; display:none;"} %>
+ </small>
+ <% end %>
+
+ <div id="graph" class="graph"> </div>
+ <%= pages_graphic(reports.first[:items],"graph") %>
+
+ <div id="past" style="display:none;">
+ <% reports.each_with_index do |report,i| %>
+ <% next if report == reports.first %>
+ <div id="graph<%= i %>" class="graph"> </div>
+ <%= pages_graphic(report[:items],"graph"+i.to_s) %>
+ <% end %>
+ </div>
+
<% end %>
<% end %>
@@ -64,6 +81,6 @@
<style type="text/css" media="screen">
table {width: 600px;}
td {padding: 10px;}
- #graph img {border: 0px; margin-top: 20px;}
- #graph {text-align: center;}
+ .graph img {border: 0px;}
+ .graph {text-align: center;}
</style>
app/views/books/index.html.erb
@@ -28,7 +28,7 @@
<%= link_to "New Book", new_book_url %> |
<%= link_to "Logout", session_path,:method => :delete %>
<% else %>
- <%= configatron.bookqueue_title %> (<%= link_to "About this site", "#" %>)
+ <%= configatron.bookqueue_title %>
<% end %>
</div>
<% if flash[:notice] %>
app/views/layouts/books.html.erb
@@ -299,4 +299,5 @@ pre
#no_book p {
font-size: 20px;
margin-top: 30px;
-}
\ No newline at end of file
+}
+
public/stylesheets/scaffold.css
9199c3df40e4f210963752ee2a6b088e6c40fb48
Rodrigo Franco (Caffo)
caffeine@gmail.com
http://github.com/caffo/bookqueue/commit/08734bab38e695c30878c7402a37955ac45f23ae
08734bab38e695c30878c7402a37955ac45f23ae
2009-10-08T10:22:58-07:00
2009-10-08T10:22:58-07:00
Reports now splitted by year
6f9d5da158a0bf533f6bb5e16fa3c2a42b71155c
Rodrigo Franco (Caffo)
caffeine@gmail.com