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

               #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'

Gemfile.lock ¶ +6

                     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)
                     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)
                 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

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

               // 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

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

                   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)

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

               @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
                       color: $colHighlight
                       background-color: $bgHighlight
               .secondnavbar
                 top: 50px
+            +
+            + // --------------- bootstrap file upload ----------------------
               .btn-file
                 position: relative
                 overflow: hidden
               .btn-file input[type=file]
                 position: absolute
               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

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

@@ -9,12 +9,42
9	return true;	9	return true;
10	end	10	end
11		11
12	admin_authorization	12	admin_authorization
13	}	13	}
14		14
		15	+ def score
		16	+ if params[:commit] == 'download csv'
		17	+ @problems = Problem.all
		18	+ else
		19	+ @problems = Problem.find_available_problems
		20	+ end
		21	+ @users = User.includes(:contests, :contest_stat).where(enabled: true) #find(:all, :include => [:contests, :contest_stat]).where(enabled: true)
		22	+ @scorearray = Array.new
		23	+ @users.each do \|u\|
		24	+ ustat = Array.new
		25	+ ustat[0] = u
		26	+ @problems.each do \|p\|
		27	+ sub = Submission.find_last_by_user_and_problem(u.id,p.id)
		28	+ if (sub!=nil) and (sub.points!=nil) and p and p.full_score
		29	+ ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
		30	+ else
		31	+ ustat << [0,false]
		32	+ end
		33	+ end
		34	+ @scorearray << ustat
		35	+ end
		36	+ if params[:commit] == 'download csv' then
		37	+ csv = gen_csv_from_scorearray(@scorearray,@problems)
		38	+ send_data csv, filename: 'last_score.csv'
		39	+ else
		40	+ render template: 'user_admin/user_stat'
		41	+ end
		42	+
		43	+ end
		44	+
15	def login_stat	45	def login_stat
16	@logins = Array.new	46	@logins = Array.new
17		47
18	date_and_time = '%Y-%m-%d %H:%M'	48	date_and_time = '%Y-%m-%d %H:%M'
19	begin	49	begin
20	md = params[:since_datetime].match(/(\d+)-(\d+)-(\d+) (\d+):(\d+)/)	50	md = params[:since_datetime].match(/(\d+)-(\d+)-(\d+) (\d+):(\d+)/)
@@ -70,18 +100,13
70	@submissions[user.id] = { login: user.login, full_name: user.full_name, count: 0, sub: { } }	100	@submissions[user.id] = { login: user.login, full_name: user.full_name, count: 0, sub: { } }
71	end	101	end
72		102
73	Submission.where("submitted_at >= ? AND submitted_at <= ?",@since_time,@until_time).find_each do \|s\|	103	Submission.where("submitted_at >= ? AND submitted_at <= ?",@since_time,@until_time).find_each do \|s\|
74	if @submissions[s.user_id]	104	if @submissions[s.user_id]
75	if not @submissions[s.user_id][:sub].has_key?(s.problem_id)	105	if not @submissions[s.user_id][:sub].has_key?(s.problem_id)
76	- a = nil	106	+ a = Problem.find_by_id(s.problem_id)
77	- begin
78	- a = Problem.find(s.problem_id)
79	- rescue
80	- a = nil
81	- end
82	@submissions[s.user_id][:sub][s.problem_id] =	107	@submissions[s.user_id][:sub][s.problem_id] =
83	{ prob_name: (a ? a.full_name : '(NULL)'),	108	{ prob_name: (a ? a.full_name : '(NULL)'),
84	sub_ids: [s.id] }	109	sub_ids: [s.id] }
85	else	110	else
86	@submissions[s.user_id][:sub][s.problem_id][:sub_ids] << s.id	111	@submissions[s.user_id][:sub][s.problem_id][:sub_ids] << s.id
87	end	112	end

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"
                 = 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