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
@@ -117,13 +117,13
117 User.find(params[:id]).destroy
117 User.find(params[:id]).destroy
118 redirect_to :action => 'list'
118 redirect_to :action => 'list'
119 end
119 end
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
127 ustat[0] = u
127 ustat[0] = u
128 @problems.each do |p|
128 @problems.each do |p|
129 sub = Submission.find_last_by_user_and_problem(u.id,p.id)
129 sub = Submission.find_last_by_user_and_problem(u.id,p.id)
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -2,12 +2,14
2
2
3 <table class="info">
3 <table class="info">
4 <tr class="info-head">
4 <tr class="info-head">
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 %>
11 <th>Total</th>
13 <th>Total</th>
12 <th>Passed</th>
14 <th>Passed</th>
13 </tr>
15 </tr>
@@ -18,12 +20,18
18 <% num_passed = 0 %>
20 <% num_passed = 0 %>
19 <% sc.each_index do |i| %>
21 <% sc.each_index do |i| %>
20 <% if i==0 %>
22 <% if i==0 %>
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] %>
27 <% num_passed += 1 if sc[i][1] %>
35 <% num_passed += 1 if sc[i][1] %>
28 <% end %>
36 <% end %>
29 <% end %>
37 <% end %>
You need to be logged in to leave comments. Login now