cafe-grader-web

Commit r304:a6eab16005af public

parent | child
Description:
shows more login/contest info on result page
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r304:a6eab16005af - - 2 files changed: 9 inserted, 1 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -120,7 +120,7
120
120
121 def user_stat
121 def user_stat
122 @problems = Problem.find_available_problems
122 @problems = Problem.find_available_problems
123 - @users = User.find(:all)
123 + @users = User.find(:all, :include => [:contests, :contest_stat])
124 @scorearray = Array.new
124 @scorearray = Array.new
125 @users.each do |u|
125 @users.each do |u|
126 ustat = Array.new
126 ustat = Array.new
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -5,6 +5,8
5 <th>User</th>
5 <th>User</th>
6 <th>Name</th>
6 <th>Name</th>
7 <th>Activated?</th>
7 <th>Activated?</th>
8 + <th>Logged in</th>
9 + <th>Contest(s)</th>
8 <% @problems.each do |p| %>
10 <% @problems.each do |p| %>
9 <th><%= p.name %></th>
11 <th><%= p.name %></th>
10 <% end %>
12 <% end %>
@@ -21,6 +23,12
21 <td><%= sc[i].login %></td>
23 <td><%= sc[i].login %></td>
22 <td><%= sc[i].full_name %></td>
24 <td><%= sc[i].full_name %></td>
23 <td><%= sc[i].activated %></td>
25 <td><%= sc[i].activated %></td>
26 + <td>
27 + <%= sc[i].try(:contest_stat).try(:started_at)!=nil ? 'yes' : 'no' %>
28 + </td>
29 + <td>
30 + <%= sc[i].contests.collect {|c| c.name}.join(', ') %>
31 + </td>
24 <% else %>
32 <% else %>
25 <td><%= sc[i][0] %></td>
33 <td><%= sc[i][0] %></td>
26 <% total += sc[i][0] %>
34 <% total += sc[i][0] %>
You need to be logged in to leave comments. Login now