Merge branch 'master' of http://github.com/LukeShu/leaguer

1 files changed, 8 insertions, 11 deletions

diff --git a/generate.sh b/generate.sh
index 7bf87e5..b8651c2 100755
--- a/generate.sh
+++ b/generate.sh
@@ -21,19 +21,12 @@ bundle exec rails generate delayed_job:active_record
 
 # The whole shebang, models, views, and controllers
 bundle exec rails generate scaffold server default_user_permissions:integer
-bundle exec rails generate scaffold match status:integer tournament:references name:string winner:references remote_id:string submitted_peer_evaluations:integer
+bundle exec rails generate scaffold match status:integer tournament_stage:references name:string winner:references remote_id:string submitted_peer_evaluations:integer
 bundle exec rails generate scaffold team match:references
 bundle exec rails generate scaffold alert author:references message:text
 bundle exec rails generate scaffold pm author:references recipient:references message:text
-bundle exec rails generate scaffold tournament name:string:unique game:references status:integer \
-	min_players_per_team:integer max_players_per_team:integer \
-	min_teams_per_match:integer max_teams_per_match:integer \
-	set_rounds:integer randomized_teams:boolean
-bundle exec rails generate scaffold game \
-	name:text \
-	min_players_per_team:integer max_players_per_team:integer \
-	min_teams_per_match:integer max_teams_per_match:integer \
-	set_rounds:integer randomized_teams:boolean
+bundle exec rails generate scaffold tournament game:references status:integer name:string:uniq min_players_per_team:integer max_players_per_team:integer min_teams_per_match:integer max_teams_per_match:integer set_rounds:integer randomized_teams:boolean sampling_method:string
+bundle exec rails generate scaffold game                                      name:string:uniq min_players_per_team:integer max_players_per_team:integer min_teams_per_match:integer max_teams_per_match:integer set_rounds:integer randomized_teams:boolean sampling_method:string
 bundle exec rails generate scaffold user name:string email:string:uniq user_name:string:uniq
 bundle exec rails generate scaffold session user:references token:string:uniq
 bundle exec rails generate scaffold bracket user:references tournament:references name:string
@@ -42,9 +35,13 @@ bundle exec rails generate scaffold bracket user:references tournament:reference
 bundle exec rails generate model       game_setting       game:references name:string vartype:integer type_opt:text description:text display_order:integer default:text
 bundle exec rails generate model tournament_setting tournament:references name:string vartype:integer type_opt:text description:text display_order:integer   value:text
 
-bundle exec rails generate model score user:references match:references value:integer
+bundle exec rails generate model tournament_stage tournament:references scheduling:string structure:text
+bundle exec rails generate model statistic user:references match:references name:string value:integer
+
 bundle exec rails generate model remote_username game:references user:references json_value:text
+
 bundle exec rails generate model bracket_match bracket:references match:references predicted_winner:references
+
 bundle exec rails generate model api_requests api_name:string
 
 # Join tables