cafe-grader-web

Commit r298:e6c044028e60 public

parent | child
Description:
assigns all users from on contest list to another
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

r298:e6c044028e60 - - 2 files changed: 40 inserted, 15 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -64,203 +64,213
64 64 added_random_password = false
65 65 if items.length>=3
66 66 password = items[2]
67 67 user_alias = (items.length>=4) ? items[3] : login
68 68 else
69 69 password = random_password
70 70 user_alias = (items.length>=4) ? items[3] : login
71 71 added_random_password = true
72 72 end
73 73
74 74 user = User.new({:login => login,
75 75 :full_name => full_name,
76 76 :password => password,
77 77 :password_confirmation => password,
78 78 :alias => user_alias})
79 79 user.activated = true
80 80 user.save
81 81
82 82 if added_random_password
83 83 note << "'#{login}' (+)"
84 84 else
85 85 note << login
86 86 end
87 87 end
88 88 end
89 89 flash[:notice] = 'User(s) ' + note.join(', ') +
90 90 ' were successfully created. ' +
91 91 '( (+) - created with random passwords.)'
92 92 redirect_to :action => 'list'
93 93 end
94 94
95 95 def edit
96 96 @user = User.find(params[:id])
97 97 end
98 98
99 99 def update
100 100 @user = User.find(params[:id])
101 101 if @user.update_attributes(params[:user])
102 102 flash[:notice] = 'User was successfully updated.'
103 103 redirect_to :action => 'show', :id => @user
104 104 else
105 105 render :action => 'edit'
106 106 end
107 107 end
108 108
109 109 def destroy
110 110 User.find(params[:id]).destroy
111 111 redirect_to :action => 'list'
112 112 end
113 113
114 114 def user_stat
115 115 @problems = Problem.find_available_problems
116 116 @users = User.find(:all)
117 117 @scorearray = Array.new
118 118 @users.each do |u|
119 119 ustat = Array.new
120 120 ustat[0] = u
121 121 @problems.each do |p|
122 122 sub = Submission.find_last_by_user_and_problem(u.id,p.id)
123 123 if (sub!=nil) and (sub.points!=nil)
124 124 ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
125 125 else
126 126 ustat << [0,false]
127 127 end
128 128 end
129 129 @scorearray << ustat
130 130 end
131 131 end
132 132
133 133 def import
134 134 if params[:file]==''
135 135 flash[:notice] = 'Error importing no file'
136 136 redirect_to :action => 'list' and return
137 137 end
138 138 import_from_file(params[:file])
139 139 end
140 140
141 141 def random_all_passwords
142 142 users = User.find(:all)
143 143 @prefix = params[:prefix] || ''
144 144 @non_admin_users = User.find_non_admin_with_prefix(@prefix)
145 145 @changed = false
146 146 if request.request_method == :post
147 147 @non_admin_users.each do |user|
148 148 password = random_password
149 149 user.password = password
150 150 user.password_confirmation = password
151 151 user.save
152 152 end
153 153 @changed = true
154 154 end
155 155 end
156 156
157 157 # contest management
158 158
159 159 def contests
160 - if params[:id]!='none'
161 - @contest = Contest.find(params[:id])
162 - else
163 - @contest = nil
160 + @contest, @users = find_contest_and_user_from_contest_id(params[:id])
161 + @contests = Contest.enabled
162 + end
163 +
164 + def assign_from_list
165 + contest_id = params[:users_contest_id]
166 + org_contest, users = find_contest_and_user_from_contest_id(contest_id)
167 + contest = Contest.find(params[:new_contest][:id])
168 + if !contest
169 + flash[:notice] = 'Error: no contest'
170 + redirect_to :action => 'contests', :id =>contest_id
164 171 end
165 - if @contest
166 - @users = @contest.users
167 - else
168 - @users = User.find_users_with_no_contest
172 +
173 + note = []
174 + users.each do |u|
175 + u.contests = [contest]
176 + note << u.login
169 177 end
170 - @contests = Contest.enabled
178 + flash[:notice] = 'User(s) ' + note.join(', ') +
179 + " were successfully reassigned to #{contest.title}."
180 + redirect_to :action => 'contests', :id =>contest.id
171 181 end
172 182
173 183 def add_to_contest
174 184 user = User.find(params[:id])
175 185 contest = Contest.find(params[:contest_id])
176 186 if user and contest
177 187 user.contests << contest
178 188 end
179 189 redirect_to :action => 'list'
180 190 end
181 191
182 192 def remove_from_contest
183 193 user = User.find(params[:id])
184 194 contest = Contest.find(params[:contest_id])
185 195 if user and contest
186 196 user.contests.delete(contest)
187 197 end
188 198 redirect_to :action => 'list'
189 199 end
190 200
191 201 def contest_management
192 202 end
193 203
194 204 def manage_contest
195 205 contest = Contest.find(params[:contest][:id])
196 206 if !contest
197 207 flash[:notice] = 'You did not choose the contest.'
198 208 redirect_to :action => 'contest_management' and return
199 209 end
200 210
201 211 operation = params[:operation]
202 212
203 213 if not ['add','remove','assign'].include? operation
204 214 flash[:notice] = 'You did not choose the operation to perform.'
205 215 redirect_to :action => 'contest_management' and return
206 216 end
207 217
208 218 lines = params[:login_list]
209 219 if !lines or lines.blank?
210 220 flash[:notice] = 'You entered an empty list.'
211 221 redirect_to :action => 'contest_management' and return
212 222 end
213 223
214 224 note = []
215 225 users = []
216 226 lines.split("\n").each do |line|
217 227 user = User.find_by_login(line.chomp)
218 228 if user
219 229 if operation=='add'
220 230 if ! user.contests.include? contest
221 231 user.contests << contest
222 232 end
223 233 elsif operation=='remove'
224 234 user.contests.delete(contest)
225 235 else
226 236 user.contests = [contest]
227 237 end
228 238
229 239 if params[:reset_timer]
230 240 user.contest_stat.forced_logout = true
231 241 user.contest_stat.reset_timer_and_save
232 242 end
233 243
234 244 if params[:notification_emails]
235 245 send_contest_update_notification_email(user, contest)
236 246 end
237 247
238 248 note << user.login
239 249 users << user
240 250 end
241 251 end
242 252
243 253 if params[:reset_timer]
244 254 logout_users(users)
245 255 end
246 256
247 257 flash[:notice] = 'User(s) ' + note.join(', ') +
248 258 ' were successfully modified. '
249 259 redirect_to :action => 'contest_management'
250 260 end
251 261
252 262 # admin management
253 263
254 264 def admin
255 265 @admins = User.find(:all).find_all {|user| user.admin? }
256 266 end
257 267
258 268 def grant_admin
259 269 login = params[:login]
260 270 user = User.find_by_login(login)
261 271 if user!=nil
262 272 admin_role = Role.find_by_name('admin')
263 273 user.roles << admin_role
264 274 else
265 275 flash[:notice] = 'Unknown user'
266 276 end
@@ -286,97 +296,111
286 296
287 297 protected
288 298
289 299 def random_password(length=5)
290 300 chars = 'abcdefghijkmnopqrstuvwxyz23456789'
291 301 newpass = ""
292 302 length.times { newpass << chars[rand(chars.size-1)] }
293 303 return newpass
294 304 end
295 305
296 306 def import_from_file(f)
297 307 data_hash = YAML.load(f)
298 308 @import_log = ""
299 309
300 310 country_data = data_hash[:countries]
301 311 site_data = data_hash[:sites]
302 312 user_data = data_hash[:users]
303 313
304 314 # import country
305 315 countries = {}
306 316 country_data.each_pair do |id,country|
307 317 c = Country.find_by_name(country[:name])
308 318 if c!=nil
309 319 countries[id] = c
310 320 @import_log << "Found #{country[:name]}\n"
311 321 else
312 322 countries[id] = Country.new(:name => country[:name])
313 323 countries[id].save
314 324 @import_log << "Created #{country[:name]}\n"
315 325 end
316 326 end
317 327
318 328 # import sites
319 329 sites = {}
320 330 site_data.each_pair do |id,site|
321 331 s = Site.find_by_name(site[:name])
322 332 if s!=nil
323 333 @import_log << "Found #{site[:name]}\n"
324 334 else
325 335 s = Site.new(:name => site[:name])
326 336 @import_log << "Created #{site[:name]}\n"
327 337 end
328 338 s.password = site[:password]
329 339 s.country = countries[site[:country_id]]
330 340 s.save
331 341 sites[id] = s
332 342 end
333 343
334 344 # import users
335 345 user_data.each_pair do |id,user|
336 346 u = User.find_by_login(user[:login])
337 347 if u!=nil
338 348 @import_log << "Found #{user[:login]}\n"
339 349 else
340 350 u = User.new(:login => user[:login])
341 351 @import_log << "Created #{user[:login]}\n"
342 352 end
343 353 u.full_name = user[:name]
344 354 u.password = user[:password]
345 355 u.country = countries[user[:country_id]]
346 356 u.site = sites[user[:site_id]]
347 357 u.activated = true
348 358 u.email = "empty-#{u.login}@none.com"
349 359 if not u.save
350 360 @import_log << "Errors\n"
351 361 u.errors.each { |attr,msg| @import_log << "#{attr} - #{msg}\n" }
352 362 end
353 363 end
354 364
355 365 end
356 366
357 367 def logout_users(users)
358 368 users.each do |user|
359 369 contest_stat = user.contest_stat(true)
360 370 if contest_stat and !contest_stat.forced_logout
361 371 contest_stat.forced_logout = true
362 372 contest_stat.save
363 373 end
364 374 end
365 375 end
366 376
367 377 def send_contest_update_notification_email(user, contest)
368 378 contest_title_name = Configuration['contest.name']
369 379 contest_name = contest.name
370 380 subject = t('contest.notification.email_subject', {
371 381 :contest_title_name => contest_title_name,
372 382 :contest_name => contest_name })
373 383 body = t('contest.notification.email_body', {
374 384 :full_name => user.full_name,
375 385 :contest_title_name => contest_title_name,
376 386 :contest_name => contest.name,
377 387 })
378 388
379 389 logger.info body
380 390 send_mail(user.email, subject, body)
381 391 end
392 +
393 + def find_contest_and_user_from_contest_id(id)
394 + if id!='none'
395 + @contest = Contest.find(id)
396 + else
397 + @contest = nil
398 + end
399 + if @contest
400 + @users = @contest.users
401 + else
402 + @users = User.find_users_with_no_contest
403 + end
404 + return [@contest, @users]
405 + end
382 406 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,65 +1,66
1 1 <h1>
2 2 List users in <% if @contest %><%= @contest.title %>
3 3 <% else %>Users not in any contests<% end %>
4 4 </h1>
5 5
6 6 <div class="submitbox">
7 7 <%= link_to '[View all users]', :action => 'list' %>
8 8 <% if Configuration.multicontests? %>
9 9 <%= link_to '[Manage bulk users in contests]', :action => 'contest_management' %>
10 10 <br/>
11 11 View users in:
12 12 <% @contests.each do |contest| %>
13 13 <%= link_to "[#{contest.name}]", :action => 'contests', :id => contest.id %>
14 14 <% end %>
15 15 <%= link_to "[no contest]", :action => 'contests', :id => 'none' %>
16 16 <% end %>
17 + <br/>
18 + <% form_tag :action => 'assign_from_list' do %>
19 + <%= hidden_field_tag 'users_contest_id', (@contest ? @contest.id : 'none') %>
20 + Assign all to
21 + <%= select("new_contest","id",Contest.all.collect {|c| [c.title, c.id]}) %>
22 + <%= submit_tag "Assign", :confirm => 'Are you sure?' %>
23 + <% end %>
17 24 </div>
18 25
19 26 <table class="info">
20 27 <tr class="info-head">
21 28 <th>Login</th>
22 29 <th>Full name</th>
23 30 <th>Email</th>
24 31 <th>Activated?</th>
25 32 <th></th>
26 33 <th></th>
27 34 <th></th>
28 35 <% if Configuration.multicontests? %>
29 36 <th>Contests</th>
30 37 <th>Other enabled contests</th>
31 38 <% end %>
32 39 </tr>
33 40
34 41 <% for user in @users %>
35 42 <tr class="info-<%= cycle("odd","even") %>">
36 43 <td><%=h user.login %></td>
37 44 <td><%=h user.full_name %></td>
38 45 <td><%=h user.email %></td>
39 46 <td><%=h user.activated %></td>
40 47 <td><%= link_to 'Show', :action => 'show', :id => user %></td>
41 48 <td><%= link_to 'Edit', :action => 'edit', :id => user %></td>
42 49 <td><%= link_to 'Destroy', { :action => 'destroy', :id => user }, :confirm => 'Are you sure?', :method => :post %></td>
43 50 <% if Configuration.multicontests? %>
44 51 <td>
45 52 <% user.contests.each do |contest| %>
46 53 <%= contest.name %> [<%= link_to 'x', :action => 'remove_from_contest', :id => user.id, :contest_id => contest.id %>]
47 54 <% end %>
48 55 </td>
49 56 <td>
50 57 <% @contests.each do |contest| %>
51 58 <% if not user.contests.all.find {|c| c.id==contest.id } %>
52 59 <%= contest.name %> [<%= link_to '+', :action => 'add_to_contest', :id => user.id, :contest_id => contest.id %>]
53 60 <% end %>
54 61 <% end %>
55 62 </td>
56 63 <% end %>
57 64 </tr>
58 65 <% end %>
59 66 </table>
60 -
61 -
62 - <br />
63 -
64 - <%= link_to 'New user', :action => 'new' %>
65 - <%= link_to 'New list of users', :action => 'new_list' %>
You need to be logged in to leave comments. Login now