summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
Diffstat (limited to 'app/views')
-rw-r--r--app/views/brackets/show.html.erb32
-rw-r--r--app/views/common/_show_tournament.html.erb3
2 files changed, 18 insertions, 17 deletions
diff --git a/app/views/brackets/show.html.erb b/app/views/brackets/show.html.erb
index 64e6e6a..a3eb000 100644
--- a/app/views/brackets/show.html.erb
+++ b/app/views/brackets/show.html.erb
@@ -21,30 +21,30 @@
%>
function chooseWinner(matchNum, teamNum, currentBox){
console.log(matchNum, teamNum);
- $id = '#match-'+matchNum+'-pred';
- $($id).val(teamNum);
+ var id = '#bracket_matches_'+matchNum;
+ $(id).val(teamNum);
if (matchNum != 1) {
- $parent = parseFloat(matchNum+<%= @logBase%> -2)/<%=@logBase%>;
- $textBox = ($parent - Math.floor($parent)) * <%= @logBase %>;
- $parent = Math.floor($parent);
- $textBox = Math.round($textBox);
- $id = "#svg-match-"+$parent+"-team-"+$textBox;
+ var parent = parseFloat(matchNum+<%= @logBase%> -2)/<%=@logBase%>;
+ var textBox = (parent - Math.floor(parent)) * <%= @logBase %>;
+ var parent = Math.floor(parent);
+ var textBox = Math.round(textBox);
+ var id = "#svg-match-"+parent+"-team-"+textBox;
- console.log($id);
+ console.log(id);
- $($id).text("Team "+teamNum);
- $($id).attr("onclick", "chooseWinner("+$parent+", "+teamNum+", "+$textBox+")");
+ $(id).text("Team "+teamNum);
+ $(id).attr("onclick", "chooseWinner("+parent+", "+teamNum+", "+textBox+")");
}
else
{
console.log("final countdown");
for(var i = 0; i < 3; i++){
- $id = "#svg-match-"+matchNum+"-team-"+i;
- $($id).attr("fill", "black");
+ id = "#svg-match-"+matchNum+"-team-"+i;
+ $(id).attr("fill", "black");
}
- $id = "#svg-match-"+matchNum+"-team-"+currentBox;
- $($id).attr("fill", "green");
+ id = "#svg-match-"+matchNum+"-team-"+currentBox;
+ $(id).attr("fill", "green");
$("#bracket-submit").prop('disabled', false);
}
}
@@ -100,9 +100,9 @@
<%= form_tag(tournament_bracket_path(@tournament, @bracket), method: 'put') do %>
<input type="hidden" name="update_action" value="predict">
<% for i in 1..@matches.length %>
- <%= hidden_field_tag('match-'+@matches[i].id.to_s+'-pred', value = nil) %>
+ <%= hidden_field_tag("bracket[matches][#{@matches[i].id.to_s}]", value = nil) %>
<% end %>
- <%= submit_tag("Sumit Prediction", disabled: true, id: "bracket-submit") %>
+ <%= submit_tag("Submit Prediction", disabled: true, id: "bracket-submit") %>
<% end %>
<%= link_to 'Back', tournaments_path %>
diff --git a/app/views/common/_show_tournament.html.erb b/app/views/common/_show_tournament.html.erb
index 02852cf..f4d02ec 100644
--- a/app/views/common/_show_tournament.html.erb
+++ b/app/views/common/_show_tournament.html.erb
@@ -33,7 +33,8 @@
<% elsif target.players.include?(current_user)%>
<p class="message">You've signed up for this tournament!</p>
<% end %>
- <% if target.status == 1 && target.stages.order(:id).first.scheduling_method == "elimination" && target.stages.order(:id).first.matches.order(:id).first.status < 2 %>
+ <% @user_bracket = target.brackets.find_by(user: current_user) %>
+ <% if target.status == 1 && target.stages.order(:id).first.scheduling_method == "elimination" && target.stages.order(:id).first.matches.order(:id).first.status < 2 && !@user_bracket %>
<%= form_tag(tournament_brackets_path(target), method: "post") do %>
<%= submit_tag("Make Bracket") %>
<% end %>