cafe-grader-web

Commit r501:c902838c1d85 public

parent | child
Description:
grafted from 2b2663ff0e59
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r501:c902838c1d85 - - 4 files changed: 48 inserted, 6 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -217,14 +217,37
217 217
218 218
219 219 def multiple_login
220 + #user with multiple IP
220 221 raw = Submission.joins(:user).joins(:problem).where("problems.available != 0").group("login,ip_address").order(:login)
221 222 last,count = 0,0
222 - @multiple = []
223 + first = 0
224 + @users = []
223 225 raw.each do |r|
224 226 if last != r.user.login
225 227 count = 1
228 + last = r.user.login
229 + first = r
226 230 else
227 - @multiple << r
231 + @users << first if count == 1
232 + @users << r
233 + count += 1
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
228 251 end
229 252 end
230 253 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -13,7 +13,7
13 13 append_to menu_items, '[Problems]', 'problems', 'index'
14 14 append_to menu_items, '[Users]', 'user_admin', 'index'
15 15 append_to menu_items, '[Results]', 'user_admin', 'user_stat'
16 - append_to menu_items, '[Report]', 'report', 'login_stat'
16 + append_to menu_items, '[Report]', 'report', 'multiple_login'
17 17 append_to menu_items, '[Graders]', 'graders', 'list'
18 18 append_to menu_items, '[Contests]', 'contest_management', 'index'
19 19 append_to menu_items, '[Sites]', 'sites', 'index'
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -34,6 +34,7
34 34 %th Submitted_at
35 35 %th Points
36 36 %th comment
37 + %th IP
37 38 %tbody
38 39 - row_odd,curr = true,''
39 40 - @submissions.each do |sub|
@@ -46,6 +47,7
46 47 %td= time_ago_in_words(sub.submitted_at) + " ago"
47 48 %td= sub.points
48 49 %td.fix-width= sub.grader_comment
50 + %td= sub.ip_address
49 51 - else
50 52 No submission
51 53
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -6,6 +6,9
6 6
7 7 =render partial: 'report_menu'
8 8
9 + Checking for all submissions with the currently available problem
10 +
11 + %h2 Users with Multiple IP
9 12 %table.tablesorter-cafe#my_table
10 13 %thead
11 14 %tr
@@ -13,8 +16,22
13 16 %th full name
14 17 %th IP
15 18 %tbody
16 - - @multiple.each do |l|
19 + - @users.each do |l|
17 20 %tr{class: cycle('info-even','info-odd')}
18 - %td= link_to l[:login], controller: 'users', action: 'profile', id: l[:id]
19 - %td= l[:full_name]
21 + %td= link_to l.user.login, controller: 'users', action: 'profile', id: l[:id]
22 + %td= l.user.full_name
20 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
You need to be logged in to leave comments. Login now