added match status

5 files changed, 20 insertions, 100 deletions

diff --git a/app/views/tournaments/_selected.html.erb b/app/views/tournaments/_selected.html.erb
deleted file mode 100644
index 8734b14..0000000
--- a/app/views/tournaments/_selected.html.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<%= form_for(@tournament) do |f| %>
-  <%= render "common/error_messages", :target => @tournament %>
-  <%= f.hidden_field(:game_id) %>
-
-  <% @chosen = Game.find_by(params[:game]) %>
-  <% @tournament.attributes.each do |name, value| %>
-    <% if (name == "id") or (name =~ /.*_at$/) or (name == "game_id") or (name == "status") %>
-      <% next %>
-    <% end %>
-    <p>
-        <%= f.label name %><br>
-        <% if !@chosen.attributes[name].nil? %>
-          <%= f.text_field(name, :value => @chosen.attributes[name] ) %>
-        <% else %>
-          <%= f.text_field name %>
-        <% end  %>
-    </p>
-  <% end %>
-
-  <%= f.submit %>
-<% end %>
diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb
index 90c3d7a..f8f21e7 100644
--- a/app/views/tournaments/index.html.erb
+++ b/app/views/tournaments/index.html.erb
@@ -1,14 +1,16 @@
-<h1>Listing Tournaments</h1>
+<h1>Listing tournaments</h1>
 
-<% if @tournaments.length > 0 %>
-<table class="table table-hover">
+<table>
   <thead>
     <tr>
       <th>Name</th>
       <th>Game</th>
       <th>Status</th>
-      <th>Players per team</th>
-      <th>Teams per match</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>
@@ -20,28 +22,13 @@
     <% @tournaments.each do |tournament| %>
       <tr>
         <td><%= tournament.name %></td>
-        <td><% case tournament.status
-              when 0 %>
-              <%= form_tag(tournament_path(tournament), method: "put") do %>
-              <input type="hidden" name="update_action" value="join">
-                <%= submit_tag("Join") %>
-              <% end %>
-            <% when 1 %>
-              Ongoing
-            <% else %>
-              Closed
-            <%end %>
-          </td>
-        <td><%= tournament.min_players_per_team %>
-            <% if tournament.min_players_per_team != tournament.max_players_per_team %>
-              to <%= tournament.max_players_per_team %>
-              <% end %>
-        </td>
-        <td><%= tournament.min_teams_per_match %>
-         <% if tournament.min_teams_per_match != tournament.max_teams_per_match %>
-              to <%= tournament.max_teams_per_match %>
-              <% end %>
-          </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>
@@ -50,9 +37,7 @@
     <% end %>
   </tbody>
 </table>
-<% else %>
-  <p class="no-entries"> No tournaments going on right now... Why not start your own? </p>
-<% end %>
+
 <br>
 
-<%= link_to 'New Tournament',  new_tournament_path, :class => "btn btn-warning btn-lg" %>
+<%= link_to 'New Tournament', new_tournament_path %>
diff --git a/app/views/tournaments/join.html.erb b/app/views/tournaments/join.html.erb
deleted file mode 100644
index 1d38d68..0000000
--- a/app/views/tournaments/join.html.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-  <%= @user.name %> 
-
diff --git a/app/views/tournaments/new.html.erb b/app/views/tournaments/new.html.erb
index 8c74068..2a60539 100644
--- a/app/views/tournaments/new.html.erb
+++ b/app/views/tournaments/new.html.erb
@@ -1,16 +1,5 @@
-<h1>New Tournament</h1>
+<h1>New tournament</h1>
 
-<%= form_tag(new_tournament_path, method: "get") do %>
-	<%= select_tag('game',
-	                options_from_collection_for_select(@games, 'id', 'name', @tournament.game.nil? || @tournament.game.id),
-	                :prompt => "Select a Game Type") %>
-	<%= submit_tag("Select", :class => "btn btn-success btn-xs") %>
-<% end %>
-
-<div id='ajax-form'>
-	<% if not @tournament.game.nil? %>
-		<%= render 'selected' %>
-	<% end %>
-</div>
+<%= render 'form' %>
 
 <%= link_to 'Back', tournaments_path %>
diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb
index 3de0623..3cb6179 100644
--- a/app/views/tournaments/show.html.erb
+++ b/app/views/tournaments/show.html.erb
@@ -1,19 +1,5 @@
-<% if @tournament.joinable_by?(current_user) %>
-	<%= form_tag(tournament_path(@tournament), method: "put") do %>
-		<input type="hidden" name="update_action" value="join">
-		<%= current_user.name %><%= submit_tag("Join") %>
-	<% end %>
-<% end %>
+<p id="notice"><%= notice %></p>
 
-
-<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"}) %>
-    <span class="sr-only">60% Complete (warning)</span>
-    </div>
-</div>
-<p><%= @tournament.players.count %> have signed up. <%= @tournament.min_players_per_team * @tournament.min_teams_per_match %> needed. </p>
-
-<% if current_user.in_group?(:host) %>
 <p>
   <strong>Name:</strong>
   <%= @tournament.name %>
@@ -21,7 +7,7 @@
 
 <p>
   <strong>Game:</strong>
-  <%= @tournament.id %>
+  <%= @tournament.game %>
 </p>
 
 <p>
@@ -59,22 +45,5 @@
   <%= @tournament.randomized_teams %>
 </p>
 
-<p>
-  <strong>Status:</strong>
-  <%= @tournament.status %>
-</p>
-
-<%= form_tag(tournaments_path.to_s + "/" + @tournament.id.to_s + "/edit", method: "get") do %>
-  <input type="hidden" name="close_action" value="close">
-  <% if @tournament.players.count >= @tournament.min_players_per_team * @tournament.min_teams_per_match  %> 
-    <%= submit_tag("Close Tournament Registration") %>
-  <% else %>
-    <%= submit_tag("Close Tournament Registration", disabled: true) %>
-  <% end %>
-<% end %>
-
 <%= link_to 'Edit', edit_tournament_path(@tournament) %> |
 <%= link_to 'Back', tournaments_path %>
-
-<% end %>
-