tournament 2.2.0 → 2.2.1

data/History.txt

@@ -1,3 +1,6 @@
+== 2.2.1 / 2009-03-19
+* Bug fixes and minor display enhancement.
+
 == 2.2.0 / 2009-03-18
 * Final update for 2009 NCAA tournament
 * Fix a couple of anchor tags.

data/Rakefile

@@ -20,7 +20,7 @@ PROJ.authors = 'Douglas A. Seifert'
 PROJ.email = 'doug+rubyforge@dseifert.net'
 PROJ.url = 'http://www.dseifert.net/code/tournament'
 PROJ.rubyforge.name = 'tournament'
-PROJ.version = '2.2.0'
+PROJ.version = '2.2.1'
 PROJ.group_id = 5863
 
 PROJ.spec.opts << '--color'

data/webgui/app/controllers/admin_controller.rb

@@ -7,12 +7,13 @@ class AdminController < ApplicationController
     if @entry
       @pool = @entry.pool
       save_picks(@entry)
-      if @entry.save
+      if @entry.save(false)
         @pool.pool.tournament_entry = @entry.tournament_entry
         @pool.save
         flash[:info] = "Tournament bracket updated."
         redirect_to :action => 'bracket', :id => @pool.id
       else
+        @pool = @pool.pool
         flash[:error] = "Could not save entry."
         render :action => 'bracket', :layout => 'bracket'
       end
@@ -49,7 +50,7 @@ class AdminController < ApplicationController
     @pool = pool.pool
     @entry = Entry.find_or_initialize_by_user_id(:user_id => current_user.id, :pool_id => pool.id, :tie_break => 0, :name => 'Tournament Bracket')
     @entry.bracket
-    @entry.save!
+    @entry.save(false)
       
     render :layout => 'bracket'
   end

data/webgui/app/views/pool/index.html.erb

@@ -9,6 +9,7 @@
  
 <%= link_to '[Edit]', :controller => 'admin', :action => 'pool', :id => pool.id %>
 <%= link_to '[Entries]', :controller => 'admin', :action => 'entries', :id => pool.id %>
+<%= link_to '[Bracket]', :controller => 'admin', :action => 'bracket', :id => pool.id %>
 <% end %>
 <%= link_to '[Leader Board]', :controller => 'reports', :action => 'show', :id => pool.id, :report => 'leader' %>
 <%= link_to '[Reports]', :controller => 'reports', :action => 'show', :id => pool.id %>
@@ -24,8 +25,10 @@ Entry Fee: $<%=pool.fee%>
 </div>
 <div class="poollistinfodetail">
 Payouts:
+<% take = pool.user_entries.size * pool.fee.to_f -
+         (pool.payouts.inject(0) {|sum, p| sum += p.kind == '$' ? p.payout.to_i : 0}) %>
 <% pool.payouts.delete_if{|p| p.kind.blank?}.sort_by {|p| p.rank }.each do |p| -%>
-<%=p.rank != 'L' ? p.rank.to_i.ordinal : 'Last'%>: <%= p.kind if p.kind == '$'%><%=p.payout%><%=p.kind if p.kind != '$'%>&nbsp;&nbsp;
+<%=p.rank != 'L' ? p.rank.to_i.ordinal : 'Last'%>: $<%=p.kind == '$' ? p.payout : p.payout.to_f / 100.0 * take%>&nbsp;&nbsp;
 <% end -%>
 </div>
 <div class="poollistinfodetail">

data/webgui/app/views/shared/_bracket.html.erb

@@ -32,17 +32,19 @@ end
   classes[idx] = "teamname "
   onclicks[idx] = is_editable ? "pick(this);" : ''
   if winner != :unk
+    real_winner = @pool.tournament_entry.picks.winner(round, game)
     contents[idx] = winner.short_name
     teams[idx] = winner.short_name
     onmouseovers[idx] = active_mouse_over;
     onmouseouts[idx] = active_mouse_out;
-    incorrect = !@pool.tournament_entry.picks.still_alive?(winner)
+    incorrect = real_winner != :unk && real_winner != winner
     if incorrect
       classes[idx] += 'missedpick '
     else
-      bracket_winner = @pool.tournament_entry.picks.winner(round, game)
-      if bracket_winner == winner
+      if real_winner != :unk && real_winner == winner
         classes[idx] += 'correctpick '
+      elsif !@pool.tournament_entry.picks.still_alive?(winner)
+        classes[idx] += 'missedpick '
       else
         classes[idx] += 'pendingpick '
       end
@@ -56,6 +58,7 @@ end
 %>
 <%= error_messages_for 'entry' %>
 <% form_for(@entry, :url => {:action => 'edit', :id => @entry.id}, :html => {:onSubmit => (is_editable ? 'return submitPicks(this);' : 'return false')}) do |f| -%>
+<div style="float: left">
 <table border="0">
 <tr>
 <td><%= f.label :name, "Entry Name"%></td><td><%= f.text_field :name %></td>
@@ -63,19 +66,21 @@ end
 <tr>
 <td><%= f.label :tie_break, 'Tie Breaker'%></td><td><%= f.text_field :tie_break %></td>
 </tr>
-<tr>
-<td colspan="2">
+</table>
+</div>
+<div style="float: left">
 <small>
 Current Score: <%= @entry.bracket.score_against(@pool.tournament_entry.picks, @pool.scoring_strategy) %> Max. Possible Score: <%= @entry.bracket.maximum_score(@pool.tournament_entry.picks, @pool.scoring_strategy) %>
 </small>
-</td>
-</table>
+</div>
 <input type="hidden" name="pool_id" value="<%=@entry.pool_id%>">
 <input type="hidden" name="picks" id="picks" value="">
 <% if is_editable %>
+<div style="clear: both">
 <input type="Submit" value="Save Changes">
 <%= submit_tag 'Cancel Changes', :name => 'cancel', :confirm => 'Are you sure?'%>
 <%= submit_tag 'Reset Picks', :name => 'reset', :confirm => 'Are you sure? Resetting will clear all picks and start the bracket over from scratch!'%>
+</div>
 <% end -%>
 <% end -%>
 <TABLE cellspacing=0 class="bracket">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tournament
 version: !ruby/object:Gem::Version 
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors: 
 - Douglas A. Seifert
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-18 00:00:00 -07:00
+date: 2009-03-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency