Description:
remove junk from ealier merge
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r484:a0c51d75908c - - 1 file changed: 0 inserted, 28 deleted
| @@ -108,124 +108,96 | |||||
|
|
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 | end |
|
153 | end |
|
|
154 |
|
154 | ||
|
|
155 | def user_stat_max |
|
155 | def user_stat_max |
|
|
156 | - @problems = Problem.find_available_problems |
|
||
|
|
157 | - @users = User.find(:all, :include => [:contests, :contest_stat]) |
|
||
|
|
158 | - @scorearray = Array.new |
|
||
|
|
159 | - #set up range from param |
|
||
|
|
160 | - since_id = params.fetch(:since_id, 0).to_i |
|
||
|
|
161 | - until_id = params.fetch(:until_id, 0).to_i |
|
||
|
|
162 | - @users.each do |u| |
|
||
|
|
163 | - ustat = Array.new |
|
||
|
|
164 | - ustat[0] = u |
|
||
|
|
165 | - @problems.each do |p| |
|
||
|
|
166 | - max_points = 0 |
|
||
|
|
167 | - Submission.find_in_range_by_user_and_problem(u.id,p.id,since_id,until_id).each do |sub| |
|
||
|
|
168 | - max_points = sub.points if sub and sub.points and (sub.points > max_points) |
|
||
|
|
169 | - end |
|
||
|
|
170 | - ustat << [(max_points.to_f*100/p.full_score).round, (max_points>=p.full_score)] |
|
||
|
|
171 | - end |
|
||
|
|
172 | - @scorearray << ustat |
|
||
|
|
173 | - end |
|
||
|
|
174 | - |
|
||
|
|
175 | - if params[:commit] == 'download csv' then |
|
||
|
|
176 | - csv = gen_csv_from_scorearray(@scorearray,@problems) |
|
||
|
|
177 | - send_data csv, filename: 'last_score.csv' |
|
||
|
|
178 | - else |
|
||
|
|
179 | - render template: 'user_admin/user_stat' |
|
||
|
|
180 | - end |
|
||
|
|
181 | - end |
|
||
|
|
182 | - |
|
||
|
|
183 | - def user_stat_max |
|
||
|
|
184 | if params[:commit] == 'download csv' |
|
156 | if params[:commit] == 'download csv' |
|
|
185 | @problems = Problem.all |
|
157 | @problems = Problem.all |
|
|
186 | else |
|
158 | else |
|
|
187 | @problems = Problem.find_available_problems |
|
159 | @problems = Problem.find_available_problems |
|
|
188 | end |
|
160 | end |
|
|
189 | @users = User.find(:all, :include => [:contests, :contest_stat]) |
|
161 | @users = User.find(:all, :include => [:contests, :contest_stat]) |
|
|
190 | @scorearray = Array.new |
|
162 | @scorearray = Array.new |
|
|
191 | #set up range from param |
|
163 | #set up range from param |
|
|
192 | since_id = params.fetch(:since_id, 0).to_i |
|
164 | since_id = params.fetch(:since_id, 0).to_i |
|
|
193 | until_id = params.fetch(:until_id, 0).to_i |
|
165 | until_id = params.fetch(:until_id, 0).to_i |
|
|
194 | @users.each do |u| |
|
166 | @users.each do |u| |
|
|
195 | ustat = Array.new |
|
167 | ustat = Array.new |
|
|
196 | ustat[0] = u |
|
168 | ustat[0] = u |
|
|
197 | @problems.each do |p| |
|
169 | @problems.each do |p| |
|
|
198 | max_points = 0 |
|
170 | max_points = 0 |
|
|
199 | Submission.find_in_range_by_user_and_problem(u.id,p.id,since_id,until_id).each do |sub| |
|
171 | Submission.find_in_range_by_user_and_problem(u.id,p.id,since_id,until_id).each do |sub| |
|
|
200 | max_points = sub.points if sub and sub.points and (sub.points > max_points) |
|
172 | max_points = sub.points if sub and sub.points and (sub.points > max_points) |
|
|
201 | end |
|
173 | end |
|
|
202 | ustat << [(max_points.to_f*100/p.full_score).round, (max_points>=p.full_score)] |
|
174 | ustat << [(max_points.to_f*100/p.full_score).round, (max_points>=p.full_score)] |
|
|
203 | end |
|
175 | end |
|
|
204 | @scorearray << ustat |
|
176 | @scorearray << ustat |
|
|
205 | end |
|
177 | end |
|
|
206 |
|
178 | ||
|
|
207 | if params[:commit] == 'download csv' then |
|
179 | if params[:commit] == 'download csv' then |
|
|
208 | csv = gen_csv_from_scorearray(@scorearray,@problems) |
|
180 | csv = gen_csv_from_scorearray(@scorearray,@problems) |
|
|
209 | send_data csv, filename: 'max_score.csv' |
|
181 | send_data csv, filename: 'max_score.csv' |
|
|
210 | else |
|
182 | else |
|
|
211 | render template: 'user_admin/user_stat' |
|
183 | render template: 'user_admin/user_stat' |
|
|
212 | end |
|
184 | end |
|
|
213 | end |
|
185 | end |
|
|
214 |
|
186 | ||
|
|
215 | def import |
|
187 | def import |
|
|
216 | if params[:file]=='' |
|
188 | if params[:file]=='' |
|
|
217 | flash[:notice] = 'Error importing no file' |
|
189 | flash[:notice] = 'Error importing no file' |
|
|
218 | redirect_to :action => 'list' and return |
|
190 | redirect_to :action => 'list' and return |
|
|
219 | end |
|
191 | end |
|
|
220 | import_from_file(params[:file]) |
|
192 | import_from_file(params[:file]) |
|
|
221 | end |
|
193 | end |
|
|
222 |
|
194 | ||
|
|
223 | def random_all_passwords |
|
195 | def random_all_passwords |
|
|
224 | users = User.find(:all) |
|
196 | users = User.find(:all) |
|
|
225 | @prefix = params[:prefix] || '' |
|
197 | @prefix = params[:prefix] || '' |
|
|
226 | @non_admin_users = User.find_non_admin_with_prefix(@prefix) |
|
198 | @non_admin_users = User.find_non_admin_with_prefix(@prefix) |
|
|
227 | @changed = false |
|
199 | @changed = false |
|
|
228 | if request.request_method == 'POST' |
|
200 | if request.request_method == 'POST' |
|
|
229 | @non_admin_users.each do |user| |
|
201 | @non_admin_users.each do |user| |
|
|
230 | password = random_password |
|
202 | password = random_password |
|
|
231 | user.password = password |
|
203 | user.password = password |
You need to be logged in to leave comments.
Login now