views/report_thank_yous.erb @@ -1,6 +1,7 @@ #!/usr/bin/env ruby require 'rubygems' require 'sinatra' +set(:appfile=>'giftsmas.rb', :views=>'views') require 'cgi' enable :sessions @@ -30,6 +31,9 @@ helpers do end error do + e = request.env['sinatra.error'] + puts e.message + e.backtrace.each{|x| puts x} render(:erb, "<h3>Oops, an error occurred.</h3>") end @@ -88,6 +92,11 @@ get '/reports/by_receiver' do render :erb, :report_receiver end +get '/reports/thank_yous' do + @receivers = @event.thank_you_notes + render :erb, :report_thank_yous +end + get '/login' do render :erb, :login end giftsmas.rb @@ -3,7 +3,7 @@ class Event < Sequel::Model @scaffold_session_value = :user_id @scaffold_associations = [:gifts, :receivers, :senders] many_to_one :user - one_to_many :gifts, :order=>:inserted_at, :eager=>[:receivers, :senders], :order=>:inserted_at + one_to_many :gifts, :eager=>[:receivers, :senders], :order=>:inserted_at many_to_many :senders, :class=>:Person, :join_table=>:event_senders, :right_key=>:person_id, :order=>:name many_to_many :receivers, :class=>:Person, :join_table=>:event_receivers, :right_key=>:person_id, :order=>:name @@ -47,4 +47,19 @@ class Event < Sequel::Model end [senders.sort, receivers.sort] end + + def thank_you_notes + receivers = Hash.new{|h,k| h[k] = Hash.new{|h2,k| h2[k] = []}} + person_ids = model.db[:gifts].join(:gift_receivers, :gift_id=>:id).filter(:event_id=>id).select(:person_id).distinct(:person_id).order(:person_id).map(:person_id) + gifts.each do |g| + g.receivers.each do |r| + g.senders.reject{|s| person_ids.include?(s.id)}.each{|s| receivers[r.name][s.name] << g.name} + end + end + receivers.values.each do |h| + h.values.each{|h2| h2.sort} + h.sort + end + receivers.sort.map{|k, v| [k, v.sort.map{|k2, v2| [k2, v2.sort]}]} + end end models/event.rb @@ -139,5 +139,5 @@ ul.scaffold_associated_records_list li form { display: inline; } position: static; width: 99%; } - table.persongifts { page-break-after: always; } + .persongifts { page-break-after: always; } } public/application.css @@ -191,8 +191,8 @@ context "Giftsmas" do (n/:h4).mapih.should == ['Event: Christmas', 'Gift Reports', 'Other'] as = n/:a eid = Event.first.id - as.maphr.should == ["/", "/manage/edit_event_receivers/#{eid}", "/manage/edit_event_senders/#{eid}", "/choose_event", "/reports/chronological", "/reports/by_receiver", "/reports/by_sender", "/reports/summary", "/reports/crosstab", "/manage/manage_event", "/manage/manage_gift", "/manage/manage_person"] - as.mapit.should == ["Giftsmas", "Associate Receivers", "Associate Senders", "Change Event", "In Chronological Order", "By Receiver", "By Sender", "Summary", "Summary Crosstab", "Manage Events", "Manage Gifts", "Manage People"] + as.maphr.should == ["/", "/manage/edit_event_receivers/#{eid}", "/manage/edit_event_senders/#{eid}", "/choose_event", "/reports/chronological", "/reports/by_receiver", "/reports/by_sender", "/reports/summary", "/reports/crosstab", "/reports/thank_yous", "/manage/manage_event", "/manage/manage_gift", "/manage/manage_person"] + as.mapit.should == ["Giftsmas", "Associate Receivers", "Associate Senders", "Change Event", "In Chronological Order", "By Receiver", "By Sender", "Summary", "Summary Crosstab", "Thank You Notes", "Manage Events", "Manage Gifts", "Manage People"] end specify "/add_gift should add gifts correctly" do @@ -342,6 +342,32 @@ context "Giftsmas" do table = tables.first (table/:th).mapit.should == ['Sender\Receiver', 'P2', 'P4'] (table/"tbody tr").map{|x| (x/:td).mapit}.should == [%w'P1 2 1', %w'P3 1 2'] + + c = content('/reports/thank_yous', :title=>'Thank You Notes', :session=>session) + uls1 = c/"> ul" + uls1.length.should == 1 + lis1 = uls1/"> li" + lis1.length.should == 2 + lis1.mapatt("class").should == ['persongifts']*2 + li1 = lis1.first + li1.it.should =~ /\AP2/ + lis2 = li1/"> ul > li" + li2 = lis2.first + li2.it.should =~ /\AP1/ + (li2/"> ul > li").mapit.should == %w'G1 G2' + li2 = lis2.last + li2.it.should =~ /\AP3/ + (li2/"> ul > li").mapit.should == %w'G4' + lis1.last.it.should =~ /\AP4/ + li1 = lis1.last + li1.it.should =~ /\AP4/ + lis2 = li1/"> ul > li" + li2 = lis2.first + li2.it.should =~ /\AP1/ + (li2/"> ul > li").mapit.should == %w'G3' + li2 = lis2.last + li2.it.should =~ /\AP3/ + (li2/"> ul > li").mapit.should == %w'G3 G4' end specify "users can't see other other users events, people, or gifts" do spec/integration.rb @@ -62,6 +62,16 @@ describe Event do g3 = Gift.add(@event, 'G3', [@receiver.id], [@sender.id], [], []) @event.reload.gifts_summary.should == [[['R', 1], ['S', 2]], [['R', 2], ['S', 1]]] end + + specify "#thank_you_notes should be a sorted hash of receivers with values being a sorted hash of senders with an associated array of gifts, excluding gifts where the sender was a receiver in the event" do + @event.thank_you_notes.should == [] + g = Gift.add(@event, 'G', [@sender.id], [@receiver.id], [], []) + @event.reload.thank_you_notes.should == [['R', [['S', ['G']]]]] + g2 = Gift.add(@event, 'G2', [@sender.id], [@receiver.id], [], []) + @event.reload.thank_you_notes.should == [['R', [['S', ['G', 'G2']]]]] + g3 = Gift.add(@event, 'G3', [@receiver.id], [@sender.id], [], []) + @event.reload.thank_you_notes.should == [] + end end describe Gift do spec/unit.rb @@ -33,6 +33,7 @@ <a href="/reports/by_sender">By Sender</a> <a href="/reports/summary">Summary</a> <a href="/reports/crosstab">Summary Crosstab</a> +<a href="/reports/thank_yous">Thank You Notes</a> <h4>Other</h4> <a href="/manage/manage_event">Manage Events</a> views/layout.erb bc8a0131ce8d6719735cc56841a06f8e65b7dc34 Jeremy Evans jeremy@lafirewall.jeremyevans.local http://github.com/jeremyevans/giftsmas/commit/1522fdeaf2f5354bc6bbef127e77a8a2f2533a1c 1522fdeaf2f5354bc6bbef127e77a8a2f2533a1c 2009-01-09T12:15:28-08:00 2009-01-09T12:15:28-08:00 Add Thank You Notes report and a few minor changes The Thank You Notes page will print on a different page for each person in the event showing them the gifts they received by person, excluding the gifts given by people who actually attended the event (i.e. were a receiver in the event), since it is assumed that you don't need to send thank you notes to those people. Make sure error backtraces are logged to the console before displaying a message to the user. Remove :order argument used twice in User.gifts association Set :appfile and :views in giftsmas.rb so test suite runs correctly. ced365a47ebfb3fa6e269c3823511fbdd3f79995 Jeremy Evans jeremy@lafirewall.jeremyevans.local