Description:
fix bug for "stuck" and add authorization
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r464:310e993b7826 - - 1 file changed: 2 inserted, 1 deleted
| @@ -1,51 +1,51 | |||
|
|
1 | 1 | class ReportController < ApplicationController |
|
|
2 | 2 | |
|
|
3 | - before_filter :admin_authorization, only: [:login_stat,:submission_stat] | |
|
|
3 | + before_filter :admin_authorization, only: [:login_stat,:submission_stat, :stuck] | |
|
|
4 | 4 | before_filter(only: [:problem_hof]) { |c| |
|
|
5 | 5 | return false unless authenticate |
|
|
6 | 6 | |
|
|
7 | 7 | if GraderConfiguration["right.user_view_submission"] |
|
|
8 | 8 | return true; |
|
|
9 | 9 | end |
|
|
10 | 10 | |
|
|
11 | 11 | admin_authorization |
|
|
12 | 12 | } |
|
|
13 | 13 | |
|
|
14 | 14 | def login_stat |
|
|
15 | 15 | @logins = Array.new |
|
|
16 | 16 | |
|
|
17 | 17 | date_and_time = '%Y-%m-%d %H:%M' |
|
|
18 | 18 | begin |
|
|
19 | 19 | md = params[:since_datetime].match(/(\d+)-(\d+)-(\d+) (\d+):(\d+)/) |
|
|
20 | 20 | @since_time = Time.zone.local(md[1].to_i,md[2].to_i,md[3].to_i,md[4].to_i,md[5].to_i) |
|
|
21 | 21 | rescue |
|
|
22 | 22 | @since_time = DateTime.new(1000,1,1) |
|
|
23 | 23 | end |
|
|
24 | 24 | begin |
|
|
25 | 25 | md = params[:until_datetime].match(/(\d+)-(\d+)-(\d+) (\d+):(\d+)/) |
|
|
26 | 26 | @until_time = Time.zone.local(md[1].to_i,md[2].to_i,md[3].to_i,md[4].to_i,md[5].to_i) |
|
|
27 | 27 | rescue |
|
|
28 | 28 | @until_time = DateTime.new(3000,1,1) |
|
|
29 | 29 | end |
|
|
30 | 30 | |
|
|
31 | 31 | User.all.each do |user| |
|
|
32 | 32 | @logins << { id: user.id, |
|
|
33 | 33 | login: user.login, |
|
|
34 | 34 | full_name: user.full_name, |
|
|
35 | 35 | count: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?", |
|
|
36 | 36 | user.id,@since_time,@until_time) |
|
|
37 | 37 | .count(:id), |
|
|
38 | 38 | min: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?", |
|
|
39 | 39 | user.id,@since_time,@until_time) |
|
|
40 | 40 | .minimum(:created_at), |
|
|
41 | 41 | max: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?", |
|
|
42 | 42 | user.id,@since_time,@until_time) |
|
|
43 | 43 | .maximum(:created_at), |
|
|
44 | 44 | ip: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?", |
|
|
45 | 45 | user.id,@since_time,@until_time) |
|
|
46 | 46 | .select(:ip_address).uniq |
|
|
47 | 47 | |
|
|
48 | 48 | } |
|
|
49 | 49 | end |
|
|
50 | 50 | end |
|
|
51 | 51 | |
| @@ -151,66 +151,67 | |||
|
|
151 | 151 | if @by_lang[lang.pretty_name][:length][:value] > sub.effective_code_length |
|
|
152 | 152 | @by_lang[lang.pretty_name][:length] = { avail: true, user_id: sub.user_id, value: sub.effective_code_length, sub_id: sub.id } |
|
|
153 | 153 | end |
|
|
154 | 154 | end |
|
|
155 | 155 | |
|
|
156 | 156 | #process user_id |
|
|
157 | 157 | @by_lang.each do |lang,prop| |
|
|
158 | 158 | prop.each do |k,v| |
|
|
159 | 159 | v[:user] = User.exists?(v[:user_id]) ? User.find(v[:user_id]).full_name : "(NULL)" |
|
|
160 | 160 | end |
|
|
161 | 161 | end |
|
|
162 | 162 | |
|
|
163 | 163 | #sum into best |
|
|
164 | 164 | if @by_lang and @by_lang.first |
|
|
165 | 165 | @best = @by_lang.first[1].clone |
|
|
166 | 166 | @by_lang.each do |lang,prop| |
|
|
167 | 167 | if @best[:runtime][:value] >= prop[:runtime][:value] |
|
|
168 | 168 | @best[:runtime] = prop[:runtime] |
|
|
169 | 169 | @best[:runtime][:lang] = lang |
|
|
170 | 170 | end |
|
|
171 | 171 | if @best[:memory][:value] >= prop[:memory][:value] |
|
|
172 | 172 | @best[:memory] = prop[:memory] |
|
|
173 | 173 | @best[:memory][:lang] = lang |
|
|
174 | 174 | end |
|
|
175 | 175 | if @best[:length][:value] >= prop[:length][:value] |
|
|
176 | 176 | @best[:length] = prop[:length] |
|
|
177 | 177 | @best[:length][:lang] = lang |
|
|
178 | 178 | end |
|
|
179 | 179 | if @best[:first][:value] >= prop[:first][:value] |
|
|
180 | 180 | @best[:first] = prop[:first] |
|
|
181 | 181 | @best[:first][:lang] = lang |
|
|
182 | 182 | end |
|
|
183 | 183 | end |
|
|
184 | 184 | end |
|
|
185 | 185 | |
|
|
186 | 186 | @histogram[:summary][:max] = [@histogram[:data].max,1].max |
|
|
187 | 187 | @summary[:attempt] = user.count |
|
|
188 | 188 | user.each_value { |v| @summary[:solve] += 1 if v == 1 } |
|
|
189 | 189 | end |
|
|
190 | 190 | |
|
|
191 | 191 | def stuck #report struggling user,problem |
|
|
192 | 192 | # init |
|
|
193 | 193 | user,problem = nil |
|
|
194 | 194 | solve = true |
|
|
195 | 195 | tries = 0 |
|
|
196 | 196 | @struggle = Array.new |
|
|
197 | 197 | record = {} |
|
|
198 | 198 | Submission.includes(:problem,:user).order(:problem_id,:user_id).find_each do |sub| |
|
|
199 | + next unless sub.problem and sub.user | |
|
|
199 | 200 | if user != sub.user_id or problem != sub.problem_id |
|
|
200 | 201 | @struggle << { user: record[:user], problem: record[:problem], tries: tries } unless solve |
|
|
201 | 202 | record = {user: sub.user, problem: sub.problem} |
|
|
202 | 203 | user,problem = sub.user_id, sub.problem_id |
|
|
203 | 204 | solve = false |
|
|
204 | 205 | tries = 0 |
|
|
205 | 206 | end |
|
|
206 | 207 | if sub.points >= sub.problem.full_score |
|
|
207 | 208 | solve = true |
|
|
208 | 209 | else |
|
|
209 | 210 | tries += 1 |
|
|
210 | 211 | end |
|
|
211 | 212 | end |
|
|
212 | 213 | @struggle.sort!{|a,b| b[:tries] <=> a[:tries] } |
|
|
213 | 214 | @struggle = @struggle[0..50] |
|
|
214 | 215 | end |
|
|
215 | 216 | |
|
|
216 | 217 | end |
You need to be logged in to leave comments.
Login now