Added date to tournament

app/controllers/static_pages_controller.rb

@@ -1,7 +1,7 @@
 class StaticPagesController < ApplicationController
 
 	def my_tournaments
-		@tournaments = current_user.tournaments.order('updated_at desc')
+		@tournaments = current_user.tournaments.sort_by{|t| t.daysUntil}
 	end
 
 	def not_allowed

app/controllers/tournaments_controller.rb

@@ -71,7 +71,7 @@ class TournamentsController < ApplicationController
   end
 
   def index
-    @tournaments = Tournament.all.limit(50).includes(:schools,:weights,:mats,:matches,:user,:wrestlers).order('updated_at desc')
+    @tournaments = Tournament.all.sort_by{|t| t.daysUntil}
   end
 
   def show
@@ -132,7 +132,7 @@ class TournamentsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def tournament_params
-      params.require(:tournament).permit(:name, :address, :director, :director_email, :tournament_type, :weigh_in_ref, :user_id)
+      params.require(:tournament).permit(:name, :address, :director, :director_email, :tournament_type, :weigh_in_ref, :user_id, :date)
     end
   
   #Check for tournament owner

app/models/tournament.rb

@@ -9,7 +9,15 @@ class Tournament < ActiveRecord::Base
 	has_many :wrestlers, through: :weights
 	has_many :matches, dependent: :destroy
 
-	
+	validates :date, presence: true
+
+	def daysUntil
+		time = (Date.today - self.date).to_i
+		if time < 0
+			time = time * -1
+		end
+		time
+	end
 
 	def resetSchoolScores
 		schools.update_all("score = 0.0")

app/views/static_pages/my_tournaments.html.erb

@@ -1,19 +1,20 @@
 <h1>My Tournaments</h1>
 <script>
-  $(document).ready(function() {
-     $('#tournamentList').dataTable();
-     pagingType: "bootstrap";
-  } );
+  // $(document).ready(function() {
+  //   $('#tournamentList').dataTable();
+  //   pagingType: "bootstrap";
+  // } );
 </script>
 <% if user_signed_in? %>
   <%= link_to 'New Tournament', new_tournament_path, :class=>"btn btn-success" %>
 <% end %>
 </br>
 </br>
-<table class="display compact cell-border" id="tournamentList">
+<table class="table table-striped table-bordered" id="tournamentList">
   <thead>
     <tr>
       <th>Name</th>
+      <th>Date</th>
       <th></th>
     </tr>
   </thead>
@@ -22,6 +23,7 @@
     <% @tournaments.each do |tournament| %>
       <tr>
         <td><%= tournament.name %></td>
+        <td><%= tournament.date %></td>
         <td><%= link_to 'Show', tournament, :class=>"btn btn-default" %>
           <% if tournament_permissions(tournament) %>
             <%= link_to 'Edit', edit_tournament_path(tournament), :class=>"btn btn-primary" %>

app/views/tournaments/_form.html.erb

@@ -27,6 +27,10 @@
     <%= f.label :director_email %><br>
     <%= f.text_field :director_email %>
   </div>
+  <div class="field">
+    <%= f.label :date %><br>
+    <%= f.date_field :date %>
+  </div>
   <div>
     <%= f.label :tournament_type %><br>
     <%= f.select :tournament_type, @tournament.tournament_types %>

app/views/tournaments/index.html.erb

@@ -1,19 +1,20 @@
 <h1>Pick A Tournament</h1>
 <script>
-  $(document).ready(function() {
-     $('#tournamentList').dataTable();
-     pagingType: "bootstrap";
-  } );
+  // $(document).ready(function() {
+  //   $('#tournamentList').dataTable();
+  //   pagingType: "bootstrap";
+  // } );
 </script>
 <% if user_signed_in? %>
   <%= link_to 'New Tournament', new_tournament_path, :class=>"btn btn-success" %>
 <% end %>
 </br>
 </br>
-<table class="display compact cell-border" id="tournamentList">
+<table class="table table-striped table-bordered" id="tournamentList">
   <thead>
     <tr>
       <th>Name</th>
+      <th>Date</th>
       <th></th>
     </tr>
   </thead>
@@ -22,6 +23,7 @@
     <% @tournaments.each do |tournament| %>
       <tr>
         <td><%= tournament.name %></td>
+        <td><%= tournament.date %></td>
         <td><%= link_to 'Show', tournament, :class=>"btn btn-default" %>
           <% if tournament_permissions(tournament) %>
             <%= link_to 'Edit', edit_tournament_path(tournament), :class=>"btn btn-primary" %>

db/migrate/20151230164000_tournament_date.rb

@@ -0,0 +1,5 @@
+class TournamentDate < ActiveRecord::Migration
+  def change
+    add_column :tournaments, :date, :date
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20151230163202) do
+ActiveRecord::Schema.define(version: 20151230164000) do
 
   create_table "delayed_jobs", force: :cascade do |t|
     t.integer  "priority",   default: 0, null: false
@@ -94,6 +94,7 @@ ActiveRecord::Schema.define(version: 20151230163202) do
     t.text     "weigh_in_ref"
     t.integer  "user_id"
     t.integer  "curently_generating_matches"
+    t.date     "date"
   end
 
   add_index "tournaments", ["user_id"], name: "index_tournaments_on_user_id"

db/seeds.rb

@@ -7,7 +7,7 @@
 #   Mayor.create(name: 'Emanuel', city: cities.first)
 if Rails.env.development?
 	User.create(id: 1, email: 'test@test.com', password: 'password', password_confirmation: 'password')
-	Tournament.create(id: 200, name: 'test', address: 'some place', director: 'some guy', director_email: 'hismail@email.com', tournament_type: 'Pool to bracket', user_id: 1)
+	Tournament.create(id: 200, name: 'test', address: 'some place', director: 'some guy', director_email: 'hismail@email.com', tournament_type: 'Pool to bracket', user_id: 1, date: Date.today)
 	School.create(id: 200, name: 'Central Crossing', tournament_id: 200)
 	School.create(id: 201, name: 'Turd Town', tournament_id: 200)
 	School.create(id: 202, name: 'Shit Show', tournament_id: 200)

test/fixtures/tournaments.yml

@@ -8,6 +8,7 @@ one:
   director_email: jacob.wimer@gmail.com
   tournament_type: Pool to bracket
   user_id: 1
+  date: 2015-12-30
   
 two:
   id: 2
@@ -17,5 +18,6 @@ two:
   director_email: jacob.wimer@gmail.com
   tournament_type: Pool to bracket
   user_id: 1
+  date: 2015-12-30
   
 

test/integration/poolbracket_matchups_test.rb

@@ -23,7 +23,8 @@ class PoolbracketMatchupsTest < ActionDispatch::IntegrationTest
       name: "Something",
       address: "Some Place",
       director: "Some Guy",
-      director_email: "test@test.com"
+      director_email: "test@test.com",
+      date: Date.today
     )
     tournament.save
     tournament

test/models/tournament_test.rb

@@ -4,4 +4,10 @@ class TournamentTest < ActiveSupport::TestCase
   test "the truth" do
      assert true
    end
+   
+   test "Tournament needs a date" do
+      tourney = Tournament.new
+      assert_not tourney.valid?
+      assert_equal [:date], tourney.errors.keys
+    end
 end