From aa6e8f12a24e33d88a5751cee5e93bf4a038e2ef Mon Sep 17 00:00:00 2001
From: Tomer Kimia <tkimia@purdue.edu>
Date: Tue, 1 Apr 2014 18:51:03 -0400
Subject: AJAX is now working in the tournament loading page
---
app/views/matches/index.html.erb | 4 ++--
app/views/tournaments/show.html.erb | 29 +++++++++++++++++++++++++++--
2 files changed, 29 insertions(+), 4 deletions(-)
(limited to 'app/views')
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb
index f1019ec..e8d304a 100644
--- a/app/views/matches/index.html.erb
+++ b/app/views/matches/index.html.erb
@@ -38,9 +38,9 @@
width="<%= 300 * @matches.count / 2 + 50 %>" height="<%= 200 * @matches.count + 50 %>"
xmlns="http://www.w3.org/2000/svg">
- <% @matches.each do |tournament | %>
+ <% (1..@matches.count).each do |i| %>
<g class="svg-match" >
-
+
</g>
<% end %>
diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb
index df85dcf..7bdbdc0 100644
--- a/app/views/tournaments/show.html.erb
+++ b/app/views/tournaments/show.html.erb
@@ -3,7 +3,7 @@
</h2>
<div class="progress">
- <%= tag("div", {:class => "progress-bar progress-bar-warning", :style => "width: " +(@tournament.players.count * 100 / (@tournament.min_players_per_team * @tournament.min_teams_per_match)).to_s + "%", "aria-valuemax" => "100", "aria-valuemin" => "0", "aria-valuenow" => (@tournament.players.count * 100 / (@tournament.min_players_per_team * @tournament.min_teams_per_match)).to_s, "role" => "progressbar"}) %>
+ <%= tag("div", {:id => "prog-bar", :class => "progress-bar progress-bar-warning", :style => "width: " +(@tournament.players.count * 100 / (@tournament.min_players_per_team * @tournament.min_teams_per_match)).to_s + "%", "aria-valuemax" => "100", "aria-valuemin" => "0", "aria-valuenow" => (@tournament.players.count * 100 / (@tournament.min_players_per_team * @tournament.min_teams_per_match)).to_s, "role" => "progressbar"}) %>
<span class="sr-only">60% Complete (warning)</span>
</div>
</div>
@@ -65,6 +65,7 @@
<h3 div="players-needed">Hmmm.... nobody's here yet! You and your friends should join the tournament.</h3>
<% end %>
+<div class="leave-buttons">
<%# If user can join, and user hasn't joined already, show the join tournment tag %>
<% if @tournament.joinable_by?(current_user) && !@tournament.players.include?(current_user) %>
<%= form_tag(tournament_path(@tournament), method: "put") do %>
@@ -94,8 +95,32 @@
<%= link_to 'Back', tournaments_path %> |
<%= link_to 'Cancel Tournament', @tournament, method: :delete, data: { confirm: 'Are you sure?' } %>
<% end %>
-
+</div>
<%end %>
</div>
+<script>
+function donehandle( tournament ) {
+ if ( console && console.log ) {
+ var here = tournament["players"].length;
+ var needed = (tournament["min_teams_per_match"] * tournament["min_players_per_team"]);
+ var pct_complete = here / needed;
+ $("#prog-bar").width( (pct_complete * 100) +"%");
+ $("#players-needed").text(here + " " + (here==1?"player has":"players have") + " signed up. " + needed + " players needed. ");
+ players = "";
+ for (var i = 0; i < tournament["players"].length; i++) {
+ players = players+"<li><span class=\"black\">"+tournament["players"][i]["user_name"]+"</span></li>"
+ }
+ $("#tournament-users").html(players);
+
+ }
+ setTimeout(function(){$.ajax({url: "<%= url_for @tournament %>.json"}).done(donehandle)}, 3000);
+}
+
+$.ajax({url: "<%= url_for @tournament %>.json"})
+ .done(donehandle);
+
+
+
+</script>
\ No newline at end of file
--
cgit v1.2.3-2-g168b
From f9a4ee4e998f5f113565a93802c041108e9a180d Mon Sep 17 00:00:00 2001
From: AndrewMurrell <amurrel@purdue.edu>
Date: Wed, 2 Apr 2014 14:53:10 -0400
Subject: now ran generate without ger
---
app/views/remote_usernames/_form.html.erb | 29 ++++++++++++++++++++++++
app/views/remote_usernames/edit.html.erb | 6 +++++
app/views/remote_usernames/index.html.erb | 31 ++++++++++++++++++++++++++
app/views/remote_usernames/index.json.jbuilder | 4 ++++
app/views/remote_usernames/new.html.erb | 5 +++++
app/views/remote_usernames/show.html.erb | 19 ++++++++++++++++
app/views/remote_usernames/show.json.jbuilder | 1 +
app/views/tournaments/_form.html.erb | 20 +++++++++++++++++
app/views/tournaments/index.html.erb | 10 +++++++++
app/views/tournaments/index.json.jbuilder | 2 +-
app/views/tournaments/show.html.erb | 25 +++++++++++++++++++++
app/views/tournaments/show.json.jbuilder | 2 +-
12 files changed, 152 insertions(+), 2 deletions(-)
create mode 100644 app/views/remote_usernames/_form.html.erb
create mode 100644 app/views/remote_usernames/edit.html.erb
create mode 100644 app/views/remote_usernames/index.html.erb
create mode 100644 app/views/remote_usernames/index.json.jbuilder
create mode 100644 app/views/remote_usernames/new.html.erb
create mode 100644 app/views/remote_usernames/show.html.erb
create mode 100644 app/views/remote_usernames/show.json.jbuilder
(limited to 'app/views')
diff --git a/app/views/remote_usernames/_form.html.erb b/app/views/remote_usernames/_form.html.erb
new file mode 100644
index 0000000..5da1f8f
--- /dev/null
+++ b/app/views/remote_usernames/_form.html.erb
@@ -0,0 +1,29 @@
+<%= form_for(@remote_username) do |f| %>
+ <% if @remote_username.errors.any? %>
+ <div id="error_explanation">
+ <h2><%= pluralize(@remote_username.errors.count, "error") %> prohibited this remote_username from being saved:</h2>
+
+ <ul>
+ <% @remote_username.errors.full_messages.each do |msg| %>
+ <li><%= msg %></li>
+ <% end %>
+ </ul>
+ </div>
+ <% end %>
+
+ <div class="field">
+ <%= f.label :game_id %><br>
+ <%= f.text_field :game_id %>
+ </div>
+ <div class="field">
+ <%= f.label :user_id %><br>
+ <%= f.text_field :user_id %>
+ </div>
+ <div class="field">
+ <%= f.label :user_name %><br>
+ <%= f.text_field :user_name %>
+ </div>
+ <div class="actions">
+ <%= f.submit %>
+ </div>
+<% end %>
diff --git a/app/views/remote_usernames/edit.html.erb b/app/views/remote_usernames/edit.html.erb
new file mode 100644
index 0000000..52d4b37
--- /dev/null
+++ b/app/views/remote_usernames/edit.html.erb
@@ -0,0 +1,6 @@
+<h1>Editing remote_username</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @remote_username %> |
+<%= link_to 'Back', remote_usernames_path %>
diff --git a/app/views/remote_usernames/index.html.erb b/app/views/remote_usernames/index.html.erb
new file mode 100644
index 0000000..14f5876
--- /dev/null
+++ b/app/views/remote_usernames/index.html.erb
@@ -0,0 +1,31 @@
+<h1>Listing remote_usernames</h1>
+
+<table>
+ <thead>
+ <tr>
+ <th>Game</th>
+ <th>User</th>
+ <th>User name</th>
+ <th></th>
+ <th></th>
+ <th></th>
+ </tr>
+ </thead>
+
+ <tbody>
+ <% @remote_usernames.each do |remote_username| %>
+ <tr>
+ <td><%= remote_username.game %></td>
+ <td><%= remote_username.user %></td>
+ <td><%= remote_username.user_name %></td>
+ <td><%= link_to 'Show', remote_username %></td>
+ <td><%= link_to 'Edit', edit_remote_username_path(remote_username) %></td>
+ <td><%= link_to 'Destroy', remote_username, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+ </tr>
+ <% end %>
+ </tbody>
+</table>
+
+<br>
+
+<%= link_to 'New Remote username', new_remote_username_path %>
diff --git a/app/views/remote_usernames/index.json.jbuilder b/app/views/remote_usernames/index.json.jbuilder
new file mode 100644
index 0000000..c9fbc0f
--- /dev/null
+++ b/app/views/remote_usernames/index.json.jbuilder
@@ -0,0 +1,4 @@
+json.array!(@remote_usernames) do |remote_username|
+ json.extract! remote_username, :id, :game_id, :user_id, :user_name
+ json.url remote_username_url(remote_username, format: :json)
+end
diff --git a/app/views/remote_usernames/new.html.erb b/app/views/remote_usernames/new.html.erb
new file mode 100644
index 0000000..b9cfcf4
--- /dev/null
+++ b/app/views/remote_usernames/new.html.erb
@@ -0,0 +1,5 @@
+<h1>New remote_username</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', remote_usernames_path %>
diff --git a/app/views/remote_usernames/show.html.erb b/app/views/remote_usernames/show.html.erb
new file mode 100644
index 0000000..416ca9d
--- /dev/null
+++ b/app/views/remote_usernames/show.html.erb
@@ -0,0 +1,19 @@
+<p id="notice"><%= notice %></p>
+
+<p>
+ <strong>Game:</strong>
+ <%= @remote_username.game %>
+</p>
+
+<p>
+ <strong>User:</strong>
+ <%= @remote_username.user %>
+</p>
+
+<p>
+ <strong>User name:</strong>
+ <%= @remote_username.user_name %>
+</p>
+
+<%= link_to 'Edit', edit_remote_username_path(@remote_username) %> |
+<%= link_to 'Back', remote_usernames_path %>
diff --git a/app/views/remote_usernames/show.json.jbuilder b/app/views/remote_usernames/show.json.jbuilder
new file mode 100644
index 0000000..1a0f6f9
--- /dev/null
+++ b/app/views/remote_usernames/show.json.jbuilder
@@ -0,0 +1 @@
+json.extract! @remote_username, :id, :game_id, :user_id, :user_name, :created_at, :updated_at
diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb
index 3dadbf7..38855a0 100644
--- a/app/views/tournaments/_form.html.erb
+++ b/app/views/tournaments/_form.html.erb
@@ -23,6 +23,26 @@
<%= f.label :status %><br>
<%= f.number_field :status %>
</div>
+ <div class="field">
+ <%= f.label :min_players_per_team %><br>
+ <%= f.number_field :min_players_per_team %>
+ </div>
+ <div class="field">
+ <%= f.label :max_players_per_team %><br>
+ <%= f.number_field :max_players_per_team %>
+ </div>
+ <div class="field">
+ <%= f.label :min_teams_per_match %><br>
+ <%= f.number_field :min_teams_per_match %>
+ </div>
+ <div class="field">
+ <%= f.label :max_teams_per_match %><br>
+ <%= f.number_field :max_teams_per_match %>
+ </div>
+ <div class="field">
+ <%= f.label :set_rounds %><br>
+ <%= f.number_field :set_rounds %>
+ </div>
<div class="field">
<%= f.label :randomized_teams %><br>
<%= f.check_box :randomized_teams %>
diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb
index 4c1d0ff..f8f21e7 100644
--- a/app/views/tournaments/index.html.erb
+++ b/app/views/tournaments/index.html.erb
@@ -6,6 +6,11 @@
<th>Name</th>
<th>Game</th>
<th>Status</th>
+ <th>Min players per team</th>
+ <th>Max players per team</th>
+ <th>Min teams per match</th>
+ <th>Max teams per match</th>
+ <th>Set rounds</th>
<th>Randomized teams</th>
<th></th>
<th></th>
@@ -19,6 +24,11 @@
<td><%= tournament.name %></td>
<td><%= tournament.game %></td>
<td><%= tournament.status %></td>
+ <td><%= tournament.min_players_per_team %></td>
+ <td><%= tournament.max_players_per_team %></td>
+ <td><%= tournament.min_teams_per_match %></td>
+ <td><%= tournament.max_teams_per_match %></td>
+ <td><%= tournament.set_rounds %></td>
<td><%= tournament.randomized_teams %></td>
<td><%= link_to 'Show', tournament %></td>
<td><%= link_to 'Edit', edit_tournament_path(tournament) %></td>
diff --git a/app/views/tournaments/index.json.jbuilder b/app/views/tournaments/index.json.jbuilder
index 32587df..4038f04 100644
--- a/app/views/tournaments/index.json.jbuilder
+++ b/app/views/tournaments/index.json.jbuilder
@@ -1,4 +1,4 @@
json.array!(@tournaments) do |tournament|
- json.extract! tournament, :id, :name, :game_id, :status, :randomized_teams
+ json.extract! tournament, :id, :name, :game_id, :status, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams
json.url tournament_url(tournament, format: :json)
end
diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb
index d58452b..3cb6179 100644
--- a/app/views/tournaments/show.html.erb
+++ b/app/views/tournaments/show.html.erb
@@ -15,6 +15,31 @@
<%= @tournament.status %>
</p>
+<p>
+ <strong>Min players per team:</strong>
+ <%= @tournament.min_players_per_team %>
+</p>
+
+<p>
+ <strong>Max players per team:</strong>
+ <%= @tournament.max_players_per_team %>
+</p>
+
+<p>
+ <strong>Min teams per match:</strong>
+ <%= @tournament.min_teams_per_match %>
+</p>
+
+<p>
+ <strong>Max teams per match:</strong>
+ <%= @tournament.max_teams_per_match %>
+</p>
+
+<p>
+ <strong>Set rounds:</strong>
+ <%= @tournament.set_rounds %>
+</p>
+
<p>
<strong>Randomized teams:</strong>
<%= @tournament.randomized_teams %>
diff --git a/app/views/tournaments/show.json.jbuilder b/app/views/tournaments/show.json.jbuilder
index d543c76..27fd5c0 100644
--- a/app/views/tournaments/show.json.jbuilder
+++ b/app/views/tournaments/show.json.jbuilder
@@ -1 +1 @@
-json.extract! @tournament, :id, :name, :game_id, :status, :randomized_teams, :created_at, :updated_at
+json.extract! @tournament, :id, :name, :game_id, :status, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :created_at, :updated_at
--
cgit v1.2.3-2-g168b
From ef22599880973aae8464bacb82e3a04d6277bc43 Mon Sep 17 00:00:00 2001
From: shumakl <shumakl@purdue.edu>
Date: Thu, 3 Apr 2014 11:19:10 -0400
Subject: Move things around between users and sessions
---
app/views/sessions/_form.html.erb | 4 ++++
app/views/sessions/index.html.erb | 2 ++
app/views/sessions/index.json.jbuilder | 2 +-
app/views/sessions/show.html.erb | 5 +++++
app/views/sessions/show.json.jbuilder | 2 +-
5 files changed, 13 insertions(+), 2 deletions(-)
(limited to 'app/views')
diff --git a/app/views/sessions/_form.html.erb b/app/views/sessions/_form.html.erb
index 1b94e77..90ad0ad 100644
--- a/app/views/sessions/_form.html.erb
+++ b/app/views/sessions/_form.html.erb
@@ -15,6 +15,10 @@
<%= f.label :user_id %><br>
<%= f.text_field :user_id %>
</div>
+ <div class="field">
+ <%= f.label :token %><br>
+ <%= f.text_field :token %>
+ </div>
<div class="actions">
<%= f.submit %>
</div>
diff --git a/app/views/sessions/index.html.erb b/app/views/sessions/index.html.erb
index 707a47d..43a7e1f 100644
--- a/app/views/sessions/index.html.erb
+++ b/app/views/sessions/index.html.erb
@@ -4,6 +4,7 @@
<thead>
<tr>
<th>User</th>
+ <th>Token</th>
<th></th>
<th></th>
<th></th>
@@ -14,6 +15,7 @@
<% @sessions.each do |session| %>
<tr>
<td><%= session.user %></td>
+ <td><%= session.token %></td>
<td><%= link_to 'Show', session %></td>
<td><%= link_to 'Edit', edit_session_path(session) %></td>
<td><%= link_to 'Destroy', session, method: :delete, data: { confirm: 'Are you sure?' } %></td>
diff --git a/app/views/sessions/index.json.jbuilder b/app/views/sessions/index.json.jbuilder
index 18fd4fa..5205ede 100644
--- a/app/views/sessions/index.json.jbuilder
+++ b/app/views/sessions/index.json.jbuilder
@@ -1,4 +1,4 @@
json.array!(@sessions) do |session|
- json.extract! session, :id, :user_id
+ json.extract! session, :id, :user_id, :token
json.url session_url(session, format: :json)
end
diff --git a/app/views/sessions/show.html.erb b/app/views/sessions/show.html.erb
index 5176869..230e6bd 100644
--- a/app/views/sessions/show.html.erb
+++ b/app/views/sessions/show.html.erb
@@ -5,5 +5,10 @@
<%= @session.user %>
</p>
+<p>
+ <strong>Token:</strong>
+ <%= @session.token %>
+</p>
+
<%= link_to 'Edit', edit_session_path(@session) %> |
<%= link_to 'Back', sessions_path %>
diff --git a/app/views/sessions/show.json.jbuilder b/app/views/sessions/show.json.jbuilder
index 4ebf936..c9efd3b 100644
--- a/app/views/sessions/show.json.jbuilder
+++ b/app/views/sessions/show.json.jbuilder
@@ -1 +1 @@
-json.extract! @session, :id, :user_id, :created_at, :updated_at
+json.extract! @session, :id, :user_id, :token, :created_at, :updated_at
--
cgit v1.2.3-2-g168b
From 8d5325cd6019b784ba2da66d19c41daaadbc19e0 Mon Sep 17 00:00:00 2001
From: shumakl <shumakl@purdue.edu>
Date: Thu, 3 Apr 2014 12:14:48 -0400
Subject: do things to avoid merge conflicts with clean2
---
app/views/tournaments/show.html.erb | 81 ++++++++++++++++++-------------------
1 file changed, 39 insertions(+), 42 deletions(-)
(limited to 'app/views')
diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb
index 7bdbdc0..1ebf4c5 100644
--- a/app/views/tournaments/show.html.erb
+++ b/app/views/tournaments/show.html.erb
@@ -11,45 +11,45 @@
<span id="tournament-side-params">
+<p>
+ <strong>Status:</strong>
+ <% if @tournament.status == 0 %>
+ Waiting for players...
+ <% else %>
+ Started
+ <% end %>
+</p>
+
+<p>
+ <strong>Min players per team:</strong>
+ <%= @tournament.min_players_per_team %>
+</p>
+
+<p>
+ <strong>Max players per team:</strong>
+ <%= @tournament.max_players_per_team %>
+</p>
+
+<p>
+ <strong>Min teams per match:</strong>
+ <%= @tournament.min_teams_per_match %>
+</p>
+
+<p>
+ <strong>Max teams per match:</strong>
+ <%= @tournament.max_teams_per_match %>
+</p>
+
+<p>
+ <strong>Set rounds:</strong>
+ <%= @tournament.set_rounds %>
+</p>
+
+<p>
+ <strong>Randomized teams:</strong>
+ <%= @tournament.randomized_teams %>
+</p>
- <p>
- <strong>Status:</strong>
- <% if @tournament.status == 0 %>
- Waiting for players...
- <% else %>
- Started
- <% end %>
- </p>
-
- <p>
- <strong>Min players per team:</strong>
- <%= @tournament.min_players_per_team %>
- </p>
-
- <p>
- <strong>Max players per team:</strong>
- <%= @tournament.max_players_per_team %>
- </p>
-
- <p>
- <strong>Min teams per match:</strong>
- <%= @tournament.min_teams_per_match %>
- </p>
-
- <p>
- <strong>Max teams per match:</strong>
- <%= @tournament.max_teams_per_match %>
- </p>
-
- <p>
- <strong>Set rounds:</strong>
- <%= @tournament.set_rounds %>
- </p>
-
- <p>
- <strong>Randomized teams:</strong>
- <%= @tournament.randomized_teams %>
- </p>
</span>
<div >
@@ -120,7 +120,4 @@ function donehandle( tournament ) {
$.ajax({url: "<%= url_for @tournament %>.json"})
.done(donehandle);
-
-
-
-</script>
\ No newline at end of file
+</script>
--
cgit v1.2.3-2-g168b