Added matches scaffold and ascended views of weights and schools

app/assets/javascripts/matches.js.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/

app/assets/stylesheets/matches.css.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the Matches controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/controllers/matches_controller.rb

@@ -0,0 +1,74 @@
+class MatchesController < ApplicationController
+  before_action :set_match, only: [:show, :edit, :update, :destroy]
+
+  # GET /matches
+  # GET /matches.json
+  def index
+    @matches = Match.all
+  end
+
+  # GET /matches/1
+  # GET /matches/1.json
+  def show
+  end
+
+  # GET /matches/new
+  def new
+    @match = Match.new
+  end
+
+  # GET /matches/1/edit
+  def edit
+  end
+
+  # POST /matches
+  # POST /matches.json
+  def create
+    @match = Match.new(match_params)
+
+    respond_to do |format|
+      if @match.save
+        format.html { redirect_to @match, notice: 'Match was successfully created.' }
+        format.json { render action: 'show', status: :created, location: @match }
+      else
+        format.html { render action: 'new' }
+        format.json { render json: @match.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PATCH/PUT /matches/1
+  # PATCH/PUT /matches/1.json
+  def update
+    respond_to do |format|
+      if @match.update(match_params)
+        format.html { redirect_to @match, notice: 'Match was successfully updated.' }
+        format.json { head :no_content }
+      else
+        format.html { render action: 'edit' }
+        format.json { render json: @match.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /matches/1
+  # DELETE /matches/1.json
+  def destroy
+    @match.destroy
+    respond_to do |format|
+      format.html { redirect_to matches_url }
+      format.json { head :no_content }
+    end
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_match
+      @match = Match.find(params[:id])
+    end
+
+    # Never trust parameters from the scary internet, only allow the white list through.
+    def match_params
+      params.require(:match).permit(:r_id, :g_id, :g_stat, :r_stat, :winner_id, :win_type, :score)
+    end
+end

app/controllers/weights_controller.rb

@@ -10,7 +10,7 @@ class WeightsController < ApplicationController
   # GET /weights/1
   # GET /weights/1.json
   def show
-    @wrestler = Wrestler.all
+    @wrestlers = Wrestler.all
     @tournament = Tournament.find(@weight.tournament_id)
   end
 

app/helpers/matches_helper.rb

@@ -0,0 +1,2 @@
+module MatchesHelper
+end

app/models/match.rb

@@ -0,0 +1,3 @@
+class Match < ActiveRecord::Base
+	belongs_to :tournament
+end

app/models/tournament.rb

@@ -1,4 +1,6 @@
 class Tournament < ActiveRecord::Base
 	has_many :schools, dependent: :destroy
 	has_many :weights, dependent: :destroy
+	has_many :matches, dependent: :destroy
+	
 end

app/models/wrestler.rb

@@ -1,4 +1,5 @@
 class Wrestler < ActiveRecord::Base
 	belongs_to :school
 	belongs_to :weight
+	has_many :matches
 end

app/views/matches/_form.html.erb

@@ -0,0 +1,45 @@
+<%= form_for(@match) do |f| %>
+  <% if @match.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@match.errors.count, "error") %> prohibited this match from being saved:</h2>
+
+      <ul>
+      <% @match.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :r_id %><br>
+    <%= f.number_field :r_id %>
+  </div>
+  <div class="field">
+    <%= f.label :g_id %><br>
+    <%= f.number_field :g_id %>
+  </div>
+  <div class="field">
+    <%= f.label :g_stat %><br>
+    <%= f.text_area :g_stat %>
+  </div>
+  <div class="field">
+    <%= f.label :r_stat %><br>
+    <%= f.text_area :r_stat %>
+  </div>
+  <div class="field">
+    <%= f.label :winner_id %><br>
+    <%= f.number_field :winner_id %>
+  </div>
+  <div class="field">
+    <%= f.label :win_type %><br>
+    <%= f.text_field :win_type %>
+  </div>
+  <div class="field">
+    <%= f.label :score %><br>
+    <%= f.text_field :score %>
+  </div>
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>

app/views/matches/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing match</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @match %> |
+<%= link_to 'Back', matches_path %>

app/views/matches/index.html.erb

@@ -0,0 +1,39 @@
+<h1>Listing matches</h1>
+
+<table>
+  <thead>
+    <tr>
+      <th>R</th>
+      <th>G</th>
+      <th>G stat</th>
+      <th>R stat</th>
+      <th>Winner</th>
+      <th>Win type</th>
+      <th>Score</th>
+      <th></th>
+      <th></th>
+      <th></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @matches.each do |match| %>
+      <tr>
+        <td><%= match.r_id %></td>
+        <td><%= match.g_id %></td>
+        <td><%= match.g_stat %></td>
+        <td><%= match.r_stat %></td>
+        <td><%= match.winner_id %></td>
+        <td><%= match.win_type %></td>
+        <td><%= match.score %></td>
+        <td><%= link_to 'Show', match %></td>
+        <td><%= link_to 'Edit', edit_match_path(match) %></td>
+        <td><%= link_to 'Destroy', match, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<br>
+
+<%= link_to 'New Match', new_match_path %>

app/views/matches/index.json.jbuilder

@@ -0,0 +1,4 @@
+json.array!(@matches) do |match|
+  json.extract! match, :id, :r_id, :g_id, :g_stat, :r_stat, :winner_id, :win_type, :score
+  json.url match_url(match, format: :json)
+end

app/views/matches/new.html.erb

@@ -0,0 +1,5 @@
+<h1>New match</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', matches_path %>

app/views/matches/show.html.erb

@@ -0,0 +1,39 @@
+<p id="notice"><%= notice %></p>
+
+<p>
+  <strong>R:</strong>
+  <%= @match.r_id %>
+</p>
+
+<p>
+  <strong>G:</strong>
+  <%= @match.g_id %>
+</p>
+
+<p>
+  <strong>G stat:</strong>
+  <%= @match.g_stat %>
+</p>
+
+<p>
+  <strong>R stat:</strong>
+  <%= @match.r_stat %>
+</p>
+
+<p>
+  <strong>Winner:</strong>
+  <%= @match.winner_id %>
+</p>
+
+<p>
+  <strong>Win type:</strong>
+  <%= @match.win_type %>
+</p>
+
+<p>
+  <strong>Score:</strong>
+  <%= @match.score %>
+</p>
+
+<%= link_to 'Edit', edit_match_path(@match) %> |
+<%= link_to 'Back', matches_path %>

app/views/matches/show.json.jbuilder

@@ -0,0 +1 @@
+json.extract! @match, :id, :r_id, :g_id, :g_stat, :r_stat, :winner_id, :win_type, :score, :created_at, :updated_at

app/views/schools/show.html.erb

@@ -42,7 +42,7 @@
   </thead>
 
   <tbody>
-    <% @wrestlers.each do |wrestler| %>
+    <% @wrestlers.order("weight_id asc").each do |wrestler| %>
       <% if wrestler.school_id == @school.id %>
         <tr>
           <td><%= wrestler.name %></td>

app/views/weights/show.html.erb

@@ -21,7 +21,7 @@
 		</tr>
 	</thead>
 	<tbody>
-		<% @wrestler.each do |wrestler| %>
+		<% @wrestlers.order("original_seed asc").each do |wrestler| %>
       		<% if wrestler.weight_id == @weight.id %>
       			<tr>
       				<td><%= wrestler.name %></td>