add randomizer

main
Ben Harris 8 months ago
parent 1d9a622303
commit c5b9fe77a8
Signed by: ben
GPG Key ID: 4E0AF802FFF7960C
  1. 4
      app/controllers/machines_controller.rb
  2. 35
      app/controllers/pages_controller.rb
  3. 4
      app/controllers/players_controller.rb
  4. 3
      app/helpers/pages_helper.rb
  5. 6
      app/views/layouts/application.html.erb
  6. 3
      app/views/machines/index.html.erb
  7. 4
      app/views/machines/show.html.erb
  8. 2
      app/views/pages/index.html.erb
  9. 10
      app/views/pages/randomize.html.erb
  10. 3
      app/views/players/index.html.erb
  11. 4
      app/views/players/show.html.erb
  12. 5
      config/routes.rb
  13. 25
      db/schema.rb
  14. 13
      test/system/machines_test.rb
  15. 11
      test/system/players_test.rb

@ -25,7 +25,7 @@ class MachinesController < ApplicationController
respond_to do |format|
if @machine.save
format.html { redirect_to machines_url, notice: 'Machine was successfully created.' }
format.html { redirect_to machines_url, notice: "Added #{@machine.name} #{@machine.edition}." }
format.json { render :show, status: :created, location: @machine }
else
format.html { render :new, status: :unprocessable_entity }
@ -38,7 +38,7 @@ class MachinesController < ApplicationController
def update
respond_to do |format|
if @machine.update(machine_params)
format.html { redirect_to machines_url, notice: 'Machine was successfully updated.' }
format.html { redirect_to machines_url, notice: "Updated #{@machine.name} #{@machine.edition}." }
format.json { render :show, status: :ok, location: @machine }
else
format.html { render :show, status: :unprocessable_entity }

@ -0,0 +1,35 @@
# frozen_string_literal: true
class PagesController < ApplicationController
def index; end
def randomize
@groups = make_teams
@machines = Machine.limit(@groups.size).order(Arel.sql('RANDOM()'))
end
private
def make_teams
r = Player.order(Arel.sql('RANDOM()')).to_a
teams = []
until r.empty?
if (r.size % 4).zero?
teams << r.shift(4)
elsif r.size.even? && (r.size > 2)
teams << r.shift(3)
teams << r.shift(3)
elsif (r.size % 3).zero?
teams << r.shift(3)
elsif r.size == 5
teams << r.shift(3)
teams << r.shift(2)
else
teams << r.shift(4)
end
end
teams.sort { |a, b| b.length <=> a.length }
end
end

@ -22,7 +22,7 @@ class PlayersController < ApplicationController
respond_to do |format|
if @player.save
format.html { redirect_to players_url, notice: 'Player was successfully created.' }
format.html { redirect_to players_url, notice: "Added #{@player.name}." }
format.json { render :show, status: :created, location: @player }
else
format.html { render :new, status: :unprocessable_entity }
@ -35,7 +35,7 @@ class PlayersController < ApplicationController
def update
respond_to do |format|
if @player.update(player_params)
format.html { redirect_to players_url, notice: 'Player was successfully updated.' }
format.html { redirect_to players_url, notice: "Updated #{@player.name}." }
format.json { render :show, status: :ok, location: @player }
else
format.html { render :show, status: :unprocessable_entity }

@ -0,0 +1,3 @@
# frozen_string_literal: true
module PagesHelper
end

@ -12,8 +12,10 @@
<body>
<nav>
<%= link_to "Pins", machines_url %>
<%= link_to "Players", players_url %>
<%= link_to 'Home', '/' %>
<%= link_to 'Pins', machines_url %>
<%= link_to 'Players', players_url %>
<%= link_to 'Randomize', controller: 'pages', action: 'randomize' %>
</nav>
<%= yield %>

@ -8,4 +8,5 @@
<% end %>
</div>
<%= link_to "New machine", new_machine_path %>
<hr>
<%= link_to "Add a pin", new_machine_path %>

@ -3,7 +3,5 @@
<%= render "form", machine: @machine %>
<div>
<%= link_to "Back to machines", machines_path %>
<%= button_to "Destroy this machine", @machine, method: :delete %>
<%= button_to "Delete #{@machine.name}", @machine, method: :delete %>
</div>

@ -0,0 +1,2 @@
<h1>Knockout</h1>
<p>To start the tournament, add players and make sure that the pins are up to date. Then hit randomize to automatically pick teams!</p>

@ -0,0 +1,10 @@
<h1>Randomize</h1>
<% @groups.each.with_index do |slice, i| %>
<h2><%= @machines[i].name %> <small><%= @machines[i].edition %></small></h2>
<ol>
<% slice.each do |player| %>
<li><%= link_to player.name, player_path(player) %></li>
<% end %>
</ol>
<% end %>

@ -8,4 +8,5 @@
<% end %>
</div>
<%= link_to "New player", new_player_path %>
<hr>
<%= link_to "Add a player", new_player_path %>

@ -3,7 +3,5 @@
<%= render "form", player: @player %>
<div>
<%= link_to "Back to players", players_path %>
<%= button_to "Destroy this player", @player, method: :delete %>
<%= button_to "Delete #{@player.name}", @player, method: :delete %>
</div>

@ -1,10 +1,9 @@
# frozen_string_literal: true
Rails.application.routes.draw do
get 'randomize', to: 'pages#randomize'
resources :machines
resources :players
# Define your application routes per the DSL in https://guides.rubyonrails.org/routing.html
# Defines the root path route ("/")
# root "articles#index"
root 'pages#index'
end

25
db/schema.rb generated

@ -1,3 +1,4 @@
# frozen_string_literal: true
# This file is auto-generated from the current state of the database. Instead
# of editing this file, please use the migrations feature of Active Record to
# incrementally modify your database, and then regenerate this schema definition.
@ -10,21 +11,21 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 2022_01_15_164820) do
ActiveRecord::Schema.define(version: 20_220_115_164_820) do
create_table "machines", force: :cascade do |t|
t.string "name"
t.string "edition"
t.datetime "created_at", precision: 6, null: false
t.datetime "updated_at", precision: 6, null: false
create_table 'machines', force: :cascade do |t|
t.string 'name'
t.string 'edition'
t.datetime 'created_at', precision: 6, null: false
t.datetime 'updated_at', precision: 6, null: false
end
create_table "players", force: :cascade do |t|
t.string "name"
t.boolean "paid"
t.integer "strikes"
t.datetime "created_at", precision: 6, null: false
t.datetime "updated_at", precision: 6, null: false
create_table 'players', force: :cascade do |t|
t.string 'name'
t.boolean 'paid'
t.integer 'strikes'
t.datetime 'created_at', precision: 6, null: false
t.datetime 'updated_at', precision: 6, null: false
end
end

@ -9,36 +9,33 @@ class MachinesTest < ApplicationSystemTestCase
test 'visiting the index' do
visit machines_url
assert_selector 'h1', text: 'Machines'
assert_selector 'h1', text: 'Pins'
end
test 'should create machine' do
visit machines_url
click_on 'New machine'
click_on 'Add a pin'
fill_in 'Edition', with: @machine.edition
fill_in 'Name', with: @machine.name
click_on 'Create Machine'
assert_text 'Machine was successfully created'
click_on 'Back'
assert_text "Added #{@machine.name} #{@machine.edition}."
end
test 'should update Machine' do
visit machine_url(@machine)
click_on 'Edit this machine', match: :first
fill_in 'Edition', with: @machine.edition
fill_in 'Name', with: @machine.name
click_on 'Update Machine'
assert_text 'Machine was successfully updated'
click_on 'Back'
assert_text "Updated #{@machine.name} #{@machine.edition}."
end
test 'should destroy Machine' do
visit machine_url(@machine)
click_on 'Destroy this machine', match: :first
click_on "Delete #{@machine.name}", match: :first
assert_text 'Machine was successfully destroyed'
end

@ -14,33 +14,30 @@ class PlayersTest < ApplicationSystemTestCase
test 'should create player' do
visit players_url
click_on 'New player'
click_on 'Add a player'
fill_in 'Name', with: @player.name
check 'Paid' if @player.paid
fill_in 'Strikes', with: @player.strikes
click_on 'Create Player'
assert_text 'Player was successfully created'
click_on 'Back'
assert_text "Added #{@player.name}."
end
test 'should update Player' do
visit player_url(@player)
click_on 'Edit this player', match: :first
fill_in 'Name', with: @player.name
check 'Paid' if @player.paid
fill_in 'Strikes', with: @player.strikes
click_on 'Update Player'
assert_text 'Player was successfully updated'
click_on 'Back'
assert_text "Updated #{@player.name}."
end
test 'should destroy Player' do
visit player_url(@player)
click_on 'Destroy this player', match: :first
click_on "Delete #{@player.name}", match: :first
assert_text 'Player was successfully destroyed'
end

Loading…
Cancel
Save