cody/wrestlingdev.com
1
0
Fork 0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-03-25 01:14:43 +00:00
Code Issues Releases Wiki Activity

Merge branch 'development'

Browse Source 
Deploying visual changes for brackets. Also deploying cache fixes.
This commit is contained in:
Jacob Cody Wimer
2017-02-02 19:07:33 +00:00
parent 196797566c 8fa529dc5f
commit 889c2114a4
12 changed files with 275 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/tournaments_controller.rb
View File

@@ -13,7 +13,7 @@ class TournamentsController < ApplicationController
@wrestler = Wrestler.find(params[:wrestler][:originalId])
respond_to do |format|
if SwapWrestlers.new.swapWrestlers(params[:wrestler][:originalId], params[:wrestler][:swapId])
format.html { redirect_to @wrestler, notice: 'Wrestler was successfully swaped.' }
format.html { redirect_to "/tournaments/#{@wrestler.tournament.id}/brackets/#{@wrestler.weight.id}", notice: 'Wrestler was successfully swaped.' }
format.json { render action: 'show', status: :created, location: @wrestler }
end
end

2
app/views/layouts/_lsidebar.html.erb
View File

@@ -5,7 +5,7 @@
<% if @tournament %>
<div class="" style="padding-right: 1%;">
<h4>Tournament Links</h4>
<ul class="">
<ul>
<li><%= link_to "Tournament home" , "/tournaments/#{@tournament.id}/" %></li>
<li><%= link_to "Brackets" , "/tournaments/#{@tournament.id}/brackets" %></li>
<li><%= link_to "Bout Board" , "/tournaments/#{@tournament.id}/up_matches" %></li>

137
app/views/tournaments/_fourPoolQuarterBracket.html.erb
View File

@@ -1,200 +1,131 @@
<style>
/*
* Flex Layout Specifics
*/
main{
display:flex;
flex-direction:row;
}
.round{
display:flex;
flex-direction:column;
justify-content:center;
width:200px;
list-style:none;
padding:0;
}
.round .spacer{ flex-grow:1; }
.round .spacer:first-child,
.round .spacer:last-child{ flex-grow:.5; }
.round .game-spacer{
flex-grow:1;
}
/*
* General Styles
*/
body{
font-family:sans-serif;
font-size:small;
padding:10px;
line-height:1.4em;
}
li.game{
padding-left:20px;
}
li.game.winner{
font-weight:bold;
}
li.game span{
float:right;
margin-right:5px;
}
li.game-top{ border-bottom:1px solid #aaa; }
li.game-spacer{
border-right:1px solid #aaa;
min-height:40px;
}
li.game-bottom{
border-top:1px solid #aaa;
}
</style>
<h5>Championship Bracket After Pool</h5>
<h5>Bracket After Pool</h5>
<main id="bracket">
<ul class="round round-1">
<% @matches.select{|m|m.bracket_position == "Quarter"}.sort_by{|m| m.bracket_position_number}.each do |match| %>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<li class="game game-top "><%= match.w1_name %> <span></span></li>
<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li class="game game-bottom "><%= match.w2_name %><span></span></li>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<% end %>
</ul>
<ul class="round round-2">
<% @matches.select{|m|m.bracket_position == "Semis"}.sort_by{|m| m.bracket_position_number}.each do |match| %>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<li class="game game-top "><%= match.w1_name %> <span></span></li>
<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li class="game game-bottom "><%= match.w2_name %><span></span></li>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<% end %>
</ul>
<ul class="round round-3">
<% @matches.select{|m|m.bracket_position == "1/2"}.each do |match| %>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<li class="game game-top "><%= match.w1_name %> <span></span></li>
<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li class="game game-bottom "><%= match.w2_name %><span></span></li>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
</ul>
<ul class="round round-4">
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<li class="game game-top "><%= match.winnerName %> <span></span></li>
<li class="bracket-winner"><%= match.winnerName %> <span></span></li>
1st
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
</ul>
<% end %>
</main>
</br>
<h5>3rd/4th</h5>
<main id="bracket">
<ul class="round round-1">
<% @matches.select{|m|m.bracket_position == "3/4"}.each do |match| %>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<li class="game game-top "><%= match.w1_name %> <span></span></li>
<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li class="game game-bottom "><%= match.w2_name %><span></span></li>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
</ul>
<ul class="round round-2">
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<li class="game game-top "> <%= match.winnerName %><span></span></li>
<li class="bracket-winner"> <%= match.winnerName %><span></span></li>
3rd
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
</ul>
<% end %>
</main>
</br>
<h5>Consolation Bracket After Pool</h5>
<main id="bracket">
<ul class="round round-1">
<% @matches.select{|m|m.bracket_position == "Conso Semis"}.sort_by{|m| m.bracket_position_number}.each do |match| %>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<li class="game game-top "><%= match.w1_name %> <span></span></li>
<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li class="game game-bottom "><%= match.w2_name %><span></span></li>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<% end %>
</ul>
<ul class="round round-2">
<% @matches.select{|m|m.bracket_position == "5/6"}.each do |match| %>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<li class="game game-top "><%= match.w1_name %> <span></span></li>
<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li class="game game-bottom "><%= match.w2_name %><span></span></li>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
</ul>
<ul class="round round-3">
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<li class="game game-top "> <%= match.winnerName %><span></span></li>
<li class="bracket-winner"> <%= match.winnerName %><span></span></li>
5th
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
</ul>
<% end %>
</main>
<br>
<h5>7th/8th</h5>
<main id="bracket">
<ul class="round round-1">
<% @matches.select{|m|m.bracket_position == "7/8"}.each do |match| %>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<li class="game game-top "><%= match.w1_name %> <span></span></li>
<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li class="game game-bottom "><%= match.w2_name %><span></span></li>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
</ul>
<ul class="round round-2">
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<li class="game game-top "><%= match.winnerName %> <span></span></li>
<li class="bracket-winner"><%= match.winnerName %> <span></span></li>
7th
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
</ul>
<% end %>
</main>
</br>

130
app/views/tournaments/_fourPoolSemiBracket.html.erb
View File

@@ -1,191 +1,123 @@
<style>
/*
* Flex Layout Specifics
*/
main{
display:flex;
flex-direction:row;
}
.round{
display:flex;
flex-direction:column;
justify-content:center;
width:200px;
list-style:none;
padding:0;
}
.round .spacer{ flex-grow:1; }
.round .spacer:first-child,
.round .spacer:last-child{ flex-grow:.5; }
.round .game-spacer{
flex-grow:1;
}
/*
* General Styles
*/
body{
font-family:sans-serif;
font-size:small;
padding:10px;
line-height:1.4em;
}
li.game{
padding-left:20px;
}
li.game.winner{
font-weight:bold;
}
li.game span{
float:right;
margin-right:5px;
}
li.game-top{ border-bottom:1px solid #aaa; }
li.game-spacer{
border-right:1px solid #aaa;
min-height:40px;
}
li.game-bottom{
border-top:1px solid #aaa;
}
</style>
<h5>Championship Bracket After Pool</h5>
<h5>Bracket After Pool</h5>
<main id="bracket">
<ul class="round round-1">
<% @matches.select{|m|m.bracket_position == "Semis"}.sort_by{|m| m.bracket_position_number}.each do |match| %>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<li class="game game-top "><%= match.w1_name %> <span></span></li>
<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li class="game game-bottom "><%= match.w2_name %><span></span></li>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<% end %>
</ul>
<ul class="round round-2">
<% @matches.select{|m|m.bracket_position == "1/2"}.each do |match| %>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<li class="game game-top "><%= match.w1_name %> <span></span></li>
<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li class="game game-bottom "><%= match.w2_name %><span></span></li>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
</ul>
<ul class="round round-3">
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<li class="game game-top "> <%= match.winnerName %><span></span></li>
<li class="bracket-winner"><%= match.winnerName %><span></span></li>
1st
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
</ul>
<% end %>
</main>
</br>
<h5>3rd/4th</h5>
<main id="bracket">
<ul class="round round-1">
<% @matches.select{|m|m.bracket_position == "3/4"}.each do |match| %>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<li class="game game-top "><%= match.w1_name %> <span></span></li>
<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li class="game game-bottom "><%= match.w2_name %><span></span></li>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
</ul>
<ul class="round round-2">
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<li class="game game-top "> <%= match.winnerName %><span></span></li>
<li class="bracket-winner"><%= match.winnerName %><span></span></li>
3rd
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
</ul>
<% end %>
</main>
</br>
<h5>Consolation Bracket After Pool</h5>
<main id="bracket">
<ul class="round round-1">
<% @matches.select{|m|m.bracket_position == "Conso Semis"}.sort_by{|m| m.bracket_position_number}.each do |match| %>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<li class="game game-top "><%= match.w1_name %> <span></span></li>
<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li class="game game-bottom "><%= match.w2_name %><span></span></li>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<% end %>
</ul>
<ul class="round round-2">
<% @matches.select{|m|m.bracket_position == "5/6"}.each do |match| %>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<li class="game game-top "><%= match.w1_name %> <span></span></li>
<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li class="game game-bottom "><%= match.w2_name %><span></span></li>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
</ul>
<ul class="round round-3">
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<li class="game game-top "> <%= match.winnerName %><span></span></li>
<li class="bracket-winner"><%= match.winnerName %><span></span></li>
5th
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
</ul>
<% end %>
</main>
<br>
<h5>7th/8th</h5>
<main id="bracket">
<ul class="round round-1">
<% @matches.select{|m|m.bracket_position == "7/8"}.each do |match| %>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<li class="game game-top "><%= match.w1_name %> <span></span></li>
<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li class="game game-bottom "><%= match.w2_name %><span></span></li>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
</ul>
<ul class="round round-2">
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<li class="game game-top "> <%= match.winnerName %><span></span></li>
<li class="bracket-winner"><%= match.winnerName %><span></span></li>
7th
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
</ul>
<% end %>
</main>
</br>

88
app/views/tournaments/_twoPoolFinalBracket.html.erb
View File

@@ -1,108 +1,46 @@
<style>
/*
* Flex Layout Specifics
*/
main{
display:flex;
flex-direction:row;
}
.round{
display:flex;
flex-direction:column;
justify-content:center;
width:200px;
list-style:none;
padding:0;
}
.round .spacer{ flex-grow:1; }
.round .spacer:first-child,
.round .spacer:last-child{ flex-grow:.5; }
.round .game-spacer{
flex-grow:1;
}
/*
* General Styles
*/
body{
font-family:sans-serif;
font-size:small;
padding:10px;
line-height:1.4em;
}
li.game{
padding-left:20px;
}
li.game.winner{
font-weight:bold;
}
li.game span{
float:right;
margin-right:5px;
}
li.game-top{ border-bottom:1px solid #aaa; }
li.game-spacer{
border-right:1px solid #aaa;
min-height:40px;
}
li.game-bottom{
border-top:1px solid #aaa;
}
</style>
</br>
<h5>Championship Match</h5>
<h5>Bracket After Pool</h5>
<main id="bracket">
<ul class="round round-1">
<% @matches.select{|m|m.bracket_position == "1/2"}.each do |match| %>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<li class="game game-top "><%= match.w1_name %> <span></span></li>
<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li class="game game-bottom "><%= match.w2_name %><span></span></li>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
</ul>
<ul class="round round-2">
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<li class="game game-top "> <%= match.winnerName %><span></span></li>
<li class="bracket-winner"><%= match.winnerName %><span></span></li>
1st
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
</ul>
<% end %>
</main>
<h5>3rd/4th</h5>
<main id="bracket">
<ul class="round round-1">
<% @matches.select{|m|m.bracket_position == "3/4"}.each do |match| %>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<li class="game game-top "><%= match.w1_name %> <span></span></li>
<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li class="game game-bottom "><%= match.w2_name %><span></span></li>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
</ul>
<ul class="round round-2">
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<li class="game game-top "><%= match.winnerName %> <span></span></li>
<li class="bracket-winner"><%= match.winnerName %> <span></span></li>
3rd
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
</ul>
<% end %>
</main>

95
app/views/tournaments/_twoPoolSemiBracket.html.erb
View File

@@ -1,122 +1,59 @@
<style>
/*
* Flex Layout Specifics
*/
main{
display:flex;
flex-direction:row;
}
.round{
display:flex;
flex-direction:column;
justify-content:center;
width:200px;
list-style:none;
padding:0;
}
.round .spacer{ flex-grow:1; }
.round .spacer:first-child,
.round .spacer:last-child{ flex-grow:.5; }
.round .game-spacer{
flex-grow:1;
}
/*
* General Styles
*/
body{
font-family:sans-serif;
font-size:small;
padding:10px;
line-height:1.4em;
}
li.game{
padding-left:20px;
}
li.game.winner{
font-weight:bold;
}
li.game span{
float:right;
margin-right:5px;
}
li.game-top{ border-bottom:1px solid #aaa; }
li.game-spacer{
border-right:1px solid #aaa;
min-height:40px;
}
li.game-bottom{
border-top:1px solid #aaa;
}
</style>
</br>
<h5>Championship Bracket After Pool</h5>
<h5>Bracket After Pool</h5>
<main id="bracket">
<ul class="round round-1">
<% @matches.select{|m|m.bracket_position == "Semis"}.sort_by{|m| m.bracket_position_number}.each do |match| %>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<li class="game game-top "><%= match.w1_name %> <span></span></li>
<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li class="game game-bottom "><%= match.w2_name %><span></span></li>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<% end %>
</ul>
<ul class="round round-2">
<% @matches.select{|m|m.bracket_position == "1/2"}.each do |match| %>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<li class="game game-top "><%= match.w1_name %> <span></span></li>
<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li class="game game-bottom "><%= match.w2_name %><span></span></li>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
</ul>
<ul class="round round-3">
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<li class="game game-top "> <%= match.winnerName %><span></span></li>
<li class="bracket-winner"><%= match.winnerName %><span></span></li>
1st
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
</ul>
<% end %>
</main>
</br>
<h5>3rd/4th</h5>
<main id="bracket">
<ul class="round round-1">
<% @matches.select{|m|m.bracket_position == "3/4"}.each do |match| %>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<li class="game game-top "><%= match.w1_name %> <span></span></li>
<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
<li class="game game-bottom "><%= match.w2_name %><span></span></li>
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
</ul>
<ul class="round round-2">
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
<li class="game game-top "> <%= match.winnerName %><span></span></li>
<li class="bracket-winner"><%= match.winnerName %><span></span></li>
3rd
<li class="spacer">&nbsp;</li>
<li>&nbsp;</li>
</ul>
<% end %>

110
app/views/tournaments/all_brackets.html.erb
View File

@@ -1,6 +1,6 @@
<% cache ["all_brackets", @tournament] do %>
<% cache ["#{@tournament.id}_all_brackets", @tournament] do %>
<style>
<style>
.pagebreak {
page-break-after: always;
border: none;
@@ -13,39 +13,87 @@
left: 1in;
height: 1in;
}
</style>
/*
* Bracket Layout Specifics
*/
main, ul {
display:flex;
}
ul {
flex-direction:column;
width: 100px;
list-style:none;
padding:0;
}
.game + li {
flex-grow:1;
}
li:first-child,li:last-child {
flex-grow:.5;
}
.game {
padding-left:5px;
}
.winner {
font-weight:bold;
}
.game span {
float:right;
margin-right:5px;
}
.game-top {
border-bottom:1px solid #aaa;
}
.game-top + li {
border-right:1px solid #aaa; min-height:30px;
}
.bracket-winner {
border-bottom:1px solid #aaa;
}
.game-bottom {
border-top:1px solid #aaa;
}
</style>
<div id="exportable">
<% @tournament.weights.sort_by{|w| w.max}.each do |w| %>
<table class='pagebreak'>
<td>
<% @weight = w %>
<% @matches = @tournament.matches.select{|m| m.weight_id == @weight.id} %>
<% @wrestlers = Wrestler.where(weight_id: @weight.id) %>
<% @pools = w.poolRounds(@matches) %>
<h5><%= @weight.max %> lbs Bracket</h5>
<%= render 'pool' %>
</td>
</table>
<table class='pagebreak'>
<td>
<% if w.pool_bracket_type == "twoPoolsToFinal" %>
<%= render 'twoPoolFinalBracket' %>
<% end %>
<% if w.pool_bracket_type == "twoPoolsToSemi" %>
<%= render 'twoPoolSemiBracket' %>
<% end %>
<% if w.pool_bracket_type == "fourPoolsToQuarter" %>
<%= render 'fourPoolQuarterBracket' %>
<% end %>
<% if w.pool_bracket_type == "fourPoolsToSemi" %>
<%= render 'fourPoolSemiBracket' %>
<% end %>
</td>
<h5><strong><%= @tournament.name %> - <%= w.max %> lbs Bracket</strong></h5>
<tr>
<td valign="top" style="padding: 10px;">
<% @weight = w %>
<% @matches = @tournament.matches.select{|m| m.weight_id == @weight.id} %>
<% @wrestlers = Wrestler.where(weight_id: @weight.id) %>
<% @pools = w.poolRounds(@matches) %>
<%= render 'pool' %>
</td>
<td valign="top" style="padding: 10px;">
<% if w.pool_bracket_type == "twoPoolsToFinal" %>
<%= render 'twoPoolFinalBracket' %>
<% end %>
<% if w.pool_bracket_type == "twoPoolsToSemi" %>
<%= render 'twoPoolSemiBracket' %>
<% end %>
<% if w.pool_bracket_type == "fourPoolsToQuarter" %>
<%= render 'fourPoolQuarterBracket' %>
<% end %>
<% if w.pool_bracket_type == "fourPoolsToSemi" %>
<%= render 'fourPoolSemiBracket' %>
<% end %>
</td>
</tr>
</table>
<% end %>
</div>

116
app/views/tournaments/bracket.html.erb
View File

@@ -1,5 +1,57 @@
<style>
/*
* Bracket Layout Specifics
*/
main {
display:flex;
}
<% cache ["brackets", @weight] do %>
.round {
display:flex;
flex-direction:column;
width: 100px;
list-style:none;
padding:0;
}
.game + li {
flex-grow:1;
}
li:first-child,li:last-child {
flex-grow:.5;
}
.game {
padding-left:5px;
}
.winner {
font-weight:bold;
}
.game span {
float:right;
margin-right:5px;
}
.game-top {
border-bottom:1px solid #aaa;
}
.game-top + li {
border-right:1px solid #aaa; min-height:30px;
}
.bracket-winner {
border-bottom:1px solid #aaa;
}
.game-bottom {
border-top:1px solid #aaa;
}
</style>
<% cache ["#{@weight.id}_bracket", @weight] do %>
</br>
</br>
</br>
@@ -7,24 +59,48 @@
<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}", :class=>"btn btn-default" %>
<br>
<br>
<h1><%= @weight.max %> lbs Bracket</h1>
<%= render 'pool' %>
<% if @bracketType == "twoPoolsToFinal" %>
<%= render 'twoPoolFinalBracket' %>
<% end %>
<% if @bracketType == "twoPoolsToSemi" %>
<%= render 'twoPoolSemiBracket' %>
<% end %>
<% if @bracketType == "fourPoolsToQuarter" %>
<%= render 'fourPoolQuarterBracket' %>
<% end %>
<% if @bracketType == "fourPoolsToSemi" %>
<%= render 'fourPoolSemiBracket' %>
<% end %>
<table class='pagebreak'>
<h5><strong><%= @tournament.name %> - <%= @weight.max %> lbs Bracket</strong></h5>
<tr>
<td valign="top" style="padding: 10px;">
<% @matches = @tournament.matches.select{|m| m.weight_id == @weight.id} %>
<% @wrestlers = Wrestler.where(weight_id: @weight.id) %>
<% @pools = @weight.poolRounds(@matches) %>
<%= render 'pool' %>
</td>
<td valign="top" style="padding: 10px;">
<% if @weight.pool_bracket_type == "twoPoolsToFinal" %>
<%= render 'twoPoolFinalBracket' %>
<% end %>
<% if @weight.pool_bracket_type == "twoPoolsToSemi" %>
<%= render 'twoPoolSemiBracket' %>
<% end %>
<% if @weight.pool_bracket_type == "fourPoolsToQuarter" %>
<%= render 'fourPoolQuarterBracket' %>
<% end %>
<% if @weight.pool_bracket_type == "fourPoolsToSemi" %>
<%= render 'fourPoolSemiBracket' %>
<% end %>
</td>
</tr>
</table>
<% end %>
<% if can? :manage, @tournament %>
<br><br>
<% if @weight.wrestlers.size <= 6 && @weight.allPoolMatchesFinished(1) %>
<%= render 'onePoolResults' %>
<% end %>
<h3>Swap Bracket Position</h3>
<%= form_for(Wrestler.new, url: swap_wrestlers_path(@tournament)) do |f| %>
<div class="field">
<%= f.label 'Wrestler 1' %><br>
<%= f.collection_select :originalId, @weight.wrestlers, :id, :name %>
</div>
<div class="field">
<%= f.label 'Wrestler 2' %><br>
<%= f.collection_select :swapId, @weight.wrestlers, :id, :name %>
</div>
<br>
<%= submit_tag "Swap", :class=>"btn btn-success"%>
<% end %>
<% end %>

2
app/views/tournaments/team_scores.html.erb
View File

@@ -1,5 +1,5 @@
<% cache ["team_scores", @tournament] do %>
<% cache ["#{@tournament.id}_team_scores", @tournament] do %>
<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}" , :class=>"btn btn-default"%>
<br>
<br>

2
app/views/tournaments/up_matches.html.erb
View File

@@ -1,7 +1,7 @@
<% if params[:print] == nil && Rails.env.production? %>
<script type='text/javascript' src='//eclkmpbn.com/adServe/banners?tid=85597_138467_5&type=shadowbox&size=800x440'></script>
<% end %>
<% cache ["up_matches", @tournament] do %>
<% cache ["#{@tournament.id}_up_matches", @tournament] do %>
<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}", :class=>"btn btn-default"%>
<script>
// $(document).ready(function() {

14
app/views/wrestlers/_form.html.erb
View File

@@ -52,19 +52,7 @@
</div>
<% end %>
<% if can? :manage, @wrestler.tournament %>
<br><br>
<h3>Swap Bracket Position</h3>
<%= form_for(Wrestler.new, url: swap_wrestlers_path(@wrestler.tournament)) do |f| %>
<%= f.hidden_field :originalId, :value => @wrestler.id %>
<div class="field">
<%= f.label 'Swap With' %><br>
<%= f.collection_select :swapId, @wrestler.weight.wrestlers, :id, :name %>
</div>
<br>
<%= submit_tag "Swap", :class=>"btn btn-success"%>
<% end %>
<% end %>

2
app/views/wrestlers/show.html.erb
View File

@@ -4,7 +4,7 @@
<% if can? :manage, @school %>
| <%= link_to "Edit #{@wrestler.name}", edit_wrestler_path(@wrestler), :class=>"btn btn-primary" %>
<% end %>
<% cache ["wrestlers", @wrestler] do %>
<% cache ["#{@wrestler.id}", @wrestler] do %>
<br>
<br>
<p>