Description:
lists users in each contest. individual user contest management moved to each contest user list page
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
Jittat Fakcharoenphol
-
r297:2abed488d02c - - 4 files changed: 92 inserted, 19 deleted
| @@ -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' %> | |
| @@ -9,25 +9,25 | |||
|
|
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. |
|
|
|
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 | |
| @@ -147,24 +147,38 | |||
|
|
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]) |
| @@ -115,24 +115,30 | |||
|
|
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 |
| @@ -25,65 +25,53 | |||
|
|
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