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
@@ -112,49 +112,49
112 flash[:notice] = 'User was successfully updated.'
112 flash[:notice] = 'User was successfully updated.'
113 redirect_to :action => 'show', :id => @user
113 redirect_to :action => 'show', :id => @user
114 else
114 else
115 render :action => 'edit'
115 render :action => 'edit'
116 end
116 end
117 end
117 end
118
118
119 def destroy
119 def destroy
120 User.find(params[:id]).destroy
120 User.find(params[:id]).destroy
121 redirect_to :action => 'list'
121 redirect_to :action => 'list'
122 end
122 end
123
123
124 def user_stat
124 def user_stat
125 @problems = Problem.find_available_problems
125 @problems = Problem.find_available_problems
126 @users = User.find(:all, :include => [:contests, :contest_stat])
126 @users = User.find(:all, :include => [:contests, :contest_stat])
127 @scorearray = Array.new
127 @scorearray = Array.new
128 @users.each do |u|
128 @users.each do |u|
129 ustat = Array.new
129 ustat = Array.new
130 ustat[0] = u
130 ustat[0] = u
131 @problems.each do |p|
131 @problems.each do |p|
132 sub = Submission.find_last_by_user_and_problem(u.id,p.id)
132 sub = Submission.find_last_by_user_and_problem(u.id,p.id)
133 if (sub!=nil) and (sub.points!=nil)
133 if (sub!=nil) and (sub.points!=nil)
134 ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
134 ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
135 else
135 else
136 - ustat << [0,false]
136 + ustat << [nil,false]
137 end
137 end
138 end
138 end
139 @scorearray << ustat
139 @scorearray << ustat
140 end
140 end
141 end
141 end
142
142
143 def user_stat_max
143 def user_stat_max
144 @problems = Problem.find_available_problems
144 @problems = Problem.find_available_problems
145 @users = User.find(:all, :include => [:contests, :contest_stat])
145 @users = User.find(:all, :include => [:contests, :contest_stat])
146 @scorearray = Array.new
146 @scorearray = Array.new
147 #set up range from param
147 #set up range from param
148 since_id = params.fetch(:since_id, 0).to_i
148 since_id = params.fetch(:since_id, 0).to_i
149 until_id = params.fetch(:until_id, 0).to_i
149 until_id = params.fetch(:until_id, 0).to_i
150 @users.each do |u|
150 @users.each do |u|
151 ustat = Array.new
151 ustat = Array.new
152 ustat[0] = u
152 ustat[0] = u
153 @problems.each do |p|
153 @problems.each do |p|
154 max_points = 0
154 max_points = 0
155 Submission.find_in_range_by_user_and_problem(u.id,p.id,since_id,until_id).each do |sub|
155 Submission.find_in_range_by_user_and_problem(u.id,p.id,since_id,until_id).each do |sub|
156 max_points = sub.points if sub and sub.points and (sub.points > max_points)
156 max_points = sub.points if sub and sub.points and (sub.points > max_points)
157 end
157 end
158 ustat << [(max_points.to_f*100/p.full_score).round, (max_points>=p.full_score)]
158 ustat << [(max_points.to_f*100/p.full_score).round, (max_points>=p.full_score)]
159 end
159 end
160 @scorearray << ustat
160 @scorearray << ustat
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -13,36 +13,40
13 <th>Logged in</th>
13 <th>Logged in</th>
14 <th>Contest(s)</th>
14 <th>Contest(s)</th>
15 <% @problems.each do |p| %>
15 <% @problems.each do |p| %>
16 <th><%= p.name %></th>
16 <th><%= p.name %></th>
17 <% end %>
17 <% end %>
18 <th>Total</th>
18 <th>Total</th>
19 <th>Passed</th>
19 <th>Passed</th>
20 </tr>
20 </tr>
21 <% counter = 0 %>
21 <% counter = 0 %>
22 <% @scorearray.each do |sc| %>
22 <% @scorearray.each do |sc| %>
23 <tr class="<%= (counter %2 ==0) ? "info-even" : "info-odd" %>">
23 <tr class="<%= (counter %2 ==0) ? "info-even" : "info-odd" %>">
24 <% total = 0 %>
24 <% total = 0 %>
25 <% num_passed = 0 %>
25 <% num_passed = 0 %>
26 <% sc.each_index do |i| %>
26 <% sc.each_index do |i| %>
27 <% if i==0 %>
27 <% if i==0 %>
28 <td><%= sc[i].login %></td>
28 <td><%= sc[i].login %></td>
29 <td><%= sc[i].full_name %></td>
29 <td><%= sc[i].full_name %></td>
30 <td><%= sc[i].activated %></td>
30 <td><%= sc[i].activated %></td>
31 <td>
31 <td>
32 <%= sc[i].try(:contest_stat).try(:started_at)!=nil ? 'yes' : 'no' %>
32 <%= sc[i].try(:contest_stat).try(:started_at)!=nil ? 'yes' : 'no' %>
33 </td>
33 </td>
34 <td>
34 <td>
35 <%= sc[i].contests.collect {|c| c.name}.join(', ') %>
35 <%= sc[i].contests.collect {|c| c.name}.join(', ') %>
36 </td>
36 </td>
37 - <% else %>
37 + <% else %>
38 - <td><%= sc[i][0] %></td>
38 + <% if sc[i][0] != nil %>
39 - <% total += sc[i][0] %>
39 + <td><%= sc[i][0] %></td>
40 - <% num_passed += 1 if sc[i][1] %>
40 + <% total += sc[i][0] %>
41 + <% num_passed += 1 if sc[i][1] %>
42 + <% else %>
43 + <td>-</td>
44 + <% end %>
41 <% end %>
45 <% end %>
42 <% end %>
46 <% end %>
43 <td><%= total %></td>
47 <td><%= total %></td>
44 <td><%= num_passed %></td>
48 <td><%= num_passed %></td>
45 </tr>
49 </tr>
46 <% counter += 1 %>
50 <% counter += 1 %>
47 <% end %>
51 <% end %>
48 </table>
52 </table>
You need to be logged in to leave comments. Login now