cafe-grader-web Commit - r694:b93b6e49e3b0

cafe-grader-web

Commit `r694:b93b6e49e3b0` public

parent | child

Description:

use datatable

Commit status:

[Not Reviewed]

References:

java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r694:b93b6e49e3b0 - Thu, 02 Nov 2017 11:31:49 - 3 files changed: 15 inserted, 7 deleted

app/views/problems/stat.html.haml ¶ +8 -4

                 }
               %h1 Problem stat: #{@problem.name}
               %h2 Overview
               %table.info
                 %thead
                   %tr.info-head
                     %th Stat
                     %th Value
                 %tbody
                   %tr{class: cycle('info-even','info-odd')}
                     %td Submissions
                     %td= @submissions.count
                   %tr{class: cycle('info-even','info-odd')}
                     %td Solved/Attempted User
                     %td #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
               %h2 Submissions Count
               = render partial: 'application/bar_graph', locals: { histogram: @histogram }
               %h2 Submissions
               - if @submissions and @submissions.count > 0
-            -   %table.info#main_table
+            +   %table#main_table.table.table-condensed.table-striped
                   %thead
-            -       %tr.info-head
+            +       %tr
                       %th ID
                       %th Login
                       %th Name
                       %th Submitted_at
                       %th Points
                       %th comment
                       %th IP
                   %tbody
                     - row_odd,curr = true,''
                     - @submissions.each do |sub|
                       - next unless sub.user
                       - row_odd,curr = !row_odd, sub.user if curr != sub.user
-            -         %tr{class: row_odd ? "info-odd" : "info-even"}
+            +         %tr
                         %td= link_to sub.id, submission_path(sub)
                         %td= link_to sub.user.login, stat_user_path(sub.user)
                         %td= sub.user.full_name
-            -           %td= time_ago_in_words(sub.submitted_at) + " ago"
+            +           %td{data: {order: sub.submitted_at}}= time_ago_in_words(sub.submitted_at) + " ago"
                         %td= sub.points
                         %td.fix-width= sub.grader_comment
                         %td= sub.ip_address
               - else
                 No submission
+            + :javascript
+            +   $("#main_table").DataTable({
+            +     paging: false
+            +   });

app/views/user_admin/index.html.haml ¶ +2 -2

-            - %h1 Listing users
+            + %h1 Users
               .panel.panel-primary
                 .panel-title.panel-heading
                   Quick Add
                 .panel-body
                   = form_tag( {method: 'post'}, {class: 'form-inline'})  do
                     .form-group
                       = label_tag 'user_login', 'Login'
                       = text_field 'user', 'login', :size => 10,class: 'form-control'
                     .form-group
                       = label_tag 'user_full_name', 'Full Name'
                       = text_field 'user', 'full_name', :size => 10,class: 'form-control'
                     .form-group
                       = label_tag 'user_password', 'Password'
                       = text_field 'user', 'password', :size => 10,class: 'form-control'
                     .form-group
                       = label_tag 'user_password_confirmation', 'Confirm'
                       = text_field 'user', 'password_confirmation', :size => 10,class: 'form-control'
                     .form-group
                       = label_tag 'user_email', 'email'
                       = text_field 'user', 'email', :size => 10,class: 'form-control'
                     =submit_tag "Create", class: 'btn btn-primary'
               .panel.panel-primary
                 .panel-title.panel-heading
                   Import from site management
                 .panel-body
                   = form_tag({:action => 'import'}, :multipart => true,class: 'form form-inline') do
                     .form-group
                       = label_tag :file, 'File:'
                       .input-group
                         %span.input-group-btn
                           %span.btn.btn-default.btn-file
                             Browse
                             = file_field_tag 'file'
                         = text_field_tag '' , nil, {readonly: true, class: 'form-control'}
                     = submit_tag 'Submit', class: 'btn btn-default'
               %p
                 = link_to '+ New user', { :action => 'new' }, { class: 'btn btn-success '}
                 = link_to '+ New list of users', { :action => 'new_list' }, { class: 'btn btn-success '}
+            +   = link_to 'Bulk Manage', bulk_manage_user_admin_path , { class: 'btn btn-default btn-info'}
                 = link_to 'View administrators',{ :action => 'admin'}, { class: 'btn btn-default '}
-            -   = link_to 'Bulk Manage', bulk_manage_user_admin_path , { class: 'btn btn-default '}
                 = link_to 'Random passwords',{ :action => 'random_all_passwords'}, { class: 'btn btn-default '}
                 = link_to 'View active users',{ :action => 'active'}, { class: 'btn btn-default '}
                 = link_to 'Mass mailing',{ :action => 'mass_mailing'}, { class: 'btn btn-default '}
               - if GraderConfiguration.multicontests?
                 %br/
                 %b Multi-contest:
                 = link_to '[Manage bulk users in contests]', :action => 'contest_management'
                 View users in:
                 - @contests.each do |contest|
                   = link_to "[#{contest.name}]", :action => 'contests', :id => contest.id
                 = link_to "[no contest]", :action => 'contests', :id => 'none'
               -# Total #{@user_count} users |
               -# - if !@paginated
               -#   Display all users.
               -#   \#{link_to '[show in pages]', :action => 'index', :page => '1'}
               -# - else
               -#   Display in pages.
               -#   \#{link_to '[display all]', :action => 'index', :page => 'all'} |
               -#   \#{will_paginate @users, :container => false}
               %table.table.table-hover.table-condense.datatable

app/views/users/stat.html.haml ¶ +5 -1

               <b>Login:</b> #{@user.login} <br/>
               <b>Full name:</b> #{@user.full_name} <br />
               %h2 Problem Stat
               %table.info
                 %thead
                   %tr.info-head
                     %th Stat
                     %th Value
                 %tbody
                   %tr{class: cycle('info-even','info-odd')}
                     %td.info_param Submissions
                     %td= @summary[:count]
                   %tr{class: cycle('info-even','info-odd')}
                     %td.info_param Solved/Attempted Problem
                     %td #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
               %h2 Submission History
               =render partial: 'application/bar_graph', locals: {histogram: @histogram, param: {bar_width: 7}}
-            - %table.tablesorter-cafe#submission_table
+            + %table#submission_table.table.table-striped
                 %thead
                   %tr
                     %th ID
                     %th Problem code
                     %th Problem full name
                     %th Language
                     %th Submitted at
                     %th Result
                     %th Score
                     - if session[:admin]
                       %th IP
                 %tbody
                   - @submission.each do |s|
                     - next unless s.problem
                     %tr
                       %td= link_to s.id, submission_path(s)
                       %td= link_to s.problem.name, stat_problem_path(s.problem)
                       %td= s.problem.full_name
                       %td= s.language.pretty_name
                       %td  #{s.submitted_at.strftime('%Y-%m-%d %H:%M')} (#{time_ago_in_words(s.submitted_at)} ago)
                       %td.fix-width= s.grader_comment
                       %td= ( s.try(:points) ? (s.points*100/s.problem.full_score)  : '' )
                       - if session[:admin]
                         %td= s.ip_address
+            + :javascript
+            +   $("#submission_table").DataTable({
+            +     paging: false
+            +   });

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r694:b93b6e49e3b0 - Thu, 02 Nov 2017 11:31:49 - 3 files changed: 15 inserted, 7 deleted

Sign in to your account

Commit r694:b93b6e49e3b0 public

Author

r694:b93b6e49e3b0 - Thu, 02 Nov 2017 11:31:49 - 3 files changed: 15 inserted, 7 deleted

Commit `r694:b93b6e49e3b0` public