Description:
merge max score from branch algo
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r411:05396b121058 - - 9 files changed: 124 inserted, 8 deleted
| @@ -0,0 +1,18 | |||
|
|
1 | + | |
|
|
2 | + = form_tag({action: :user_stat_max }) do | |
|
|
3 | + .submitbox | |
|
|
4 | + %table | |
|
|
5 | + %tr | |
|
|
6 | + %td{colspan: 6, style: 'font-weight: bold'} Query maximum score in submission range | |
|
|
7 | + %tr | |
|
|
8 | + %td{style: 'width: 120px; font-weight: bold'} Submission ID: | |
|
|
9 | + %td{align: 'right'} From date: | |
|
|
10 | + %td= text_field_tag 'start_date', params[:start_date] | |
|
|
11 | + %td Time: | |
|
|
12 | + %td= text_field_tag 'start_time', params[:start_time], style: 'width:40px' | |
|
|
13 | + %td= submit_tag 'query' | |
|
|
14 | + %tr | |
|
|
15 | + %td | |
|
|
16 | + %td{colspan: 5} Leave blank date and/or time for no condition | |
|
|
17 | + %br/ | |
|
|
18 | + | |
| @@ -0,0 +1,18 | |||
|
|
1 | + | |
|
|
2 | + | |
|
|
3 | + = form_tag({action: :user_stat_max }) do | |
|
|
4 | + .submitbox | |
|
|
5 | + %table | |
|
|
6 | + %tr | |
|
|
7 | + %td{colspan: 6, style: 'font-weight: bold'} Query maximum score in submission range | |
|
|
8 | + %tr | |
|
|
9 | + %td{style: 'width: 120px; font-weight: bold'} Submission ID: | |
|
|
10 | + %td{align: 'right'} From: | |
|
|
11 | + %td= text_field_tag 'since_id', params[:since_id], style: 'width:40px' | |
|
|
12 | + %td To: | |
|
|
13 | + %td= text_field_tag 'until_id', params[:until_id], style: 'width:40px' | |
|
|
14 | + %td= submit_tag 'query' | |
|
|
15 | + %tr | |
|
|
16 | + %td | |
|
|
17 | + %td{colspan: 5} Leave blank for uncondition | |
|
|
18 | + | |
| @@ -0,0 +1,44 | |||
|
|
1 | + %h1 User grading results | |
|
|
2 | + %h2 Show max scores in submission range | |
|
|
3 | + | |
|
|
4 | + - if @problem and @problem.errors | |
|
|
5 | + =error_messages_for 'problem' | |
|
|
6 | + | |
|
|
7 | + = render partial: 'submission_range' | |
|
|
8 | + | |
|
|
9 | + - if @log | |
|
|
10 | + %h3 Import log | |
|
|
11 | + %pre.import-log | |
|
|
12 | + = @log | |
|
|
13 | + | |
|
|
14 | + %p= link_to '[Show only latest submissions]', controller: :user_admin, action: :user_stat | |
|
|
15 | + | |
|
|
16 | + %table.info | |
|
|
17 | + %thead | |
|
|
18 | + %tr.info-head | |
|
|
19 | + %th User | |
|
|
20 | + %th Name | |
|
|
21 | + %th Activated? | |
|
|
22 | + %th Logged in | |
|
|
23 | + %th Contest(s) | |
|
|
24 | + - @problems.each do |p| | |
|
|
25 | + %th= p.name | |
|
|
26 | + %th Total | |
|
|
27 | + %th Passed | |
|
|
28 | + %tbody | |
|
|
29 | + - @scorearray.each do |sc| | |
|
|
30 | + %tr{class: cycle('info-even','info-odd')} | |
|
|
31 | + - total,num_passed = 0,0 | |
|
|
32 | + - sc.each_index do |i| | |
|
|
33 | + - if i == 0 | |
|
|
34 | + %td= sc[i].login | |
|
|
35 | + %td= sc[i].full_name | |
|
|
36 | + %td= sc[i].activated | |
|
|
37 | + %td= sc[i].try(:contest_stat).try(:started_at)!=nil ? 'yes' : 'no' | |
|
|
38 | + %td= sc[i].contests.collect {|c| c.name}.join(', ') | |
|
|
39 | + - else | |
|
|
40 | + %td= sc[i][0] | |
|
|
41 | + - total += sc[i][0] | |
|
|
42 | + - num_passed += 1 if sc[i][1] | |
|
|
43 | + %td= total | |
|
|
44 | + %td= num_passed | |
| @@ -1,329 +1,350 | |||
|
|
1 | 1 | class UserAdminController < ApplicationController |
|
|
2 | 2 | |
|
|
3 | 3 | include MailHelperMethods |
|
|
4 | 4 | |
|
|
5 | 5 | before_filter :admin_authorization |
|
|
6 | 6 | |
|
|
7 | 7 | # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html) |
|
|
8 | 8 | verify :method => :post, :only => [ :destroy, |
|
|
9 | 9 | :create, :create_from_list, |
|
|
10 | 10 | :update, |
|
|
11 | 11 | :manage_contest, |
|
|
12 | 12 | :bulk_mail |
|
|
13 | 13 | ], |
|
|
14 | 14 | :redirect_to => { :action => :list } |
|
|
15 | 15 | |
|
|
16 | 16 | def index |
|
|
17 | 17 | list |
|
|
18 | 18 | render :action => 'list' |
|
|
19 | 19 | end |
|
|
20 | 20 | |
|
|
21 | 21 | def list |
|
|
22 | 22 | @user_count = User.count |
|
|
23 | 23 | if params[:page] == 'all' |
|
|
24 | 24 | @users = User.all |
|
|
25 | 25 | @paginated = false |
|
|
26 | 26 | else |
|
|
27 | 27 | @users = User.paginate :page => params[:page] |
|
|
28 | 28 | @paginated = true |
|
|
29 | 29 | end |
|
|
30 | 30 | @hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at'] |
|
|
31 | 31 | @contests = Contest.enabled |
|
|
32 | 32 | end |
|
|
33 | 33 | |
|
|
34 | 34 | def active |
|
|
35 | 35 | sessions = ActiveRecord::SessionStore::Session.find(:all, :conditions => ["updated_at >= ?", 60.minutes.ago]) |
|
|
36 | 36 | @users = [] |
|
|
37 | 37 | sessions.each do |session| |
|
|
38 | 38 | if session.data[:user_id] |
|
|
39 | 39 | @users << User.find(session.data[:user_id]) |
|
|
40 | 40 | end |
|
|
41 | 41 | end |
|
|
42 | 42 | end |
|
|
43 | 43 | |
|
|
44 | 44 | def show |
|
|
45 | 45 | @user = User.find(params[:id]) |
|
|
46 | 46 | end |
|
|
47 | 47 | |
|
|
48 | 48 | def new |
|
|
49 | 49 | @user = User.new |
|
|
50 | 50 | end |
|
|
51 | 51 | |
|
|
52 | 52 | def create |
|
|
53 | 53 | @user = User.new(params[:user]) |
|
|
54 | 54 | @user.activated = true |
|
|
55 | 55 | if @user.save |
|
|
56 | 56 | flash[:notice] = 'User was successfully created.' |
|
|
57 | 57 | redirect_to :action => 'list' |
|
|
58 | 58 | else |
|
|
59 | 59 | render :action => 'new' |
|
|
60 | 60 | end |
|
|
61 | 61 | end |
|
|
62 | 62 | |
|
|
63 | 63 | def create_from_list |
|
|
64 | 64 | lines = params[:user_list] |
|
|
65 | 65 | |
|
|
66 | 66 | note = [] |
|
|
67 | 67 | |
|
|
68 | 68 | lines.split("\n").each do |line| |
|
|
69 | 69 | items = line.chomp.split(',') |
|
|
70 | 70 | if items.length>=2 |
|
|
71 | 71 | login = items[0] |
|
|
72 | 72 | full_name = items[1] |
|
|
73 | 73 | |
|
|
74 | 74 | added_random_password = false |
|
|
75 | 75 | if items.length>=3 |
|
|
76 | 76 | password = items[2].chomp(" ") |
|
|
77 | 77 | user_alias = (items.length>=4) ? items[3] : login |
|
|
78 | 78 | else |
|
|
79 | 79 | password = random_password |
|
|
80 | 80 | user_alias = (items.length>=4) ? items[3] : login |
|
|
81 | 81 | added_random_password = true |
|
|
82 | 82 | end |
|
|
83 | 83 | |
|
|
84 | 84 | user = User.new({:login => login, |
|
|
85 | 85 | :full_name => full_name, |
|
|
86 | 86 | :password => password, |
|
|
87 | 87 | :password_confirmation => password, |
|
|
88 | 88 | :alias => user_alias}) |
|
|
89 | 89 | user.activated = true |
|
|
90 | 90 | user.save |
|
|
91 | 91 | |
|
|
92 | 92 | if added_random_password |
|
|
93 | 93 | note << "'#{login}' (+)" |
|
|
94 | 94 | else |
|
|
95 | 95 | note << login |
|
|
96 | 96 | end |
|
|
97 | 97 | end |
|
|
98 | 98 | end |
|
|
99 | 99 | flash[:notice] = 'User(s) ' + note.join(', ') + |
|
|
100 | 100 | ' were successfully created. ' + |
|
|
101 | 101 | '( (+) - created with random passwords.)' |
|
|
102 | 102 | redirect_to :action => 'list' |
|
|
103 | 103 | end |
|
|
104 | 104 | |
|
|
105 | 105 | def edit |
|
|
106 | 106 | @user = User.find(params[:id]) |
|
|
107 | 107 | end |
|
|
108 | 108 | |
|
|
109 | 109 | def update |
|
|
110 | 110 | @user = User.find(params[:id]) |
|
|
111 | 111 | if @user.update_attributes(params[:user]) |
|
|
112 | 112 | flash[:notice] = 'User was successfully updated.' |
|
|
113 | 113 | redirect_to :action => 'show', :id => @user |
|
|
114 | 114 | else |
|
|
115 | 115 | render :action => 'edit' |
|
|
116 | 116 | end |
|
|
117 | 117 | end |
|
|
118 | 118 | |
|
|
119 | 119 | def destroy |
|
|
120 | 120 | User.find(params[:id]).destroy |
|
|
121 | 121 | redirect_to :action => 'list' |
|
|
122 | 122 | end |
|
|
123 | 123 | |
|
|
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 |
- |
|
|
|
133 |
- |
|
|
|
134 |
- |
|
|
|
135 | - else | |
|
|
136 |
- |
|
|
|
137 | - end | |
|
|
132 | + sub = Submission.find_last_by_user_and_problem(u.id,p.id) | |
|
|
133 | + if (sub!=nil) and (sub.points!=nil) | |
|
|
134 | + ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)] | |
|
|
135 | + else | |
|
|
136 | + ustat << [0,false] | |
|
|
137 | + end | |
|
|
138 | + end | |
|
|
139 | + @scorearray << ustat | |
|
|
140 | + end | |
|
|
141 | + end | |
|
|
142 | + | |
|
|
143 | + def user_stat_max | |
|
|
144 | + @problems = Problem.find_available_problems | |
|
|
145 | + @users = User.find(:all, :include => [:contests, :contest_stat]) | |
|
|
146 | + @scorearray = Array.new | |
|
|
147 | + #set up range from param | |
|
|
148 | + since_id = params.fetch(:since_id, 0).to_i | |
|
|
149 | + until_id = params.fetch(:until_id, 0).to_i | |
|
|
150 | + @users.each do |u| | |
|
|
151 | + ustat = Array.new | |
|
|
152 | + ustat[0] = u | |
|
|
153 | + @problems.each do |p| | |
|
|
154 | + max_points = 0 | |
|
|
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) | |
|
|
157 | + end | |
|
|
158 | + ustat << [(max_points.to_f*100/p.full_score).round, (max_points>=p.full_score)] | |
|
|
138 | 159 | end |
|
|
139 | 160 | @scorearray << ustat |
|
|
140 | 161 | end |
|
|
141 | 162 | end |
|
|
142 | 163 | |
|
|
143 | 164 | def import |
|
|
144 | 165 | if params[:file]=='' |
|
|
145 | 166 | flash[:notice] = 'Error importing no file' |
|
|
146 | 167 | redirect_to :action => 'list' and return |
|
|
147 | 168 | end |
|
|
148 | 169 | import_from_file(params[:file]) |
|
|
149 | 170 | end |
|
|
150 | 171 | |
|
|
151 | 172 | def random_all_passwords |
|
|
152 | 173 | users = User.find(:all) |
|
|
153 | 174 | @prefix = params[:prefix] || '' |
|
|
154 | 175 | @non_admin_users = User.find_non_admin_with_prefix(@prefix) |
|
|
155 | 176 | @changed = false |
|
|
156 | 177 | if request.request_method == 'POST' |
|
|
157 | 178 | @non_admin_users.each do |user| |
|
|
158 | 179 | password = random_password |
|
|
159 | 180 | user.password = password |
|
|
160 | 181 | user.password_confirmation = password |
|
|
161 | 182 | user.save |
|
|
162 | 183 | end |
|
|
163 | 184 | @changed = true |
|
|
164 | 185 | end |
|
|
165 | 186 | end |
|
|
166 | 187 | |
|
|
167 | 188 | # contest management |
|
|
168 | 189 | |
|
|
169 | 190 | def contests |
|
|
170 | 191 | @contest, @users = find_contest_and_user_from_contest_id(params[:id]) |
|
|
171 | 192 | @contests = Contest.enabled |
|
|
172 | 193 | end |
|
|
173 | 194 | |
|
|
174 | 195 | def assign_from_list |
|
|
175 | 196 | contest_id = params[:users_contest_id] |
|
|
176 | 197 | org_contest, users = find_contest_and_user_from_contest_id(contest_id) |
|
|
177 | 198 | contest = Contest.find(params[:new_contest][:id]) |
|
|
178 | 199 | if !contest |
|
|
179 | 200 | flash[:notice] = 'Error: no contest' |
|
|
180 | 201 | redirect_to :action => 'contests', :id =>contest_id |
|
|
181 | 202 | end |
|
|
182 | 203 | |
|
|
183 | 204 | note = [] |
|
|
184 | 205 | users.each do |u| |
|
|
185 | 206 | u.contests = [contest] |
|
|
186 | 207 | note << u.login |
|
|
187 | 208 | end |
|
|
188 | 209 | flash[:notice] = 'User(s) ' + note.join(', ') + |
|
|
189 | 210 | " were successfully reassigned to #{contest.title}." |
|
|
190 | 211 | redirect_to :action => 'contests', :id =>contest.id |
|
|
191 | 212 | end |
|
|
192 | 213 | |
|
|
193 | 214 | def add_to_contest |
|
|
194 | 215 | user = User.find(params[:id]) |
|
|
195 | 216 | contest = Contest.find(params[:contest_id]) |
|
|
196 | 217 | if user and contest |
|
|
197 | 218 | user.contests << contest |
|
|
198 | 219 | end |
|
|
199 | 220 | redirect_to :action => 'list' |
|
|
200 | 221 | end |
|
|
201 | 222 | |
|
|
202 | 223 | def remove_from_contest |
|
|
203 | 224 | user = User.find(params[:id]) |
|
|
204 | 225 | contest = Contest.find(params[:contest_id]) |
|
|
205 | 226 | if user and contest |
|
|
206 | 227 | user.contests.delete(contest) |
|
|
207 | 228 | end |
|
|
208 | 229 | redirect_to :action => 'list' |
|
|
209 | 230 | end |
|
|
210 | 231 | |
|
|
211 | 232 | def contest_management |
|
|
212 | 233 | end |
|
|
213 | 234 | |
|
|
214 | 235 | def manage_contest |
|
|
215 | 236 | contest = Contest.find(params[:contest][:id]) |
|
|
216 | 237 | if !contest |
|
|
217 | 238 | flash[:notice] = 'You did not choose the contest.' |
|
|
218 | 239 | redirect_to :action => 'contest_management' and return |
|
|
219 | 240 | end |
|
|
220 | 241 | |
|
|
221 | 242 | operation = params[:operation] |
|
|
222 | 243 | |
|
|
223 | 244 | if not ['add','remove','assign'].include? operation |
|
|
224 | 245 | flash[:notice] = 'You did not choose the operation to perform.' |
|
|
225 | 246 | redirect_to :action => 'contest_management' and return |
|
|
226 | 247 | end |
|
|
227 | 248 | |
|
|
228 | 249 | lines = params[:login_list] |
|
|
229 | 250 | if !lines or lines.blank? |
|
|
230 | 251 | flash[:notice] = 'You entered an empty list.' |
|
|
231 | 252 | redirect_to :action => 'contest_management' and return |
|
|
232 | 253 | end |
|
|
233 | 254 | |
|
|
234 | 255 | note = [] |
|
|
235 | 256 | users = [] |
|
|
236 | 257 | lines.split("\n").each do |line| |
|
|
237 | 258 | user = User.find_by_login(line.chomp) |
|
|
238 | 259 | if user |
|
|
239 | 260 | if operation=='add' |
|
|
240 | 261 | if ! user.contests.include? contest |
|
|
241 | 262 | user.contests << contest |
|
|
242 | 263 | end |
|
|
243 | 264 | elsif operation=='remove' |
|
|
244 | 265 | user.contests.delete(contest) |
|
|
245 | 266 | else |
|
|
246 | 267 | user.contests = [contest] |
|
|
247 | 268 | end |
|
|
248 | 269 | |
|
|
249 | 270 | if params[:reset_timer] |
|
|
250 | 271 | user.contest_stat.forced_logout = true |
|
|
251 | 272 | user.contest_stat.reset_timer_and_save |
|
|
252 | 273 | end |
|
|
253 | 274 | |
|
|
254 | 275 | if params[:notification_emails] |
|
|
255 | 276 | send_contest_update_notification_email(user, contest) |
|
|
256 | 277 | end |
|
|
257 | 278 | |
|
|
258 | 279 | note << user.login |
|
|
259 | 280 | users << user |
|
|
260 | 281 | end |
|
|
261 | 282 | end |
|
|
262 | 283 | |
|
|
263 | 284 | if params[:reset_timer] |
|
|
264 | 285 | logout_users(users) |
|
|
265 | 286 | end |
|
|
266 | 287 | |
|
|
267 | 288 | flash[:notice] = 'User(s) ' + note.join(', ') + |
|
|
268 | 289 | ' were successfully modified. ' |
|
|
269 | 290 | redirect_to :action => 'contest_management' |
|
|
270 | 291 | end |
|
|
271 | 292 | |
|
|
272 | 293 | # admin management |
|
|
273 | 294 | |
|
|
274 | 295 | def admin |
|
|
275 | 296 | @admins = User.find(:all).find_all {|user| user.admin? } |
|
|
276 | 297 | end |
|
|
277 | 298 | |
|
|
278 | 299 | def grant_admin |
|
|
279 | 300 | login = params[:login] |
|
|
280 | 301 | user = User.find_by_login(login) |
|
|
281 | 302 | if user!=nil |
|
|
282 | 303 | admin_role = Role.find_by_name('admin') |
|
|
283 | 304 | user.roles << admin_role |
|
|
284 | 305 | else |
|
|
285 | 306 | flash[:notice] = 'Unknown user' |
|
|
286 | 307 | end |
|
|
287 | 308 | flash[:notice] = 'User added as admins' |
|
|
288 | 309 | redirect_to :action => 'admin' |
|
|
289 | 310 | end |
|
|
290 | 311 | |
|
|
291 | 312 | def revoke_admin |
|
|
292 | 313 | user = User.find(params[:id]) |
|
|
293 | 314 | if user==nil |
|
|
294 | 315 | flash[:notice] = 'Unknown user' |
|
|
295 | 316 | redirect_to :action => 'admin' and return |
|
|
296 | 317 | elsif user.login == 'root' |
|
|
297 | 318 | flash[:notice] = 'You cannot revoke admisnistrator permission from root.' |
|
|
298 | 319 | redirect_to :action => 'admin' and return |
|
|
299 | 320 | end |
|
|
300 | 321 | |
|
|
301 | 322 | admin_role = Role.find_by_name('admin') |
|
|
302 | 323 | user.roles.delete(admin_role) |
|
|
303 | 324 | flash[:notice] = 'User permission revoked' |
|
|
304 | 325 | redirect_to :action => 'admin' |
|
|
305 | 326 | end |
|
|
306 | 327 | |
|
|
307 | 328 | # mass mailing |
|
|
308 | 329 | |
|
|
309 | 330 | def mass_mailing |
|
|
310 | 331 | end |
|
|
311 | 332 | |
|
|
312 | 333 | def bulk_mail |
|
|
313 | 334 | lines = params[:login_list] |
|
|
314 | 335 | if !lines or lines.blank? |
|
|
315 | 336 | flash[:notice] = 'You entered an empty list.' |
|
|
316 | 337 | redirect_to :action => 'mass_mailing' and return |
|
|
317 | 338 | end |
|
|
318 | 339 | |
|
|
319 | 340 | mail_subject = params[:subject] |
|
|
320 | 341 | if !mail_subject or mail_subject.blank? |
|
|
321 | 342 | flash[:notice] = 'You entered an empty mail subject.' |
|
|
322 | 343 | redirect_to :action => 'mass_mailing' and return |
|
|
323 | 344 | end |
|
|
324 | 345 | |
|
|
325 | 346 | mail_body = params[:email_body] |
|
|
326 | 347 | if !mail_body or mail_body.blank? |
|
|
327 | 348 | flash[:notice] = 'You entered an empty mail body.' |
|
|
328 | 349 | redirect_to :action => 'mass_mailing' and return |
|
|
329 | 350 | end |
| @@ -1,133 +1,134 | |||
|
|
1 | 1 | # Methods added to this helper will be available to all templates in the application. |
|
|
2 | 2 | module ApplicationHelper |
|
|
3 | 3 | |
|
|
4 | 4 | def user_header |
|
|
5 | 5 | menu_items = '' |
|
|
6 | 6 | user = User.find(session[:user_id]) |
|
|
7 | 7 | |
|
|
8 | 8 | if (user!=nil) and (session[:admin]) |
|
|
9 | 9 | # admin menu |
|
|
10 | 10 | menu_items << "<b>Administrative task:</b> " |
|
|
11 | 11 | append_to menu_items, '[Announcements]', 'announcements', 'index' |
|
|
12 | 12 | append_to menu_items, '[Msg console]', 'messages', 'console' |
|
|
13 | 13 | append_to menu_items, '[Problems]', 'problems', 'index' |
|
|
14 | 14 | append_to menu_items, '[Users]', 'user_admin', 'index' |
|
|
15 | 15 | append_to menu_items, '[Results]', 'user_admin', 'user_stat' |
|
|
16 | + append_to menu_items, '[Report]', 'report', 'login_stat' | |
|
|
16 | 17 | append_to menu_items, '[Graders]', 'graders', 'list' |
|
|
17 | 18 | append_to menu_items, '[Contests]', 'contest_management', 'index' |
|
|
18 | 19 | append_to menu_items, '[Sites]', 'sites', 'index' |
|
|
19 | 20 | append_to menu_items, '[System config]', 'configurations', 'index' |
|
|
20 | 21 | menu_items << "<br/>" |
|
|
21 | 22 | end |
|
|
22 | 23 | |
|
|
23 | 24 | # main page |
|
|
24 | 25 | append_to menu_items, "[#{I18n.t 'menu.main'}]", 'main', 'list' |
|
|
25 | 26 | append_to menu_items, "[#{I18n.t 'menu.messages'}]", 'messages', 'list' |
|
|
26 | 27 | |
|
|
27 | 28 | if (user!=nil) and (GraderConfiguration.show_tasks_to?(user)) |
|
|
28 | 29 | append_to menu_items, "[#{I18n.t 'menu.tasks'}]", 'tasks', 'list' |
|
|
29 | 30 | append_to menu_items, "[#{I18n.t 'menu.submissions'}]", 'main', 'submission' |
|
|
30 | 31 | append_to menu_items, "[#{I18n.t 'menu.test'}]", 'test', 'index' |
|
|
31 | 32 | end |
|
|
32 | 33 | append_to menu_items, "[#{I18n.t 'menu.help'}]", 'main', 'help' |
|
|
33 | 34 | |
|
|
34 | 35 | if GraderConfiguration['system.user_setting_enabled'] |
|
|
35 | 36 | append_to menu_items, "[#{I18n.t 'menu.settings'}]", 'users', 'index' |
|
|
36 | 37 | end |
|
|
37 | 38 | append_to menu_items, "[#{I18n.t 'menu.log_out'}]", 'main', 'login' |
|
|
38 | 39 | |
|
|
39 | 40 | menu_items.html_safe |
|
|
40 | 41 | end |
|
|
41 | 42 | |
|
|
42 | 43 | def append_to(option,label, controller, action) |
|
|
43 | 44 | option << ' ' if option!='' |
|
|
44 | 45 | option << link_to_unless_current(label, |
|
|
45 | 46 | :controller => controller, |
|
|
46 | 47 | :action => action) |
|
|
47 | 48 | end |
|
|
48 | 49 | |
|
|
49 | 50 | def format_short_time(time) |
|
|
50 | 51 | now = Time.now.gmtime |
|
|
51 | 52 | st = '' |
|
|
52 | 53 | if (time.yday != now.yday) or |
|
|
53 | 54 | (time.year != now.year) |
|
|
54 | 55 | st = time.strftime("%x ") |
|
|
55 | 56 | end |
|
|
56 | 57 | st + time.strftime("%X") |
|
|
57 | 58 | end |
|
|
58 | 59 | |
|
|
59 | 60 | def format_short_duration(duration) |
|
|
60 | 61 | return '' if duration==nil |
|
|
61 | 62 | d = duration.to_f |
|
|
62 | 63 | return Time.at(d).gmtime.strftime("%X") |
|
|
63 | 64 | end |
|
|
64 | 65 | |
|
|
65 | 66 | def read_textfile(fname,max_size=2048) |
|
|
66 | 67 | begin |
|
|
67 | 68 | File.open(fname).read(max_size) |
|
|
68 | 69 | rescue |
|
|
69 | 70 | nil |
|
|
70 | 71 | end |
|
|
71 | 72 | end |
|
|
72 | 73 | |
|
|
73 | 74 | def user_title_bar(user) |
|
|
74 | 75 | header = '' |
|
|
75 | 76 | time_left = '' |
|
|
76 | 77 | |
|
|
77 | 78 | # |
|
|
78 | 79 | # if the contest is over |
|
|
79 | 80 | if GraderConfiguration.time_limit_mode? |
|
|
80 | 81 | if user.contest_finished? |
|
|
81 | 82 | header = <<CONTEST_OVER |
|
|
82 | 83 | <tr><td colspan="2" align="center"> |
|
|
83 | 84 | <span class="contest-over-msg">THE CONTEST IS OVER</span> |
|
|
84 | 85 | </td></tr> |
|
|
85 | 86 | CONTEST_OVER |
|
|
86 | 87 | end |
|
|
87 | 88 | if !user.contest_started? |
|
|
88 | 89 | time_left = " " + (t 'title_bar.contest_not_started') |
|
|
89 | 90 | else |
|
|
90 | 91 | time_left = " " + (t 'title_bar.remaining_time') + |
|
|
91 | 92 | " #{format_short_duration(user.contest_time_left)}" |
|
|
92 | 93 | end |
|
|
93 | 94 | end |
|
|
94 | 95 | |
|
|
95 | 96 | # |
|
|
96 | 97 | # if the contest is in the anaysis mode |
|
|
97 | 98 | if GraderConfiguration.analysis_mode? |
|
|
98 | 99 | header = <<ANALYSISMODE |
|
|
99 | 100 | <tr><td colspan="2" align="center"> |
|
|
100 | 101 | <span class="contest-over-msg">ANALYSIS MODE</span> |
|
|
101 | 102 | </td></tr> |
|
|
102 | 103 | ANALYSISMODE |
|
|
103 | 104 | end |
|
|
104 | 105 | |
|
|
105 | 106 | contest_name = GraderConfiguration['contest.name'] |
|
|
106 | 107 | |
|
|
107 | 108 | # |
|
|
108 | 109 | # build real title bar |
|
|
109 | 110 | result = <<TITLEBAR |
|
|
110 | 111 | <div class="title"> |
|
|
111 | 112 | <table> |
|
|
112 | 113 | #{header} |
|
|
113 | 114 | <tr> |
|
|
114 | 115 | <td class="left-col"> |
|
|
115 | 116 | #{user.full_name}<br/> |
|
|
116 | 117 | #{t 'title_bar.current_time'} #{format_short_time(Time.new)} |
|
|
117 | 118 | #{time_left} |
|
|
118 | 119 | <br/> |
|
|
119 | 120 | </td> |
|
|
120 | 121 | <td class="right-col">#{contest_name}</td> |
|
|
121 | 122 | </tr> |
|
|
122 | 123 | </table> |
|
|
123 | 124 | </div> |
|
|
124 | 125 | TITLEBAR |
|
|
125 | 126 | result.html_safe |
|
|
126 | 127 | end |
|
|
127 | 128 | |
|
|
128 | 129 | def markdown(text) |
|
|
129 | 130 | markdown = RDiscount.new(text) |
|
|
130 | 131 | markdown.to_html.html_safe |
|
|
131 | 132 | end |
|
|
132 | 133 | |
|
|
133 | 134 | end |
| @@ -1,166 +1,173 | |||
|
|
1 | 1 | class Submission < ActiveRecord::Base |
|
|
2 | 2 | |
|
|
3 | 3 | belongs_to :language |
|
|
4 | 4 | belongs_to :problem |
|
|
5 | 5 | belongs_to :user |
|
|
6 | 6 | |
|
|
7 | 7 | before_validation :assign_problem |
|
|
8 | 8 | before_validation :assign_language |
|
|
9 | 9 | |
|
|
10 | 10 | validates_presence_of :source |
|
|
11 | 11 | validates_length_of :source, :maximum => 100_000, :allow_blank => true, :message => 'too long' |
|
|
12 | 12 | validates_length_of :source, :minimum => 1, :allow_blank => true, :message => 'too short' |
|
|
13 | 13 | validate :must_have_valid_problem |
|
|
14 | 14 | validate :must_specify_language |
|
|
15 | 15 | |
|
|
16 | 16 | before_save :assign_latest_number_if_new_recond |
|
|
17 | 17 | |
|
|
18 | 18 | def self.find_last_by_user_and_problem(user_id, problem_id) |
|
|
19 | 19 | last_sub = find(:first, |
|
|
20 | 20 | :conditions => {:user_id => user_id, |
|
|
21 | 21 | :problem_id => problem_id}, |
|
|
22 | 22 | :order => 'number DESC') |
|
|
23 | 23 | return last_sub |
|
|
24 | 24 | end |
|
|
25 | 25 | |
|
|
26 | 26 | def self.find_all_last_by_problem(problem_id) |
|
|
27 | 27 | # need to put in SQL command, maybe there's a better way |
|
|
28 | 28 | Submission.find_by_sql("SELECT * FROM submissions " + |
|
|
29 | 29 | "WHERE id = " + |
|
|
30 | 30 | "(SELECT MAX(id) FROM submissions AS subs " + |
|
|
31 | 31 | "WHERE subs.user_id = submissions.user_id AND " + |
|
|
32 | 32 | "problem_id = " + problem_id.to_s + " " + |
|
|
33 | 33 | "GROUP BY user_id) " + |
|
|
34 | 34 | "ORDER BY user_id") |
|
|
35 | 35 | end |
|
|
36 | 36 | |
|
|
37 | + def self.find_in_range_by_user_and_problem(user_id, problem_id,since_id,until_id) | |
|
|
38 | + records = Submission.where(problem_id: problem_id,user_id: user_id) | |
|
|
39 | + records = records.where('id >= ?',since_id) if since_id > 0 | |
|
|
40 | + records = records.where('id <= ?',until_id) if until_id > 0 | |
|
|
41 | + records.all | |
|
|
42 | + end | |
|
|
43 | + | |
|
|
37 | 44 | def self.find_last_for_all_available_problems(user_id) |
|
|
38 | 45 | submissions = Array.new |
|
|
39 | 46 | problems = Problem.find_available_problems |
|
|
40 | 47 | problems.each do |problem| |
|
|
41 | 48 | sub = Submission.find_last_by_user_and_problem(user_id, problem.id) |
|
|
42 | 49 | submissions << sub if sub!=nil |
|
|
43 | 50 | end |
|
|
44 | 51 | submissions |
|
|
45 | 52 | end |
|
|
46 | 53 | |
|
|
47 | 54 | def self.find_by_user_problem_number(user_id, problem_id, number) |
|
|
48 | 55 | Submission.find(:first, |
|
|
49 | 56 | :conditions => { |
|
|
50 | 57 | :user_id => user_id, |
|
|
51 | 58 | :problem_id => problem_id, |
|
|
52 | 59 | :number => number |
|
|
53 | 60 | }) |
|
|
54 | 61 | end |
|
|
55 | 62 | |
|
|
56 | 63 | def self.find_all_by_user_problem(user_id, problem_id) |
|
|
57 | 64 | Submission.find(:all, |
|
|
58 | 65 | :conditions => { |
|
|
59 | 66 | :user_id => user_id, |
|
|
60 | 67 | :problem_id => problem_id, |
|
|
61 | 68 | }) |
|
|
62 | 69 | end |
|
|
63 | 70 | |
|
|
64 | 71 | def download_filename |
|
|
65 | 72 | if self.problem.output_only |
|
|
66 | 73 | return self.source_filename |
|
|
67 | 74 | else |
|
|
68 | 75 | timestamp = self.submitted_at.localtime.strftime("%H%M%S") |
|
|
69 | 76 | return "#{self.problem.name}-#{timestamp}.#{self.language.ext}" |
|
|
70 | 77 | end |
|
|
71 | 78 | end |
|
|
72 | 79 | |
|
|
73 | 80 | protected |
|
|
74 | 81 | |
|
|
75 | 82 | def self.find_option_in_source(option, source) |
|
|
76 | 83 | if source==nil |
|
|
77 | 84 | return nil |
|
|
78 | 85 | end |
|
|
79 | 86 | i = 0 |
|
|
80 | 87 | source.each_line do |s| |
|
|
81 | 88 | if s =~ option |
|
|
82 | 89 | words = s.split |
|
|
83 | 90 | return words[1] |
|
|
84 | 91 | end |
|
|
85 | 92 | i = i + 1 |
|
|
86 | 93 | if i==10 |
|
|
87 | 94 | return nil |
|
|
88 | 95 | end |
|
|
89 | 96 | end |
|
|
90 | 97 | return nil |
|
|
91 | 98 | end |
|
|
92 | 99 | |
|
|
93 | 100 | def self.find_language_in_source(source, source_filename="") |
|
|
94 | 101 | langopt = find_option_in_source(/^LANG:/,source) |
|
|
95 | 102 | if langopt |
|
|
96 | 103 | return (Language.find_by_name(langopt) || |
|
|
97 | 104 | Language.find_by_pretty_name(langopt)) |
|
|
98 | 105 | else |
|
|
99 | 106 | if source_filename |
|
|
100 | 107 | return Language.find_by_extension(source_filename.split('.').last) |
|
|
101 | 108 | else |
|
|
102 | 109 | return nil |
|
|
103 | 110 | end |
|
|
104 | 111 | end |
|
|
105 | 112 | end |
|
|
106 | 113 | |
|
|
107 | 114 | def self.find_problem_in_source(source, source_filename="") |
|
|
108 | 115 | prob_opt = find_option_in_source(/^TASK:/,source) |
|
|
109 | 116 | if problem = Problem.find_by_name(prob_opt) |
|
|
110 | 117 | return problem |
|
|
111 | 118 | else |
|
|
112 | 119 | if source_filename |
|
|
113 | 120 | return Problem.find_by_name(source_filename.split('.').first) |
|
|
114 | 121 | else |
|
|
115 | 122 | return nil |
|
|
116 | 123 | end |
|
|
117 | 124 | end |
|
|
118 | 125 | end |
|
|
119 | 126 | |
|
|
120 | 127 | def assign_problem |
|
|
121 | 128 | if self.problem_id!=-1 |
|
|
122 | 129 | begin |
|
|
123 | 130 | self.problem = Problem.find(self.problem_id) |
|
|
124 | 131 | rescue ActiveRecord::RecordNotFound |
|
|
125 | 132 | self.problem = nil |
|
|
126 | 133 | end |
|
|
127 | 134 | else |
|
|
128 | 135 | self.problem = Submission.find_problem_in_source(self.source, |
|
|
129 | 136 | self.source_filename) |
|
|
130 | 137 | end |
|
|
131 | 138 | end |
|
|
132 | 139 | |
|
|
133 | 140 | def assign_language |
|
|
134 | 141 | self.language = Submission.find_language_in_source(self.source, |
|
|
135 | 142 | self.source_filename) |
|
|
136 | 143 | end |
|
|
137 | 144 | |
|
|
138 | 145 | # validation codes |
|
|
139 | 146 | def must_specify_language |
|
|
140 | 147 | return if self.source==nil |
|
|
141 | 148 | |
|
|
142 | 149 | # for output_only tasks |
|
|
143 | 150 | return if self.problem!=nil and self.problem.output_only |
|
|
144 | 151 | |
|
|
145 | 152 | if self.language==nil |
|
|
146 | 153 | errors.add('source',"must specify programming language") unless self.language!=nil |
|
|
147 | 154 | end |
|
|
148 | 155 | end |
|
|
149 | 156 | |
|
|
150 | 157 | def must_have_valid_problem |
|
|
151 | 158 | return if self.source==nil |
|
|
152 | 159 | if self.problem==nil |
|
|
153 | 160 | errors.add('problem',"must be specified.") |
|
|
154 | 161 | elsif (!self.problem.available) and (self.new_record?) |
|
|
155 | 162 | errors.add('problem',"must be valid.") |
|
|
156 | 163 | end |
|
|
157 | 164 | end |
|
|
158 | 165 | |
|
|
159 | 166 | # callbacks |
|
|
160 | 167 | def assign_latest_number_if_new_recond |
|
|
161 | 168 | return if !self.new_record? |
|
|
162 | 169 | latest = Submission.find_last_by_user_and_problem(self.user_id, self.problem_id) |
|
|
163 | 170 | self.number = (latest==nil) ? 1 : latest.number + 1; |
|
|
164 | 171 | end |
|
|
165 | 172 | |
|
|
166 | 173 | end |
| @@ -1,26 +1,28 | |||
|
|
1 | 1 | %h1 Login status |
|
|
2 | 2 | |
|
|
3 | 3 | |
|
|
4 | 4 | .task-menu |
|
|
5 | 5 | Reports |
|
|
6 | 6 | %br/ |
|
|
7 | 7 | = link_to '[Submission]', :action => 'submit_stat' |
|
|
8 | 8 | = link_to '[Login]', :action => 'login_stat' |
|
|
9 | 9 | |
|
|
10 | + =render partial: 'date_range' | |
|
|
11 | + | |
|
|
10 | 12 | %table.info |
|
|
11 | 13 | %thead |
|
|
12 | 14 | %tr.info-head |
|
|
13 | 15 | %th login |
|
|
14 | 16 | %th full name |
|
|
15 | 17 | %th login count |
|
|
16 | 18 | %th earliest |
|
|
17 | 19 | %th latest |
|
|
18 | 20 | %tbody |
|
|
19 | 21 | - @logins.each do |l| |
|
|
20 | 22 | %tr{class: cycle('info-even','info-odd')} |
|
|
21 | 23 | %td= l[:login] |
|
|
22 | 24 | %td= l[:full_name] |
|
|
23 | 25 | %td= l[:count] |
|
|
24 | 26 | %td= l[:min] |
|
|
25 | 27 | %td= l[:max] |
|
|
26 | 28 | |
| @@ -1,43 +1,48 | |||
|
|
1 | 1 | <h1>User grading results</h1> |
|
|
2 | + <h2>Show scores from latest submission</h2> | |
|
|
3 | + | |
|
|
4 | + <%= render 'submission_range' %> | |
|
|
5 | + | |
|
|
6 | + <p>Latest scores</p> | |
|
|
2 | 7 | |
|
|
3 | 8 | <table class="info"> |
|
|
4 | 9 | <tr class="info-head"> |
|
|
5 | 10 | <th>User</th> |
|
|
6 | 11 | <th>Name</th> |
|
|
7 | 12 | <th>Activated?</th> |
|
|
8 | 13 | <th>Logged in</th> |
|
|
9 | 14 | <th>Contest(s)</th> |
|
|
10 | 15 | <% @problems.each do |p| %> |
|
|
11 | 16 | <th><%= p.name %></th> |
|
|
12 | 17 | <% end %> |
|
|
13 | 18 | <th>Total</th> |
|
|
14 | 19 | <th>Passed</th> |
|
|
15 | 20 | </tr> |
|
|
16 | 21 | <% counter = 0 %> |
|
|
17 | 22 | <% @scorearray.each do |sc| %> |
|
|
18 | 23 | <tr class="<%= (counter %2 ==0) ? "info-even" : "info-odd" %>"> |
|
|
19 | 24 | <% total = 0 %> |
|
|
20 | 25 | <% num_passed = 0 %> |
|
|
21 | 26 | <% sc.each_index do |i| %> |
|
|
22 | 27 | <% if i==0 %> |
|
|
23 | 28 | <td><%= sc[i].login %></td> |
|
|
24 | 29 | <td><%= sc[i].full_name %></td> |
|
|
25 | 30 | <td><%= sc[i].activated %></td> |
|
|
26 | 31 | <td> |
|
|
27 | 32 | <%= sc[i].try(:contest_stat).try(:started_at)!=nil ? 'yes' : 'no' %> |
|
|
28 | 33 | </td> |
|
|
29 | 34 | <td> |
|
|
30 | 35 | <%= sc[i].contests.collect {|c| c.name}.join(', ') %> |
|
|
31 | 36 | </td> |
|
|
32 | 37 | <% else %> |
|
|
33 | 38 | <td><%= sc[i][0] %></td> |
|
|
34 | 39 | <% total += sc[i][0] %> |
|
|
35 | 40 | <% num_passed += 1 if sc[i][1] %> |
|
|
36 | 41 | <% end %> |
|
|
37 | 42 | <% end %> |
|
|
38 | 43 | <td><%= total %></td> |
|
|
39 | 44 | <td><%= num_passed %></td> |
|
|
40 | 45 | </tr> |
|
|
41 | 46 | <% counter += 1 %> |
|
|
42 | 47 | <% end %> |
|
|
43 | 48 | </table> |
| @@ -1,72 +1,72 | |||
|
|
1 | 1 | CafeGrader::Application.routes.draw do |
|
|
2 | 2 | get "report/login" |
|
|
3 | 3 | |
|
|
4 | - get "logins/list" | |
|
|
5 | - | |
|
|
6 | 4 | resources :contests |
|
|
7 | 5 | |
|
|
8 | 6 | resources :announcements |
|
|
9 | 7 | resources :sites |
|
|
10 | 8 | |
|
|
9 | + resources :problems, only: [:show] | |
|
|
10 | + | |
|
|
11 | 11 | # The priority is based upon order of creation: |
|
|
12 | 12 | # first created -> highest priority. |
|
|
13 | 13 | |
|
|
14 | 14 | # Sample of regular route: |
|
|
15 | 15 | # match 'products/:id' => 'catalog#view' |
|
|
16 | 16 | # Keep in mind you can assign values other than :controller and :action |
|
|
17 | 17 | |
|
|
18 | 18 | # Sample of named route: |
|
|
19 | 19 | # match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase |
|
|
20 | 20 | # This route can be invoked with purchase_url(:id => product.id) |
|
|
21 | 21 | |
|
|
22 | 22 | # Sample resource route (maps HTTP verbs to controller actions automatically): |
|
|
23 | 23 | # resources :products |
|
|
24 | 24 | |
|
|
25 | 25 | # Sample resource route with options: |
|
|
26 | 26 | # resources :products do |
|
|
27 | 27 | # member do |
|
|
28 | 28 | # get 'short' |
|
|
29 | 29 | # post 'toggle' |
|
|
30 | 30 | # end |
|
|
31 | 31 | # |
|
|
32 | 32 | # collection do |
|
|
33 | 33 | # get 'sold' |
|
|
34 | 34 | # end |
|
|
35 | 35 | # end |
|
|
36 | 36 | |
|
|
37 | 37 | # Sample resource route with sub-resources: |
|
|
38 | 38 | # resources :products do |
|
|
39 | 39 | # resources :comments, :sales |
|
|
40 | 40 | # resource :seller |
|
|
41 | 41 | # end |
|
|
42 | 42 | |
|
|
43 | 43 | # Sample resource route with more complex sub-resources |
|
|
44 | 44 | # resources :products do |
|
|
45 | 45 | # resources :comments |
|
|
46 | 46 | # resources :sales do |
|
|
47 | 47 | # get 'recent', :on => :collection |
|
|
48 | 48 | # end |
|
|
49 | 49 | # end |
|
|
50 | 50 | |
|
|
51 | 51 | # Sample resource route within a namespace: |
|
|
52 | 52 | # namespace :admin do |
|
|
53 | 53 | # # Directs /admin/products/* to Admin::ProductsController |
|
|
54 | 54 | # # (app/controllers/admin/products_controller.rb) |
|
|
55 | 55 | # resources :products |
|
|
56 | 56 | # end |
|
|
57 | 57 | |
|
|
58 | 58 | # You can have the root of your site routed with "root" |
|
|
59 | 59 | # just remember to delete public/index.html. |
|
|
60 | 60 | # root :to => 'welcome#index' |
|
|
61 | 61 | |
|
|
62 | 62 | root :to => 'main#login' |
|
|
63 | 63 | |
|
|
64 | 64 | match 'tasks/view/:file.:ext' => 'tasks#view' |
|
|
65 | 65 | match 'tasks/download/:id/:file.:ext' => 'tasks#download' |
|
|
66 | 66 | |
|
|
67 | 67 | # See how all your routes lay out with "rake routes" |
|
|
68 | 68 | |
|
|
69 | 69 | # This is a legacy wild controller route that's not recommended for RESTful applications. |
|
|
70 | 70 | # Note: This route will make all actions in every controller accessible via GET requests. |
|
|
71 | 71 | match ':controller(/:action(/:id))(.:format)' |
|
|
72 | 72 | end |
You need to be logged in to leave comments.
Login now