Description:
merge check multiple login from master (which grafts from java-bm)
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r502:b0abb7bd35dd - - 6 files changed: 84 inserted, 1 deleted
@@ -0,0 +1,37 | |||||
|
|
1 | + - content_for :header do | ||
|
|
2 | + = stylesheet_link_tag 'tablesorter-theme.cafe' | ||
|
|
3 | + = javascript_include_tag 'local_jquery' | ||
|
|
4 | + | ||
|
|
5 | + %h1 Login status | ||
|
|
6 | + | ||
|
|
7 | + =render partial: 'report_menu' | ||
|
|
8 | + | ||
|
|
9 | + Checking for all submissions with the currently available problem | ||
|
|
10 | + | ||
|
|
11 | + %h2 Users with Multiple IP | ||
|
|
12 | + %table.tablesorter-cafe#my_table | ||
|
|
13 | + %thead | ||
|
|
14 | + %tr | ||
|
|
15 | + %th login | ||
|
|
16 | + %th full name | ||
|
|
17 | + %th IP | ||
|
|
18 | + %tbody | ||
|
|
19 | + - @users.each do |l| | ||
|
|
20 | + %tr{class: cycle('info-even','info-odd')} | ||
|
|
21 | + %td= link_to l.user.login, controller: 'users', action: 'profile', id: l[:id] | ||
|
|
22 | + %td= l.user.full_name | ||
|
|
23 | + %td= l[:ip_address] | ||
|
|
24 | + | ||
|
|
25 | + %h2 IP with multiple users | ||
|
|
26 | + %table.tablesorter-cafe#my_table | ||
|
|
27 | + %thead | ||
|
|
28 | + %tr | ||
|
|
29 | + %th IP | ||
|
|
30 | + %th login | ||
|
|
31 | + %th full name | ||
|
|
32 | + %tbody | ||
|
|
33 | + - @ip.each do |l| | ||
|
|
34 | + %tr{class: cycle('info-even','info-odd')} | ||
|
|
35 | + %td= l[:ip_address] | ||
|
|
36 | + %td= link_to l.user.login, controller: 'users', action: 'profile', id: l[:id] | ||
|
|
37 | + %td= l.user.full_name |
@@ -170,49 +170,86 | |||||
|
170 | @best[:runtime][:lang] = lang |
|
170 | @best[:runtime][:lang] = lang |
|
171 | end |
|
171 | end |
|
172 | if @best[:memory][:value] >= prop[:memory][:value] |
|
172 | if @best[:memory][:value] >= prop[:memory][:value] |
|
173 | @best[:memory] = prop[:memory] |
|
173 | @best[:memory] = prop[:memory] |
|
174 | @best[:memory][:lang] = lang |
|
174 | @best[:memory][:lang] = lang |
|
175 | end |
|
175 | end |
|
176 | if @best[:length][:value] >= prop[:length][:value] |
|
176 | if @best[:length][:value] >= prop[:length][:value] |
|
177 | @best[:length] = prop[:length] |
|
177 | @best[:length] = prop[:length] |
|
178 | @best[:length][:lang] = lang |
|
178 | @best[:length][:lang] = lang |
|
179 | end |
|
179 | end |
|
180 | if @best[:first][:value] >= prop[:first][:value] |
|
180 | if @best[:first][:value] >= prop[:first][:value] |
|
181 | @best[:first] = prop[:first] |
|
181 | @best[:first] = prop[:first] |
|
182 | @best[:first][:lang] = lang |
|
182 | @best[:first][:lang] = lang |
|
183 | end |
|
183 | end |
|
184 | end |
|
184 | end |
|
185 | end |
|
185 | end |
|
186 |
|
186 | ||
|
187 | @histogram[:summary][:max] = [@histogram[:data].max,1].max |
|
187 | @histogram[:summary][:max] = [@histogram[:data].max,1].max |
|
188 | @summary[:attempt] = user.count |
|
188 | @summary[:attempt] = user.count |
|
189 | user.each_value { |v| @summary[:solve] += 1 if v == 1 } |
|
189 | user.each_value { |v| @summary[:solve] += 1 if v == 1 } |
|
190 | end |
|
190 | end |
|
191 |
|
191 | ||
|
192 | def stuck #report struggling user,problem |
|
192 | def stuck #report struggling user,problem |
|
193 | # init |
|
193 | # init |
|
194 | user,problem = nil |
|
194 | user,problem = nil |
|
195 | solve = true |
|
195 | solve = true |
|
196 | tries = 0 |
|
196 | tries = 0 |
|
197 | @struggle = Array.new |
|
197 | @struggle = Array.new |
|
198 | record = {} |
|
198 | record = {} |
|
199 | Submission.includes(:problem,:user).order(:problem_id,:user_id).find_each do |sub| |
|
199 | Submission.includes(:problem,:user).order(:problem_id,:user_id).find_each do |sub| |
|
200 | next unless sub.problem and sub.user |
|
200 | next unless sub.problem and sub.user |
|
201 | if user != sub.user_id or problem != sub.problem_id |
|
201 | if user != sub.user_id or problem != sub.problem_id |
|
202 | @struggle << { user: record[:user], problem: record[:problem], tries: tries } unless solve |
|
202 | @struggle << { user: record[:user], problem: record[:problem], tries: tries } unless solve |
|
203 | record = {user: sub.user, problem: sub.problem} |
|
203 | record = {user: sub.user, problem: sub.problem} |
|
204 | user,problem = sub.user_id, sub.problem_id |
|
204 | user,problem = sub.user_id, sub.problem_id |
|
205 | solve = false |
|
205 | solve = false |
|
206 | tries = 0 |
|
206 | tries = 0 |
|
207 | end |
|
207 | end |
|
208 | if sub.points >= sub.problem.full_score |
|
208 | if sub.points >= sub.problem.full_score |
|
209 | solve = true |
|
209 | solve = true |
|
210 | else |
|
210 | else |
|
211 | tries += 1 |
|
211 | tries += 1 |
|
212 | end |
|
212 | end |
|
213 | end |
|
213 | end |
|
214 | @struggle.sort!{|a,b| b[:tries] <=> a[:tries] } |
|
214 | @struggle.sort!{|a,b| b[:tries] <=> a[:tries] } |
|
215 | @struggle = @struggle[0..50] |
|
215 | @struggle = @struggle[0..50] |
|
216 | end |
|
216 | end |
|
217 |
|
217 | ||
|
|
218 | + | ||
|
|
219 | + def multiple_login | ||
|
|
220 | + #user with multiple IP | ||
|
|
221 | + raw = Submission.joins(:user).joins(:problem).where("problems.available != 0").group("login,ip_address").order(:login) | ||
|
|
222 | + last,count = 0,0 | ||
|
|
223 | + first = 0 | ||
|
|
224 | + @users = [] | ||
|
|
225 | + raw.each do |r| | ||
|
|
226 | + if last != r.user.login | ||
|
|
227 | + count = 1 | ||
|
|
228 | + last = r.user.login | ||
|
|
229 | + first = r | ||
|
|
230 | + else | ||
|
|
231 | + @users << first if count == 1 | ||
|
|
232 | + @users << r | ||
|
|
233 | + count += 1 | ||
|
218 | end |
|
234 | end |
|
|
235 | + end | ||
|
|
236 | + | ||
|
|
237 | + #IP with multiple user | ||
|
|
238 | + raw = Submission.joins(:user).joins(:problem).where("problems.available != 0").group("login,ip_address").order(:ip_address) | ||
|
|
239 | + last,count = 0,0 | ||
|
|
240 | + first = 0 | ||
|
|
241 | + @ip = [] | ||
|
|
242 | + raw.each do |r| | ||
|
|
243 | + if last != r.ip_address | ||
|
|
244 | + count = 1 | ||
|
|
245 | + last = r.ip_address | ||
|
|
246 | + first = r | ||
|
|
247 | + else | ||
|
|
248 | + @ip << first if count == 1 | ||
|
|
249 | + @ip << r | ||
|
|
250 | + count += 1 | ||
|
|
251 | + end | ||
|
|
252 | + end | ||
|
|
253 | + end | ||
|
|
254 | + | ||
|
|
255 | + end |
@@ -105,96 +105,102 | |||||
|
105 | end |
|
105 | end |
|
106 | end |
|
106 | end |
|
107 | flash[:notice] = 'User(s) ' + note.join(', ') + |
|
107 | flash[:notice] = 'User(s) ' + note.join(', ') + |
|
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 | + if params[:commit] == 'download csv' then | ||
|
|
154 | + csv = gen_csv_from_scorearray(@scorearray,@problems) | ||
|
|
155 | + send_data csv, filename: 'last_score.csv' | ||
|
|
156 | + else | ||
|
|
157 | + render template: 'user_admin/user_stat' | ||
|
|
158 | + end | ||
|
153 | end |
|
159 | end |
|
154 |
|
160 | ||
|
155 | def user_stat_max |
|
161 | def user_stat_max |
|
156 | if params[:commit] == 'download csv' |
|
162 | if params[:commit] == 'download csv' |
|
157 | @problems = Problem.all |
|
163 | @problems = Problem.all |
|
158 | else |
|
164 | else |
|
159 | @problems = Problem.find_available_problems |
|
165 | @problems = Problem.find_available_problems |
|
160 | end |
|
166 | end |
|
161 | @users = User.find(:all, :include => [:contests, :contest_stat]) |
|
167 | @users = User.find(:all, :include => [:contests, :contest_stat]) |
|
162 | @scorearray = Array.new |
|
168 | @scorearray = Array.new |
|
163 | #set up range from param |
|
169 | #set up range from param |
|
164 | since_id = params.fetch(:since_id, 0).to_i |
|
170 | since_id = params.fetch(:since_id, 0).to_i |
|
165 | until_id = params.fetch(:until_id, 0).to_i |
|
171 | until_id = params.fetch(:until_id, 0).to_i |
|
166 | @users.each do |u| |
|
172 | @users.each do |u| |
|
167 | ustat = Array.new |
|
173 | ustat = Array.new |
|
168 | ustat[0] = u |
|
174 | ustat[0] = u |
|
169 | @problems.each do |p| |
|
175 | @problems.each do |p| |
|
170 | max_points = 0 |
|
176 | max_points = 0 |
|
171 | Submission.find_in_range_by_user_and_problem(u.id,p.id,since_id,until_id).each do |sub| |
|
177 | Submission.find_in_range_by_user_and_problem(u.id,p.id,since_id,until_id).each do |sub| |
|
172 | max_points = sub.points if sub and sub.points and (sub.points > max_points) |
|
178 | max_points = sub.points if sub and sub.points and (sub.points > max_points) |
|
173 | end |
|
179 | end |
|
174 | ustat << [(max_points.to_f*100/p.full_score).round, (max_points>=p.full_score)] |
|
180 | ustat << [(max_points.to_f*100/p.full_score).round, (max_points>=p.full_score)] |
|
175 | end |
|
181 | end |
|
176 | @scorearray << ustat |
|
182 | @scorearray << ustat |
|
177 | end |
|
183 | end |
|
178 |
|
184 | ||
|
179 | if params[:commit] == 'download csv' then |
|
185 | if params[:commit] == 'download csv' then |
|
180 | csv = gen_csv_from_scorearray(@scorearray,@problems) |
|
186 | csv = gen_csv_from_scorearray(@scorearray,@problems) |
|
181 | send_data csv, filename: 'max_score.csv' |
|
187 | send_data csv, filename: 'max_score.csv' |
|
182 | else |
|
188 | else |
|
183 | render template: 'user_admin/user_stat' |
|
189 | render template: 'user_admin/user_stat' |
|
184 | end |
|
190 | end |
|
185 | end |
|
191 | end |
|
186 |
|
192 | ||
|
187 | def import |
|
193 | def import |
|
188 | if params[:file]=='' |
|
194 | if params[:file]=='' |
|
189 | flash[:notice] = 'Error importing no file' |
|
195 | flash[:notice] = 'Error importing no file' |
|
190 | redirect_to :action => 'list' and return |
|
196 | redirect_to :action => 'list' and return |
|
191 | end |
|
197 | end |
|
192 | import_from_file(params[:file]) |
|
198 | import_from_file(params[:file]) |
|
193 | end |
|
199 | end |
|
194 |
|
200 | ||
|
195 | def random_all_passwords |
|
201 | def random_all_passwords |
|
196 | users = User.find(:all) |
|
202 | users = User.find(:all) |
|
197 | @prefix = params[:prefix] || '' |
|
203 | @prefix = params[:prefix] || '' |
|
198 | @non_admin_users = User.find_non_admin_with_prefix(@prefix) |
|
204 | @non_admin_users = User.find_non_admin_with_prefix(@prefix) |
|
199 | @changed = false |
|
205 | @changed = false |
|
200 | if request.request_method == 'POST' |
|
206 | if request.request_method == 'POST' |
@@ -1,64 +1,64 | |||||
|
1 | # Methods added to this helper will be available to all templates in the application. |
|
1 | # Methods added to this helper will be available to all templates in the application. |
|
2 | module ApplicationHelper |
|
2 | module ApplicationHelper |
|
3 |
|
3 | ||
|
4 | def user_header |
|
4 | def user_header |
|
5 | menu_items = '' |
|
5 | menu_items = '' |
|
6 | user = User.find(session[:user_id]) |
|
6 | user = User.find(session[:user_id]) |
|
7 |
|
7 | ||
|
8 | if (user!=nil) and (session[:admin]) |
|
8 | if (user!=nil) and (session[:admin]) |
|
9 | # admin menu |
|
9 | # admin menu |
|
10 | menu_items << "<b>Administrative task:</b> " |
|
10 | menu_items << "<b>Administrative task:</b> " |
|
11 | append_to menu_items, '[Announcements]', 'announcements', 'index' |
|
11 | append_to menu_items, '[Announcements]', 'announcements', 'index' |
|
12 | append_to menu_items, '[Msg console]', 'messages', 'console' |
|
12 | append_to menu_items, '[Msg console]', 'messages', 'console' |
|
13 | append_to menu_items, '[Problems]', 'problems', 'index' |
|
13 | append_to menu_items, '[Problems]', 'problems', 'index' |
|
14 | append_to menu_items, '[Users]', 'user_admin', 'index' |
|
14 | append_to menu_items, '[Users]', 'user_admin', 'index' |
|
15 | append_to menu_items, '[Results]', 'user_admin', 'user_stat' |
|
15 | append_to menu_items, '[Results]', 'user_admin', 'user_stat' |
|
16 |
- append_to menu_items, '[Report]', 'report', 'login |
|
16 | + append_to menu_items, '[Report]', 'report', 'multiple_login' |
|
17 | append_to menu_items, '[Graders]', 'graders', 'list' |
|
17 | append_to menu_items, '[Graders]', 'graders', 'list' |
|
18 | append_to menu_items, '[Contests]', 'contest_management', 'index' |
|
18 | append_to menu_items, '[Contests]', 'contest_management', 'index' |
|
19 | append_to menu_items, '[Sites]', 'sites', 'index' |
|
19 | append_to menu_items, '[Sites]', 'sites', 'index' |
|
20 | append_to menu_items, '[System config]', 'configurations', 'index' |
|
20 | append_to menu_items, '[System config]', 'configurations', 'index' |
|
21 | menu_items << "<br/>" |
|
21 | menu_items << "<br/>" |
|
22 | end |
|
22 | end |
|
23 |
|
23 | ||
|
24 | # main page |
|
24 | # main page |
|
25 | append_to menu_items, "[#{I18n.t 'menu.main'}]", 'main', 'list' |
|
25 | append_to menu_items, "[#{I18n.t 'menu.main'}]", 'main', 'list' |
|
26 | append_to menu_items, "[#{I18n.t 'menu.messages'}]", 'messages', 'list' |
|
26 | append_to menu_items, "[#{I18n.t 'menu.messages'}]", 'messages', 'list' |
|
27 |
|
27 | ||
|
28 | if (user!=nil) and (GraderConfiguration.show_tasks_to?(user)) |
|
28 | if (user!=nil) and (GraderConfiguration.show_tasks_to?(user)) |
|
29 | append_to menu_items, "[#{I18n.t 'menu.tasks'}]", 'tasks', 'list' |
|
29 | append_to menu_items, "[#{I18n.t 'menu.tasks'}]", 'tasks', 'list' |
|
30 | append_to menu_items, "[#{I18n.t 'menu.submissions'}]", 'main', 'submission' |
|
30 | append_to menu_items, "[#{I18n.t 'menu.submissions'}]", 'main', 'submission' |
|
31 | append_to menu_items, "[#{I18n.t 'menu.test'}]", 'test', 'index' |
|
31 | append_to menu_items, "[#{I18n.t 'menu.test'}]", 'test', 'index' |
|
32 | end |
|
32 | end |
|
33 |
|
33 | ||
|
34 | if GraderConfiguration['right.user_hall_of_fame'] |
|
34 | if GraderConfiguration['right.user_hall_of_fame'] |
|
35 | append_to menu_items, "[#{I18n.t 'menu.hall_of_fame'}]", 'report', 'problem_hof' |
|
35 | append_to menu_items, "[#{I18n.t 'menu.hall_of_fame'}]", 'report', 'problem_hof' |
|
36 | end |
|
36 | end |
|
37 | append_to menu_items, "[#{I18n.t 'menu.help'}]", 'main', 'help' |
|
37 | append_to menu_items, "[#{I18n.t 'menu.help'}]", 'main', 'help' |
|
38 |
|
38 | ||
|
39 | if GraderConfiguration['system.user_setting_enabled'] |
|
39 | if GraderConfiguration['system.user_setting_enabled'] |
|
40 | append_to menu_items, "[#{I18n.t 'menu.settings'}]", 'users', 'index' |
|
40 | append_to menu_items, "[#{I18n.t 'menu.settings'}]", 'users', 'index' |
|
41 | end |
|
41 | end |
|
42 | append_to menu_items, "[#{I18n.t 'menu.log_out'}]", 'main', 'login' |
|
42 | append_to menu_items, "[#{I18n.t 'menu.log_out'}]", 'main', 'login' |
|
43 |
|
43 | ||
|
44 | menu_items.html_safe |
|
44 | menu_items.html_safe |
|
45 | end |
|
45 | end |
|
46 |
|
46 | ||
|
47 | def append_to(option,label, controller, action) |
|
47 | def append_to(option,label, controller, action) |
|
48 | option << ' ' if option!='' |
|
48 | option << ' ' if option!='' |
|
49 | option << link_to_unless_current(label, |
|
49 | option << link_to_unless_current(label, |
|
50 | :controller => controller, |
|
50 | :controller => controller, |
|
51 | :action => action) |
|
51 | :action => action) |
|
52 | end |
|
52 | end |
|
53 |
|
53 | ||
|
54 | def format_short_time(time) |
|
54 | def format_short_time(time) |
|
55 | now = Time.now.gmtime |
|
55 | now = Time.now.gmtime |
|
56 | st = '' |
|
56 | st = '' |
|
57 | if (time.yday != now.yday) or |
|
57 | if (time.yday != now.yday) or |
|
58 | (time.year != now.year) |
|
58 | (time.year != now.year) |
|
59 | st = time.strftime("%x ") |
|
59 | st = time.strftime("%x ") |
|
60 | end |
|
60 | end |
|
61 | st + time.strftime("%X") |
|
61 | st + time.strftime("%X") |
|
62 | end |
|
62 | end |
|
63 |
|
63 | ||
|
64 | def format_short_duration(duration) |
|
64 | def format_short_duration(duration) |
@@ -1,51 +1,53 | |||||
|
1 | :css |
|
1 | :css |
|
2 | .fix-width { |
|
2 | .fix-width { |
|
3 | font-family: "Consolas, Monaco, Droid Sans Mono,Mono, Monospace,Courier" |
|
3 | font-family: "Consolas, Monaco, Droid Sans Mono,Mono, Monospace,Courier" |
|
4 | } |
|
4 | } |
|
5 |
|
5 | ||
|
6 | %h1 Problem stat: #{@problem.name} |
|
6 | %h1 Problem stat: #{@problem.name} |
|
7 | %h2 Overview |
|
7 | %h2 Overview |
|
8 |
|
8 | ||
|
9 |
|
9 | ||
|
10 | %table.info |
|
10 | %table.info |
|
11 | %thead |
|
11 | %thead |
|
12 | %tr.info-head |
|
12 | %tr.info-head |
|
13 | %th Stat |
|
13 | %th Stat |
|
14 | %th Value |
|
14 | %th Value |
|
15 | %tbody |
|
15 | %tbody |
|
16 | %tr{class: cycle('info-even','info-odd')} |
|
16 | %tr{class: cycle('info-even','info-odd')} |
|
17 | %td Submissions |
|
17 | %td Submissions |
|
18 | %td= @submissions.count |
|
18 | %td= @submissions.count |
|
19 | %tr{class: cycle('info-even','info-odd')} |
|
19 | %tr{class: cycle('info-even','info-odd')} |
|
20 | %td Solved/Attempted User |
|
20 | %td Solved/Attempted User |
|
21 | %td #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%) |
|
21 | %td #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%) |
|
22 |
|
22 | ||
|
23 | %h2 Submissions Count |
|
23 | %h2 Submissions Count |
|
24 | = render partial: 'application/bar_graph', locals: { histogram: @histogram } |
|
24 | = render partial: 'application/bar_graph', locals: { histogram: @histogram } |
|
25 |
|
25 | ||
|
26 | %h2 Submissions |
|
26 | %h2 Submissions |
|
27 | - if @submissions and @submissions.count > 0 |
|
27 | - if @submissions and @submissions.count > 0 |
|
28 | %table.info#main_table |
|
28 | %table.info#main_table |
|
29 | %thead |
|
29 | %thead |
|
30 | %tr.info-head |
|
30 | %tr.info-head |
|
31 | %th ID |
|
31 | %th ID |
|
32 | %th Login |
|
32 | %th Login |
|
33 | %th Name |
|
33 | %th Name |
|
34 | %th Submitted_at |
|
34 | %th Submitted_at |
|
35 | %th Points |
|
35 | %th Points |
|
36 | %th comment |
|
36 | %th comment |
|
|
37 | + %th IP | ||
|
37 | %tbody |
|
38 | %tbody |
|
38 | - row_odd,curr = true,'' |
|
39 | - row_odd,curr = true,'' |
|
39 | - @submissions.each do |sub| |
|
40 | - @submissions.each do |sub| |
|
40 | - next unless sub.user |
|
41 | - next unless sub.user |
|
41 | - row_odd,curr = !row_odd, sub.user if curr != sub.user |
|
42 | - row_odd,curr = !row_odd, sub.user if curr != sub.user |
|
42 | %tr{class: row_odd ? "info-odd" : "info-even"} |
|
43 | %tr{class: row_odd ? "info-odd" : "info-even"} |
|
43 | %td= link_to sub.id, controller: 'graders', action: 'submission', id: sub.id |
|
44 | %td= link_to sub.id, controller: 'graders', action: 'submission', id: sub.id |
|
44 | %td= link_to sub.user.login, controller: :users, action: :profile, id: sub.user.id |
|
45 | %td= link_to sub.user.login, controller: :users, action: :profile, id: sub.user.id |
|
45 | %td= sub.user.full_name |
|
46 | %td= sub.user.full_name |
|
46 | %td= time_ago_in_words(sub.submitted_at) + " ago" |
|
47 | %td= time_ago_in_words(sub.submitted_at) + " ago" |
|
47 | %td= sub.points |
|
48 | %td= sub.points |
|
48 | %td.fix-width= sub.grader_comment |
|
49 | %td.fix-width= sub.grader_comment |
|
|
50 | + %td= sub.ip_address | ||
|
49 | - else |
|
51 | - else |
|
50 | No submission |
|
52 | No submission |
|
51 |
|
53 |
@@ -1,7 +1,8 | |||||
|
1 |
|
1 | ||
|
2 | .task-menu |
|
2 | .task-menu |
|
3 | Reports |
|
3 | Reports |
|
4 | %br/ |
|
4 | %br/ |
|
5 | = link_to '[Hall of Fame]', :action => 'problem_hof' |
|
5 | = link_to '[Hall of Fame]', :action => 'problem_hof' |
|
6 | = link_to '[Struggle]', :action => 'stuck' |
|
6 | = link_to '[Struggle]', :action => 'stuck' |
|
7 | = link_to '[Login]', :action => 'login_stat' |
|
7 | = link_to '[Login]', :action => 'login_stat' |
|
|
8 | + = link_to '[Multiple Login]', :action => 'multiple_login' |
You need to be logged in to leave comments.
Login now