Description:
use datatable
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r694:b93b6e49e3b0 - - 3 files changed: 15 inserted, 7 deleted
| @@ -1,53 +1,57 | |||
|
|
1 | 1 | :css |
|
|
2 | 2 | .fix-width { |
|
|
3 | 3 | font-family: "Consolas, Monaco, Droid Sans Mono,Mono, Monospace,Courier" |
|
|
4 | 4 | } |
|
|
5 | 5 | |
|
|
6 | 6 | %h1 Problem stat: #{@problem.name} |
|
|
7 | 7 | %h2 Overview |
|
|
8 | 8 | |
|
|
9 | 9 | |
|
|
10 | 10 | %table.info |
|
|
11 | 11 | %thead |
|
|
12 | 12 | %tr.info-head |
|
|
13 | 13 | %th Stat |
|
|
14 | 14 | %th Value |
|
|
15 | 15 | %tbody |
|
|
16 | 16 | %tr{class: cycle('info-even','info-odd')} |
|
|
17 | 17 | %td Submissions |
|
|
18 | 18 | %td= @submissions.count |
|
|
19 | 19 | %tr{class: cycle('info-even','info-odd')} |
|
|
20 | 20 | %td Solved/Attempted User |
|
|
21 | 21 | %td #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%) |
|
|
22 | 22 | |
|
|
23 | 23 | %h2 Submissions Count |
|
|
24 | 24 | = render partial: 'application/bar_graph', locals: { histogram: @histogram } |
|
|
25 | 25 | |
|
|
26 | 26 | %h2 Submissions |
|
|
27 | 27 | - if @submissions and @submissions.count > 0 |
|
|
28 | - %table.info#main_table | |
|
|
28 | + %table#main_table.table.table-condensed.table-striped | |
|
|
29 | 29 | %thead |
|
|
30 |
- %tr |
|
|
|
30 | + %tr | |
|
|
31 | 31 | %th ID |
|
|
32 | 32 | %th Login |
|
|
33 | 33 | %th Name |
|
|
34 | 34 | %th Submitted_at |
|
|
35 | 35 | %th Points |
|
|
36 | 36 | %th comment |
|
|
37 | 37 | %th IP |
|
|
38 | 38 | %tbody |
|
|
39 | 39 | - row_odd,curr = true,'' |
|
|
40 | 40 | - @submissions.each do |sub| |
|
|
41 | 41 | - next unless sub.user |
|
|
42 | 42 | - row_odd,curr = !row_odd, sub.user if curr != sub.user |
|
|
43 | - %tr{class: row_odd ? "info-odd" : "info-even"} | |
|
|
43 | + %tr | |
|
|
44 | 44 | %td= link_to sub.id, submission_path(sub) |
|
|
45 | 45 | %td= link_to sub.user.login, stat_user_path(sub.user) |
|
|
46 | 46 | %td= sub.user.full_name |
|
|
47 |
- %td |
|
|
|
47 | + %td{data: {order: sub.submitted_at}}= time_ago_in_words(sub.submitted_at) + " ago" | |
|
|
48 | 48 | %td= sub.points |
|
|
49 | 49 | %td.fix-width= sub.grader_comment |
|
|
50 | 50 | %td= sub.ip_address |
|
|
51 | 51 | - else |
|
|
52 | 52 | No submission |
|
|
53 | 53 | |
|
|
54 | + :javascript | |
|
|
55 | + $("#main_table").DataTable({ | |
|
|
56 | + paging: false | |
|
|
57 | + }); | |
| @@ -1,93 +1,93 | |||
|
|
1 |
- %h1 |
|
|
|
1 | + %h1 Users | |
|
|
2 | 2 | |
|
|
3 | 3 | .panel.panel-primary |
|
|
4 | 4 | .panel-title.panel-heading |
|
|
5 | 5 | Quick Add |
|
|
6 | 6 | .panel-body |
|
|
7 | 7 | = form_tag( {method: 'post'}, {class: 'form-inline'}) do |
|
|
8 | 8 | .form-group |
|
|
9 | 9 | = label_tag 'user_login', 'Login' |
|
|
10 | 10 | = text_field 'user', 'login', :size => 10,class: 'form-control' |
|
|
11 | 11 | .form-group |
|
|
12 | 12 | = label_tag 'user_full_name', 'Full Name' |
|
|
13 | 13 | = text_field 'user', 'full_name', :size => 10,class: 'form-control' |
|
|
14 | 14 | .form-group |
|
|
15 | 15 | = label_tag 'user_password', 'Password' |
|
|
16 | 16 | = text_field 'user', 'password', :size => 10,class: 'form-control' |
|
|
17 | 17 | .form-group |
|
|
18 | 18 | = label_tag 'user_password_confirmation', 'Confirm' |
|
|
19 | 19 | = text_field 'user', 'password_confirmation', :size => 10,class: 'form-control' |
|
|
20 | 20 | .form-group |
|
|
21 | 21 | = label_tag 'user_email', 'email' |
|
|
22 | 22 | = text_field 'user', 'email', :size => 10,class: 'form-control' |
|
|
23 | 23 | =submit_tag "Create", class: 'btn btn-primary' |
|
|
24 | 24 | |
|
|
25 | 25 | .panel.panel-primary |
|
|
26 | 26 | .panel-title.panel-heading |
|
|
27 | 27 | Import from site management |
|
|
28 | 28 | .panel-body |
|
|
29 | 29 | = form_tag({:action => 'import'}, :multipart => true,class: 'form form-inline') do |
|
|
30 | 30 | .form-group |
|
|
31 | 31 | = label_tag :file, 'File:' |
|
|
32 | 32 | .input-group |
|
|
33 | 33 | %span.input-group-btn |
|
|
34 | 34 | %span.btn.btn-default.btn-file |
|
|
35 | 35 | Browse |
|
|
36 | 36 | = file_field_tag 'file' |
|
|
37 | 37 | = text_field_tag '' , nil, {readonly: true, class: 'form-control'} |
|
|
38 | 38 | = submit_tag 'Submit', class: 'btn btn-default' |
|
|
39 | 39 | |
|
|
40 | 40 | |
|
|
41 | 41 | %p |
|
|
42 | 42 | = link_to '+ New user', { :action => 'new' }, { class: 'btn btn-success '} |
|
|
43 | 43 | = link_to '+ New list of users', { :action => 'new_list' }, { class: 'btn btn-success '} |
|
|
44 | + = link_to 'Bulk Manage', bulk_manage_user_admin_path , { class: 'btn btn-default btn-info'} | |
|
|
44 | 45 | = link_to 'View administrators',{ :action => 'admin'}, { class: 'btn btn-default '} |
|
|
45 | - = link_to 'Bulk Manage', bulk_manage_user_admin_path , { class: 'btn btn-default '} | |
|
|
46 | 46 | = link_to 'Random passwords',{ :action => 'random_all_passwords'}, { class: 'btn btn-default '} |
|
|
47 | 47 | = link_to 'View active users',{ :action => 'active'}, { class: 'btn btn-default '} |
|
|
48 | 48 | = link_to 'Mass mailing',{ :action => 'mass_mailing'}, { class: 'btn btn-default '} |
|
|
49 | 49 | |
|
|
50 | 50 | - if GraderConfiguration.multicontests? |
|
|
51 | 51 | %br/ |
|
|
52 | 52 | %b Multi-contest: |
|
|
53 | 53 | = link_to '[Manage bulk users in contests]', :action => 'contest_management' |
|
|
54 | 54 | View users in: |
|
|
55 | 55 | - @contests.each do |contest| |
|
|
56 | 56 | = link_to "[#{contest.name}]", :action => 'contests', :id => contest.id |
|
|
57 | 57 | = link_to "[no contest]", :action => 'contests', :id => 'none' |
|
|
58 | 58 | |
|
|
59 | 59 | -# Total #{@user_count} users | |
|
|
60 | 60 | -# - if !@paginated |
|
|
61 | 61 | -# Display all users. |
|
|
62 | 62 | -# \#{link_to '[show in pages]', :action => 'index', :page => '1'} |
|
|
63 | 63 | -# - else |
|
|
64 | 64 | -# Display in pages. |
|
|
65 | 65 | -# \#{link_to '[display all]', :action => 'index', :page => 'all'} | |
|
|
66 | 66 | -# \#{will_paginate @users, :container => false} |
|
|
67 | 67 | |
|
|
68 | 68 | |
|
|
69 | 69 | %table.table.table-hover.table-condense.datatable |
|
|
70 | 70 | %thead |
|
|
71 | 71 | %th Login |
|
|
72 | 72 | %th Full name |
|
|
73 | 73 | %th email |
|
|
74 | 74 | %th Remark |
|
|
75 | 75 | %th |
|
|
76 | 76 | Activated |
|
|
77 | 77 | %sup{class: 'text-primary',data: {toggle: 'tooltip', placement: 'top'}, title: 'User has already confirmed the email?' } [?] |
|
|
78 | 78 | %th |
|
|
79 | 79 | Enabled |
|
|
80 | 80 | %sup{class: 'text-primary',data: {toggle: 'tooltip', placement: 'top'}, title: 'Allow the user to login?' } [?] |
|
|
81 | 81 | %th Last IP |
|
|
82 | 82 | %th |
|
|
83 | 83 | %th |
|
|
84 | 84 | %th |
|
|
85 | 85 | %th |
|
|
86 | 86 | - for user in @users |
|
|
87 | 87 | %tr |
|
|
88 | 88 | %td= link_to user.login, stat_user_path(user) |
|
|
89 | 89 | %td= user.full_name |
|
|
90 | 90 | %td= user.email |
|
|
91 | 91 | %td= user.remark |
|
|
92 | 92 | %td= toggle_button(user.activated?, toggle_activate_user_path(user),"toggle_activate_user_#{user.id}") |
|
|
93 | 93 | %td= toggle_button(user.enabled?, toggle_enable_user_path(user),"toggle_enable_user_#{user.id}") |
| @@ -1,66 +1,70 | |||
|
|
1 | 1 | - content_for :header do |
|
|
2 | 2 | = javascript_include_tag 'local_jquery' |
|
|
3 | 3 | |
|
|
4 | 4 | :javascript |
|
|
5 | 5 | $(function () { |
|
|
6 | 6 | $('#submission_table').tablesorter({widgets: ['zebra']}); |
|
|
7 | 7 | }); |
|
|
8 | 8 | |
|
|
9 | 9 | :css |
|
|
10 | 10 | .fix-width { |
|
|
11 | 11 | font-family: Droid Sans Mono,Consolas, monospace, mono, Courier New, Courier; |
|
|
12 | 12 | } |
|
|
13 | 13 | |
|
|
14 | 14 | %h1= @user.full_name |
|
|
15 | 15 | |
|
|
16 | 16 | <b>Login:</b> #{@user.login} <br/> |
|
|
17 | 17 | <b>Full name:</b> #{@user.full_name} <br /> |
|
|
18 | 18 | |
|
|
19 | 19 | |
|
|
20 | 20 | %h2 Problem Stat |
|
|
21 | 21 | %table.info |
|
|
22 | 22 | %thead |
|
|
23 | 23 | %tr.info-head |
|
|
24 | 24 | %th Stat |
|
|
25 | 25 | %th Value |
|
|
26 | 26 | %tbody |
|
|
27 | 27 | %tr{class: cycle('info-even','info-odd')} |
|
|
28 | 28 | %td.info_param Submissions |
|
|
29 | 29 | %td= @summary[:count] |
|
|
30 | 30 | %tr{class: cycle('info-even','info-odd')} |
|
|
31 | 31 | %td.info_param Solved/Attempted Problem |
|
|
32 | 32 | %td #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%) |
|
|
33 | 33 | |
|
|
34 | 34 | %h2 Submission History |
|
|
35 | 35 | |
|
|
36 | 36 | =render partial: 'application/bar_graph', locals: {histogram: @histogram, param: {bar_width: 7}} |
|
|
37 | 37 | |
|
|
38 | 38 | |
|
|
39 | - %table.tablesorter-cafe#submission_table | |
|
|
39 | + %table#submission_table.table.table-striped | |
|
|
40 | 40 | %thead |
|
|
41 | 41 | %tr |
|
|
42 | 42 | %th ID |
|
|
43 | 43 | %th Problem code |
|
|
44 | 44 | %th Problem full name |
|
|
45 | 45 | %th Language |
|
|
46 | 46 | %th Submitted at |
|
|
47 | 47 | %th Result |
|
|
48 | 48 | %th Score |
|
|
49 | 49 | - if session[:admin] |
|
|
50 | 50 | %th IP |
|
|
51 | 51 | %tbody |
|
|
52 | 52 | - @submission.each do |s| |
|
|
53 | 53 | - next unless s.problem |
|
|
54 | 54 | %tr |
|
|
55 | 55 | %td= link_to s.id, submission_path(s) |
|
|
56 | 56 | %td= link_to s.problem.name, stat_problem_path(s.problem) |
|
|
57 | 57 | %td= s.problem.full_name |
|
|
58 | 58 | %td= s.language.pretty_name |
|
|
59 | 59 | %td #{s.submitted_at.strftime('%Y-%m-%d %H:%M')} (#{time_ago_in_words(s.submitted_at)} ago) |
|
|
60 | 60 | %td.fix-width= s.grader_comment |
|
|
61 | 61 | %td= ( s.try(:points) ? (s.points*100/s.problem.full_score) : '' ) |
|
|
62 | 62 | - if session[:admin] |
|
|
63 | 63 | %td= s.ip_address |
|
|
64 | 64 | |
|
|
65 | 65 | |
|
|
66 | 66 | |
|
|
67 | + :javascript | |
|
|
68 | + $("#submission_table").DataTable({ | |
|
|
69 | + paging: false | |
|
|
70 | + }); | |
You need to be logged in to leave comments.
Login now