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