cafe-grader-web

Commit r442:ce576ec8e8c3 public

parent | child
Description:
report ip
Commit status:
[Not Reviewed]
References:
algo
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

r442:ce576ec8e8c3 - - 2 files changed: 10 inserted, 2 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -35,13 +35,17
35 35 .count(:id),
36 36 min: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?",
37 37 user.id,@since_time,@until_time)
38 38 .minimum(:created_at),
39 39 max: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?",
40 40 user.id,@since_time,@until_time)
41 - .maximum(:created_at)
41 + .maximum(:created_at),
42 + ip: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?",
43 + user.id,@since_time,@until_time)
44 + .select(:ip_address).uniq
45 +
42 46 }
43 47 end
44 48 end
45 49
46 50 def submission_stat
47 51
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -19,14 +19,18
19 19 %tr
20 20 %th login
21 21 %th full name
22 22 %th login count
23 23 %th earliest
24 24 %th latest
25 + %th IP
25 26 %tbody
26 27 - @logins.each do |l|
27 28 %tr{class: cycle('info-even','info-odd')}
28 29 %td= link_to l[:login], controller: 'users', action: 'profile', id: l[:id]
29 30 %td= l[:full_name]
30 31 %td= l[:count]
31 32 %td= l[:min] ? l[:min].in_time_zone.strftime('%Y-%m-%d %H:%M') : ''
32 - %td= l[:max] ? "#{l[:max].in_time_zone.strftime('%Y-%m-%d %H:%M')} (#{time_ago_in_words(l[:max].in_time_zone)} ago)" : ''
33 + %td= l[:max] ? "#{l[:max].in_time_zone.strftime('%Y-%m-%d %H:%M.%S')} (#{time_ago_in_words(l[:max].in_time_zone)} ago)" : ''
34 + %td
35 + - l[:ip].each do |ip|
36 + #{ip.ip_address} <br/>
You need to be logged in to leave comments. Login now