From bd1bfe729030312fc678a3705c881744aa650c63 Mon Sep 17 00:00:00 2001
From: tkimia <tkimia@purdue.edu>
Date: Thu, 24 Apr 2014 18:08:26 -0400
Subject: text in graph is a bit better

---
 app/assets/stylesheets/matches.css.scss | 15 +++++++++++++++
 lib/scheduling/elimination.rb           |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/matches.css.scss b/app/assets/stylesheets/matches.css.scss
index 66da68e..ee43ab4 100644
--- a/app/assets/stylesheets/matches.css.scss
+++ b/app/assets/stylesheets/matches.css.scss
@@ -51,4 +51,19 @@
     form {
         color: #333;
     }
+}
+
+svg {
+    min-width: 600px;
+}
+
+@media (max-width: 900px) {
+  svg text {
+    font-size: 200%;
+  }
+}
+@media (max-width: 700px) {
+  svg text {
+    font-size: 150%;
+  }
 }
\ No newline at end of file
diff --git a/lib/scheduling/elimination.rb b/lib/scheduling/elimination.rb
index e66a29a..4e368b5 100644
--- a/lib/scheduling/elimination.rb
+++ b/lib/scheduling/elimination.rb
@@ -108,7 +108,7 @@ STRING
 
 				t = 1
 				while t <= numTeams
-					color = (matches[i].teams[t-1] and matches[i].teams[t-1].users.include?(current_user)) ? "#BCED91" : "white"
+					color = (matches[i].teams[t-1] and matches[i].teams[t-1].users.include?(current_user)) ? "#5BC0DE" : "white"
 					str += "\t\t<rect width=\"#{rw-5}%\" height=\"#{rh*Float(30)/(matchHeight)}%\" x=\"#{rx + 2.5}%\" y=\"#{ry + (Float(t-1)/numTeams)*rh + 2 }%\" fill=\"#{color}\" />\n"
 					if matches[i].teams[t-1]
 						str += "\t\t<text x=\"#{rx + rw/4}%\" y=\"#{ry + (Float(t-1)/numTeams + Float(30)/(matchHeight))*rh}%\" font-size=\"#{rh}\">Team #{matches[i].teams[t-1].id}</text>\n"
-- 
cgit v1.2.3-54-g00ecf


From 575c8a552cbcf11934b32f4d24636cdc18094f53 Mon Sep 17 00:00:00 2001
From: tkimia <tkimia@purdue.edu>
Date: Thu, 24 Apr 2014 18:37:18 -0400
Subject: number of matches has new formula that works for all teams/match

---
 lib/scheduling/elimination.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/scheduling/elimination.rb b/lib/scheduling/elimination.rb
index 4e368b5..cf0d625 100644
--- a/lib/scheduling/elimination.rb
+++ b/lib/scheduling/elimination.rb
@@ -17,7 +17,7 @@ module Scheduling
 
 		def create_matches
 			num_teams = (self.tournament.players.count/self.tournament.min_players_per_team).floor
-			num_matches = num_teams - 1
+			num_matches = (Float(num_teams -  tournament.min_teams_per_match)/(tournament.min_teams_per_match - 1)).ceil + 1
 			for i in 1..num_matches
 				self.tournament_stage.matches.create(status: 0, submitted_peer_evaluations: 0)
 			end
-- 
cgit v1.2.3-54-g00ecf