summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authortkimia <tkimia@purdue.edu>2014-04-10 17:37:08 -0400
committertkimia <tkimia@purdue.edu>2014-04-10 17:37:08 -0400
commiteafa409389ce53ee2ab8eb99e81a3d0f4cc49c74 (patch)
treee6e0bd60b1ff007591f589a615ad2fef4e8a9475 /app/views
parented85b858b34b29eeed5d4d6d871c49c1ee60bb36 (diff)
parentc3af0f5b51dfe842ad9e4c5ea93e202e26e818ac (diff)
Merge branch 'clean2' of https://github.com/LukeShu/leaguer into clean2
Diffstat (limited to 'app/views')
-rw-r--r--app/views/matches/_form.html.erb4
-rw-r--r--app/views/matches/index.html.erb2
-rw-r--r--app/views/matches/index.json.jbuilder2
-rw-r--r--app/views/matches/show.html.erb5
-rw-r--r--app/views/matches/show.json.jbuilder2
5 files changed, 13 insertions, 2 deletions
diff --git a/app/views/matches/_form.html.erb b/app/views/matches/_form.html.erb
index 9fe255c..bb33501 100644
--- a/app/views/matches/_form.html.erb
+++ b/app/views/matches/_form.html.erb
@@ -31,6 +31,10 @@
<%= f.label :remote_id %><br>
<%= f.text_field :remote_id %>
</div>
+ <div class="field">
+ <%= f.label :submitted_peer_evaluations %><br>
+ <%= f.number_field :submitted_peer_evaluations %>
+ </div>
<div class="actions">
<%= f.submit %>
</div>
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb
index 8d699f9..7b7676a 100644
--- a/app/views/matches/index.html.erb
+++ b/app/views/matches/index.html.erb
@@ -8,6 +8,7 @@
<th>Name</th>
<th>Winner</th>
<th>Remote</th>
+ <th>Submitted peer evaluations</th>
<th></th>
<th></th>
<th></th>
@@ -22,6 +23,7 @@
<td><%= match.name %></td>
<td><%= match.winner %></td>
<td><%= match.remote_id %></td>
+ <td><%= match.submitted_peer_evaluations %></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>
diff --git a/app/views/matches/index.json.jbuilder b/app/views/matches/index.json.jbuilder
index 18f172d..8efb8f9 100644
--- a/app/views/matches/index.json.jbuilder
+++ b/app/views/matches/index.json.jbuilder
@@ -1,4 +1,4 @@
json.array!(@matches) do |match|
- json.extract! match, :id, :status, :tournament_id, :name, :winner_id, :remote_id
+ json.extract! match, :id, :status, :tournament_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations
json.url match_url(match, format: :json)
end
diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb
index 1ee7f1d..1164113 100644
--- a/app/views/matches/show.html.erb
+++ b/app/views/matches/show.html.erb
@@ -25,5 +25,10 @@
<%= @match.remote_id %>
</p>
+<p>
+ <strong>Submitted peer evaluations:</strong>
+ <%= @match.submitted_peer_evaluations %>
+</p>
+
<%= link_to 'Edit', edit_match_path(@match) %> |
<%= link_to 'Back', matches_path %>
diff --git a/app/views/matches/show.json.jbuilder b/app/views/matches/show.json.jbuilder
index bfd2be4..37496c9 100644
--- a/app/views/matches/show.json.jbuilder
+++ b/app/views/matches/show.json.jbuilder
@@ -1 +1 @@
-json.extract! @match, :id, :status, :tournament_id, :name, :winner_id, :remote_id, :created_at, :updated_at
+json.extract! @match, :id, :status, :tournament_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations, :created_at, :updated_at