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 | Show 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 | Show whitespace Increase context Show commentsHide comments
@@ -17,49 +17,53
17 17 date_and_time = '%Y-%m-%d %H:%M'
18 18 begin
19 19 @since_time = DateTime.strptime(params[:since_datetime],date_and_time)
20 20 rescue
21 21 @since_time = DateTime.new(1000,1,1)
22 22 end
23 23 begin
24 24 @until_time = DateTime.strptime(params[:until_datetime],date_and_time)
25 25 rescue
26 26 @until_time = DateTime.new(3000,1,1)
27 27 end
28 28
29 29 User.all.each do |user|
30 30 @logins << { id: user.id,
31 31 login: user.login,
32 32 full_name: user.full_name,
33 33 count: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?",
34 34 user.id,@since_time,@until_time)
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
48 52 date_and_time = '%Y-%m-%d %H:%M'
49 53 begin
50 54 @since_time = DateTime.strptime(params[:since_datetime],date_and_time)
51 55 rescue
52 56 @since_time = DateTime.new(1000,1,1)
53 57 end
54 58 begin
55 59 @until_time = DateTime.strptime(params[:until_datetime],date_and_time)
56 60 rescue
57 61 @until_time = DateTime.new(3000,1,1)
58 62 end
59 63
60 64 @submissions = {}
61 65
62 66 User.find_each do |user|
63 67 @submissions[user.id] = { login: user.login, full_name: user.full_name, count: 0, sub: { } }
64 68 end
65 69
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,32 +1,36
1 1 - content_for :header do
2 2 = stylesheet_link_tag 'tablesorter-theme.cafe'
3 3 = javascript_include_tag 'new'
4 4
5 5 %script{:type=>"text/javascript"}
6 6 $(function () {
7 7 $('#since_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
8 8 $('#until_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
9 9 $('#my_table').tablesorter({widthFixed: true, widgets: ['zebra']});
10 10 });
11 11
12 12 %h1 Login status
13 13
14 14 =render partial: 'report_menu'
15 15 =render partial: 'date_range', locals: {param_text: 'Login date range:', title: 'Query login stat in the range' }
16 16
17 17 %table.tablesorter-cafe#my_table
18 18 %thead
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