cafe-grader-web Commit - r570:0b74eb4e28fa

cafe-grader-web

Commit `r570:0b74eb4e28fa` public

parent | child

Description:

- add problem toggle test js reponse (it was forgotten) - change score report to bootstrap-sortable

Commit status:

[Not Reviewed]

References:

bootstrap

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r570:0b74eb4e28fa - Mon, 11 Jul 2016 06:49:19 - 8 files changed: 77 inserted, 25 deleted

app/views/problems/toggle_test.js.haml created 644 ¶ +2

@@ -0,0 +1,2
	1	+ = render partial: 'toggle_button',
	2	+ locals: {button_id: "#problem-test-#{@problem.id}",button_on: @problem.test_allowed?}

Gemfile ¶ +5 -1

               # gem 'capistrano'
               # To use debugger
               # gem 'debugger'
               #
               #in-place editor
               gem 'best_in_place', '~> 3.0.1'
               # jquery addition
               gem 'jquery-rails'
               gem 'jquery-ui-sass-rails'
               gem 'jquery-timepicker-addon-rails'
               gem 'jquery-tablesorter'
               #syntax highlighter
               gem 'rouge'
               #add bootstrap
               gem 'bootstrap-sass', '~> 3.2.0'
               gem 'bootstrap-switch-rails'
               gem 'bootstrap-toggle-rails'
               gem 'autoprefixer-rails'
+            + #bootstrap sortable
+            + gem 'momentjs-rails'
+            + gem 'rails_bootstrap_sortable'
+            +
+            + #ace editor
               gem 'ace-rails-ap'
               gem 'haml'
               gem 'haml-rails'
               gem 'mail'
               gem 'rdiscount'
               gem 'test-unit'
               gem 'will_paginate', '~> 3.0.7'
               gem 'dynamic_form'
               gem 'in_place_editing'
               gem 'verification', :git => 'https://github.com/sikachu/verification.git'
               group :test, :development do
                 gem 'rspec-rails', '~> 2.99.0'
               end

Gemfile.lock ¶ +6

                     railties (>= 3.1, < 4.1)
                   hike (1.2.3)
                   i18n (0.7.0)
                   in_place_editing (1.2.0)
                   journey (1.0.4)
                   jquery-rails (3.1.2)
                     railties (>= 3.0, < 5.0)
                     thor (>= 0.14, < 2.0)
                   jquery-tablesorter (1.13.4)
                     railties (>= 3.1, < 5)
                   jquery-timepicker-addon-rails (1.4.1)
                     railties (>= 3.1)
                   jquery-ui-rails (4.0.3)
                     jquery-rails
                     railties (>= 3.1.0)
                   jquery-ui-sass-rails (4.0.3.0)
                     jquery-rails
                     jquery-ui-rails (= 4.0.3)
                     railties (>= 3.1.0)
                   json (1.8.2)
                   mail (2.5.4)
                     mime-types (~> 1.16)
                     treetop (~> 1.4.8)
                   mime-types (1.25.1)
+            +     momentjs-rails (2.11.1)
+            +       railties (>= 3.1)
                   multi_json (1.10.1)
                   mysql2 (0.3.20)
                   polyglot (0.3.5)
                   power_assert (0.2.2)
                   prototype-rails (3.2.1)
                     rails (~> 3.2)
                   rack (1.4.5)
                   rack-cache (1.2)
                     rack (>= 0.4)
                   rack-ssl (1.3.4)
                     rack
                   rack-test (0.6.3)
                     rack (>= 1.0)
                   rails (3.2.21)
                     actionmailer (= 3.2.21)
                     actionpack (= 3.2.21)
                     activerecord (= 3.2.21)
                     activeresource (= 3.2.21)
                     activesupport (= 3.2.21)
                     bundler (~> 1.0)
                     railties (= 3.2.21)
+            +     rails_bootstrap_sortable (2.0.0)
+            +       momentjs-rails (~> 2, >= 2.8.3)
                   railties (3.2.21)
                     actionpack (= 3.2.21)
                     activesupport (= 3.2.21)
                     rack-ssl (~> 1.3.2)
                     rake (>= 0.8.7)
                     rdoc (~> 3.4)
                     thor (>= 0.14.6, < 2.0)
                   rake (10.4.2)
                   rdiscount (2.1.8)
                   rdoc (3.12.2)
                     json (~> 1.4)
                   rouge (1.8.0)
                   rspec-collection_matchers (1.1.2)
                     rspec-expectations (>= 2.99.0.beta1)
                   rspec-core (2.99.2)
                   rspec-expectations (2.99.2)
                     diff-lcs (>= 1.1.3, < 2.0)
                   rspec-mocks (2.99.3)
                   rspec-rails (2.99.0)
                     actionpack (>= 3.0)
                     activemodel (>= 3.0)
                     activesupport (>= 3.0)
                     railties (>= 3.0)
                     rspec-collection_matchers
                     execjs (>= 0.3.0)
                     json (>= 1.8.0)
                   will_paginate (3.0.7)
               PLATFORMS
                 ruby
               DEPENDENCIES
                 ace-rails-ap
                 autoprefixer-rails
                 best_in_place (~> 3.0.1)
                 bootstrap-sass (~> 3.2.0)
                 bootstrap-switch-rails
                 bootstrap-toggle-rails
                 coffee-rails (~> 3.2.2)
                 dynamic_form
                 haml
                 haml-rails
                 in_place_editing
                 jquery-rails
                 jquery-tablesorter
                 jquery-timepicker-addon-rails
                 jquery-ui-sass-rails
                 mail
+            +   momentjs-rails
                 mysql2
                 prototype-rails
                 rails (= 3.2.21)
+            +   rails_bootstrap_sortable
                 rdiscount
                 rouge
                 rspec-rails (~> 2.99.0)
                 sass-rails (~> 3.2.6)
                 select2-rails
                 test-unit
                 uglifier
                 verification!
                 will_paginate (~> 3.0.7)

app/assets/javascripts/application.js ¶ +2 -2

               // This is a manifest file that'll be compiled into application.js, which will include all the files
               // listed below.
               //
               // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
               // or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
               //
               // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
               // the compiled file.
               //
               // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
               // GO AFTER THE REQUIRES BELOW.
               //
               //= require jquery
               //= require jquery_ujs
               //= require jquery.ui.all
               //= require bootstrap-sprockets
-            - //x= require bootstrap-switch
+            + //= require moment
-            - //= require bootstrap-toggle
+            + //= require bootstrap-sortable
               //= require select2
               //= require custom
               //= require ace-rails-ap
               //= require ace/mode-c_cpp
               //= require ace/mode-ruby
               //= require ace/mode-pascal
               //= require ace/mode-javascript
               //= require ace/mode-java
               //= require ace/theme-merbivore
               // since this is after blank line, it is not downloaded
               //x= require prototype
               //x= require prototype_ujs
               //x= require effects
               //x= require dragdrop
               //x= require controls

app/assets/javascripts/custom.js.coffee ¶ +1 -1

                 #$(".bootstrap-switch").bootstrapSwitch()
                 $(".bootstrap-toggle").bootstrapToggle()
                 $('.btn-file :file').on 'fileselect', (event, numFiles, label) ->
                   input = $(this).parents('.input-group').find(':text')
                   log = if numFiles > 1 then numFiles + ' files selected' else label
                   if input.length
                     input.val log
                   else
                     if log
                       alert log
                   return
                 $(".go-button").on 'click', (event) ->
                   link = $(this).attr("data-source")
                   url = $(link).val()
                   if url
                     window.location.href = url
                   return
                 $('.ajax-toggle').on 'click', (event) ->
                   target = $(event.target)
                   target.removeClass 'btn-default'
                   target.removeClass 'btn-success'
                   target.addClass 'btn-warning'
                   target.text '...'
                   return
+            +
                 #ace editor
                 e = ace.edit("editor")
                 e.setTheme('ace/theme/merbivore')
                 e.getSession().setTabSize(2)
                 e.getSession().setUseSoftTabs(true)
                 return

app/assets/stylesheets/application.css.sass ¶ +14 -1

                * file per style scope.
                *
                // bootstrap says that we should not do this, but @import each file instead
                #   *= require_tree .
                #   *= require_self
                */
               @import jquery.ui.all
               @import jquery.ui.core
               @import jquery.ui.core
               @import jquery.ui.theme
               @import jquery.ui.datepicker
               @import jquery.ui.slider
               @import jquery-ui-timepicker-addon
               @import jquery-tablesorter/theme.metro-dark
               @import tablesorter-theme.cafe
               //bootstrap
               @import bootstrap-sprockets
               @import bootstrap
               @import select2
               @import select2-bootstrap
               //@import bootstrap3-switch
               @import bootstrap-toggle
+            + @import bootstrap-sortable
               //bootstrap navbar color (from)
               $bgDefault      : #19197b
               $bgHighlight    : #06064b
               $colDefault     : #8e8eb4
               $colHighlight   : #ffffff
               $dropDown       : false
               .navbar-default
                 background-color: $bgDefault
                 border-color: $bgHighlight
                 .navbar-brand
                   color: $colDefault
                   &:hover, &:focus
                     color: $colHighlight
                 .navbar-text
                   color: $colDefault
                 .navbar-nav
                   > li
                     > a
                       color: $colDefault
                       &:hover, &:focus
                         color: $colHighlight
                     @if $dropDown
                       > .dropdown-menu
                     background-color: $bgHighlight
                   .icon-bar
                     background-color: $colDefault
                 .navbar-collapse,
                 .navbar-form
                   border-color: $colDefault
                 .navbar-link
                   color: $colDefault
                   &:hover
                     color: $colHighlight
               @media (max-width: 767px)
                 .navbar-default .navbar-nav .open .dropdown-menu
                   > li > a
                     color: $colDefault
                     &:hover, &:focus
                       color: $colHighlight
                   > .active
                     > a, > a:hover, > a:focus
                       color: $colHighlight
                       background-color: $bgHighlight
               .secondnavbar
                 top: 50px
+            +
+            + // --------------- bootstrap file upload ----------------------
               .btn-file
                 position: relative
                 overflow: hidden
               .btn-file input[type=file]
                 position: absolute
                 top: 0
                 right: 0
                 min-width: 100%
                 min-height: 100%
                 font-size: 100px
                 text-align: right
                 filter: alpha(opacity=0)
                 opacity: 0
                 outline: none
                 background: white
                 cursor: inherit
                 display: block
               body
                 background: white image-url("topbg.jpg") repeat-x top center
                 //font-size: 13px
                 //font-family: Tahoma, "sans-serif"
                 margin: 10px
                 padding: 10px
-            -   padding-top: 40px
+            +   padding-top: 60px
+            + // ------------------ bootstrap sortable --------------------
+            + table.sortable th
+            +   padding-right: 20px !important
+            +   span.sign
+            +     right: -15px !important
+            +   &.text-right
+            +     padding-left: 20px !important
+            +     padding-right: 8px !important
+            +     &:after, span.sign
+            +       left: -15px !important
               input
                 font-family: Tahoma, "sans-serif"
               h1
                 font-size: 24px
                 color: #334488
                 line-height: 2em
               h2
                 font-size: 18px
                 color: #5566bb
                 line-height: 1.5em
               hr
                 border-top: 1px solid #dddddd
                 border-bottom: 1px solid #eeeeee
               //#a
               //  color: #6666cc

app/controllers/report_controller.rb ¶ +31 -6

               class ReportController < ApplicationController
                 before_filter :admin_authorization, only: [:login_stat,:submission_stat, :stuck, :cheat_report, :cheat_scruntinize]
                 before_filter(only: [:problem_hof]) { |c|
                   return false unless authenticate
                   if GraderConfiguration["right.user_view_submission"]
                     return true;
                   end
                   admin_authorization
                 }
+            +   def score
+            +     if params[:commit] == 'download csv'
+            +       @problems = Problem.all
+            +     else
+            +       @problems = Problem.find_available_problems
+            +     end
+            +     @users = User.includes(:contests, :contest_stat).where(enabled: true) #find(:all, :include => [:contests, :contest_stat]).where(enabled: true)
+            +     @scorearray = Array.new
+            +     @users.each do |u|
+            +       ustat = Array.new
+            +       ustat[0] = u
+            +       @problems.each do |p|
+            +         sub = Submission.find_last_by_user_and_problem(u.id,p.id)
+            +         if (sub!=nil) and (sub.points!=nil) and p and p.full_score
+            +           ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
+            +         else
+            +           ustat << [0,false]
+            +         end
+            +       end
+            +       @scorearray << ustat
+            +     end
+            +     if params[:commit] == 'download csv' then
+            +       csv = gen_csv_from_scorearray(@scorearray,@problems)
+            +       send_data csv, filename: 'last_score.csv'
+            +     else
+            +       render template: 'user_admin/user_stat'
+            +     end
+            +
+            +   end
+            +
                 def login_stat
                   @logins = Array.new
                   date_and_time = '%Y-%m-%d %H:%M'
                   begin
                     md = params[:since_datetime].match(/(\d+)-(\d+)-(\d+) (\d+):(\d+)/)
                     @since_time = Time.zone.local(md[1].to_i,md[2].to_i,md[3].to_i,md[4].to_i,md[5].to_i)
                   rescue
                     @since_time = DateTime.new(1000,1,1)
                   end
                   begin
                     md = params[:until_datetime].match(/(\d+)-(\d+)-(\d+) (\d+):(\d+)/)
                     @until_time = Time.zone.local(md[1].to_i,md[2].to_i,md[3].to_i,md[4].to_i,md[5].to_i)
                   rescue
                     @until_time = DateTime.new(3000,1,1)
                   end
                   User.all.each do |user|
                     @logins << { id: user.id,
                                  login: user.login,
                                  full_name: user.full_name,
                                  count: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?",
                                                     user.id,@since_time,@until_time)
                                         .count(:id),
                 def submission_stat
                   date_and_time = '%Y-%m-%d %H:%M'
                   begin
                     @since_time = DateTime.strptime(params[:since_datetime],date_and_time)
                   rescue
                     @since_time = DateTime.new(1000,1,1)
                   end
                   begin
                     @until_time = DateTime.strptime(params[:until_datetime],date_and_time)
                   rescue
                     @until_time = DateTime.new(3000,1,1)
                   end
                   @submissions = {}
                   User.find_each do |user|
                     @submissions[user.id] = { login: user.login, full_name: user.full_name, count: 0, sub: { } }
                   end
                   Submission.where("submitted_at >= ? AND submitted_at <= ?",@since_time,@until_time).find_each do |s|
                     if @submissions[s.user_id]
                       if not @submissions[s.user_id][:sub].has_key?(s.problem_id)
-            -           a = nil
+            +           a = Problem.find_by_id(s.problem_id)
-            -           begin
-            -             a = Problem.find(s.problem_id)
-            -           rescue
-            -             a = nil
-            -           end
                         @submissions[s.user_id][:sub][s.problem_id] =
                           { prob_name: (a ? a.full_name : '(NULL)'),
                             sub_ids: [s.id] }
                       else
                         @submissions[s.user_id][:sub][s.problem_id][:sub_ids] << s.id
                       end
                       @submissions[s.user_id][:count] += 1
                     end
                   end
                 end
                 def problem_hof
                   # gen problem list
                   @user = User.find(session[:user_id])
                   @problems = @user.available_problems
                   # get selected problems or the default
                   if params[:id]
                     begin
                       @problem = Problem.available.find(params[:id])
                     rescue
                       redirect_to action: :problem_hof
                       flash[:notice] = 'Error: submissions for that problem are not viewable.'
                       return

app/views/user_admin/user_stat.html.haml ¶ +16 -14

-            - - content_for :header do
+            + /- content_for :header do
-            -   = javascript_include_tag 'local_jquery'
+            + / = javascript_include_tag 'local_jquery'
-            -   = stylesheet_link_tag 'tablesorter-theme.cafe'
+            + / = stylesheet_link_tag 'tablesorter-theme.cafe'
               %script{:type=>"text/javascript"}
                 $(function () {
                 $('#since_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
                 $('#until_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
-            -   $('#my_table').tablesorter({widgets: ['zebra']});
+            +   /$('#my_table').tablesorter({widgets: ['zebra']});
                 });
               %h1 User grading results
               %h2= params[:action] == 'user_stat' ? "Show scores from latest submission" : "Show max scores in submission range"
               - if @problem and @problem.errors
                 =error_messages_for 'problem'
               = render partial: 'submission_range'
               - if params[:action] == 'user_stat'
                 %h3 Latest score
                 = link_to '[download csv with all problems]', controller: :user_admin, action: :user_stat, commit: 'download csv'
               - else
                 %h3 Max score
                 = link_to '[Show only latest submissions]', controller: :user_admin, action: :user_stat
                 = link_to '[download csv with all problems]', controller: :user_admin, action: :user_stat_max, commit: 'download csv'
-            - %table.tablesorter-cafe#my_table
+            + %table.table.sortable.table-striped.table-bordered
                 %thead
                   %tr
-            -       %th User
+            +       %th Login
                     %th Name
                     %th Activated?
-            -       %th Logged in
+            +       %th Logged_in
                     %th Contest(s)
                     %th Remark
                     - @problems.each do |p|
-            -         %th= p.name
+            +         %th.text-right= p.name
-            -       %th Total
+            +       %th.text-right Total
-            -       %th Passed
+            +       %th.text-right Passed
                 %tbody
                   - @scorearray.each do |sc|
-            -       %tr{class: cycle('info-even','info-odd')}
+            +       %tr
                       - total,num_passed = 0,0
                       - sc.each_index do |i|
                         - if i == 0
                           %td= link_to sc[i].login, controller: 'users', action: 'profile', id: sc[i]
                           %td= sc[i].full_name
                           %td= sc[i].activated
                           %td= sc[i].try(:contest_stat).try(:started_at)!=nil ? 'yes' : 'no'
                           %td= sc[i].contests.collect {|c| c.name}.join(', ')
                           %td= sc[i].remark
                         - else
-            -             %td= sc[i][0]
+            +             %td.text-right= sc[i][0]
                           - total += sc[i][0]
                           - num_passed += 1 if sc[i][1]
-            -         %td= total
+            +         %td.text-right= total
-            -         %td= num_passed
+            +         %td.text-right= num_passed
+            + :javascript
+            +   $.bootstrapSortable(true,'reversed')

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

r570:0b74eb4e28fa - Mon, 11 Jul 2016 06:49:19 - 8 files changed: 77 inserted, 25 deleted

Sign in to your account

Commit r570:0b74eb4e28fa public

Author

r570:0b74eb4e28fa - Mon, 11 Jul 2016 06:49:19 - 8 files changed: 77 inserted, 25 deleted

Commit `r570:0b74eb4e28fa` public