Description:
fix download score in user_stat not working
Commit status:
[Not Reviewed]
References:
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Add another comment

r499:1da8597120e1 - - 1 file changed: 6 inserted, 0 deleted

@@ -1,344 +1,350
1 require 'csv'
1 require 'csv'
2
2
3 class UserAdminController < ApplicationController
3 class UserAdminController < ApplicationController
4
4
5 include MailHelperMethods
5 include MailHelperMethods
6
6
7 before_filter :admin_authorization
7 before_filter :admin_authorization
8
8
9 # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
9 # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
10 verify :method => :post, :only => [ :destroy,
10 verify :method => :post, :only => [ :destroy,
11 :create, :create_from_list,
11 :create, :create_from_list,
12 :update,
12 :update,
13 :manage_contest,
13 :manage_contest,
14 :bulk_mail
14 :bulk_mail
15 ],
15 ],
16 :redirect_to => { :action => :list }
16 :redirect_to => { :action => :list }
17
17
18 def index
18 def index
19 list
19 list
20 render :action => 'list'
20 render :action => 'list'
21 end
21 end
22
22
23 def list
23 def list
24 @user_count = User.count
24 @user_count = User.count
25 if params[:page] == 'all'
25 if params[:page] == 'all'
26 @users = User.all
26 @users = User.all
27 @paginated = false
27 @paginated = false
28 else
28 else
29 @users = User.paginate :page => params[:page]
29 @users = User.paginate :page => params[:page]
30 @paginated = true
30 @paginated = true
31 end
31 end
32 @hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at']
32 @hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at']
33 @contests = Contest.enabled
33 @contests = Contest.enabled
34 end
34 end
35
35
36 def active
36 def active
37 sessions = ActiveRecord::SessionStore::Session.find(:all, :conditions => ["updated_at >= ?", 60.minutes.ago])
37 sessions = ActiveRecord::SessionStore::Session.find(:all, :conditions => ["updated_at >= ?", 60.minutes.ago])
38 @users = []
38 @users = []
39 sessions.each do |session|
39 sessions.each do |session|
40 if session.data[:user_id]
40 if session.data[:user_id]
41 @users << User.find(session.data[:user_id])
41 @users << User.find(session.data[:user_id])
42 end
42 end
43 end
43 end
44 end
44 end
45
45
46 def show
46 def show
47 @user = User.find(params[:id])
47 @user = User.find(params[:id])
48 end
48 end
49
49
50 def new
50 def new
51 @user = User.new
51 @user = User.new
52 end
52 end
53
53
54 def create
54 def create
55 @user = User.new(params[:user])
55 @user = User.new(params[:user])
56 @user.activated = true
56 @user.activated = true
57 if @user.save
57 if @user.save
58 flash[:notice] = 'User was successfully created.'
58 flash[:notice] = 'User was successfully created.'
59 redirect_to :action => 'list'
59 redirect_to :action => 'list'
60 else
60 else
61 render :action => 'new'
61 render :action => 'new'
62 end
62 end
63 end
63 end
64
64
65 def create_from_list
65 def create_from_list
66 lines = params[:user_list]
66 lines = params[:user_list]
67
67
68 note = []
68 note = []
69
69
70 lines.split("\n").each do |line|
70 lines.split("\n").each do |line|
71 items = line.chomp.split(',')
71 items = line.chomp.split(',')
72 if items.length>=2
72 if items.length>=2
73 login = items[0]
73 login = items[0]
74 full_name = items[1]
74 full_name = items[1]
75
75
76 added_random_password = false
76 added_random_password = false
77 if items.length>=3
77 if items.length>=3
78 password = items[2].chomp(" ")
78 password = items[2].chomp(" ")
79 user_alias = (items.length>=4) ? items[3] : login
79 user_alias = (items.length>=4) ? items[3] : login
80 else
80 else
81 password = random_password
81 password = random_password
82 user_alias = (items.length>=4) ? items[3] : login
82 user_alias = (items.length>=4) ? items[3] : login
83 added_random_password = true
83 added_random_password = true
84 end
84 end
85
85
86 user = User.find_by_login(login)
86 user = User.find_by_login(login)
87 if (user)
87 if (user)
88 user.full_name = full_name
88 user.full_name = full_name
89 user.password = password
89 user.password = password
90 else
90 else
91 user = User.new({:login => login,
91 user = User.new({:login => login,
92 :full_name => full_name,
92 :full_name => full_name,
93 :password => password,
93 :password => password,
94 :password_confirmation => password,
94 :password_confirmation => password,
95 :alias => user_alias})
95 :alias => user_alias})
96 end
96 end
97 user.activated = true
97 user.activated = true
98 user.save
98 user.save
99
99
100 if added_random_password
100 if added_random_password
101 note << "'#{login}' (+)"
101 note << "'#{login}' (+)"
102 else
102 else
103 note << login
103 note << login
104 end
104 end
105 end
105 end
106 end
106 end
107 flash[:notice] = 'User(s) ' + note.join(', ') +
107 flash[:notice] = 'User(s) ' + note.join(', ') +
108 ' were successfully created. ' +
108 ' were successfully created. ' +
109 '( (+) - created with random passwords.)'
109 '( (+) - created with random passwords.)'
110 redirect_to :action => 'list'
110 redirect_to :action => 'list'
111 end
111 end
112
112
113 def edit
113 def edit
114 @user = User.find(params[:id])
114 @user = User.find(params[:id])
115 end
115 end
116
116
117 def update
117 def update
118 @user = User.find(params[:id])
118 @user = User.find(params[:id])
119 if @user.update_attributes(params[:user])
119 if @user.update_attributes(params[:user])
120 flash[:notice] = 'User was successfully updated.'
120 flash[:notice] = 'User was successfully updated.'
121 redirect_to :action => 'show', :id => @user
121 redirect_to :action => 'show', :id => @user
122 else
122 else
123 render :action => 'edit'
123 render :action => 'edit'
124 end
124 end
125 end
125 end
126
126
127 def destroy
127 def destroy
128 User.find(params[:id]).destroy
128 User.find(params[:id]).destroy
129 redirect_to :action => 'list'
129 redirect_to :action => 'list'
130 end
130 end
131
131
132 def user_stat
132 def user_stat
133 if params[:commit] == 'download csv'
133 if params[:commit] == 'download csv'
134 @problems = Problem.all
134 @problems = Problem.all
135 else
135 else
136 @problems = Problem.find_available_problems
136 @problems = Problem.find_available_problems
137 end
137 end
138 @users = User.find(:all, :include => [:contests, :contest_stat])
138 @users = User.find(:all, :include => [:contests, :contest_stat])
139 @scorearray = Array.new
139 @scorearray = Array.new
140 @users.each do |u|
140 @users.each do |u|
141 ustat = Array.new
141 ustat = Array.new
142 ustat[0] = u
142 ustat[0] = u
143 @problems.each do |p|
143 @problems.each do |p|
144 sub = Submission.find_last_by_user_and_problem(u.id,p.id)
144 sub = Submission.find_last_by_user_and_problem(u.id,p.id)
145 if (sub!=nil) and (sub.points!=nil)
145 if (sub!=nil) and (sub.points!=nil)
146 ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
146 ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
147 else
147 else
148 ustat << [0,false]
148 ustat << [0,false]
149 end
149 end
150 end
150 end
151 @scorearray << ustat
151 @scorearray << ustat
152 end
152 end
153 + if params[:commit] == 'download csv' then
154 + csv = gen_csv_from_scorearray(@scorearray,@problems)
155 + send_data csv, filename: 'last_score.csv'
156 + else
157 + render template: 'user_admin/user_stat'
158 + end
153 end
159 end
154
160
155 def user_stat_max
161 def user_stat_max
156 if params[:commit] == 'download csv'
162 if params[:commit] == 'download csv'
157 @problems = Problem.all
163 @problems = Problem.all
158 else
164 else
159 @problems = Problem.find_available_problems
165 @problems = Problem.find_available_problems
160 end
166 end
161 @users = User.find(:all, :include => [:contests, :contest_stat])
167 @users = User.find(:all, :include => [:contests, :contest_stat])
162 @scorearray = Array.new
168 @scorearray = Array.new
163 #set up range from param
169 #set up range from param
164 since_id = params.fetch(:since_id, 0).to_i
170 since_id = params.fetch(:since_id, 0).to_i
165 until_id = params.fetch(:until_id, 0).to_i
171 until_id = params.fetch(:until_id, 0).to_i
166 @users.each do |u|
172 @users.each do |u|
167 ustat = Array.new
173 ustat = Array.new
168 ustat[0] = u
174 ustat[0] = u
169 @problems.each do |p|
175 @problems.each do |p|
170 max_points = 0
176 max_points = 0
171 Submission.find_in_range_by_user_and_problem(u.id,p.id,since_id,until_id).each do |sub|
177 Submission.find_in_range_by_user_and_problem(u.id,p.id,since_id,until_id).each do |sub|
172 max_points = sub.points if sub and sub.points and (sub.points > max_points)
178 max_points = sub.points if sub and sub.points and (sub.points > max_points)
173 end
179 end
174 ustat << [(max_points.to_f*100/p.full_score).round, (max_points>=p.full_score)]
180 ustat << [(max_points.to_f*100/p.full_score).round, (max_points>=p.full_score)]
175 end
181 end
176 @scorearray << ustat
182 @scorearray << ustat
177 end
183 end
178
184
179 if params[:commit] == 'download csv' then
185 if params[:commit] == 'download csv' then
180 csv = gen_csv_from_scorearray(@scorearray,@problems)
186 csv = gen_csv_from_scorearray(@scorearray,@problems)
181 send_data csv, filename: 'max_score.csv'
187 send_data csv, filename: 'max_score.csv'
182 else
188 else
183 render template: 'user_admin/user_stat'
189 render template: 'user_admin/user_stat'
184 end
190 end
185 end
191 end
186
192
187 def import
193 def import
188 if params[:file]==''
194 if params[:file]==''
189 flash[:notice] = 'Error importing no file'
195 flash[:notice] = 'Error importing no file'
190 redirect_to :action => 'list' and return
196 redirect_to :action => 'list' and return
191 end
197 end
192 import_from_file(params[:file])
198 import_from_file(params[:file])
193 end
199 end
194
200
195 def random_all_passwords
201 def random_all_passwords
196 users = User.find(:all)
202 users = User.find(:all)
197 @prefix = params[:prefix] || ''
203 @prefix = params[:prefix] || ''
198 @non_admin_users = User.find_non_admin_with_prefix(@prefix)
204 @non_admin_users = User.find_non_admin_with_prefix(@prefix)
199 @changed = false
205 @changed = false
200 if request.request_method == 'POST'
206 if request.request_method == 'POST'
201 @non_admin_users.each do |user|
207 @non_admin_users.each do |user|
202 password = random_password
208 password = random_password
203 user.password = password
209 user.password = password
204 user.password_confirmation = password
210 user.password_confirmation = password
205 user.save
211 user.save
206 end
212 end
207 @changed = true
213 @changed = true
208 end
214 end
209 end
215 end
210
216
211 # contest management
217 # contest management
212
218
213 def contests
219 def contests
214 @contest, @users = find_contest_and_user_from_contest_id(params[:id])
220 @contest, @users = find_contest_and_user_from_contest_id(params[:id])
215 @contests = Contest.enabled
221 @contests = Contest.enabled
216 end
222 end
217
223
218 def assign_from_list
224 def assign_from_list
219 contest_id = params[:users_contest_id]
225 contest_id = params[:users_contest_id]
220 org_contest, users = find_contest_and_user_from_contest_id(contest_id)
226 org_contest, users = find_contest_and_user_from_contest_id(contest_id)
221 contest = Contest.find(params[:new_contest][:id])
227 contest = Contest.find(params[:new_contest][:id])
222 if !contest
228 if !contest
223 flash[:notice] = 'Error: no contest'
229 flash[:notice] = 'Error: no contest'
224 redirect_to :action => 'contests', :id =>contest_id
230 redirect_to :action => 'contests', :id =>contest_id
225 end
231 end
226
232
227 note = []
233 note = []
228 users.each do |u|
234 users.each do |u|
229 u.contests = [contest]
235 u.contests = [contest]
230 note << u.login
236 note << u.login
231 end
237 end
232 flash[:notice] = 'User(s) ' + note.join(', ') +
238 flash[:notice] = 'User(s) ' + note.join(', ') +
233 " were successfully reassigned to #{contest.title}."
239 " were successfully reassigned to #{contest.title}."
234 redirect_to :action => 'contests', :id =>contest.id
240 redirect_to :action => 'contests', :id =>contest.id
235 end
241 end
236
242
237 def add_to_contest
243 def add_to_contest
238 user = User.find(params[:id])
244 user = User.find(params[:id])
239 contest = Contest.find(params[:contest_id])
245 contest = Contest.find(params[:contest_id])
240 if user and contest
246 if user and contest
241 user.contests << contest
247 user.contests << contest
242 end
248 end
243 redirect_to :action => 'list'
249 redirect_to :action => 'list'
244 end
250 end
245
251
246 def remove_from_contest
252 def remove_from_contest
247 user = User.find(params[:id])
253 user = User.find(params[:id])
248 contest = Contest.find(params[:contest_id])
254 contest = Contest.find(params[:contest_id])
249 if user and contest
255 if user and contest
250 user.contests.delete(contest)
256 user.contests.delete(contest)
251 end
257 end
252 redirect_to :action => 'list'
258 redirect_to :action => 'list'
253 end
259 end
254
260
255 def contest_management
261 def contest_management
256 end
262 end
257
263
258 def manage_contest
264 def manage_contest
259 contest = Contest.find(params[:contest][:id])
265 contest = Contest.find(params[:contest][:id])
260 if !contest
266 if !contest
261 flash[:notice] = 'You did not choose the contest.'
267 flash[:notice] = 'You did not choose the contest.'
262 redirect_to :action => 'contest_management' and return
268 redirect_to :action => 'contest_management' and return
263 end
269 end
264
270
265 operation = params[:operation]
271 operation = params[:operation]
266
272
267 if not ['add','remove','assign'].include? operation
273 if not ['add','remove','assign'].include? operation
268 flash[:notice] = 'You did not choose the operation to perform.'
274 flash[:notice] = 'You did not choose the operation to perform.'
269 redirect_to :action => 'contest_management' and return
275 redirect_to :action => 'contest_management' and return
270 end
276 end
271
277
272 lines = params[:login_list]
278 lines = params[:login_list]
273 if !lines or lines.blank?
279 if !lines or lines.blank?
274 flash[:notice] = 'You entered an empty list.'
280 flash[:notice] = 'You entered an empty list.'
275 redirect_to :action => 'contest_management' and return
281 redirect_to :action => 'contest_management' and return
276 end
282 end
277
283
278 note = []
284 note = []
279 users = []
285 users = []
280 lines.split("\n").each do |line|
286 lines.split("\n").each do |line|
281 user = User.find_by_login(line.chomp)
287 user = User.find_by_login(line.chomp)
282 if user
288 if user
283 if operation=='add'
289 if operation=='add'
284 if ! user.contests.include? contest
290 if ! user.contests.include? contest
285 user.contests << contest
291 user.contests << contest
286 end
292 end
287 elsif operation=='remove'
293 elsif operation=='remove'
288 user.contests.delete(contest)
294 user.contests.delete(contest)
289 else
295 else
290 user.contests = [contest]
296 user.contests = [contest]
291 end
297 end
292
298
293 if params[:reset_timer]
299 if params[:reset_timer]
294 user.contest_stat.forced_logout = true
300 user.contest_stat.forced_logout = true
295 user.contest_stat.reset_timer_and_save
301 user.contest_stat.reset_timer_and_save
296 end
302 end
297
303
298 if params[:notification_emails]
304 if params[:notification_emails]
299 send_contest_update_notification_email(user, contest)
305 send_contest_update_notification_email(user, contest)
300 end
306 end
301
307
302 note << user.login
308 note << user.login
303 users << user
309 users << user
304 end
310 end
305 end
311 end
306
312
307 if params[:reset_timer]
313 if params[:reset_timer]
308 logout_users(users)
314 logout_users(users)
309 end
315 end
310
316
311 flash[:notice] = 'User(s) ' + note.join(', ') +
317 flash[:notice] = 'User(s) ' + note.join(', ') +
312 ' were successfully modified. '
318 ' were successfully modified. '
313 redirect_to :action => 'contest_management'
319 redirect_to :action => 'contest_management'
314 end
320 end
315
321
316 # admin management
322 # admin management
317
323
318 def admin
324 def admin
319 @admins = User.find(:all).find_all {|user| user.admin? }
325 @admins = User.find(:all).find_all {|user| user.admin? }
320 end
326 end
321
327
322 def grant_admin
328 def grant_admin
323 login = params[:login]
329 login = params[:login]
324 user = User.find_by_login(login)
330 user = User.find_by_login(login)
325 if user!=nil
331 if user!=nil
326 admin_role = Role.find_by_name('admin')
332 admin_role = Role.find_by_name('admin')
327 user.roles << admin_role
333 user.roles << admin_role
328 else
334 else
329 flash[:notice] = 'Unknown user'
335 flash[:notice] = 'Unknown user'
330 end
336 end
331 flash[:notice] = 'User added as admins'
337 flash[:notice] = 'User added as admins'
332 redirect_to :action => 'admin'
338 redirect_to :action => 'admin'
333 end
339 end
334
340
335 def revoke_admin
341 def revoke_admin
336 user = User.find(params[:id])
342 user = User.find(params[:id])
337 if user==nil
343 if user==nil
338 flash[:notice] = 'Unknown user'
344 flash[:notice] = 'Unknown user'
339 redirect_to :action => 'admin' and return
345 redirect_to :action => 'admin' and return
340 elsif user.login == 'root'
346 elsif user.login == 'root'
341 flash[:notice] = 'You cannot revoke admisnistrator permission from root.'
347 flash[:notice] = 'You cannot revoke admisnistrator permission from root.'
342 redirect_to :action => 'admin' and return
348 redirect_to :action => 'admin' and return
343 end
349 end
344
350
You need to be logged in to leave comments. Login now