From 6452aee07a067d42bc1b449e210e628e087a82fd Mon Sep 17 00:00:00 2001 From: Jacob Cody Wimer Date: Mon, 16 Mar 2015 09:13:12 -0400 Subject: [PATCH] Removed delayed job and generate matches --- Gemfile | 1 - Gemfile.lock | 28 ++++------- app/controllers/static_pages_controller.rb | 22 -------- app/views/tournaments/show.html.erb | 7 --- config/routes.rb | 1 - .../20150316131043_remove_delayed_jobs.rb | 5 ++ db/schema.rb | 50 +++++++------------ 7 files changed, 33 insertions(+), 81 deletions(-) create mode 100644 db/migrate/20150316131043_remove_delayed_jobs.rb diff --git a/Gemfile b/Gemfile index 5d5224d..1b013e4 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,6 @@ gem 'spring', group: :development gem 'cancan' gem 'round_robin_tournament' gem 'rb-readline' - gem 'delayed_job_active_record' gem 'jquery-datatables-rails', github: 'rweng/jquery-datatables-rails' gem 'jquery-ui-rails' diff --git a/Gemfile.lock b/Gemfile.lock index c008f64..06db1c2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/rweng/jquery-datatables-rails.git - revision: db17aa0145164095b2b21f83f1ef7ccf91b9ea54 + revision: 2fed0538ecdeaeb6e36651e36e329b0a595f7fac specs: jquery-datatables-rails (3.1.1) actionpack (>= 3.1) @@ -58,12 +58,7 @@ GEM coffee-script (2.3.0) coffee-script-source execjs - coffee-script-source (1.9.0) - delayed_job (4.0.6) - activesupport (>= 3.0, < 5.0) - delayed_job_active_record (4.0.3) - activerecord (>= 3.0, < 5.0) - delayed_job (>= 3.0, < 4.1) + coffee-script-source (1.9.1) devise (3.4.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -72,12 +67,12 @@ GEM thread_safe (~> 0.1) warden (~> 1.2.3) erubis (2.7.0) - execjs (2.3.0) - globalid (0.3.2) + execjs (2.4.0) + globalid (0.3.3) activesupport (>= 4.1.0) hike (1.2.3) i18n (0.7.0) - jbuilder (2.2.6) + jbuilder (2.2.11) activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) jquery-rails (4.0.3) @@ -94,8 +89,8 @@ GEM mime-types (2.4.3) mini_portile (0.6.2) minitest (5.5.1) - multi_json (1.10.1) - mysql2 (0.3.17) + multi_json (1.11.0) + mysql2 (0.3.18) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) orm_adapter (0.5.0) @@ -120,7 +115,7 @@ GEM activesupport (>= 4.2.0.beta, < 5.0) nokogiri (~> 1.6.0) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.1) + rails-html-sanitizer (1.0.2) loofah (~> 2.0) rails_12factor (0.0.3) rails_serve_static_assets @@ -147,7 +142,7 @@ GEM sdoc (0.4.1) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) - spring (1.3.1) + spring (1.3.3) sprockets (2.12.3) hike (~> 1.2) multi_json (~> 1.0) @@ -159,13 +154,13 @@ GEM sprockets (>= 2.8, < 4.0) sqlite3 (1.3.10) thor (0.19.1) - thread_safe (0.3.4) + thread_safe (0.3.5) tilt (1.4.1) turbolinks (2.5.3) coffee-rails tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.7.0) + uglifier (2.7.1) execjs (>= 0.3.0) json (>= 1.8.0) warden (1.2.3) @@ -178,7 +173,6 @@ DEPENDENCIES bootstrap-sass (= 2.3.2.0) cancan coffee-rails (~> 4.0.0) - delayed_job_active_record devise jbuilder (~> 2.0) jquery-datatables-rails! diff --git a/app/controllers/static_pages_controller.rb b/app/controllers/static_pages_controller.rb index 1072d0f..f8a4ea7 100644 --- a/app/controllers/static_pages_controller.rb +++ b/app/controllers/static_pages_controller.rb @@ -58,26 +58,4 @@ class StaticPagesController < ApplicationController end end - def generate_matches - if user_signed_in? - else - redirect_to root_path - end - if params[:tournament] - @tournament = Tournament.find(params[:tournament]) - end - if @tournament - @tournament.generateMatches - end - - end - - - - - - - - - end diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb index 374e4d5..afce54a 100644 --- a/app/views/tournaments/show.html.erb +++ b/app/views/tournaments/show.html.erb @@ -23,13 +23,6 @@ <%= @tournament.director_email %>

-
-
-<% if user_signed_in? %> - <%= link_to "New #{@tournament.name} School" , "/schools/new?tournament=#{@tournament.id}" %> -
- BE CAREFUL <%= link_to "Generate Pool Matches" , "/static_pages/generate_matches?tournament=#{@tournament.id}", :class=>"btn" %> -<% end %>

School Lineups

diff --git a/config/routes.rb b/config/routes.rb index 1e13fd5..dd21cb0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -24,7 +24,6 @@ Wrestling::Application.routes.draw do get 'static_pages/brackets' get 'static_pages/weights' get 'admin/index' - get 'static_pages/generate_matches' get 'static_pages/up_matches' get 'static_pages/control_match' get 'static_pages/results' diff --git a/db/migrate/20150316131043_remove_delayed_jobs.rb b/db/migrate/20150316131043_remove_delayed_jobs.rb new file mode 100644 index 0000000..7bdf624 --- /dev/null +++ b/db/migrate/20150316131043_remove_delayed_jobs.rb @@ -0,0 +1,5 @@ +class RemoveDelayedJobs < ActiveRecord::Migration + def change + drop_table :delayed_jobs + end +end diff --git a/db/schema.rb b/db/schema.rb index 8f8c713..4835122 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,23 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20150209154145) do - - create_table "delayed_jobs", force: :cascade do |t| - t.integer "priority", default: 0, null: false - t.integer "attempts", default: 0, null: false - t.text "handler", null: false - t.text "last_error" - t.datetime "run_at" - t.datetime "locked_at" - t.datetime "failed_at" - t.string "locked_by" - t.string "queue" - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority" +ActiveRecord::Schema.define(version: 20150316131043) do create_table "matches", force: :cascade do |t| t.integer "r_id" @@ -35,8 +19,8 @@ ActiveRecord::Schema.define(version: 20150209154145) do t.text "g_stat" t.text "r_stat" t.integer "winner_id" - t.string "win_type", limit: 255 - t.string "score", limit: 255 + t.string "win_type" + t.string "score" t.datetime "created_at" t.datetime "updated_at" t.integer "tournament_id" @@ -46,14 +30,14 @@ ActiveRecord::Schema.define(version: 20150209154145) do end create_table "mats", force: :cascade do |t| - t.string "name", limit: 255 + t.string "name" t.integer "tournament_id" t.datetime "created_at" t.datetime "updated_at" end create_table "schools", force: :cascade do |t| - t.string "name", limit: 255 + t.string "name" t.datetime "created_at" t.datetime "updated_at" t.integer "tournament_id" @@ -61,25 +45,25 @@ ActiveRecord::Schema.define(version: 20150209154145) do end create_table "tournaments", force: :cascade do |t| - t.string "name", limit: 255 - t.string "address", limit: 255 - t.string "director", limit: 255 - t.string "director_email", limit: 255 + t.string "name" + t.string "address" + t.string "director" + t.string "director_email" t.datetime "created_at" t.datetime "updated_at" end create_table "users", force: :cascade do |t| - t.string "email", limit: 255, default: "", null: false - t.string "encrypted_password", limit: 255, default: "", null: false - t.string "reset_password_token", limit: 255 + t.string "email", default: "", null: false + t.string "encrypted_password", default: "", null: false + t.string "reset_password_token" t.datetime "reset_password_sent_at" t.datetime "remember_created_at" - t.integer "sign_in_count", default: 0, null: false + t.integer "sign_in_count", default: 0, null: false t.datetime "current_sign_in_at" t.datetime "last_sign_in_at" - t.string "current_sign_in_ip", limit: 255 - t.string "last_sign_in_ip", limit: 255 + t.string "current_sign_in_ip" + t.string "last_sign_in_ip" t.datetime "created_at" t.datetime "updated_at" end @@ -95,7 +79,7 @@ ActiveRecord::Schema.define(version: 20150209154145) do end create_table "wrestlers", force: :cascade do |t| - t.string "name", limit: 255 + t.string "name" t.integer "school_id" t.integer "weight_id" t.integer "seed" @@ -104,7 +88,7 @@ ActiveRecord::Schema.define(version: 20150209154145) do t.datetime "updated_at" t.integer "season_win" t.integer "season_loss" - t.string "criteria", limit: 255 + t.string "criteria" t.integer "poolNumber" t.boolean "extra" end