Description:
Merge pull request #21 from nattee/master
block report/current_score from normal user
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r721:93040f45d604 - - 1 file changed: 1 inserted, 1 deleted
@@ -1,199 +1,199 | |||||
|
1 | require 'csv' |
|
1 | require 'csv' |
|
2 |
|
2 | ||
|
3 | class ReportController < ApplicationController |
|
3 | class ReportController < ApplicationController |
|
4 |
|
4 | ||
|
5 | before_filter :authenticate |
|
5 | before_filter :authenticate |
|
6 |
|
6 | ||
|
7 | - before_filter :admin_authorization, only: [:login_stat,:submission_stat, :stuck, :cheat_report, :cheat_scruntinize, :show_max_score] |
|
7 | + before_filter :admin_authorization, only: [:login_stat,:submission_stat, :stuck, :cheat_report, :cheat_scruntinize, :show_max_score, :current_score] |
|
8 |
|
8 | ||
|
9 | before_filter(only: [:problem_hof]) { |c| |
|
9 | before_filter(only: [:problem_hof]) { |c| |
|
10 | return false unless authenticate |
|
10 | return false unless authenticate |
|
11 |
|
11 | ||
|
12 | admin_authorization unless GraderConfiguration["right.user_view_submission"] |
|
12 | admin_authorization unless GraderConfiguration["right.user_view_submission"] |
|
13 | } |
|
13 | } |
|
14 |
|
14 | ||
|
15 | def max_score |
|
15 | def max_score |
|
16 | end |
|
16 | end |
|
17 |
|
17 | ||
|
18 | def current_score |
|
18 | def current_score |
|
19 | @problems = Problem.available_problems |
|
19 | @problems = Problem.available_problems |
|
20 | @users = User.includes(:contests).includes(:contest_stat).where(enabled: true) |
|
20 | @users = User.includes(:contests).includes(:contest_stat).where(enabled: true) |
|
21 | @scorearray = calculate_max_score(@problems, @users,0,0,true) |
|
21 | @scorearray = calculate_max_score(@problems, @users,0,0,true) |
|
22 |
|
22 | ||
|
23 | #rencer accordingly |
|
23 | #rencer accordingly |
|
24 | if params[:button] == 'download' then |
|
24 | if params[:button] == 'download' then |
|
25 | csv = gen_csv_from_scorearray(@scorearray,@problems) |
|
25 | csv = gen_csv_from_scorearray(@scorearray,@problems) |
|
26 | send_data csv, filename: 'max_score.csv' |
|
26 | send_data csv, filename: 'max_score.csv' |
|
27 | else |
|
27 | else |
|
28 | #render template: 'user_admin/user_stat' |
|
28 | #render template: 'user_admin/user_stat' |
|
29 | render 'current_score' |
|
29 | render 'current_score' |
|
30 | end |
|
30 | end |
|
31 | end |
|
31 | end |
|
32 |
|
32 | ||
|
33 | def show_max_score |
|
33 | def show_max_score |
|
34 | #process parameters |
|
34 | #process parameters |
|
35 | #problems |
|
35 | #problems |
|
36 | @problems = [] |
|
36 | @problems = [] |
|
37 | if params[:problem_id] |
|
37 | if params[:problem_id] |
|
38 | params[:problem_id].each do |id| |
|
38 | params[:problem_id].each do |id| |
|
39 | next unless id.strip != "" |
|
39 | next unless id.strip != "" |
|
40 | pid = Problem.find_by_id(id.to_i) |
|
40 | pid = Problem.find_by_id(id.to_i) |
|
41 | @problems << pid if pid |
|
41 | @problems << pid if pid |
|
42 | end |
|
42 | end |
|
43 | end |
|
43 | end |
|
44 |
|
44 | ||
|
45 | #users |
|
45 | #users |
|
46 | @users = if params[:user] == "all" then |
|
46 | @users = if params[:user] == "all" then |
|
47 | User.includes(:contests).includes(:contest_stat) |
|
47 | User.includes(:contests).includes(:contest_stat) |
|
48 | else |
|
48 | else |
|
49 | User.includes(:contests).includes(:contest_stat).where(enabled: true) |
|
49 | User.includes(:contests).includes(:contest_stat).where(enabled: true) |
|
50 | end |
|
50 | end |
|
51 |
|
51 | ||
|
52 | #set up range from param |
|
52 | #set up range from param |
|
53 | @since_id = params.fetch(:from_id, 0).to_i |
|
53 | @since_id = params.fetch(:from_id, 0).to_i |
|
54 | @until_id = params.fetch(:to_id, 0).to_i |
|
54 | @until_id = params.fetch(:to_id, 0).to_i |
|
55 | @since_id = nil if @since_id == 0 |
|
55 | @since_id = nil if @since_id == 0 |
|
56 | @until_id = nil if @until_id == 0 |
|
56 | @until_id = nil if @until_id == 0 |
|
57 |
|
57 | ||
|
58 | #calculate the routine |
|
58 | #calculate the routine |
|
59 | @scorearray = calculate_max_score(@problems, @users, @since_id, @until_id) |
|
59 | @scorearray = calculate_max_score(@problems, @users, @since_id, @until_id) |
|
60 |
|
60 | ||
|
61 | #rencer accordingly |
|
61 | #rencer accordingly |
|
62 | if params[:button] == 'download' then |
|
62 | if params[:button] == 'download' then |
|
63 | csv = gen_csv_from_scorearray(@scorearray,@problems) |
|
63 | csv = gen_csv_from_scorearray(@scorearray,@problems) |
|
64 | send_data csv, filename: 'max_score.csv' |
|
64 | send_data csv, filename: 'max_score.csv' |
|
65 | else |
|
65 | else |
|
66 | #render template: 'user_admin/user_stat' |
|
66 | #render template: 'user_admin/user_stat' |
|
67 | render 'max_score' |
|
67 | render 'max_score' |
|
68 | end |
|
68 | end |
|
69 |
|
69 | ||
|
70 | end |
|
70 | end |
|
71 |
|
71 | ||
|
72 | def score |
|
72 | def score |
|
73 | if params[:commit] == 'download csv' |
|
73 | if params[:commit] == 'download csv' |
|
74 | @problems = Problem.all |
|
74 | @problems = Problem.all |
|
75 | else |
|
75 | else |
|
76 | @problems = Problem.available_problems |
|
76 | @problems = Problem.available_problems |
|
77 | end |
|
77 | end |
|
78 | @users = User.includes(:contests, :contest_stat).where(enabled: true) |
|
78 | @users = User.includes(:contests, :contest_stat).where(enabled: true) |
|
79 | @scorearray = Array.new |
|
79 | @scorearray = Array.new |
|
80 | @users.each do |u| |
|
80 | @users.each do |u| |
|
81 | ustat = Array.new |
|
81 | ustat = Array.new |
|
82 | ustat[0] = u |
|
82 | ustat[0] = u |
|
83 | @problems.each do |p| |
|
83 | @problems.each do |p| |
|
84 | sub = Submission.find_last_by_user_and_problem(u.id,p.id) |
|
84 | sub = Submission.find_last_by_user_and_problem(u.id,p.id) |
|
85 | if (sub!=nil) and (sub.points!=nil) and p and p.full_score |
|
85 | if (sub!=nil) and (sub.points!=nil) and p and p.full_score |
|
86 | ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)] |
|
86 | ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)] |
|
87 | else |
|
87 | else |
|
88 | ustat << [0,false] |
|
88 | ustat << [0,false] |
|
89 | end |
|
89 | end |
|
90 | end |
|
90 | end |
|
91 | @scorearray << ustat |
|
91 | @scorearray << ustat |
|
92 | end |
|
92 | end |
|
93 | if params[:commit] == 'download csv' then |
|
93 | if params[:commit] == 'download csv' then |
|
94 | csv = gen_csv_from_scorearray(@scorearray,@problems) |
|
94 | csv = gen_csv_from_scorearray(@scorearray,@problems) |
|
95 | send_data csv, filename: 'last_score.csv' |
|
95 | send_data csv, filename: 'last_score.csv' |
|
96 | else |
|
96 | else |
|
97 | render template: 'user_admin/user_stat' |
|
97 | render template: 'user_admin/user_stat' |
|
98 | end |
|
98 | end |
|
99 |
|
99 | ||
|
100 | end |
|
100 | end |
|
101 |
|
101 | ||
|
102 | def login_stat |
|
102 | def login_stat |
|
103 | @logins = Array.new |
|
103 | @logins = Array.new |
|
104 |
|
104 | ||
|
105 | date_and_time = '%Y-%m-%d %H:%M' |
|
105 | date_and_time = '%Y-%m-%d %H:%M' |
|
106 | begin |
|
106 | begin |
|
107 | md = params[:since_datetime].match(/(\d+)-(\d+)-(\d+) (\d+):(\d+)/) |
|
107 | md = params[:since_datetime].match(/(\d+)-(\d+)-(\d+) (\d+):(\d+)/) |
|
108 | @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) |
|
108 | @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) |
|
109 | rescue |
|
109 | rescue |
|
110 | @since_time = DateTime.new(1000,1,1) |
|
110 | @since_time = DateTime.new(1000,1,1) |
|
111 | end |
|
111 | end |
|
112 | begin |
|
112 | begin |
|
113 | md = params[:until_datetime].match(/(\d+)-(\d+)-(\d+) (\d+):(\d+)/) |
|
113 | md = params[:until_datetime].match(/(\d+)-(\d+)-(\d+) (\d+):(\d+)/) |
|
114 | @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) |
|
114 | @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) |
|
115 | rescue |
|
115 | rescue |
|
116 | @until_time = DateTime.new(3000,1,1) |
|
116 | @until_time = DateTime.new(3000,1,1) |
|
117 | end |
|
117 | end |
|
118 |
|
118 | ||
|
119 | User.all.each do |user| |
|
119 | User.all.each do |user| |
|
120 | @logins << { id: user.id, |
|
120 | @logins << { id: user.id, |
|
121 | login: user.login, |
|
121 | login: user.login, |
|
122 | full_name: user.full_name, |
|
122 | full_name: user.full_name, |
|
123 | count: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?", |
|
123 | count: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?", |
|
124 | user.id,@since_time,@until_time) |
|
124 | user.id,@since_time,@until_time) |
|
125 | .count(:id), |
|
125 | .count(:id), |
|
126 | min: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?", |
|
126 | min: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?", |
|
127 | user.id,@since_time,@until_time) |
|
127 | user.id,@since_time,@until_time) |
|
128 | .minimum(:created_at), |
|
128 | .minimum(:created_at), |
|
129 | max: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?", |
|
129 | max: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?", |
|
130 | user.id,@since_time,@until_time) |
|
130 | user.id,@since_time,@until_time) |
|
131 | .maximum(:created_at), |
|
131 | .maximum(:created_at), |
|
132 | ip: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?", |
|
132 | ip: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?", |
|
133 | user.id,@since_time,@until_time) |
|
133 | user.id,@since_time,@until_time) |
|
134 | .select(:ip_address).uniq |
|
134 | .select(:ip_address).uniq |
|
135 |
|
135 | ||
|
136 | } |
|
136 | } |
|
137 | end |
|
137 | end |
|
138 | end |
|
138 | end |
|
139 |
|
139 | ||
|
140 | def submission_stat |
|
140 | def submission_stat |
|
141 |
|
141 | ||
|
142 | date_and_time = '%Y-%m-%d %H:%M' |
|
142 | date_and_time = '%Y-%m-%d %H:%M' |
|
143 | begin |
|
143 | begin |
|
144 | @since_time = DateTime.strptime(params[:since_datetime],date_and_time) |
|
144 | @since_time = DateTime.strptime(params[:since_datetime],date_and_time) |
|
145 | rescue |
|
145 | rescue |
|
146 | @since_time = DateTime.new(1000,1,1) |
|
146 | @since_time = DateTime.new(1000,1,1) |
|
147 | end |
|
147 | end |
|
148 | begin |
|
148 | begin |
|
149 | @until_time = DateTime.strptime(params[:until_datetime],date_and_time) |
|
149 | @until_time = DateTime.strptime(params[:until_datetime],date_and_time) |
|
150 | rescue |
|
150 | rescue |
|
151 | @until_time = DateTime.new(3000,1,1) |
|
151 | @until_time = DateTime.new(3000,1,1) |
|
152 | end |
|
152 | end |
|
153 |
|
153 | ||
|
154 | @submissions = {} |
|
154 | @submissions = {} |
|
155 |
|
155 | ||
|
156 | User.find_each do |user| |
|
156 | User.find_each do |user| |
|
157 | @submissions[user.id] = { login: user.login, full_name: user.full_name, count: 0, sub: { } } |
|
157 | @submissions[user.id] = { login: user.login, full_name: user.full_name, count: 0, sub: { } } |
|
158 | end |
|
158 | end |
|
159 |
|
159 | ||
|
160 | Submission.where("submitted_at >= ? AND submitted_at <= ?",@since_time,@until_time).find_each do |s| |
|
160 | Submission.where("submitted_at >= ? AND submitted_at <= ?",@since_time,@until_time).find_each do |s| |
|
161 | if @submissions[s.user_id] |
|
161 | if @submissions[s.user_id] |
|
162 | if not @submissions[s.user_id][:sub].has_key?(s.problem_id) |
|
162 | if not @submissions[s.user_id][:sub].has_key?(s.problem_id) |
|
163 | a = Problem.find_by_id(s.problem_id) |
|
163 | a = Problem.find_by_id(s.problem_id) |
|
164 | @submissions[s.user_id][:sub][s.problem_id] = |
|
164 | @submissions[s.user_id][:sub][s.problem_id] = |
|
165 | { prob_name: (a ? a.full_name : '(NULL)'), |
|
165 | { prob_name: (a ? a.full_name : '(NULL)'), |
|
166 | sub_ids: [s.id] } |
|
166 | sub_ids: [s.id] } |
|
167 | else |
|
167 | else |
|
168 | @submissions[s.user_id][:sub][s.problem_id][:sub_ids] << s.id |
|
168 | @submissions[s.user_id][:sub][s.problem_id][:sub_ids] << s.id |
|
169 | end |
|
169 | end |
|
170 | @submissions[s.user_id][:count] += 1 |
|
170 | @submissions[s.user_id][:count] += 1 |
|
171 | end |
|
171 | end |
|
172 | end |
|
172 | end |
|
173 | end |
|
173 | end |
|
174 |
|
174 | ||
|
175 | def problem_hof |
|
175 | def problem_hof |
|
176 | # gen problem list |
|
176 | # gen problem list |
|
177 | @user = User.find(session[:user_id]) |
|
177 | @user = User.find(session[:user_id]) |
|
178 | @problems = @user.available_problems |
|
178 | @problems = @user.available_problems |
|
179 |
|
179 | ||
|
180 | # get selected problems or the default |
|
180 | # get selected problems or the default |
|
181 | if params[:id] |
|
181 | if params[:id] |
|
182 | begin |
|
182 | begin |
|
183 | @problem = Problem.available.find(params[:id]) |
|
183 | @problem = Problem.available.find(params[:id]) |
|
184 | rescue |
|
184 | rescue |
|
185 | redirect_to action: :problem_hof |
|
185 | redirect_to action: :problem_hof |
|
186 | flash[:notice] = 'Error: submissions for that problem are not viewable.' |
|
186 | flash[:notice] = 'Error: submissions for that problem are not viewable.' |
|
187 | return |
|
187 | return |
|
188 | end |
|
188 | end |
|
189 | end |
|
189 | end |
|
190 |
|
190 | ||
|
191 | return unless @problem |
|
191 | return unless @problem |
|
192 |
|
192 | ||
|
193 | @by_lang = {} #aggregrate by language |
|
193 | @by_lang = {} #aggregrate by language |
|
194 |
|
194 | ||
|
195 | range =65 |
|
195 | range =65 |
|
196 | @histogram = { data: Array.new(range,0), summary: {} } |
|
196 | @histogram = { data: Array.new(range,0), summary: {} } |
|
197 | @summary = {count: 0, solve: 0, attempt: 0} |
|
197 | @summary = {count: 0, solve: 0, attempt: 0} |
|
198 | user = Hash.new(0) |
|
198 | user = Hash.new(0) |
|
199 | Submission.where(problem_id: @problem.id).find_each do |sub| |
|
199 | Submission.where(problem_id: @problem.id).find_each do |sub| |
You need to be logged in to leave comments.
Login now