Description:
report only enabled user
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r550:6d57d5eff450 - - 1 file changed: 1 inserted, 1 deleted
| @@ -97,97 +97,97 | |||||
|
|
97 | else |
|
97 | else |
|
|
98 | user = User.new({:login => login, |
|
98 | user = User.new({:login => login, |
|
|
99 | :full_name => full_name, |
|
99 | :full_name => full_name, |
|
|
100 | :password => password, |
|
100 | :password => password, |
|
|
101 | :password_confirmation => password, |
|
101 | :password_confirmation => password, |
|
|
102 | :alias => user_alias}) |
|
102 | :alias => user_alias}) |
|
|
103 | end |
|
103 | end |
|
|
104 | user.activated = true |
|
104 | user.activated = true |
|
|
105 | user.save |
|
105 | user.save |
|
|
106 |
|
106 | ||
|
|
107 | if added_random_password |
|
107 | if added_random_password |
|
|
108 | note << "'#{login}' (+)" |
|
108 | note << "'#{login}' (+)" |
|
|
109 | else |
|
109 | else |
|
|
110 | note << login |
|
110 | note << login |
|
|
111 | end |
|
111 | end |
|
|
112 | end |
|
112 | end |
|
|
113 | end |
|
113 | end |
|
|
114 | flash[:notice] = 'User(s) ' + note.join(', ') + |
|
114 | flash[:notice] = 'User(s) ' + note.join(', ') + |
|
|
115 | ' were successfully created. ' + |
|
115 | ' were successfully created. ' + |
|
|
116 | '( (+) - created with random passwords.)' |
|
116 | '( (+) - created with random passwords.)' |
|
|
117 | redirect_to :action => 'list' |
|
117 | redirect_to :action => 'list' |
|
|
118 | end |
|
118 | end |
|
|
119 |
|
119 | ||
|
|
120 | def edit |
|
120 | def edit |
|
|
121 | @user = User.find(params[:id]) |
|
121 | @user = User.find(params[:id]) |
|
|
122 | end |
|
122 | end |
|
|
123 |
|
123 | ||
|
|
124 | def update |
|
124 | def update |
|
|
125 | @user = User.find(params[:id]) |
|
125 | @user = User.find(params[:id]) |
|
|
126 | if @user.update_attributes(params[:user]) |
|
126 | if @user.update_attributes(params[:user]) |
|
|
127 | flash[:notice] = 'User was successfully updated.' |
|
127 | flash[:notice] = 'User was successfully updated.' |
|
|
128 | redirect_to :action => 'show', :id => @user |
|
128 | redirect_to :action => 'show', :id => @user |
|
|
129 | else |
|
129 | else |
|
|
130 | render :action => 'edit' |
|
130 | render :action => 'edit' |
|
|
131 | end |
|
131 | end |
|
|
132 | end |
|
132 | end |
|
|
133 |
|
133 | ||
|
|
134 | def destroy |
|
134 | def destroy |
|
|
135 | User.find(params[:id]).destroy |
|
135 | User.find(params[:id]).destroy |
|
|
136 | redirect_to :action => 'list' |
|
136 | redirect_to :action => 'list' |
|
|
137 | end |
|
137 | end |
|
|
138 |
|
138 | ||
|
|
139 | def user_stat |
|
139 | def user_stat |
|
|
140 | if params[:commit] == 'download csv' |
|
140 | if params[:commit] == 'download csv' |
|
|
141 | @problems = Problem.all |
|
141 | @problems = Problem.all |
|
|
142 | else |
|
142 | else |
|
|
143 | @problems = Problem.find_available_problems |
|
143 | @problems = Problem.find_available_problems |
|
|
144 | end |
|
144 | end |
|
|
145 |
- @users = User. |
|
145 | + @users = User.includes(:contests, :contest_stat).where(enabled: true) #find(:all, :include => [:contests, :contest_stat]).where(enabled: true) |
|
|
146 | @scorearray = Array.new |
|
146 | @scorearray = Array.new |
|
|
147 | @users.each do |u| |
|
147 | @users.each do |u| |
|
|
148 | ustat = Array.new |
|
148 | ustat = Array.new |
|
|
149 | ustat[0] = u |
|
149 | ustat[0] = u |
|
|
150 | @problems.each do |p| |
|
150 | @problems.each do |p| |
|
|
151 | sub = Submission.find_last_by_user_and_problem(u.id,p.id) |
|
151 | sub = Submission.find_last_by_user_and_problem(u.id,p.id) |
|
|
152 | if (sub!=nil) and (sub.points!=nil) and p and p.full_score |
|
152 | if (sub!=nil) and (sub.points!=nil) and p and p.full_score |
|
|
153 | ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)] |
|
153 | ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)] |
|
|
154 | else |
|
154 | else |
|
|
155 | ustat << [0,false] |
|
155 | ustat << [0,false] |
|
|
156 | end |
|
156 | end |
|
|
157 | end |
|
157 | end |
|
|
158 | @scorearray << ustat |
|
158 | @scorearray << ustat |
|
|
159 | end |
|
159 | end |
|
|
160 | if params[:commit] == 'download csv' then |
|
160 | if params[:commit] == 'download csv' then |
|
|
161 | csv = gen_csv_from_scorearray(@scorearray,@problems) |
|
161 | csv = gen_csv_from_scorearray(@scorearray,@problems) |
|
|
162 | send_data csv, filename: 'last_score.csv' |
|
162 | send_data csv, filename: 'last_score.csv' |
|
|
163 | else |
|
163 | else |
|
|
164 | render template: 'user_admin/user_stat' |
|
164 | render template: 'user_admin/user_stat' |
|
|
165 | end |
|
165 | end |
|
|
166 | end |
|
166 | end |
|
|
167 |
|
167 | ||
|
|
168 | def user_stat_max |
|
168 | def user_stat_max |
|
|
169 | if params[:commit] == 'download csv' |
|
169 | if params[:commit] == 'download csv' |
|
|
170 | @problems = Problem.all |
|
170 | @problems = Problem.all |
|
|
171 | else |
|
171 | else |
|
|
172 | @problems = Problem.find_available_problems |
|
172 | @problems = Problem.find_available_problems |
|
|
173 | end |
|
173 | end |
|
|
174 | @users = User.find(:all, :include => [:contests, :contest_stat]) |
|
174 | @users = User.find(:all, :include => [:contests, :contest_stat]) |
|
|
175 | @scorearray = Array.new |
|
175 | @scorearray = Array.new |
|
|
176 | #set up range from param |
|
176 | #set up range from param |
|
|
177 | since_id = params.fetch(:since_id, 0).to_i |
|
177 | since_id = params.fetch(:since_id, 0).to_i |
|
|
178 | until_id = params.fetch(:until_id, 0).to_i |
|
178 | until_id = params.fetch(:until_id, 0).to_i |
|
|
179 | @users.each do |u| |
|
179 | @users.each do |u| |
|
|
180 | ustat = Array.new |
|
180 | ustat = Array.new |
|
|
181 | ustat[0] = u |
|
181 | ustat[0] = u |
|
|
182 | @problems.each do |p| |
|
182 | @problems.each do |p| |
|
|
183 | max_points = 0 |
|
183 | max_points = 0 |
|
|
184 | Submission.find_in_range_by_user_and_problem(u.id,p.id,since_id,until_id).each do |sub| |
|
184 | Submission.find_in_range_by_user_and_problem(u.id,p.id,since_id,until_id).each do |sub| |
|
|
185 | max_points = sub.points if sub and sub.points and (sub.points > max_points) |
|
185 | max_points = sub.points if sub and sub.points and (sub.points > max_points) |
|
|
186 | end |
|
186 | end |
|
|
187 | ustat << [(max_points.to_f*100/p.full_score).round, (max_points>=p.full_score)] |
|
187 | ustat << [(max_points.to_f*100/p.full_score).round, (max_points>=p.full_score)] |
|
|
188 | end |
|
188 | end |
|
|
189 | @scorearray << ustat |
|
189 | @scorearray << ustat |
|
|
190 | end |
|
190 | end |
|
|
191 |
|
191 | ||
|
|
192 | if params[:commit] == 'download csv' then |
|
192 | if params[:commit] == 'download csv' then |
|
|
193 | csv = gen_csv_from_scorearray(@scorearray,@problems) |
|
193 | csv = gen_csv_from_scorearray(@scorearray,@problems) |
You need to be logged in to leave comments.
Login now