From d2e4f58410c20f5e7b9e8e0dde3fd55d201af4bb Mon Sep 17 00:00:00 2001
From: Luke Shumaker <shumakl@purdue.edu>
Date: Sun, 6 Apr 2014 13:18:00 -0400
Subject: run generate

---
 app/controllers/servers_controller.rb | 2 +-
 app/views/servers/_form.html.erb      | 4 ++++
 app/views/servers/index.html.erb      | 2 ++
 app/views/servers/index.json.jbuilder | 2 +-
 app/views/servers/show.html.erb       | 5 +++++
 app/views/servers/show.json.jbuilder  | 2 +-
 6 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'app')

diff --git a/app/controllers/servers_controller.rb b/app/controllers/servers_controller.rb
index 43999c4..4c12c7e 100644
--- a/app/controllers/servers_controller.rb
+++ b/app/controllers/servers_controller.rb
@@ -69,6 +69,6 @@ class ServersController < ApplicationController
 
 	# Never trust parameters from the scary internet, only allow the white list through.
 	def server_params
-		params[:server]
+		params.require(:server).permit(:default_user_permissions)
 	end
 end
diff --git a/app/views/servers/_form.html.erb b/app/views/servers/_form.html.erb
index b08654b..6211f9a 100644
--- a/app/views/servers/_form.html.erb
+++ b/app/views/servers/_form.html.erb
@@ -11,6 +11,10 @@
     </div>
   <% end %>
 
+  <div class="field">
+    <%= f.label :default_user_permissions %><br>
+    <%= f.number_field :default_user_permissions %>
+  </div>
   <div class="actions">
     <%= f.submit %>
   </div>
diff --git a/app/views/servers/index.html.erb b/app/views/servers/index.html.erb
index f45d393..b3064f4 100644
--- a/app/views/servers/index.html.erb
+++ b/app/views/servers/index.html.erb
@@ -3,6 +3,7 @@
 <table>
   <thead>
     <tr>
+      <th>Default user permissions</th>
       <th></th>
       <th></th>
       <th></th>
@@ -12,6 +13,7 @@
   <tbody>
     <% @servers.each do |server| %>
       <tr>
+        <td><%= server.default_user_permissions %></td>
         <td><%= link_to 'Show', server %></td>
         <td><%= link_to 'Edit', edit_server_path(server) %></td>
         <td><%= link_to 'Destroy', server, method: :delete, data: { confirm: 'Are you sure?' } %></td>
diff --git a/app/views/servers/index.json.jbuilder b/app/views/servers/index.json.jbuilder
index 2776abc..3c9df60 100644
--- a/app/views/servers/index.json.jbuilder
+++ b/app/views/servers/index.json.jbuilder
@@ -1,4 +1,4 @@
 json.array!(@servers) do |server|
-  json.extract! server, :id
+  json.extract! server, :id, :default_user_permissions
   json.url server_url(server, format: :json)
 end
diff --git a/app/views/servers/show.html.erb b/app/views/servers/show.html.erb
index 039cd8f..b18f09f 100644
--- a/app/views/servers/show.html.erb
+++ b/app/views/servers/show.html.erb
@@ -1,4 +1,9 @@
 <p id="notice"><%= notice %></p>
 
+<p>
+  <strong>Default user permissions:</strong>
+  <%= @server.default_user_permissions %>
+</p>
+
 <%= link_to 'Edit', edit_server_path(@server) %> |
 <%= link_to 'Back', servers_path %>
diff --git a/app/views/servers/show.json.jbuilder b/app/views/servers/show.json.jbuilder
index 972b1c0..c566f76 100644
--- a/app/views/servers/show.json.jbuilder
+++ b/app/views/servers/show.json.jbuilder
@@ -1 +1 @@
-json.extract! @server, :id, :created_at, :updated_at
+json.extract! @server, :id, :default_user_permissions, :created_at, :updated_at
-- 
cgit v1.2.3-2-g168b


From a81c1ca571b0bb41f0acba6594559c7405fc2bb1 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <shumakl@purdue.edu>
Date: Sun, 6 Apr 2014 13:58:00 -0400
Subject: Simplify the server controller and views, as it is a singular
 resource

---
 app/controllers/servers_controller.rb | 51 +++++------------------------------
 app/views/servers/index.html.erb      | 27 -------------------
 app/views/servers/index.json.jbuilder |  4 ---
 app/views/servers/new.html.erb        |  5 ----
 4 files changed, 7 insertions(+), 80 deletions(-)
 delete mode 100644 app/views/servers/index.html.erb
 delete mode 100644 app/views/servers/index.json.jbuilder
 delete mode 100644 app/views/servers/new.html.erb

(limited to 'app')

diff --git a/app/controllers/servers_controller.rb b/app/controllers/servers_controller.rb
index 27c6f9f..e3850b8 100644
--- a/app/controllers/servers_controller.rb
+++ b/app/controllers/servers_controller.rb
@@ -1,43 +1,15 @@
 class ServersController < ApplicationController
-
-	# GET /servers
-	# GET /servers.json
-	def index
-		@servers = Server.all
-	end
-
-	# GET /servers/1
-	# GET /servers/1.json
+	# GET /server
+	# GET /server.json
 	def show
 	end
 
-	# GET /servers/new
-	def new
-		@server = Server.new
-	end
-
-	# GET /servers/1/edit
+	# GET /server/edit
 	def edit
 	end
 
-	# POST /servers
-	# POST /servers.json
-	def create
-		@server = Server.new(server_params)
-
-		respond_to do |format|
-			if @server.save
-				format.html { redirect_to @server, notice: 'Server was successfully created.' }
-				format.json { render action: 'show', status: :created, location: @server }
-			else
-				format.html { render action: 'new' }
-				format.json { render json: @server.errors, status: :unprocessable_entity }
-			end
-		end
-	end
-
-	# PATCH/PUT /servers/1
-	# PATCH/PUT /servers/1.json
+	# PATCH/PUT /server
+	# PATCH/PUT /server.json
 	def update
 		respond_to do |format|
 			if @server.update(server_params)
@@ -50,20 +22,11 @@ class ServersController < ApplicationController
 		end
 	end
 
-	# DELETE /servers/1
-	# DELETE /servers/1.json
-	def destroy
-		@server.destroy
-		respond_to do |format|
-			format.html { redirect_to servers_url }
-			format.json { head :no_content }
-		end
-	end
-
 	private
+
 	# Use callbacks to share common setup or constraints between actions.
 	def set_server
-		@server = Server.find(params[:id])
+		@server = Server.first
 	end
 
 	# Never trust parameters from the scary internet, only allow the white list through.
diff --git a/app/views/servers/index.html.erb b/app/views/servers/index.html.erb
deleted file mode 100644
index b3064f4..0000000
--- a/app/views/servers/index.html.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-<h1>Listing servers</h1>
-
-<table>
-  <thead>
-    <tr>
-      <th>Default user permissions</th>
-      <th></th>
-      <th></th>
-      <th></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @servers.each do |server| %>
-      <tr>
-        <td><%= server.default_user_permissions %></td>
-        <td><%= link_to 'Show', server %></td>
-        <td><%= link_to 'Edit', edit_server_path(server) %></td>
-        <td><%= link_to 'Destroy', server, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-
-<br>
-
-<%= link_to 'New Server', new_server_path %>
diff --git a/app/views/servers/index.json.jbuilder b/app/views/servers/index.json.jbuilder
deleted file mode 100644
index 3c9df60..0000000
--- a/app/views/servers/index.json.jbuilder
+++ /dev/null
@@ -1,4 +0,0 @@
-json.array!(@servers) do |server|
-  json.extract! server, :id, :default_user_permissions
-  json.url server_url(server, format: :json)
-end
diff --git a/app/views/servers/new.html.erb b/app/views/servers/new.html.erb
deleted file mode 100644
index 0422009..0000000
--- a/app/views/servers/new.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<h1>New server</h1>
-
-<%= render 'form' %>
-
-<%= link_to 'Back', servers_path %>
-- 
cgit v1.2.3-2-g168b


From 6be38bc3b6ee5546c0d1f26497c2687b4138df35 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <shumakl@purdue.edu>
Date: Sun, 6 Apr 2014 13:58:56 -0400
Subject: User.permission_bits: return 2^n instead of n for each.

This way they can easily be ORed together, C-like.
---
 app/models/user.rb | 45 +++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

(limited to 'app')

diff --git a/app/models/user.rb b/app/models/user.rb
index 626e4bf..0b77ab1 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -11,31 +11,32 @@ class User < ActiveRecord::Base
 
 	def self.permission_bits
 		return {
-			:create_tournament => 1,
-			:edit_tournament => 2,
-			:join_tournament => 3,
-			:delete_tournament => 4,
+			:create_tournament	=> (2**1),
+			:edit_tournament	=> (2**2),
+			:join_tournament	=> (2**3),
+			:delete_tournament	=> (2**4),
 
-			:create_game => 5,
-			:edit_game => 6,
-			:delete_game => 7,
+			:create_game	=> (2**5),
+			:edit_game  	=> (2**6),
+			:delete_game	=> (2**7),
 
-			:create_user => 8,
-			:edit_user => 9,
-			:delete_user => 10,
+			:create_user	=> (2**8),
+			:edit_user  	=> (2**9),
+			:delete_user	=> (2**10),
 
-			:create_alert => 11,
-			:edit_alert => 12,
-			:delete_alert => 13,
+			:create_alert	=> (2**11),
+			:edit_alert 	=> (2**12),
+			:delete_alert	=> (2**13),
 
-			:create_pm => 14,
-			:edit_pm => 15,
-			:delete_pm => 16,
+			:create_pm	=> (2**14),
+			:edit_pm	=> (2**15),
+			:delete_pm	=> (2**16),
 
-			:create_session => 17,
-			:delete_session => 18,
+			:create_session	=> (2**17),
+			:delete_session	=> (2**18),
 
-			:edit_permissions => 19,
+			:edit_permissions	=> (2**19),
+			:edit_server    	=> (2**20),
 		}
 	end
 
@@ -44,21 +45,21 @@ class User < ActiveRecord::Base
 		if bit.nil?
 			return false
 		else
-			return (self.permissions & (2**bit) != 0)
+			return (self.permissions & bit != 0)
 		end
 	end
 
 	def add_ability(action)
 		bit = User.permission_bits[action.to_sym]
 		unless bit.nil?
-			self.permissions |= 2**bit
+			self.permissions |= bit
 		end
 	end
 
 	def remove_ability(action)
 		bit = User.permission_bits[action.to_sym]
 		unless bit.nil?
-			self.permissions &= ~ (2**bit)
+			self.permissions &= ~ bit
 		end
 	end
 
-- 
cgit v1.2.3-2-g168b


From 2da3c10d18856c254457a3106eb8f1762b5077a9 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <shumakl@purdue.edu>
Date: Sun, 6 Apr 2014 14:04:21 -0400
Subject: oops

---
 app/views/servers/edit.html.erb | 3 +--
 app/views/servers/show.html.erb | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'app')

diff --git a/app/views/servers/edit.html.erb b/app/views/servers/edit.html.erb
index a92cdb5..99f7faa 100644
--- a/app/views/servers/edit.html.erb
+++ b/app/views/servers/edit.html.erb
@@ -2,5 +2,4 @@
 
 <%= render 'form' %>
 
-<%= link_to 'Show', @server %> |
-<%= link_to 'Back', servers_path %>
+<%= link_to 'Show', @server %>
diff --git a/app/views/servers/show.html.erb b/app/views/servers/show.html.erb
index aa6752a..875be5d 100644
--- a/app/views/servers/show.html.erb
+++ b/app/views/servers/show.html.erb
@@ -3,5 +3,4 @@
   <%= @server.default_user_permissions %>
 </p>
 
-<%= link_to 'Edit', edit_server_path(@server) %> |
-<%= link_to 'Back', servers_path %>
+<%= link_to 'Edit', edit_server_path(@server) %>
-- 
cgit v1.2.3-2-g168b


From cfaff7870d0348b25b3b4b2597950894ab25d989 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <shumakl@purdue.edu>
Date: Sun, 6 Apr 2014 14:32:38 -0400
Subject: implement editing the default user permissions

---
 app/controllers/servers_controller.rb |  2 +-
 app/controllers/users_controller.rb   |  2 +-
 app/models/server.rb                  | 36 +++++++++++++++++++++++++++++++++++
 app/views/servers/_form.html.erb      | 23 ++++++++++------------
 app/views/servers/edit.html.erb       |  2 +-
 app/views/servers/show.html.erb       |  2 +-
 6 files changed, 50 insertions(+), 17 deletions(-)

(limited to 'app')

diff --git a/app/controllers/servers_controller.rb b/app/controllers/servers_controller.rb
index e3850b8..83a9f31 100644
--- a/app/controllers/servers_controller.rb
+++ b/app/controllers/servers_controller.rb
@@ -31,6 +31,6 @@ class ServersController < ApplicationController
 
 	# Never trust parameters from the scary internet, only allow the white list through.
 	def server_params
-		params.require(:server).permit(:default_user_permissions)
+		params.require(:server).permit(:default_user_permissions, :default_user_abilities => User.permission_bits.keys)
 	end
 end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index dd66c18..637480f 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -33,7 +33,7 @@ class UsersController < ApplicationController
 			return
 		end
 
-		@user.permissions = 0
+		@user.permissions = Server.first.default_user_permissions
 		respond_to do |format|
 			if @user.save
 				sign_in @user
diff --git a/app/models/server.rb b/app/models/server.rb
index 120f0fa..5ba7524 100644
--- a/app/models/server.rb
+++ b/app/models/server.rb
@@ -1,2 +1,38 @@
 class Server < ActiveRecord::Base
+	def default_user_abilities
+		@abilities ||= User::Abilities.new(DefaultUser.new(self))
+	end
+	def default_user_abilities=(new)
+		new.each do |k,v|
+			if v == "0"
+				v = false
+			end
+			default_user_abilities[k] = v
+		end
+	end
+	class DefaultUser
+		def initialize(server)
+			@server = server
+		end
+		def can?(action)
+			bit = User.permission_bits[action]
+			if bit.nil?
+				return false
+			else
+				return (@server.default_user_permissions & bit != 0)
+			end
+		end
+		def add_ability(action)
+			bit = User.permission_bits[action.to_sym]
+			unless bit.nil?
+				@server.default_user_permissions |= bit
+			end
+		end
+		def remove_ability(action)
+			bit = User.permission_bits[action.to_sym]
+			unless bit.nil?
+				@server.default_user_permissions &= ~ bit
+			end
+		end
+	end
 end
diff --git a/app/views/servers/_form.html.erb b/app/views/servers/_form.html.erb
index 6211f9a..1afde11 100644
--- a/app/views/servers/_form.html.erb
+++ b/app/views/servers/_form.html.erb
@@ -1,20 +1,17 @@
 <%= form_for(@server) do |f| %>
-  <% if @server.errors.any? %>
-    <div id="error_explanation">
-      <h2><%= pluralize(@server.errors.count, "error") %> prohibited this server from being saved:</h2>
+  <%= render "common/error_messages", :target => @server %>
 
-      <ul>
-      <% @server.errors.full_messages.each do |msg| %>
-        <li><%= msg %></li>
+  <fieldset>
+    <legend>Default permissions for new users</legend>
+    <ul>
+      <%= fields_for "server[default_user_abilities]", @server.default_user_abilities do |a| %>
+      <% @server.default_user_abilities.keys.each do |ability| %>
+      <li><label><%= a.check_box(ability) %> <%= ability.to_s.humanize %></label></li>
       <% end %>
-      </ul>
-    </div>
-  <% end %>
+    <% end %>
+    </ul>
+  </fieldset>
 
-  <div class="field">
-    <%= f.label :default_user_permissions %><br>
-    <%= f.number_field :default_user_permissions %>
-  </div>
   <div class="actions">
     <%= f.submit %>
   </div>
diff --git a/app/views/servers/edit.html.erb b/app/views/servers/edit.html.erb
index 99f7faa..d37864f 100644
--- a/app/views/servers/edit.html.erb
+++ b/app/views/servers/edit.html.erb
@@ -2,4 +2,4 @@
 
 <%= render 'form' %>
 
-<%= link_to 'Show', @server %>
+<%= link_to server_path %>
diff --git a/app/views/servers/show.html.erb b/app/views/servers/show.html.erb
index 875be5d..54aaf66 100644
--- a/app/views/servers/show.html.erb
+++ b/app/views/servers/show.html.erb
@@ -3,4 +3,4 @@
   <%= @server.default_user_permissions %>
 </p>
 
-<%= link_to 'Edit', edit_server_path(@server) %>
+<%= link_to 'Edit', edit_server_path %>
-- 
cgit v1.2.3-2-g168b


From 353a5dfcc1782744684922b7d41c8030750d1533 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <shumakl@purdue.edu>
Date: Sun, 6 Apr 2014 14:54:24 -0400
Subject: add a server settings button to the top bar if you have permission

---
 app/assets/stylesheets/custom.css.scss | 1 +
 app/views/layouts/application.html.erb | 3 +++
 2 files changed, 4 insertions(+)

(limited to 'app')

diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
index 1a9b09a..febcbb8 100644
--- a/app/assets/stylesheets/custom.css.scss
+++ b/app/assets/stylesheets/custom.css.scss
@@ -24,6 +24,7 @@ a, input[type="submit"] {
 	&.signup { @extend .btn-success; }
 	&.signin { @extend .btn-info; }
 	&.signout { @extend .btn-danger; }
+	&.server { @extend .btn-danger; }
 }
 
 p.errors {
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 976ee85..6d1d7f4 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -21,6 +21,9 @@
 		<% if signed_in? %>
 			<%= link_to current_user.user_name, current_user, :class => "user" %>
 			<%= link_to "Sign out", session_path("current"), method: "delete", :class => "signout" %>
+			<% if current_user.can? :edit_server %>
+				<%= link_to "Server settings", edit_server_path, :class => "server" %>
+			<% end %>
 		<% else %>
 			<%= link_to "Log in", new_session_path, :class => "signin" %>
 			<%= link_to "Sign up", new_user_path, :class => "signup" %>
-- 
cgit v1.2.3-2-g168b


From 7e7b56d0a722e6c7e453d83f65324ec9d571b109 Mon Sep 17 00:00:00 2001
From: DavisLWebb <davislwebb@ymail.com>
Date: Sun, 6 Apr 2014 17:23:21 -0400
Subject: Fixed match view, GUNTAS

---
 app/views/matches/show.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb
index 6fb4042..20860e2 100644
--- a/app/views/matches/show.html.erb
+++ b/app/views/matches/show.html.erb
@@ -61,8 +61,8 @@
 	Players see the Peer Review Page
 	Host see the Game Status
 -->
-<% if (@match.status==0) %>
-	<% if (@tournament.players.include?(current_user) %>
+<% if @match.status == 0 %>
+	<% if @tournament.players.include?(current_user) %>
 		<% @match.teams.each do |team| %>
 			<ul>
 				<% team.users.collect{|u| u.user_name}.each do |k| %>
-- 
cgit v1.2.3-2-g168b


From 8f1a442b8f647ddca49572c8deb63f035d85ccf8 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <shumakl@purdue.edu>
Date: Sun, 6 Apr 2014 17:32:34 -0400
Subject: I swear I have fixed this before

---
 app/controllers/tournaments_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
index a9e91b0..2fc82ed 100644
--- a/app/controllers/tournaments_controller.rb
+++ b/app/controllers/tournaments_controller.rb
@@ -99,7 +99,7 @@ class TournamentsController < ApplicationController
 					format.html { redirect_to @tournament, notice: 'You have joined this tournament.' }
 					format.json { head :no_content }
 				else
-					format.html { render action: 'permission_denied', status: :forbidden }
+					format.html { redirect_to @tournament, notice: "You don't have permission to start this tournament." }
 					format.json { render json: "Permission denied", status: :forbidden }
 				end
 			end
-- 
cgit v1.2.3-2-g168b


From f85943114dba527a1f87abb03229553472f57c0c Mon Sep 17 00:00:00 2001
From: tkimia <tkimia@purdue.edu>
Date: Sun, 6 Apr 2014 18:45:41 -0400
Subject: started SVG generation

---
 app/controllers/matches_controller.rb |  4 ++++
 app/models/tournament.rb              |  4 ++--
 app/views/matches/index.html.erb      | 32 +++++++++++++++++++++++++++-----
 3 files changed, 33 insertions(+), 7 deletions(-)

(limited to 'app')

diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb
index 31fc9ad..e773667 100644
--- a/app/controllers/matches_controller.rb
+++ b/app/controllers/matches_controller.rb
@@ -8,6 +8,10 @@ class MatchesController < ApplicationController
 
   def index
     @matches = @tournament.matches
+    # width of SVG
+    @width = 300 * (Math.log2(@matches.count).floor + 1) + 300;
+    # height of SVG
+    @height = 200 * 2**Math.log2(@matches.count).floor + 100;
   end
 
   def get_riot_info
diff --git a/app/models/tournament.rb b/app/models/tournament.rb
index e408cfe..0029de7 100644
--- a/app/models/tournament.rb
+++ b/app/models/tournament.rb
@@ -31,7 +31,7 @@ class Tournament < ActiveRecord::Base
 		for i in 1..num_matches
 			self.matches.create(name: "Match #{i}", status: 0)
 		end
-		match_num = 0
+		match_num = num_matches-1
 		team_num = 0
 		#for each grouping of min_players_per_team
 		self.players.each_slice(min_players_per_team) do |players|
@@ -39,7 +39,7 @@ class Tournament < ActiveRecord::Base
 			self.matches[match_num].teams.push(Team.create(users: players))
 			#if the match is full, move to the next match, otherwise move to the next team
 			if (team_num != 0 and team_num % max_teams_per_match == 0)
-				match_num += 1
+				match_num -= 1
 				team_num = 0
 			else
 				team_num += 1
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb
index 219507d..031b2a9 100644
--- a/app/views/matches/index.html.erb
+++ b/app/views/matches/index.html.erb
@@ -26,17 +26,39 @@
 
 <br>
 
-
+<div id="match-tree">
 <SVG version="1.1"
    baseProfile="full"
-   width="<%= 300 * @matches.count / 2 + 50 %>" height="<%= 200 * @matches.count + 50 %>"
+   width="<%= @width %>" height="<%= @height = [@height, 500].max %>"
    xmlns="http://www.w3.org/2000/svg">
-
+   <line x1="300" y1="0" x2="300" y2="<%= @height %>" stroke="black" />
    <% (1..@matches.count).each do |i| %>
     <g class="svg-match">
-      <rect rx="10"
-      
+      <rect height="120px" width="213px" 
+          x="<%= @width - (i-1)*50 -  250*(Math.log2(i).floor+1) %>"
+          y="<%= (@height/(Math.log2(i).floor+2)) - 60 + 250*(i - 2**(Math.log2(i).floor)) %>"
+          fill="#ffd281"
+          rx="20px"
+          stroke-width="2"
+          <% case @matches[i-1].status %>
+          <% when 0 %>
+            <% if @matches[i-1].teams.count < @tournament.min_teams_per_match %>
+              stroke="red"
+              fill-opacity="0.6"
+            <% else %>
+              stroke="green"
+            <% end %>
+          <% when 1 %>
+          stroke="orange"
+          <% when 2 %>
+          stroke="yellow"
+          <% when 3 %>
+          stroke="grey"
+          <% end %>
+          />
     </g>
    <% end %>
 
+
 </SVG>
+</div>
\ No newline at end of file
-- 
cgit v1.2.3-2-g168b


From dc417a48ec2abc83a3ffad742c3c4a4207054300 Mon Sep 17 00:00:00 2001
From: guntasgrewal <guntasgrewal@gmail.com>
Date: Sun, 6 Apr 2014 20:03:32 -0400
Subject: Dragging to Rank

---
 app/assets/javascripts/application.js   |  3 +++
 app/assets/stylesheets/matches.css.scss | 24 ++++++++++++++++++++++
 app/views/layouts/application.html.erb  |  5 +++++
 app/views/matches/show.html.erb         | 36 +++++++++++----------------------
 4 files changed, 44 insertions(+), 24 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index d6925fa..cb6edeb 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -14,3 +14,6 @@
 //= require jquery_ujs
 //= require turbolinks
 //= require_tree .
+//= require 'drag.js'
+//= require 'dragsort.js'
+//= require 'coordinates.js'
diff --git a/app/assets/stylesheets/matches.css.scss b/app/assets/stylesheets/matches.css.scss
index 4c396e3..3ef9170 100644
--- a/app/assets/stylesheets/matches.css.scss
+++ b/app/assets/stylesheets/matches.css.scss
@@ -1,3 +1,27 @@
 // Place all the styles related to the matches controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+#boxes li {
+    cursor: move;
+    position: relative;
+    float: left;
+    margin: 5px;
+    width: 180px;
+    height: 240px;
+    border: 1px solid rgb(0, 0, 0);
+    text-align: center;
+    padding-top: 10px;
+    background-color: rgb(238, 238, 255);
+}
+#numeric li {
+    cursor: move;
+    position: relative;
+    float: left;
+    margin: 5px;
+    width: 180px;
+    height: 240px;
+    border: 1px solid rgb(0, 0, 0);
+    text-align: center;
+    padding-top: 10px;
+    background-color: rgb(238, 238, 255);
+}
\ No newline at end of file
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 976ee85..8a5f985 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -8,6 +8,11 @@
   <%= yield :head %>
 </head>
 <body>
+<script>
+		window.onload = function() {
+			BetterDragSort.makeListSortable(document.getElementById("boxes"));
+		};
+</script>
 <header><nav>
 	<div class="navbar-brand"><%= link_to('Leaguer', root_path) %></div>
 	<div>
diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb
index 6fb4042..ffa7682 100644
--- a/app/views/matches/show.html.erb
+++ b/app/views/matches/show.html.erb
@@ -2,7 +2,6 @@
   <strong>Status:</strong>
   <%= @match.status %>
 </p>
-
 <p>
   <strong>Tournament:</strong>
   <%= @match.tournament.id %>
@@ -27,49 +26,38 @@
 	Note:- The change of status from 1 to 2 is coming from League Data Pull (RIOT API)
 
 -->
-<!--
-	This is what the HOST will see when the Match Status is NOT 3
--->
-<% if (@tournament.hosts.include?(current_user) and @match.winner.nil?) %>
-	<%= form_for([@tournament, @match], method: "put") do |f| %>
-		<ul>
-			<% @match.teams.each do |team| %>
-				<li><label><%= f.radio_button(:winner, team.id) %>
-					<%= team.users.collect{|u| u.user_name}.join(", ") %></label></li>
-		  <% end %>
-		</ul>
-		<%= f.submit("Select Winner") %>
-	<% end %>
-<% end %>
 
 <!--
 	This is what the Players and the Hosts of the tournament will view when the Match Status is 0
 -->
-<% if (@match.status==0) %>
+<% if (@match.status==1) %>
 	<% if (@tournament.players.include?(current_user) || @tournament.hosts.include?(current_user)) %>
 			<% @match.teams.each do |team| %>
-				<ul>
+				<ol>
 					<% team.users.collect{|u| u.user_name}.each do |k| %>
-						<li><label><%= k %></label></li>
+						<li><%= k %></li>
 					<% end %>
-				</ul>
+				</ol>
 		  	<% end %>
 	<% end %>
 <% end %>
 
 <!--
+	When Match Status is 2
 	Players see the Peer Review Page
 	Host see the Game Status
 -->
 <% if (@match.status==0) %>
-	<% if (@tournament.players.include?(current_user) %>
+	<% if (@tournament.players.include?(current_user)) %>
 		<% @match.teams.each do |team| %>
-			<ul>
+			<ol id="boxes" class="sortable">
 				<% team.users.collect{|u| u.user_name}.each do |k| %>
-					<li><label><%= k %></label></li>
+					<li><%= k %></li>
 				<% end %>
-			</ul>
-		 <% end %>	
+			</ol>
+	  	<% end %>	
+	<% elsif (@tournament.hosts.include?(current_user)) %>
+		<label>Game Status Page Goes here! Because you are a Host that is not a player!</label>
 	<% end %>
 <% end %>
 
-- 
cgit v1.2.3-2-g168b


From 7b5bf825a8174712f3ef6e9ea7f6180e7d230f99 Mon Sep 17 00:00:00 2001
From: nfoy <nfoy@purdue.edu>
Date: Sun, 6 Apr 2014 20:18:17 -0400
Subject: Auto-Checking for a match's end is implemented.

---
 app/controllers/matches_controller.rb | 32 +++++++++++++++++++++++++++++++-
 app/views/matches/show.html.erb       |  2 +-
 2 files changed, 32 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb
index e773667..c369717 100644
--- a/app/controllers/matches_controller.rb
+++ b/app/controllers/matches_controller.rb
@@ -5,6 +5,7 @@ class MatchesController < ApplicationController
 	# GET /matches.json
   require 'httparty'
   require 'json'
+  require 'delayed_job'
 
   def index
     @matches = @tournament.matches
@@ -14,6 +15,8 @@ class MatchesController < ApplicationController
     @height = 200 * 2**Math.log2(@matches.count).floor + 100;
   end
 
+
+
   def get_riot_info
 	if signed_in?
 
@@ -118,14 +121,41 @@ class MatchesController < ApplicationController
   end #end def
 	# GET /matches/1
 	# GET /matches/1.json
+
+	def is_match_over
+		response = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/summoner/by-name/#{@first}?api_key=ad539f86-22fd-474d-9279-79a7a296ac38")
+		riot_id = response["#{@first}"]['id']
+		#recent game information
+		game_info = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/game/by-summoner/#{riot_id}/recent?api_key=ad539f86-22fd-474d-9279-79a7a296ac38")
+		first_id = game_info["games"][0]["gameId"]
+
+		while true do 
+			sleep(240) #wait four minutes
+
+			recent = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/game/by-summoner/#{riot_id}/recent?api_key=ad539f86-22fd-474d-9279-79a7a296ac38")
+			current_id = recent["games"][0]["gameId"]
+
+			if current_id != first_id
+				@match.status = 2
+			end
+		end #while
+	end
+	handle_asynchronously :is_match_over
+
 	def show
+		if @match.id == 1
+			is_match_over
+		end
+
+
 	end
 
 	private
 	# Use callbacks to share common setup or constraints between actions.
 	def set_match
 		set_tournament
-		@match = @tournament.matches.find(params[:id]);
+		@match = @tournament.matches.find(params[:id])
+		@first = @match.teams.first.users.first.user_name.downcase
 	end
 	def set_tournament
 		@tournament = Tournament.find(params[:tournament_id])
diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb
index 20860e2..44fe9ee 100644
--- a/app/views/matches/show.html.erb
+++ b/app/views/matches/show.html.erb
@@ -61,7 +61,7 @@
 	Players see the Peer Review Page
 	Host see the Game Status
 -->
-<% if @match.status == 0 %>
+if (@match.status==0) %>
 	<% if @tournament.players.include?(current_user) %>
 		<% @match.teams.each do |team| %>
 			<ul>
-- 
cgit v1.2.3-2-g168b


From 0f982ba511d4f38322f69a6aaed768181b4e2852 Mon Sep 17 00:00:00 2001
From: tkimia <tkimia@purdue.edu>
Date: Sun, 6 Apr 2014 21:10:46 -0400
Subject: some more graphics

---
 app/assets/stylesheets/matches.css.scss |  8 ++++
 app/controllers/matches_controller.rb   |  2 +-
 app/models/tournament.rb                |  2 +-
 app/views/matches/index.html.erb        | 80 +++++++++++++++++++--------------
 4 files changed, 56 insertions(+), 36 deletions(-)

(limited to 'app')

diff --git a/app/assets/stylesheets/matches.css.scss b/app/assets/stylesheets/matches.css.scss
index 4c396e3..e0bed85 100644
--- a/app/assets/stylesheets/matches.css.scss
+++ b/app/assets/stylesheets/matches.css.scss
@@ -1,3 +1,11 @@
 // Place all the styles related to the matches controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+
+#match-tree{
+	float: right;
+}
+
+#hovered-info-text {
+	
+}
\ No newline at end of file
diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb
index e773667..28bc512 100644
--- a/app/controllers/matches_controller.rb
+++ b/app/controllers/matches_controller.rb
@@ -9,7 +9,7 @@ class MatchesController < ApplicationController
   def index
     @matches = @tournament.matches
     # width of SVG
-    @width = 300 * (Math.log2(@matches.count).floor + 1) + 300;
+    @width = 300 * (Math.log2(@matches.count).floor + 1);
     # height of SVG
     @height = 200 * 2**Math.log2(@matches.count).floor + 100;
   end
diff --git a/app/models/tournament.rb b/app/models/tournament.rb
index 0029de7..859518c 100644
--- a/app/models/tournament.rb
+++ b/app/models/tournament.rb
@@ -38,7 +38,7 @@ class Tournament < ActiveRecord::Base
 			#create a new team in the current match
 			self.matches[match_num].teams.push(Team.create(users: players))
 			#if the match is full, move to the next match, otherwise move to the next team
-			if (team_num != 0 and team_num % max_teams_per_match == 0)
+			if (team_num > max_teams_per_match)
 				match_num -= 1
 				team_num = 0
 			else
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb
index 031b2a9..6fd831f 100644
--- a/app/views/matches/index.html.erb
+++ b/app/views/matches/index.html.erb
@@ -27,38 +27,50 @@
 <br>
 
 <div id="match-tree">
-<SVG version="1.1"
-   baseProfile="full"
-   width="<%= @width %>" height="<%= @height = [@height, 500].max %>"
-   xmlns="http://www.w3.org/2000/svg">
-   <line x1="300" y1="0" x2="300" y2="<%= @height %>" stroke="black" />
-   <% (1..@matches.count).each do |i| %>
-    <g class="svg-match">
-      <rect height="120px" width="213px" 
-          x="<%= @width - (i-1)*50 -  250*(Math.log2(i).floor+1) %>"
-          y="<%= (@height/(Math.log2(i).floor+2)) - 60 + 250*(i - 2**(Math.log2(i).floor)) %>"
-          fill="#ffd281"
-          rx="20px"
-          stroke-width="2"
-          <% case @matches[i-1].status %>
-          <% when 0 %>
-            <% if @matches[i-1].teams.count < @tournament.min_teams_per_match %>
-              stroke="red"
-              fill-opacity="0.6"
-            <% else %>
-              stroke="green"
-            <% end %>
-          <% when 1 %>
-          stroke="orange"
-          <% when 2 %>
-          stroke="yellow"
-          <% when 3 %>
-          stroke="grey"
-          <% end %>
-          />
-    </g>
-   <% end %>
-
-
+  <SVG version="1.1"
+  baseProfile="full"
+  width="<%= @width %>" height="<%= @height = [@height, 500].max %>"
+  xmlns="http://www.w3.org/2000/svg">
+   <script type="text/ecmascript"><![CDATA[
+    function redirect(i){
+      window.location.replace("<%= request.original_url %>"+"/"+i);
+    }
+    ]]>
+  </script>
+  <% (1..@matches.count).each do |i| %>
+  <g id="svg-match-<%= i %>" onmouseover="dispStats(<%= i %>)" onclick="redirect(<%= @matches[i-1].id %>)" cursor="pointer">
+    <rect height="120px" width="213px" 
+    x="<%= @width - (i-1)*50 - 250*(Math.log2(i).floor+1) %>"
+    y="<%= (@height/(Math.log2(i).floor+2)) - 60 + 250*(i - 2**(Math.log2(i).floor)) %>"
+    fill="#ffd281"
+    rx="20px"
+    stroke-width="2"
+    <% case @matches[i-1].status %>
+    <% when 0 %>
+    <% if @matches[i-1].teams.count < @tournament.min_teams_per_match %>
+    stroke="red"
+    fill-opacity="0.6"
+    <% else %>
+    stroke="green"
+    <% end %>
+    <% when 1 %>
+    stroke="orange"
+    <% when 2 %>
+    stroke="yellow"
+    <% when 3 %>
+    stroke="grey"
+    <% end %>
+    />
+  </g>
+  <% if i > 1 %>
+  <line 
+  stroke="black"
+  x1="<%= @width - (i-2)*50 -  250*(Math.log2(i-1).floor+1) %>"
+  y1="<%= (@height/(Math.log2(i-1).floor+2)) - 60 + 250*((i-1) - 2**(Math.log2(i-1).floor)) + 60 %>"
+  x2="<%= @width - (i-1)*50 -  250*(Math.log2(i).floor+1) + 213 %>"
+  y2="<%= (@height/(Math.log2(i).floor+2)) - 60 + 250*(i - 2**(Math.log2(i).floor)) + 60 %>"
+  />
+  <% end %>
+  <% end %>
 </SVG>
-</div>
\ No newline at end of file
+</div>
-- 
cgit v1.2.3-2-g168b


From 94c0eb446f9ae49aa8d2fadee4ede17f0056a7b7 Mon Sep 17 00:00:00 2001
From: tkimia <tkimia@purdue.edu>
Date: Sun, 6 Apr 2014 21:21:47 -0400
Subject: how 2 spell tournament?

---
 app/views/tournaments/show.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb
index b654804..e80e0e8 100644
--- a/app/views/tournaments/show.html.erb
+++ b/app/views/tournaments/show.html.erb
@@ -66,13 +66,13 @@
 <% if @tournament.joinable_by?(current_user) && !@tournament.players.include?(current_user) %> 
   <%= form_tag(tournament_path(@tournament), method: "put") do %>
     <input type="hidden" name="update_action" value="join">
-    <%= submit_tag("Join Tournamnet") %>
+    <%= submit_tag("Join Tournament") %>
   <% end %>
 
 <% elsif @tournament.players.include?(current_user) %>
     <%= form_tag(tournament_path(@tournament), method: "put") do %>
     <input type="hidden" name="update_action" value="leave">
-    <%= submit_tag("Leave Tournamnet") %>
+    <%= submit_tag("Leave Tournament") %>
   <% end %>
 <% end %>
 
-- 
cgit v1.2.3-2-g168b


From 5084f01e0ea7ba7c378982099fdbf9880857f091 Mon Sep 17 00:00:00 2001
From: tkimia <tkimia@purdue.edu>
Date: Sun, 6 Apr 2014 21:52:32 -0400
Subject: matches are given teams correctly

---
 app/models/tournament.rb             |  9 +++++----
 app/views/tournaments/index.html.erb | 14 +++++++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'app')

diff --git a/app/models/tournament.rb b/app/models/tournament.rb
index 859518c..72c3ac8 100644
--- a/app/models/tournament.rb
+++ b/app/models/tournament.rb
@@ -34,16 +34,17 @@ class Tournament < ActiveRecord::Base
 		match_num = num_matches-1
 		team_num = 0
 		#for each grouping of min_players_per_team
-		self.players.each_slice(min_players_per_team) do |players|
-			#create a new team in the current match
-			self.matches[match_num].teams.push(Team.create(users: players))
+		players.each_slice(min_players_per_team) do |players|
+
 			#if the match is full, move to the next match, otherwise move to the next team
-			if (team_num > max_teams_per_match)
+			if (team_num == min_teams_per_match)
 				match_num -= 1
 				team_num = 0
 			else
 				team_num += 1
 			end
+			#create a new team in the current match
+			self.matches[match_num].teams.push(Team.create(users: players))
 		end
 	end
 end
diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb
index e174de7..72eacba 100644
--- a/app/views/tournaments/index.html.erb
+++ b/app/views/tournaments/index.html.erb
@@ -15,13 +15,17 @@
               <h3><%= t.name %></h3>
             <% end %>
 
-             <div class="row">
+             <div class="row" style="margin-left:2%;">
               <div class="col-md-4 host">
                Hosted by: <%= t.hosts.first.name %>
               </div>
-              <div class="col-md-8 things">
-                <p> Players per team </p>
-                <p> two </p>
+              <div class="col-md-4 things">
+                <p> Players per team: <%= t.min_players_per_team %></p>
+                <p> Players signed up: <%= t.players.count %> </p>
+              </div>
+              <div class="col-md-4 things">
+                <p> <%= (t.randomized_teams)? "Teams are Random" : "Teams are Chosen" %></p>
+                <p> Players signed up: <%= t.players.count %> </p>
               </div>
             </div> 
           
@@ -36,7 +40,7 @@
                   <%= submit_tag("Join") %>
                 <% end %>
             <% else %>
-              <p> You've signed up for this tournament! </p>
+              <p style="margin-top:10px;"> You've signed up for this tournament! </p>
             <% end %>
           </div>
 
-- 
cgit v1.2.3-2-g168b


From dd46c4b23640b0719e16e874b8f593e159b54a3c Mon Sep 17 00:00:00 2001
From: guntasgrewal <guntasgrewal@gmail.com>
Date: Sun, 6 Apr 2014 22:04:51 -0400
Subject: small changes

---
 app/views/matches/show.html.erb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app')

diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb
index ffa7682..25be7b8 100644
--- a/app/views/matches/show.html.erb
+++ b/app/views/matches/show.html.erb
@@ -55,6 +55,7 @@
 					<li><%= k %></li>
 				<% end %>
 			</ol>
+			
 	  	<% end %>	
 	<% elsif (@tournament.hosts.include?(current_user)) %>
 		<label>Game Status Page Goes here! Because you are a Host that is not a player!</label>
-- 
cgit v1.2.3-2-g168b


From 546b5895e7fe48d7f2e3c1032622805ee8fba090 Mon Sep 17 00:00:00 2001
From: tkimia <tkimia@purdue.edu>
Date: Sun, 6 Apr 2014 22:16:05 -0400
Subject: matches start

---
 app/controllers/matches_controller.rb | 25 ++++++++++++++++++++++++-
 app/views/matches/index.html.erb      | 10 +++++++++-
 2 files changed, 33 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb
index e9fe727..ee68e11 100644
--- a/app/controllers/matches_controller.rb
+++ b/app/controllers/matches_controller.rb
@@ -1,5 +1,5 @@
 class MatchesController < ApplicationController
-	before_action :set_tournament, only: [:index]
+	before_action :set_tournament, only: [:index, :update]
 
 	# GET /matches
 	# GET /matches.json
@@ -150,6 +150,29 @@ class MatchesController < ApplicationController
 
 	end
 
+	def update
+		case params[:update_action]
+		when "start"
+			check_permission(:edit, @tournament)
+			status = 1
+			respond_to do |format|
+				if @match
+					format.html { redirect_to tournament_match_path(@tournament, self), notice: 'Match has started.' }
+					format.json { head :no_content }
+				else
+					format.html { redirect_to @tournament, notice: "You don't have permission to start this match." }
+					format.json { render json: "Permission denied", status: :forbidden }
+				end
+			end
+		else
+			respond_to do |format|
+				format.html { redirect_to @tournament, notice: "Invalid action", status: :unprocessable_entity }
+				format.json { render json: @tournament.errors, status: :unprocessable_entity }
+			end
+		end
+
+	end
+
 	private
 	# Use callbacks to share common setup or constraints between actions.
 	def set_match
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb
index 6fd831f..052d176 100644
--- a/app/views/matches/index.html.erb
+++ b/app/views/matches/index.html.erb
@@ -18,7 +18,15 @@
         <td><%= match.id%></td>
         <td><%= match.name %></td>
         <td><%= link_to "Show", tournament_match_path(@tournament, match) %>
-        <td><%= submit_tag("Start Match") %>
+        <td> <%# If user is the host, let them start the tournment %>
+          <% if @tournament.hosts.include?(current_user) %>
+  
+            <%= form_tag(tournament_match_path(@tournament, match), method: "put") do %>
+             <input type="hidden" name="update_action" value="start">
+             <%= submit_tag("Start Match") %>
+            <% end %>
+          <% end %>
+</div></td>
       </tr>
     <% end %>
   </tbody>
-- 
cgit v1.2.3-2-g168b