tournament 3.1.1 → 3.2.0

data/History.txt

@@ -1,3 +1,9 @@
+== 3.2.0 / 2009-03-14
+* Fix team selection page to not jump around when using arrow keys
+  with the autocomplete pop ups.
+* Allow switch between seed and matchup order in team selection page.
+* Minor cosmetic formatting changes.
+
 == 3.1.1 / 2009-03-13
 * Bugfixes for showing add entry links.  Makes sure participants can
   add entries once the teams are set.

data/lib/tournament.rb

@@ -7,7 +7,7 @@ unless defined? Tournament
 module Tournament
 
   # :stopdoc:
-  VERSION = '3.1.1'
+  VERSION = '3.2.0'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/webgui/app/models/pool.rb

@@ -6,7 +6,7 @@ class Pool < ActiveRecord::Base
   before_save :marshal_pool
   belongs_to :user
   has_many :entries
-  has_many :user_entries, :class_name => 'Entry', :conditions => ['user_id != ?', '#{user_id}']
+  has_many :user_entries, :class_name => 'Entry', :conditions => ['user_id != ?', '#{user_id}'], :include => :user, :order => 'users.login, entries.name'
   has_many :users, :through => :user_entries
   has_many :pending_entries, :class_name => 'Entry', :conditions => ['completed = ? and user_id != ?', false, '#{user_id}']
   has_one :tournament_entry, :class_name => 'Entry', :conditions => ['user_id = \'#{user_id}\'']

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

@@ -8,7 +8,7 @@
 <% @pools.each do |p| -%>
 <tr>
 <td><%=link_to p.name, :action => 'pool', :id => p.id%></td>
-<td><%=p.starts_at.to_formatted_s(:short)%></td>
+<td><%=p.starts_at.to_formatted_s(:long)%></td>
 </tr>
 <% end %>
 </table>

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

@@ -3,7 +3,7 @@
 <% if Pool.active_pools.size > 0 %>
 <% Pool.active_pools.each do |pool| -%>
 <div class="poollistblock">
-<span class="poollisthead"><%= pool.name %></span>
+<span class="poollisthead<%= pool.completed? ? ' poollistheaddone' : ''%>"><%= pool.name %></span>
 <small>
 <% if current_user && pool.user_id == current_user.id %>
 <% if pool.tournament_entry -%>
@@ -31,7 +31,7 @@ Total Entries: <%= pool.user_entries.size%>
 Last Update: <%=pool.updated_at.to_formatted_s(:long)%>
 </div>
 <div class="poollistinfodetail">
-Entry Fee: $<%=pool.fee%>
+Entry Fee: <%=number_to_currency(pool.fee)%>
 </div>
 <% if pool.user_entries.size > 0 -%>
 <div class="poollistinfodetail">
@@ -39,7 +39,7 @@ 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 == '$' ? p.payout : p.payout.to_f / 100.0 * take%>&nbsp;&nbsp;
+<%=p.rank != 'L' ? p.rank.to_i.ordinal : 'Last'%>: <%=number_to_currency(p.kind == '$' ? p.payout : p.payout.to_f / 100.0 * take)%>&nbsp;&nbsp;
 <% end -%>
 </div>
 <% end -%>

data/webgui/app/views/teams/choose.html.erb

@@ -17,19 +17,22 @@
 <p>
 <i>Same color region champs play each other in final four:</i>
 </p>
+<p>
+Order: <%= button_to_function('Seed Order', 'switch_to_seed_order()', :id => 'seed_button', :disabled => true) %> <%= button_to_function('Matchup Order', 'switch_to_matchup_order()', :id => 'matchup_button')%>
+</p>
 <%= form_tag({:controller => 'teams', :action => 'change', :id => @pool.id}, {:method => "POST"}) %>
 <% @pool.region_seedings.each_with_index do |arr, index| -%>
 <% region_name = arr[0]; teams = arr[1] %>
 <div class="<%= cycle('regionLeft', 'regionRight', :name => 'tbclass')%> <%= cycle('regionTop', 'regionTop', 'regionBottom', 'regionBottom', :name => 'lrclass')%>">
 Region Name: <input type="text" name="region<%=index%>[name]" value="<%=region_name%>">
-<table>
+<table id="<%="region_#{index}"%>">
 <tr>
 <th>Seed</th>
 <th>Name</th>
 <th>Short<br/>Name</th>
 </tr>
 <% teams.each_with_index do |team, seed_idx| -%>
-<tr>
+<tr id="<%="region_#{index}_#{seed_idx}"%>">
 <td>
 <%= seed_idx + 1%>
 </td>

data/webgui/public/javascripts/application.js

@@ -1,2 +1,65 @@
 // Place your application-specific JavaScript functions and classes here
 // This file is automatically included by javascript_include_tag :defaults
+var swapMethod = {
+	swap: function(element, el) {
+		element = $(element);
+		el = $(el);
+
+		if (element == el) return element;
+
+		var clone = el.cloneNode(false); // no need to clone deep
+		Element.replace(element, clone);
+		Element.replace(el, element);
+		Element.replace(clone, el); // make sure references (like event observers) are kept
+		return element;
+	}
+}
+Element.addMethods(swapMethod);
+
+var swaps = [
+  [15,2],
+  [10,7],
+  [7,14],
+  [10,3],
+  [10,11],
+  [7,6],
+  [3,13],
+  [7,4],
+  [6,12],
+  [4,9],
+  [3,8],
+  [2,16]
+];
+var order = 'seed';
+
+function switch_to_seed_order() {
+  if (order == 'seed') {
+    return;
+  }
+  $('matchup_button').enable();
+  $('seed_button').disable();
+  order = 'seed';
+  apply_swaps(swaps.reverse());
+}
+
+function switch_to_matchup_order() {
+  if (order == 'matchup') {
+    return;
+  }
+  $('matchup_button').disable();
+  $('seed_button').enable();
+  order = 'matchup';
+  apply_swaps(swaps.reverse());
+}
+
+function apply_swaps(swaps) {
+  for(var region = 0; region < 4; ++region) {
+    swaps.forEach(function(s) {
+      var index1 = s[0] - 1;
+      var index2 = s[1] - 1;
+      var node1 = $('region_' + region + '_' + index1);
+      var node2 = $('region_' + region + '_' + index2);
+      node1.swap(node2);
+    });
+  }
+}

data/webgui/public/javascripts/controls.js

@@ -211,13 +211,21 @@ Autocompleter.Base = Class.create({
   markPrevious: function() {
     if(this.index > 0) this.index--;
       else this.index = this.entryCount-1;
-    this.getEntry(this.index).scrollIntoView(true);
+    var entry = this.getEntry(this.index);
+    var doff = document.viewport.getScrollOffsets();
+    var eoff = entry.cumulativeOffset();
+    if (eoff[1] < doff[1])
+      entry.scrollIntoView(true);
   },
 
   markNext: function() {
     if(this.index < this.entryCount-1) this.index++;
       else this.index = 0;
-    this.getEntry(this.index).scrollIntoView(false);
+    var entry = this.getEntry(this.index);
+    var doff = document.viewport.getScrollOffsets();
+    var eoff = entry.cumulativeOffset();
+    if (eoff[1] + entry.getHeight() > doff[1] + document.viewport.getHeight())
+      entry.scrollIntoView(false);
   },
 
   getEntry: function(index) {
@@ -960,4 +968,4 @@ Form.Element.DelayedObserver = Class.create({
     this.timer = null;
     this.callback(this.element, $F(this.element));
   }
-});
+});

data/webgui/public/stylesheets/main.css

@@ -13,6 +13,7 @@ h1 {
 }
 .poollistblock {
   margin-left: 10px;
+  margin-bottom: 30px;
 }
 .poollistinfo {
   margin-left: 20px;
@@ -27,6 +28,9 @@ h1 {
   font-weight: bold;
   color: green;
 }
+.poollistheaddone {
+  color: gray;
+}
 #wrap {
   margin:0 auto;
   width:auto;

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 3
-  - 1
-  - 1
-  version: 3.1.1
+  - 2
+  - 0
+  version: 3.2.0
 platform: ruby
 authors: 
 - Douglas A. Seifert
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-13 00:00:00 -08:00
+date: 2010-03-13 23:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency