cafe-grader-web

Commit r297:2abed488d02c public

parent | child
Description:
lists users in each contest. individual user contest management moved to each contest user list page
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

r297:2abed488d02c - - 4 files changed: 92 inserted, 19 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -0,0 +1,65
1 + <h1>
2 + List users in <% if @contest %><%= @contest.title %>
3 + <% else %>Users not in any contests<% end %>
4 + </h1>
5 +
6 + <div class="submitbox">
7 + <%= link_to '[View all users]', :action => 'list' %>
8 + <% if Configuration.multicontests? %>
9 + <%= link_to '[Manage bulk users in contests]', :action => 'contest_management' %>
10 + <br/>
11 + View users in:
12 + <% @contests.each do |contest| %>
13 + <%= link_to "[#{contest.name}]", :action => 'contests', :id => contest.id %>
14 + <% end %>
15 + <%= link_to "[no contest]", :action => 'contests', :id => 'none' %>
16 + <% end %>
17 + </div>
18 +
19 + <table class="info">
20 + <tr class="info-head">
21 + <th>Login</th>
22 + <th>Full name</th>
23 + <th>Email</th>
24 + <th>Activated?</th>
25 + <th></th>
26 + <th></th>
27 + <th></th>
28 + <% if Configuration.multicontests? %>
29 + <th>Contests</th>
30 + <th>Other enabled contests</th>
31 + <% end %>
32 + </tr>
33 +
34 + <% for user in @users %>
35 + <tr class="info-<%= cycle("odd","even") %>">
36 + <td><%=h user.login %></td>
37 + <td><%=h user.full_name %></td>
38 + <td><%=h user.email %></td>
39 + <td><%=h user.activated %></td>
40 + <td><%= link_to 'Show', :action => 'show', :id => user %></td>
41 + <td><%= link_to 'Edit', :action => 'edit', :id => user %></td>
42 + <td><%= link_to 'Destroy', { :action => 'destroy', :id => user }, :confirm => 'Are you sure?', :method => :post %></td>
43 + <% if Configuration.multicontests? %>
44 + <td>
45 + <% user.contests.each do |contest| %>
46 + <%= contest.name %> [<%= link_to 'x', :action => 'remove_from_contest', :id => user.id, :contest_id => contest.id %>]
47 + <% end %>
48 + </td>
49 + <td>
50 + <% @contests.each do |contest| %>
51 + <% if not user.contests.all.find {|c| c.id==contest.id } %>
52 + <%= contest.name %> [<%= link_to '+', :action => 'add_to_contest', :id => user.id, :contest_id => contest.id %>]
53 + <% end %>
54 + <% end %>
55 + </td>
56 + <% end %>
57 + </tr>
58 + <% end %>
59 + </table>
60 +
61 +
62 + <br />
63 +
64 + <%= link_to 'New user', :action => 'new' %>
65 + <%= link_to 'New list of users', :action => 'new_list' %>
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,69 +1,69
1 1 class UserAdminController < ApplicationController
2 2
3 3 include MailHelperMethods
4 4
5 5 before_filter :admin_authorization
6 6
7 7 def index
8 8 list
9 9 render :action => 'list'
10 10 end
11 11
12 12 # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
13 13 verify :method => :post, :only => [ :destroy,
14 14 :create, :create_from_list,
15 15 :update ],
16 16 :redirect_to => { :action => :list }
17 17
18 18 def list
19 19 @users = User.find(:all)
20 20 @hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at']
21 - @contests = Contest.all(:conditions => {:enabled => true})
21 + @contests = Contest.enabled
22 22 end
23 23
24 24 def active
25 25 sessions = ActiveRecord::SessionStore::Session.find(:all, :conditions => ["updated_at >= ?", 60.minutes.ago])
26 26 @users = []
27 27 sessions.each do |session|
28 28 if session.data[:user_id]
29 29 @users << User.find(session.data[:user_id])
30 30 end
31 31 end
32 32 end
33 33
34 34 def show
35 35 @user = User.find(params[:id])
36 36 end
37 37
38 38 def new
39 39 @user = User.new
40 40 end
41 41
42 42 def create
43 43 @user = User.new(params[:user])
44 44 @user.activated = true
45 45 if @user.save
46 46 flash[:notice] = 'User was successfully created.'
47 47 redirect_to :action => 'list'
48 48 else
49 49 render :action => 'new'
50 50 end
51 51 end
52 52
53 53 def create_from_list
54 54 lines = params[:user_list]
55 55
56 56 note = []
57 57
58 58 lines.split("\n").each do |line|
59 59 items = line.chomp.split(',')
60 60 if items.length>=2
61 61 login = items[0]
62 62 full_name = items[1]
63 63
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
@@ -111,96 +111,110
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 + def contests
160 + if params[:id]!='none'
161 + @contest = Contest.find(params[:id])
162 + else
163 + @contest = nil
164 + end
165 + if @contest
166 + @users = @contest.users
167 + else
168 + @users = User.find_users_with_no_contest
169 + end
170 + @contests = Contest.enabled
171 + end
172 +
159 173 def add_to_contest
160 174 user = User.find(params[:id])
161 175 contest = Contest.find(params[:contest_id])
162 176 if user and contest
163 177 user.contests << contest
164 178 end
165 179 redirect_to :action => 'list'
166 180 end
167 181
168 182 def remove_from_contest
169 183 user = User.find(params[:id])
170 184 contest = Contest.find(params[:contest_id])
171 185 if user and contest
172 186 user.contests.delete(contest)
173 187 end
174 188 redirect_to :action => 'list'
175 189 end
176 190
177 191 def contest_management
178 192 end
179 193
180 194 def manage_contest
181 195 contest = Contest.find(params[:contest][:id])
182 196 if !contest
183 197 flash[:notice] = 'You did not choose the contest.'
184 198 redirect_to :action => 'contest_management' and return
185 199 end
186 200
187 201 operation = params[:operation]
188 202
189 203 if not ['add','remove','assign'].include? operation
190 204 flash[:notice] = 'You did not choose the operation to perform.'
191 205 redirect_to :action => 'contest_management' and return
192 206 end
193 207
194 208 lines = params[:login_list]
195 209 if !lines or lines.blank?
196 210 flash[:notice] = 'You entered an empty list.'
197 211 redirect_to :action => 'contest_management' and return
198 212 end
199 213
200 214 note = []
201 215 users = []
202 216 lines.split("\n").each do |line|
203 217 user = User.find_by_login(line.chomp)
204 218 if user
205 219 if operation=='add'
206 220 if ! user.contests.include? contest
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -79,96 +79,102
79 79 else
80 80 self.email
81 81 end
82 82 end
83 83
84 84 def email_for_editing=(e)
85 85 self.email=e
86 86 end
87 87
88 88 def alias_for_editing
89 89 if self.alias==nil
90 90 "(unknown)"
91 91 elsif self.alias==''
92 92 "(blank)"
93 93 else
94 94 self.alias
95 95 end
96 96 end
97 97
98 98 def alias_for_editing=(e)
99 99 self.alias=e
100 100 end
101 101
102 102 def activation_key
103 103 if self.hashed_password==nil
104 104 encrypt_new_password
105 105 end
106 106 Digest::SHA1.hexdigest(self.hashed_password)[0..7]
107 107 end
108 108
109 109 def verify_activation_key(key)
110 110 key == activation_key
111 111 end
112 112
113 113 def self.random_password(length=5)
114 114 chars = 'abcdefghjkmnopqrstuvwxyz'
115 115 password = ''
116 116 length.times { password << chars[rand(chars.length - 1)] }
117 117 password
118 118 end
119 119
120 120 def self.find_non_admin_with_prefix(prefix='')
121 121 users = User.find(:all)
122 122 return users.find_all { |u| !(u.admin?) and u.login.index(prefix)==0 }
123 123 end
124 124
125 125 # Contest information
126 126
127 + def self.find_users_with_no_contest()
128 + users = User.find(:all)
129 + return users.find_all { |u| u.contests.length == 0 }
130 + end
131 +
132 +
127 133 def contest_time_left
128 134 if Configuration.contest_mode?
129 135 return nil if site==nil
130 136 return site.time_left
131 137 elsif Configuration.indv_contest_mode?
132 138 time_limit = Configuration.contest_time_limit
133 139 if time_limit == nil
134 140 return nil
135 141 end
136 142 if contest_stat==nil or contest_stat.started_at==nil
137 143 return (Time.now.gmtime + time_limit) - Time.now.gmtime
138 144 else
139 145 finish_time = contest_stat.started_at + time_limit
140 146 current_time = Time.now.gmtime
141 147 if current_time > finish_time
142 148 return 0
143 149 else
144 150 return finish_time - current_time
145 151 end
146 152 end
147 153 else
148 154 return nil
149 155 end
150 156 end
151 157
152 158 def contest_finished?
153 159 if Configuration.contest_mode?
154 160 return false if site==nil
155 161 return site.finished?
156 162 elsif Configuration.indv_contest_mode?
157 163 return false if self.contest_stat(true)==nil
158 164 return contest_time_left == 0
159 165 else
160 166 return false
161 167 end
162 168 end
163 169
164 170 def contest_started?
165 171 if Configuration.contest_mode?
166 172 return true if site==nil
167 173 return site.started
168 174 else
169 175 return true
170 176 end
171 177 end
172 178
173 179 def update_start_time
174 180 stat = self.contest_stat
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,89 +1,77
1 1 <h1>Listing users</h1>
2 2
3 3 <div class="submitbox">
4 4 <b>Quick add</b>
5 5 <% form_tag :action => 'create' do %>
6 6 <table border="0">
7 7 <tr>
8 8 <td><label for="user_login">Login</label></td>
9 9 <td><label for="user_full_name">Full name</label></td>
10 10 <td><label for="user_password">Password</label></td>
11 11 <td><label for="user_password_confirmation">Confirm</label></td>
12 12 <td><label for="user_email">Email</label></td>
13 13 </tr>
14 14 <tr>
15 15 <td><%= text_field 'user', 'login', :size => 10 %></td>
16 16 <td><%= text_field 'user', 'full_name', :size => 30 %></td>
17 17 <td><%= password_field 'user', 'password', :size => 10 %></td>
18 18 <td><%= password_field 'user', 'password_confirmation', :size => 10 %></td>
19 19 <td><%= text_field 'user', 'email', :size => 15 %></td>
20 20 <td><%= submit_tag "Create" %></td>
21 21 </tr>
22 22 </table>
23 23 <% end %>
24 24 <br/>
25 25 <b>Import from site management</b>
26 26 <% form_tag({:action => 'import'}, :multipart => true) do %>
27 27 File: <%= file_field_tag 'file' %> <%= submit_tag 'Import' %>
28 28 <% end %>
29 29 <br/>
30 30 <b>What else: </b>
31 31 <%= link_to '[New user]', :action => 'new' %>
32 32 <%= link_to '[New list of users]', :action => 'new_list' %>
33 33 <%= link_to '[View administrators]', :action => 'admin' %>
34 34 <%= link_to '[Random passwords]', :action => 'random_all_passwords' %>
35 35 <%= link_to '[View active users]', :action => 'active' %>
36 36 <% if Configuration.multicontests? %>
37 + <br/><b>Multi-contest:</b>
37 38 <%= link_to '[Manage bulk users in contests]', :action => 'contest_management' %>
39 + View users in:
40 + <% @contests.each do |contest| %>
41 + <%= link_to "[#{contest.name}]", :action => 'contests', :id => contest.id %>
42 + <% end %>
43 + <%= link_to "[no contest]", :action => 'contests', :id => 'none' %>
38 44 <% end %>
39 45 </div>
40 46
41 47 <table class="info">
42 48 <tr class="info-head">
43 49 <% for column in User.content_columns %>
44 50 <% if !@hidden_columns.index(column.name) %>
45 51 <th><%= column.human_name %></th>
46 52 <% end %>
47 53 <% end %>
48 54 <th></th>
49 55 <th></th>
50 56 <th></th>
51 - <% if Configuration.multicontests? %>
52 - <th>Contests</th>
53 - <th>Other enabled contests</th>
54 - <% end %>
55 57 </tr>
56 58
57 59 <% for user in @users %>
58 60 <tr class="info-<%= cycle("odd","even") %>">
59 61 <% for column in User.content_columns %>
60 62 <% if !@hidden_columns.index(column.name) %>
61 63 <td><%=h user.send(column.name) %></td>
62 64 <% end %>
63 65 <% end %>
64 66 <td><%= link_to 'Show', :action => 'show', :id => user %></td>
65 67 <td><%= link_to 'Edit', :action => 'edit', :id => user %></td>
66 68 <td><%= link_to 'Destroy', { :action => 'destroy', :id => user }, :confirm => 'Are you sure?', :method => :post %></td>
67 - <% if Configuration.multicontests? %>
68 - <td>
69 - <% user.contests.each do |contest| %>
70 - <%= contest.name %> [<%= link_to 'x', :action => 'remove_from_contest', :id => user.id, :contest_id => contest.id %>]
71 - <% end %>
72 - </td>
73 - <td>
74 - <% @contests.each do |contest| %>
75 - <% if not user.contests.all.find {|c| c.id==contest.id } %>
76 - <%= contest.name %> [<%= link_to '+', :action => 'add_to_contest', :id => user.id, :contest_id => contest.id %>]
77 - <% end %>
78 - <% end %>
79 - </td>
80 - <% end %>
81 69 </tr>
82 70 <% end %>
83 71 </table>
84 72
85 73
86 74 <br />
87 75
88 76 <%= link_to 'New user', :action => 'new' %>
89 77 <%= link_to 'New list of users', :action => 'new_list' %>
You need to be logged in to leave comments. Login now