cafe-grader-web

Commit r386:aef66acd0ee0 public

parent | child
Description:
shows scores only for submitted problems
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

r386:aef66acd0ee0 - - 2 files changed: 9 inserted, 5 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -124,25 +124,25
124 124 def user_stat
125 125 @problems = Problem.find_available_problems
126 126 @users = User.find(:all, :include => [:contests, :contest_stat])
127 127 @scorearray = Array.new
128 128 @users.each do |u|
129 129 ustat = Array.new
130 130 ustat[0] = u
131 131 @problems.each do |p|
132 132 sub = Submission.find_last_by_user_and_problem(u.id,p.id)
133 133 if (sub!=nil) and (sub.points!=nil)
134 134 ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
135 135 else
136 - ustat << [0,false]
136 + ustat << [nil,false]
137 137 end
138 138 end
139 139 @scorearray << ustat
140 140 end
141 141 end
142 142
143 143 def user_stat_max
144 144 @problems = Problem.find_available_problems
145 145 @users = User.find(:all, :include => [:contests, :contest_stat])
146 146 @scorearray = Array.new
147 147 #set up range from param
148 148 since_id = params.fetch(:since_id, 0).to_i
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -25,24 +25,28
25 25 <% num_passed = 0 %>
26 26 <% sc.each_index do |i| %>
27 27 <% if i==0 %>
28 28 <td><%= sc[i].login %></td>
29 29 <td><%= sc[i].full_name %></td>
30 30 <td><%= sc[i].activated %></td>
31 31 <td>
32 32 <%= sc[i].try(:contest_stat).try(:started_at)!=nil ? 'yes' : 'no' %>
33 33 </td>
34 34 <td>
35 35 <%= sc[i].contests.collect {|c| c.name}.join(', ') %>
36 36 </td>
37 - <% else %>
38 - <td><%= sc[i][0] %></td>
39 - <% total += sc[i][0] %>
40 - <% num_passed += 1 if sc[i][1] %>
37 + <% else %>
38 + <% if sc[i][0] != nil %>
39 + <td><%= sc[i][0] %></td>
40 + <% total += sc[i][0] %>
41 + <% num_passed += 1 if sc[i][1] %>
42 + <% else %>
43 + <td>-</td>
44 + <% end %>
41 45 <% end %>
42 46 <% end %>
43 47 <td><%= total %></td>
44 48 <td><%= num_passed %></td>
45 49 </tr>
46 50 <% counter += 1 %>
47 51 <% end %>
48 52 </table>
You need to be logged in to leave comments. Login now