cafe-grader-web Commit - r661:50e8e6077bb9

cafe-grader-web

Commit `r661:50e8e6077bb9` public

parent | child

Description:

update master

Commit status:

[Not Reviewed]

References:

merge default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r661:50e8e6077bb9 - Sat, 17 Jun 2017 05:49:44 - 146 files changed: 1465 inserted, 2374 deleted

app/controllers/testcases_controller.rb created 644 ¶ +32

			@@ -0,0 +1,32
		1	+ class TestcasesController < ApplicationController
		2	+ before_action :set_testcase, only: [:download_input,:download_sol]
		3	+ before_action :testcase_authorization
		4	+
		5	+ def download_input
		6	+ send_data @testcase.input, type: 'text/plain', filename: "#{@testcase.problem.name}.#{@testcase.num}.in"
		7	+ end
		8	+
		9	+ def download_sol
		10	+ send_data @testcase.sol, type: 'text/plain', filename: "#{@testcase.problem.name}.#{@testcase.num}.sol"
		11	+ end
		12	+
		13	+ def show_problem
		14	+ @problem = Problem.includes(:testcases).find(params[:problem_id])
		15	+ unless @current_user.admin? or @problem.view_testcase
		16	+ flash[:error] = 'You cannot view the testcase of this problem'
		17	+ redirect_to :controller => 'main', :action => 'list'
		18	+ end
		19	+ end
		20	+
		21	+
		22	+ private
		23	+ # Use callbacks to share common setup or constraints between actions.
		24	+ def set_testcase
		25	+ @testcase = Testcase.find(params[:id])
		26	+ end
		27	+
		28	+ # Only allow a trusted parameter "white list" through.
		29	+ def testcase_params
		30	+ params[:testcase]
		31	+ end
		32	+ end

app/helpers/testcases_helper.rb created 644 ¶ +2

			@@ -0,0 +1,2
		1	+ module TestcasesHelper
		2	+ end

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

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

app/views/submissions/compiler_msg.js.haml created 644 ¶ +4

			@@ -0,0 +1,4
		1	+ :plain
		2	+ $("#compiler_msg").html("#{j @submission.compiler_message}");
		3	+ $("#compiler").modal();
		4	+

app/views/submissions/rejudge.js.haml created 644 ¶ +2

			@@ -0,0 +1,2
		1	+ :plain
		2	+ $("body").prepend("<div class=\"alert alert-info\"> Submission #{@submission.id}'s task status has been changed to \"#{@task.status_str}\". It will be re-judged soon. </div>")

app/views/testcases/show_problem.html.haml created 644 ¶ +25

			@@ -0,0 +1,25
		1	+ %h1 Test cases
		2	+ %h2= @problem.long_name
		3	+
		4	+ /navbar
		5	+ %ul.nav.nav-pills{role: :tablist}
		6	+ - @problem.testcases.each.with_index do \|tc,id\|
		7	+ %li{role: :presentation, class: ('active' if id == 0)}
		8	+ %a{href:"#tc#{tc.id}", role: 'tab', data: {toggle: 'tab'}}= tc.num
		9	+
		10	+ /actual data
		11	+ .tab-content
		12	+ - @problem.testcases.each.with_index do \|tc,id\|
		13	+ .tab-pane{id: "tc#{tc.id}",class: ('active' if id == 0)}
		14	+ .row
		15	+ .col-md-6
		16	+ %h3 Input
		17	+ = link_to "Download",download_input_testcase_path(tc),class: 'btn btn-info btn-sm'
		18	+ .col-md-6
		19	+ %h3 Output
		20	+ = link_to "Download",download_sol_testcase_path(tc),class: 'btn btn-info btn-sm'
		21	+ .row
		22	+ .col-md-6
		23	+ %textarea{ rows: 25,readonly: true,style: "width:100%;resize=none;overflow-y: scroll;"}= tc.input
		24	+ .col-md-6
		25	+ %textarea{ rows: 25,readonly: true,style: "width:100%;resize=none;overflow-y: scroll;"}= tc.sol

app/views/user_admin/bulk_manage.html.haml created 644 ¶ +77

			@@ -0,0 +1,77
		1	+ %h1 Bulk Manage User
		2	+
		3	+ = form_tag bulk_manage_user_admin_path
		4	+ .row
		5	+ .col-md-6
		6	+ .panel.panel-primary
		7	+ .panel-title.panel-heading
		8	+ Filter User
		9	+ .panel-body
		10	+ Filtering users whose login match the following MySQL regex
		11	+ .form-group
		12	+ = label_tag "regex", 'Regex Pattern'
		13	+ = text_field_tag "regex", params[:regex], class: 'form-control'
		14	+ %p
		15	+ Example
		16	+ %ul
		17	+ %li
		18	+ %code root
		19	+ matches every user whose login contains "root"
		20	+ %li
		21	+ %code ^56
		22	+ matches every user whose login starts with "56"
		23	+ %li
		24	+ %code 21$
		25	+ matches every user whose login ends with "21"
		26	+ .col-md-6
		27	+ .panel.panel-primary
		28	+ .panel-title.panel-heading
		29	+ Action
		30	+ .panel-body
		31	+ .row.form-group
		32	+ .col-md-6
		33	+ %label.checkbox-inline
		34	+ = check_box_tag "enabled", true, params[:enabled]
		35	+ Change "Enabled" to
		36	+ .col-md-3
		37	+ %label.radio-inline
		38	+ = radio_button_tag "enable", 1, params[:enable] == '1', id: 'enable-yes'
		39	+ Yes
		40	+ .col-md-3
		41	+ %label.radio-inline
		42	+ = radio_button_tag "enable", 0, params[:enable] == '0', id: 'enable-no'
		43	+ No
		44	+ .row.form-group
		45	+ .col-md-6
		46	+ %label.checkbox-inline
		47	+ = check_box_tag "gen_password", true, params[:gen_password]
		48	+ Generate new random password
		49	+
		50	+ .row
		51	+ .col-md-12
		52	+ = submit_tag "Preview Result", class: 'btn btn-default'
		53	+ - if @users
		54	+ .row
		55	+ .col-md-4
		56	+ - if @action
		57	+ %h2 Confirmation
		58	+ - if @action[:set_enable]
		59	+ .alert.alert-info The following users will be set #{(@action[:enabled] ? 'enable' : 'disable')}.
		60	+ - if @action[:gen_password]
		61	+ .alert.alert-info The password of the following users will be randomly generated.
		62	+ .row
		63	+ .col-md-4
		64	+ = submit_tag "Perform", class: 'btn btn-primary'
		65	+ .row
		66	+ .col-md-12
		67	+ The pattern matches #{@users.count} following users.
		68	+ %br
		69	+ - @users.each do \|user\|
		70	+ = user.login
		71	+ = ' '
		72	+ = user.full_name
		73	+ = ' '
		74	+ = "(#{user.remark})" if user.remark
		75	+ %br
		76	+
		77	+

config/secrets.yml.SAMPLE created 644 ¶ +8

			@@ -0,0 +1,8
		1	+ development:
		2	+ secret_key_base: '444f426d08add8e2d7cbd76e2057e521e06091231eb4d5472af6ba5654ea1124ce6a636f549be6827ce09561c314181226ad840d44e4677e1077942ee0dc82bd'
		3	+
		4	+ test:
		5	+ secret_key_base: 'd52f411b06a79cc9f56d92e10d27e670cf0f0c3357e7caf9018ec23091b5c452ea9266c03a5c9e37b72c358702d4d460e957f90dcc553c9fc73a98adb520e781'
		6	+
		7	+ production:
		8	+ secret_key_base: '7f85485d3d652fc6336dfe3cd98917d9bd7a323b32096bf7635d26b98ccd0480816cc2d12b5c10805cecf7d8fb322104e2bda71eb60dd871c5c537e56a063038'

db/migrate/20161031063337_add_config_view_test.rb created 644 ¶ +16

			@@ -0,0 +1,16
		1	+ class AddConfigViewTest < ActiveRecord::Migration
		2	+ def up
		3	+ GraderConfiguration.create key: 'right.view_testcase', value_type: 'boolean', value:'true', description:'When true, any user can view/download test data'
		4	+ #uglily and dirtily and shamelessly check other config and inifialize
		5	+ GraderConfiguration.where(key: 'right.user_hall_of_fame').first_or_create(value_type: 'boolean', value: 'false',
		6	+ description: 'If true, any user can access hall of fame page.')
		7	+ GraderConfiguration.where(key: 'right.multiple_ip_login').first_or_create(value_type: 'boolean', value: 'false',
		8	+ description: 'When change from true to false, a user can login from the first IP they logged into afterward.')
		9	+ GraderConfiguration.where(key: 'right.user_view_submission').first_or_create(value_type: 'boolean', value: 'false',
		10	+ description: 'If true, any user can view submissions of every one.')
		11	+ end
		12	+
		13	+ def down
		14	+ GraderConfiguration.where(key: 'right.view_testcase').destroy_all;
		15	+ end
		16	+ end

db/migrate/20170123162543_change_testcase_size.rb created 644 ¶ +6

			@@ -0,0 +1,6
		1	+ class ChangeTestcaseSize < ActiveRecord::Migration
		2	+ def change
		3	+ change_column :testcases, :input, :text, :limit => 4294967295
		4	+ change_column :testcases, :sol, :text, :limit => 4294967295
		5	+ end
		6	+ end

db/migrate/20170124024527_add_view_testcase_to_problem.rb created 644 ¶ +5

			@@ -0,0 +1,5
		1	+ class AddViewTestcaseToProblem < ActiveRecord::Migration
		2	+ def change
		3	+ add_column :problems, :view_testcase, :bool
		4	+ end
		5	+ end

db/migrate/20170310110146_add_index_to_task.rb created 644 ¶ +5

			@@ -0,0 +1,5
		1	+ class AddIndexToTask < ActiveRecord::Migration
		2	+ def change
		3	+ add_index :tasks, :submission_id
		4	+ end
		5	+ end

db/migrate/20170427070345_add_heart_beat_full.rb created 644 ¶ +9

			@@ -0,0 +1,9
		1	+ class AddHeartBeatFull < ActiveRecord::Migration
		2	+ def up
		3	+ GraderConfiguration.create key: 'right.heartbeat_response_full', value_type: 'string', value:'RESTART', description:'Heart beat response text when user got full score (set this value to the empty string to disable this feature)'
		4	+ end
		5	+
		6	+ def down
		7	+
		8	+ end
		9	+ end

lib/tasks/fixtures.rake created 644 ¶ +41

			@@ -0,0 +1,41
		1	+ # Original from http://snippets.dzone.com/posts/show/4468 by MichaelBoutros
		2	+ #
		3	+ # Optimized version which uses to_yaml for content creation and checks
		4	+ # that models are ActiveRecord::Base models before trying to fetch
		5	+ # them from database.
		6	+ namespace :db do
		7	+ namespace :fixtures do
		8	+ desc 'Dumps all models into fixtures.'
		9	+ task :dump => :environment do
		10	+ puts "rails root = #{Rails.root}"
		11	+ models = Dir.glob(Rails.root.to_s + '/app/models/**.rb').map do \|s\|
		12	+ Pathname.new(s).basename.to_s.gsub(/\.rb$/,'').camelize
		13	+ end
		14	+
		15	+ puts "Found models: " + models.join(', ')
		16	+
		17	+ models.each do \|m\|
		18	+ model = m.constantize
		19	+ next unless model.ancestors.include?(ActiveRecord::Base)
		20	+
		21	+ puts "Dumping model: " + m
		22	+ entries = model.all.order(id: :asc)
		23	+
		24	+ increment = 1
		25	+
		26	+ model_file = Rails.root.to_s + '/test/fixtures2/' + m.underscore.pluralize + '.yml'
		27	+ File.open(model_file, 'w') do \|f\|
		28	+ entries.each do \|a\|
		29	+ attrs = a.attributes
		30	+ attrs.delete_if{\|k,v\| v.blank?}
		31	+
		32	+ output = {m + '_' + increment.to_s => attrs}
		33	+ f << output.to_yaml.gsub(/^--- \n/,'') + "\n"
		34	+
		35	+ increment += 1
		36	+ end
		37	+ end
		38	+ end
		39	+ end
		40	+ end
		41	+ end

test/controllers/announcements_controller_test.rb created 644 ¶ +50

			@@ -0,0 +1,50
		1	+ require 'test_helper'
		2	+
		3	+ class AnnouncementsControllerTest < ActionController::TestCase
		4	+ setup do
		5	+ @announcement = announcements(:one)
		6	+ @request.session[:user_id] = users(:admin).id
		7	+ end
		8	+
		9	+ test "should get index" do
		10	+ get :index
		11	+ assert_response :success
		12	+ assert_not_nil assigns(:announcements)
		13	+ end
		14	+
		15	+ test "should get new" do
		16	+ get :new
		17	+ assert_response :success
		18	+ end
		19	+
		20	+ test "should create announcement" do
		21	+ assert_difference('Announcement.count') do
		22	+ post :create, announcement: { author: 'aa',body: 'bb', published: true, frontpage: true, title: 'test'}
		23	+ end
		24	+
		25	+ assert_redirected_to announcement_path(assigns(:announcement))
		26	+ end
		27	+
		28	+ test "should show announcement" do
		29	+ get :show, id: @announcement
		30	+ assert_response :success
		31	+ end
		32	+
		33	+ test "should get edit" do
		34	+ get :edit, id: @announcement
		35	+ assert_response :success
		36	+ end
		37	+
		38	+ test "should update announcement" do
		39	+ patch :update, id: @announcement, announcement: { author: 'aa',body: 'bb', published: true, frontpage: true, title: 'test'}
		40	+ assert_redirected_to announcement_path(assigns(:announcement))
		41	+ end
		42	+
		43	+ test "should destroy announcement" do
		44	+ assert_difference('Announcement.count', -1) do
		45	+ delete :destroy, id: @announcement
		46	+ end
		47	+
		48	+ assert_redirected_to announcements_path
		49	+ end
		50	+ end

test/controllers/testcases_controller_test.rb created 644 ¶ +7

			@@ -0,0 +1,7
		1	+ require 'test_helper'
		2	+
		3	+ class TestcasesControllerTest < ActionController::TestCase
		4	+ setup do
		5	+ @testcase = testcases(:one)
		6	+ end
		7	+ end

test/fixtures/grader_configurations.yml created 644 ¶ +144

			@@ -0,0 +1,144
		1	+ GraderConfiguration_1:
		2	+ key: system.single_user_mode
		3	+ value_type: boolean
		4	+ value: 'false'
		5	+ description: Only admins can log in to the system when running under single user mode.
		6	+
		7	+ GraderConfiguration_2:
		8	+ key: ui.front.title
		9	+ value_type: string
		10	+ value: Grader
		11	+
		12	+ GraderConfiguration_3:
		13	+ key: ui.front.welcome_message
		14	+ value_type: string
		15	+ value: Welcome!
		16	+
		17	+ GraderConfiguration_4:
		18	+ key: ui.show_score
		19	+ value_type: boolean
		20	+ value: 'true'
		21	+
		22	+ GraderConfiguration_5:
		23	+ key: contest.time_limit
		24	+ value_type: string
		25	+ value: unlimited
		26	+ description: Time limit in format hh:mm, or "unlimited" for contests with no time
		27	+ limits. This config is CACHED. Restart the server before the change can take
		28	+ effect.
		29	+
		30	+ GraderConfiguration_6:
		31	+ key: system.mode
		32	+ value_type: string
		33	+ value: standard
		34	+ description: Current modes are "standard", "contest", "indv-contest", and "analysis".
		35	+
		36	+
		37	+ GraderConfiguration_7:
		38	+ key: contest.name
		39	+ value_type: string
		40	+ value: Grader
		41	+ description: This name will be shown on the user header bar.
		42	+
		43	+
		44	+ GraderConfiguration_8:
		45	+ key: contest.multisites
		46	+ value_type: boolean
		47	+ value: 'false'
		48	+ description: If the server is in contest mode and this option is true, on the log
		49	+ in of the admin a menu for site selections is shown.
		50	+
		51	+
		52	+ GraderConfiguration_9:
		53	+ key: right.user_hall_of_fame
		54	+ value_type: boolean
		55	+ value: 'false'
		56	+ description: If true, any user can access hall of fame page.
		57	+
		58	+
		59	+ GraderConfiguration_10:
		60	+ key: right.multiple_ip_login
		61	+ value_type: boolean
		62	+ value: 'true'
		63	+ description: When change from true to false, a user can login from the first IP
		64	+ they logged into afterward.
		65	+
		66	+
		67	+ GraderConfiguration_11:
		68	+ key: right.user_view_submission
		69	+ value_type: boolean
		70	+ value: 'false'
		71	+ description: If true, any user can view submissions of every one.
		72	+
		73	+
		74	+ GraderConfiguration_12:
		75	+ key: right.bypass_agreement
		76	+ value_type: boolean
		77	+ value: 'true'
		78	+ description: When false, a user must accept usage agreement before login
		79	+
		80	+
		81	+ GraderConfiguration_13:
		82	+ key: right.heartbeat_response
		83	+ value_type: string
		84	+ value: OK
		85	+ description: Heart beat response text
		86	+
		87	+
		88	+ GraderConfiguration_14:
		89	+ key: right.view_testcase
		90	+ value_type: boolean
		91	+ value: 'false'
		92	+ description: When true, any user can view/download test data
		93	+
		94	+
		95	+ GraderConfiguration_15:
		96	+ key: system.online_registration.smtp
		97	+ value_type: string
		98	+ value: smtp.somehost.com
		99	+
		100	+
		101	+ GraderConfiguration_16:
		102	+ key: system.online_registration.from
		103	+ value_type: string
		104	+ value: your.email@address
		105	+
		106	+
		107	+ GraderConfiguration_17:
		108	+ key: system.admin_email
		109	+ value_type: string
		110	+ value: admin@admin.email
		111	+
		112	+
		113	+ GraderConfiguration_18:
		114	+ key: system.user_setting_enabled
		115	+ value_type: boolean
		116	+ value: 'true'
		117	+ description: If this option is true, users can change their settings
		118	+
		119	+
		120	+ GraderConfiguration_19:
		121	+ key: contest.test_request.early_timeout
		122	+ value_type: boolean
		123	+ value: 'false'
		124	+
		125	+
		126	+ GraderConfiguration_20:
		127	+ key: system.multicontests
		128	+ value_type: boolean
		129	+ value: 'false'
		130	+
		131	+
		132	+ GraderConfiguration_21:
		133	+ key: contest.confirm_indv_contest_start
		134	+ value_type: boolean
		135	+ value: 'false'
		136	+
		137	+
		138	+ GraderConfiguration_22:
		139	+ key: contest.default_contest_name
		140	+ value_type: string
		141	+ value: none
		142	+ description: New user will be assigned to this contest automatically, if it exists. Set
		143	+ to 'none' if there is no default contest.
		144	+

test/integration/admin_task_test.rb created 644 ¶ +7

			@@ -0,0 +1,7
		1	+ require 'test_helper'
		2	+
		3	+ class AdminTaskTest < ActionDispatch::IntegrationTest
		4	+ # test "the truth" do
		5	+ # assert true
		6	+ # end
		7	+ end

test/integration/login_test.rb created 644 ¶ +40

			@@ -0,0 +1,40
		1	+ require 'test_helper'
		2	+
		3	+ class LoginTest < ActionDispatch::IntegrationTest
		4	+ # test "the truth" do
		5	+ # assert true
		6	+ # end
		7	+
		8	+ test "login with invalid information" do
		9	+ get root_path
		10	+ assert_response :success
		11	+ post login_login_path, login: "root", password: "hahaha"
		12	+ assert_redirected_to root_path
		13	+ end
		14	+
		15	+ test "normal user login" do
		16	+ get root_path
		17	+ assert_response :success
		18	+ post login_login_path, {login: "john", password: "hello" }
		19	+ assert_redirected_to main_list_path
		20	+ end
		21	+
		22	+ test "normal user login in single_user mode" do
		23	+ GraderConfiguration.find_by(key: GraderConfiguration::SINGLE_USER_KEY).update_attributes(value: 'true')
		24	+ GraderConfiguration.reload
		25	+ get root_path
		26	+ assert_response :success
		27	+ post login_login_path, {login: "john", password: "hello" }
		28	+ follow_redirect!
		29	+ assert_redirected_to root_path
		30	+ end
		31	+
		32	+ test "root login in in single_user mode" do
		33	+ GraderConfiguration.find_by(key: GraderConfiguration::SINGLE_USER_KEY).update_attributes(value: 'true')
		34	+ GraderConfiguration.reload
		35	+ get root_path
		36	+ assert_response :success
		37	+ post login_login_path, {login: "admin", password: "admin" }
		38	+ assert_redirected_to main_list_path
		39	+ end
		40	+ end

.gitignore ¶ +2

               # Ignore the default SQLite database.
               /db/*.sqlite3
               # Ignore all logfiles and tempfiles.
               /log/*.log
               /tmp
               *~
               /vendor/plugins/rails_upgrade
               #ignore public assets???
               /public/assets
               /public
               /data
               #ignore .orig and .swp
               *.orig
               *.swp
               #ignore rvm setting file
               .ruby-gemset
               .ruby-version
+            +
+            + /config/secrets.yml

Gemfile ¶ +27 -16

               source 'https://rubygems.org'
-            - gem 'rails', '~>3.2'
+            + #rails
+            + gem 'rails', '~>4.2.0'
+            + gem 'activerecord-session_store'
-            - gem 'select2-rails'
               # Bundle edge Rails instead:
               # gem 'rails', :git => 'git://github.com/rails/rails.git'
+            + #---------------- database ---------------------
+            + #the database
               gem 'mysql2'
+            + #for testing
+            + gem 'sqlite3'
+            + #for dumping database into yaml
+            + gem 'yaml_db'
               # Gems used only for assets and not required
               # in production environments by default.
-            - group :assets do
-            -   gem 'sass-rails',   '~> 3.2.6'
-            -   gem 'coffee-rails', '~> 3.2.2'
+            + gem 'sass-rails'
+            + gem 'coffee-rails'
                 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
                 # gem 'therubyracer', :platforms => :ruby
-            -   gem 'uglifier'
-            - end
+            + gem 'uglifier'
-            - gem 'prototype-rails'
+            + gem 'haml'
+            + gem 'haml-rails'
+            + # gem 'prototype-rails'
               # To use ActiveModel has_secure_password
               # gem 'bcrypt-ruby', '~> 3.0.0'
               # To use Jbuilder templates for JSON
               # gem 'jbuilder'
               # Use unicorn as the app server
               # gem 'unicorn'
               # Deploy with Capistrano
               # 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-ui-rails'
               gem 'jquery-timepicker-addon-rails'
               gem 'jquery-tablesorter'
               gem 'jquery-countdown-rails'
               #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'
+            + #----------- user interface -----------------
+            + #select 2
+            + gem 'select2-rails'
               #ace editor
               gem 'ace-rails-ap'
+            + #paginator
+            + gem 'will_paginate', '~> 3.0.7'
-            - 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
+            +
+            + #---------------- testiing -----------------------
+            + gem 'minitest-reporters'
+            +
+            + #---------------- for console --------------------
+            + gem 'fuzzy-string-match'

Gemfile.lock ¶ +168 -141

		@@ -1,208 +1,235
1	1	GIT
2	2	remote: https://github.com/sikachu/verification.git
3		- revision: 76eaf51b13276ecae54bd9cd115832595d2ff56d
	3	+ revision: ff31697b940d7b0e2ec65f08764215c96104e76d
4	4	specs:
5	5	verification (1.0.3)
6		- actionpack (>= 3.0.0, < 5.0)
7		- activesupport (>= 3.0.0, < 5.0)
	6	+ actionpack (>= 3.0.0, < 5.1)
	7	+ activesupport (>= 3.0.0, < 5.1)
8	8
9	9	GEM
10	10	remote: https://rubygems.org/
11	11	specs:
12		- ace-rails-ap (4.0.2)
13		- actionmailer (3.2.22.5)
14		- actionpack (= 3.2.22.5)
15		- mail (~> 2.5.4)
16		- action~~pack (3.2.22.5~~)
17		- acti~~vemodel (= 3.2.22.5~~)
18		- acti~~vesupport (= 3.2.22.5~~)
19		- builder (~> 3.0.0)
	12	+ RubyInline (3.12.4)
	13	+ ZenTest (~> 4.3)
	14	+ ZenTest (4.11.1)
	15	+ ace-rails-ap (4.1.1)
	16	+ actionmailer (4.2.7.1)
	17	+ actionpack (= 4.2.7.1)
	18	+ actionview (= 4.2.7.1)
	19	+ activejob (= 4.2.7.1)
	20	+ mail (~> 2.5, >= 2.5.4)
	21	+ rails-dom-testing (~> 1.0, >= 1.0.5)
	22	+ actionpack (4.2.7.1)
	23	+ actionview (= 4.2.7.1)
	24	+ activesupport (= 4.2.7.1)
	25	+ rack (~> 1.6)
	26	+ rack-test (~> 0.6.2)
	27	+ rails-dom-testing (~> 1.0, >= 1.0.5)
	28	+ rails-html-sanitizer (~> 1.0, >= 1.0.2)
	29	+ actionview (4.2.7.1)
	30	+ activesupport (= 4.2.7.1)
	31	+ builder (~> 3.1)
20	32	erubis (~> 2.7.0)
21		- journey (~> 1.0.4)
22		- rack (~> 1.4.5)
23		- rack-cache (~> 1.2)
24		- ~~rack-test (~> 0.6~~.1)
25		- sprockets (~> 2.2.1)
26		- activemodel (~~3.2.22.5~~)
27		- activesupport (= ~~3.2.22.5~~)
28		- builder (~> 3.~~0.0~~)
29		- activerecord (~~3.2.22.5~~)
30		- activemodel (= ~~3.2.22.5~~)
31		- activesupport (= ~~3.2.22.5~~)
32		- arel (~> ~~3.0.2~~)
33		- tzinfo (~> 0.3.29)
34		- activeresource (3.2.22.5)
35		- active~~model (= 3.2.22.5~~)
36		- activesupport (= 3.2.22.5)
37		- activesupport (3.2.22.5)
38		- i18n (~> 0.6, >= 0.6.4)
39		- multi_json (~> 1.0)
40		- arel (3.0.3)
41		- autoprefixer-rails (6.0.3)
	33	+ rails-dom-testing (~> 1.0, >= 1.0.5)
	34	+ rails-html-sanitizer (~> 1.0, >= 1.0.2)
	35	+ activejob (4.2.7.1)
	36	+ activesupport (= 4.2.7.1)
	37	+ globalid (>= 0.3.0)
	38	+ activemodel (4.2.7.1)
	39	+ activesupport (= 4.2.7.1)
	40	+ builder (~> 3.1)
	41	+ activerecord (4.2.7.1)
	42	+ activemodel (= 4.2.7.1)
	43	+ activesupport (= 4.2.7.1)
	44	+ arel (~> 6.0)
	45	+ activerecord-session_store (1.0.0)
	46	+ actionpack (>= 4.0, < 5.1)
	47	+ activerecord (>= 4.0, < 5.1)
	48	+ multi_json (~> 1.11, >= 1.11.2)
	49	+ rack (>= 1.5.2, < 3)
	50	+ railties (>= 4.0, < 5.1)
	51	+ activesupport (4.2.7.1)
	52	+ i18n (~> 0.7)
	53	+ json (~> 1.7, >= 1.7.7)
	54	+ minitest (~> 5.1)
	55	+ thread_safe (~> 0.3, >= 0.3.4)
	56	+ tzinfo (~> 1.1)
	57	+ ansi (1.5.0)
	58	+ arel (6.0.4)
	59	+ autoprefixer-rails (6.6.0)
42	60	execjs
43		- json
44	61	best_in_place (3.0.3)
45	62	actionpack (>= 3.2)
46	63	railties (>= 3.2)
47	64	bootstrap-sass (3.2.0.2)
48	65	sass (~> 3.2)
49	66	bootstrap-switch-rails (3.3.3)
50	67	bootstrap-toggle-rails (2.2.1.0)
51		- builder (3.~~0.4~~)
52		- coffee-rails (~~3.2.2~~)
	68	+ builder (3.2.2)
	69	+ coffee-rails (4.2.1)
53	70	coffee-script (>= 2.2.0)
54		- railties (~~~> 3.2.0~~)
55		- coffee-script (2.~~3.0~~)
	71	+ railties (>= 4.0.0, < 5.2.x)
	72	+ coffee-script (2.4.1)
56	73	coffee-script-source
57	74	execjs
58		- coffee-script-source (1.~~9.0~~)
59		- diff-lcs (1.2.5)
	75	+ coffee-script-source (1.12.2)
	76	+ concurrent-ruby (1.0.4)
60	77	dynamic_form (1.1.4)
61	78	erubis (2.7.0)
62		- execjs (2.3.0)
63		- haml (4.0.6)
	79	+ execjs (2.7.0)
	80	+ fuzzy-string-match (1.0.0)
	81	+ RubyInline (>= 3.8.6)
	82	+ globalid (0.3.7)
	83	+ activesupport (>= 4.1.0)
	84	+ haml (4.0.7)
64	85	tilt
65		- haml-rails (0.4)
66		- actionpack (>= ~~3.1, < 4~~.1)
67		- activesupport (>= ~~3.1, < 4~~.1)
68		- haml (>= ~~3.1, < 4.1~~)
69		- ~~railties (>= 3.1, < 4~~.1)
70		- hike (1.2.3)
	86	+ haml-rails (0.9.0)
	87	+ actionpack (>= 4.0.1)
	88	+ activesupport (>= 4.0.1)
	89	+ haml (>= 4.0.6, < 5.0)
	90	+ html2haml (>= 1.0.1)
	91	+ railties (>= 4.0.1)
	92	+ html2haml (2.0.0)
	93	+ erubis (~> 2.7.0)
	94	+ haml (~> 4.0.0)
	95	+ nokogiri (~> 1.6.0)
	96	+ ruby_parser (~> 3.5)
71	97	i18n (0.7.0)
72	98	in_place_editing (1.2.0)
73		- journey (1.0.4)
74	99	jquery-countdown-rails (2.0.2)
75		- jquery-rails (~~3.1.2~~)
76		- rail~~ties (>= 3.0, < 5.0~~)
	100	+ jquery-rails (4.2.1)
	101	+ rails-dom-testing (>= 1, < 3)
	102	+ railties (>= 4.2.0)
77	103	thor (>= 0.14, < 2.0)
78		- jquery-tablesorter (1.~~13.4~~)
79		- railties (>= 3.~~1, < 5~~)
	104	+ jquery-tablesorter (1.23.3)
	105	+ railties (>= 3.2, < 6)
80	106	jquery-timepicker-addon-rails (1.4.1)
81	107	railties (>= 3.1)
82		- jquery-ui-rails (~~4.0.3~~)
83		- jquery-rails
84		- railties (>= 3.1.0)
85		- jquery-ui-sass-rails (4.0.3.0)
86		- jquery-rails
87		- jquery-ui-rails (= 4.0.3)
88		- railties (>= 3.1.0)
	108	+ jquery-ui-rails (6.0.1)
	109	+ railties (>= 3.2.16)
89	110	json (1.8.3)
90		- ~~mail (2.5.4~~)
91		- mime-types (~> 1.16)
92		- treetop (~> 1.4.8)
93		- mime-types (1.~~25.~~1)
94		- momentjs-rails (2.11.1)
	111	+ loofah (2.0.3)
	112	+ nokogiri (>= 1.5.9)
	113	+ mail (2.6.4)
	114	+ mime-types (>= 1.16, < 4)
	115	+ mime-types (3.1)
	116	+ mime-types-data (~> 3.2015)
	117	+ mime-types-data (3.2016.0521)
	118	+ mini_portile2 (2.1.0)
	119	+ minitest (5.10.1)
	120	+ minitest-reporters (1.1.13)
	121	+ ansi
	122	+ builder
	123	+ minitest (>= 5.0)
	124	+ ruby-progressbar
	125	+ momentjs-rails (2.15.1)
95	126	railties (>= 3.1)
96	127	multi_json (1.12.1)
97		- mysql2 (0.~~3.20~~)
98		- polyglot (0.3.5)
99		- power_assert (0.2.2)
100		- prototype-rails (3.2.1)
101		- rails (~> 3.2)
102		- rack (1.4.7)
103		- rack-cache (1.6.1)
104		- rack (>= 0.4)
105		- rack-ssl (1.3.4)
106		- rack
	128	+ mysql2 (0.4.5)
	129	+ nokogiri (1.6.8.1)
	130	+ mini_portile2 (~> 2.1.0)
	131	+ rack (1.6.5)
107	132	rack-test (0.6.3)
108	133	rack (>= 1.0)
109		- rails (~~3.2.22.5~~)
110		- actionmailer (= ~~3.2.22.5~~)
111		- actionpack (= ~~3.2.22.5~~)
112		- acti~~verecord (= 3.2.22.5~~)
113		- active~~resource (= 3.2.22.5~~)
114		- active~~support (= 3.2.22.5~~)
115		- bundler (~> 1.0)
116		- ~~railties (= 3.2.22.5~~)
117		- rails_bootstrap_sortable (2.0.0)
118		- ~~momentjs-rails (~> 2, >= 2.8.3~~)
119		- railties (3.2.22.5)
120		- actionpack (= 3.2.22.5)
121		- activesupport (~~= 3.2.22.5~~)
122		- rack-ssl (~> 1.3.2)
	134	+ rails (4.2.7.1)
	135	+ actionmailer (= 4.2.7.1)
	136	+ actionpack (= 4.2.7.1)
	137	+ actionview (= 4.2.7.1)
	138	+ activejob (= 4.2.7.1)
	139	+ activemodel (= 4.2.7.1)
	140	+ activerecord (= 4.2.7.1)
	141	+ activesupport (= 4.2.7.1)
	142	+ bundler (>= 1.3.0, < 2.0)
	143	+ railties (= 4.2.7.1)
	144	+ sprockets-rails
	145	+ rails-deprecated_sanitizer (1.0.3)
	146	+ activesupport (>= 4.2.0.alpha)
	147	+ rails-dom-testing (1.0.8)
	148	+ activesupport (>= 4.2.0.beta, < 5.0)
	149	+ nokogiri (~> 1.6)
	150	+ rails-deprecated_sanitizer (>= 1.0.1)
	151	+ rails-html-sanitizer (1.0.3)
	152	+ loofah (~> 2.0)
	153	+ rails_bootstrap_sortable (2.0.1)
	154	+ momentjs-rails (>= 2.8.3)
	155	+ railties (4.2.7.1)
	156	+ actionpack (= 4.2.7.1)
	157	+ activesupport (= 4.2.7.1)
123	158	rake (>= 0.8.7)
124		- rdoc (~> 3.4)
125		- thor (>= 0.14.6, < 2.0)
126		- rake (11.2.2)
127		- r~~discount (2.1.8~~)
128		- rdoc (3.12.2)
129		- json (~> 1.4)
130		- rouge (1.8.0)
131		- rspec-collection_matchers (1.1.2)
132		- rspec-expectations (>= 2.99.0.beta1)
133		- rspec-core (2.99.2)
134		- rspec-expectations (2.99.2)
135		- ~~diff-lcs (>= 1.1.3, < 2~~.0)
136		- rspec-mocks (2.99.3)
137		- rspec-rails (2.99.0)
138		- actionpack (>= 3.0)
139		- activemodel (>= 3.0)
140		- activesupport (>= 3.0)
141		- railties (>= 3.0)
142		- rspec-collection_matchers
143		- rspec-core (~> 2.99.0)
144		- rspec-expectations (~> 2.99.0)
145		- rspec-mocks (~> 2.99.0)
146		- sass (3.4.11)
147		- sass-rails (3.2.6)
148		- railties (~> 3.2.0)
149		- sass (>= 3.1.10)
150		- tilt (~> 1.3)
151		- select2-rails (4.0.1)
	159	+ thor (>= 0.18.1, < 2.0)
	160	+ rake (12.0.0)
	161	+ rdiscount (2.2.0.1)
	162	+ rouge (2.0.7)
	163	+ ruby-progressbar (1.8.1)
	164	+ ruby_parser (3.8.3)
	165	+ sexp_processor (~> 4.1)
	166	+ sass (3.4.23)
	167	+ sass-rails (5.0.6)
	168	+ railties (>= 4.0.0, < 6)
	169	+ sass (~> 3.1)
	170	+ sprockets (>= 2.8, < 4.0)
	171	+ sprockets-rails (>= 2.0, < 4.0)
	172	+ tilt (>= 1.1, < 3)
	173	+ select2-rails (4.0.3)
152	174	thor (~> 0.14)
153		- s~~prockets (2.2.3~~)
154		- hike (~> 1.2)
155		- ~~multi_json~~ (~> 1.0)
156		- rack (~~~> 1.0~~)
157		- tilt (~> 1.1, != 1.3.0)
158		- test-unit (3.0.9)
159		- power_assert
160		- thor (0.19.1)
161		- ~~tilt (1.4.1~~)
162		- tr~~eetop~~ (1.4~~.15~~)
163		- polyglot
164		- polyglot (>= 0.3.1)
165		- tzinfo (~~0.3.51~~)
166		- uglifier (2.7.0)
167		- execjs (>= 0.3.0)
168		- ~~json (>= 1.8.0~~)
169		- will_paginate (3.0.7)
	175	+ sexp_processor (4.7.0)
	176	+ sprockets (3.7.1)
	177	+ concurrent-ruby (~> 1.0)
	178	+ rack (> 1, < 3)
	179	+ sprockets-rails (3.2.0)
	180	+ actionpack (>= 4.0)
	181	+ activesupport (>= 4.0)
	182	+ sprockets (>= 3.0.0)
	183	+ sqlite3 (1.3.12)
	184	+ thor (0.19.4)
	185	+ thread_safe (0.3.5)
	186	+ tilt (2.0.5)
	187	+ tzinfo (1.2.2)
	188	+ thread_safe (~> 0.1)
	189	+ uglifier (3.0.4)
	190	+ execjs (>= 0.3.0, < 3)
	191	+ will_paginate (3.0.12)
	192	+ yaml_db (0.4.2)
	193	+ rails (>= 3.0, < 5.1)
	194	+ rake (>= 0.8.7)
170	195
171	196	PLATFORMS
172	197	ruby
173	198
174	199	DEPENDENCIES
175	200	ace-rails-ap
	201	+ activerecord-session_store
176	202	autoprefixer-rails
177	203	best_in_place (~> 3.0.1)
178	204	bootstrap-sass (~> 3.2.0)
179	205	bootstrap-switch-rails
180	206	bootstrap-toggle-rails
181		- coffee-rails ~~(~> 3.2.2)~~
	207	+ coffee-rails
182	208	dynamic_form
	209	+ fuzzy-string-match
183	210	haml
184	211	haml-rails
185	212	in_place_editing
186	213	jquery-countdown-rails
187	214	jquery-rails
188	215	jquery-tablesorter
189	216	jquery-timepicker-addon-rails
190		- jquery-ui-~~sass-~~rails
	217	+ jquery-ui-rails
191	218	mail
	219	+ minitest-reporters
192	220	momentjs-rails
193	221	mysql2
194		- prototype-rails
195		- rails (~> 3.2)
	222	+ rails (~> 4.2.0)
196	223	rails_bootstrap_sortable
197	224	rdiscount
198	225	rouge
199		- rspec-rails (~> 2.99.0)
200		- sass-rails (~> 3.2.6)
	226	+ sass-rails
201	227	select2-rails
202		- test-unit
	228	+ sqlite3
203	229	uglifier
204	230	verification!
205	231	will_paginate (~> 3.0.7)
	232	+ yaml_db
206	233
207	234	BUNDLED WITH
208		- 1.1~~2.5~~
	235	+ 1.13.6

app/assets/javascripts/application.js ¶ +1 -4

               // 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 jquery-ui
               //= require bootstrap-sprockets
               //= require moment
               //= require bootstrap-sortable
               //= require select2
               //= require ace-rails-ap
               //= require ace/mode-c_cpp
               //= require ace/mode-python
               //= require ace/mode-ruby
               //= require ace/mode-pascal
               //= require ace/mode-javascript
               //= require ace/mode-java
               //= require ace/theme-merbivore
               //= require custom
               //= require jquery.countdown
               //-------------- addition from local_jquery -----------
-            - //= require jquery.ui.datepicker
-            - //= require jquery.ui.slider
-            - //= require jquery-ui-timepicker-addon
               //= require jquery-tablesorter
               //= require best_in_place
               //= require best_in_place.jquery-ui
               //= require brython
               // 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/local_jquery.js ¶ -10

-            - //= require jquery
-            - //= require jquery_ujs
-            - //= require jquery.ui.all
-            - //= require jquery.ui.datepicker
-            - //= require jquery.ui.slider
-            - //= require jquery-ui-timepicker-addon
-            - //= require jquery-tablesorter
-            - //= require best_in_place
-            - //= require best_in_place.jquery-ui
+            -
-              $(document).ready(function() {
                 /* Activating Best In Place */
                 jQuery(".best_in_place").best_in_place();
               });

app/assets/stylesheets/application.css.scss ¶ +5 -5

               /* This is a manifest file that'll be compiled into application.css, which will include all the files
                * listed below.
                *
                * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
                * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
                *
                * You're free to add application-wide styles to this file and they'll appear at the bottom of the
                * compiled file so the styles you add here take precedence over styles defined in any styles
                * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
                * 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.theme";
-            - @import "jquery.ui.datepicker";
-            - @import "jquery.ui.slider";
+            + @import "jquery-ui";
+            + //@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 "jquery.countdown";
               @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;
               @font-face {
                   font-family: 'Glyphicons Halflings';

app/controllers/announcements_controller.rb ¶ +9 -4

               class AnnouncementsController < ApplicationController
                 before_filter :admin_authorization
                 in_place_edit_for :announcement, :published
                 # GET /announcements
                 # GET /announcements.xml
                 def index
-            -     @announcements = Announcement.find(:all,
-            -                                        :order => "created_at DESC")
+            +     @announcements = Announcement.order(created_at: :desc)
                   respond_to do |format|
                     format.html # index.html.erb
                     format.xml  { render :xml => @announcements }
                   end
                 end
                 # GET /announcements/1
                 # GET /announcements/1.xml
                 def show
                   @announcement = Announcement.find(params[:id])
                   respond_to do |format|
                     format.html # show.html.erb
                     format.xml  { render :xml => @announcement }
                   end
                 end
                 # GET /announcements/new
                 # GET /announcements/new.xml
                 def new
                   @announcement = Announcement.new
                   respond_to do |format|
                     format.html # new.html.erb
                     format.xml  { render :xml => @announcement }
                   end
                 end
                 # GET /announcements/1/edit
                 def edit
                   @announcement = Announcement.find(params[:id])
                 end
                 # POST /announcements
                 # POST /announcements.xml
                 def create
-            -     @announcement = Announcement.new(params[:announcement])
+            +     @announcement = Announcement.new(announcement_params)
                   respond_to do |format|
                     if @announcement.save
                       flash[:notice] = 'Announcement was successfully created.'
                       format.html { redirect_to(@announcement) }
                       format.xml  { render :xml => @announcement, :status => :created, :location => @announcement }
                     else
                       format.html { render :action => "new" }
                       format.xml  { render :xml => @announcement.errors, :status => :unprocessable_entity }
                     end
                   end
                 end
                 # PUT /announcements/1
                 # PUT /announcements/1.xml
                 def update
                   @announcement = Announcement.find(params[:id])
                   respond_to do |format|
-            -       if @announcement.update_attributes(params[:announcement])
+            +       if @announcement.update_attributes(announcement_params)
                       flash[:notice] = 'Announcement was successfully updated.'
                       format.html { redirect_to(@announcement) }
                       format.js   {}
                       format.xml  { head :ok }
                     else
                       format.html { render :action => "edit" }
                       format.js   {}
                       format.xml  { render :xml => @announcement.errors, :status => :unprocessable_entity }
                     end
                   end
                 end
                 def toggle
                   @announcement = Announcement.find(params[:id])
                   @announcement.update_attributes( published:  !@announcement.published? )
                   respond_to do |format|
                     format.js { render partial: 'toggle_button',
                                 locals: {button_id: "#announcement_toggle_#{@announcement.id}",button_on: @announcement.published? } }
                   end
                 end
                 def toggle_front
                   @announcement = Announcement.find(params[:id])
                   @announcement.update_attributes( frontpage:  !@announcement.frontpage? )
                   respond_to do |format|
                     format.js { render partial: 'toggle_button',
                                 locals: {button_id: "#announcement_toggle_front_#{@announcement.id}",button_on: @announcement.frontpage? } }
                   end
                 end
                 # DELETE /announcements/1
                 # DELETE /announcements/1.xml
                 def destroy
                   @announcement = Announcement.find(params[:id])
                   @announcement.destroy
                   respond_to do |format|
                     format.html { redirect_to(announcements_url) }
                     format.xml  { head :ok }
                   end
                 end
+            +
+            +   private
+            +
+            +     def announcement_params
+            +       params.require(:announcement).permit(:author, :body, :published, :frontpage, :contest_only, :title)
+            +     end
               end

app/controllers/application_controller.rb ¶ +18 -6

               class ApplicationController < ActionController::Base
                 protect_from_forgery
-            -   before_filter :current_user
+            +   before_filter :current_user
                 SINGLE_USER_MODE_CONF_KEY = 'system.single_user_mode'
                 MULTIPLE_IP_LOGIN_CONF_KEY = 'right.multiple_ip_login'
                 #report and redirect for unauthorized activities
                 def unauthorized_redirect
                   flash[:notice] = 'You are not authorized to view the page you requested'
                   redirect_to :controller => 'main', :action => 'login'
                 end
                 # Returns the current logged-in user (if any).
                 def current_user
                   return nil unless session[:user_id]
                   @current_user ||= User.find(session[:user_id])
                 end
                 def admin_authorization
                   return false unless authenticate
-            -     user = User.find(session[:user_id], :include => ['roles'])
+            +     user = User.includes(:roles).find(session[:user_id])
                   unless user.admin?
                     unauthorized_redirect
                     return false
                   end
                   return true
                 end
                 def authorization_by_roles(allowed_roles)
                   return false unless authenticate
                   user = User.find(session[:user_id])
                   unless user.roles.detect { |role| allowed_roles.member?(role.name) }
                     unauthorized_redirect
                     return false
                   end
                 end
+            +   def testcase_authorization
+            +     #admin always has privileged
+            +     puts "haha"
+            +     if @current_user.admin?
+            +       return true
+            +     end
+            +
+            +     puts "hehe"
+            +     puts GraderConfiguration["right.view_testcase"]
+            +     unauthorized_redirect unless GraderConfiguration["right.view_testcase"]
+            +   end
+            +
                 protected
                 def authenticate
                   unless session[:user_id]
                     flash[:notice] = 'You need to login'
                     if GraderConfiguration[SINGLE_USER_MODE_CONF_KEY]
                       flash[:notice] = 'You need to login but you cannot log in at this time'
                     end
                     redirect_to :controller => 'main', :action => 'login'
                     return false
                   end
                   # check if run in single user mode
                   if GraderConfiguration[SINGLE_USER_MODE_CONF_KEY]
                     user = User.find_by_id(session[:user_id])
                     if user==nil or (not user.admin?)
                       flash[:notice] = 'You cannot log in at this time'
                       redirect_to :controller => 'main', :action => 'login'
                       return false
                     end
                     unless user.enabled?
                       flash[:notice] = 'Your account is disabled'
                       redirect_to :controller => 'main', :action => 'login'
                       return false
                 end
                 def authenticate_by_ip_address
                   #this assume that we have already authenticate normally
                   unless GraderConfiguration[MULTIPLE_IP_LOGIN_CONF_KEY]
                     user = User.find(session[:user_id])
                     if (not user.admin? and user.last_ip and user.last_ip != request.remote_ip)
                       flash[:notice] = "You cannot use the system from #{request.remote_ip}. Your last ip is #{user.last_ip}"
                       redirect_to :controller => 'main', :action => 'login'
                       puts "CHEAT: user #{user.login} tried to login from '#{request.remote_ip}' while last ip is '#{user.last_ip}' at #{Time.zone.now}"
                       return false
                     end
                     unless user.last_ip
                       user.last_ip = request.remote_ip
                       user.save
                     end
                   end
                   return true
                 end
                 def authorization
                   return false unless authenticate
                   user = User.find(session[:user_id])
                   unless user.roles.detect { |role|
-            - 	role.rights.detect{ |right|
-            - 	  right.controller == self.class.controller_name and
-            -           (right.action == 'all' or right.action == action_name)
-            - 	}
+            +         role.rights.detect{ |right|
+            +           right.controller == self.class.controller_name and
+            +             (right.action == 'all' or right.action == action_name)
+            +         }
                     }
                     flash[:notice] = 'You are not authorized to view the page you requested'
                     #request.env['HTTP_REFERER'] ? (redirect_to :back) : (redirect_to :controller => 'login')
                     redirect_to :controller => 'main', :action => 'login'
                     return false
                   end
                 end
                 def verify_time_limit
                   return true if session[:user_id]==nil
                   user = User.find(session[:user_id], :include => :site)
                   return true if user==nil or user.site == nil
                   if user.contest_finished?
                     flash[:notice] = 'Error: the contest you are participating is over.'
                     redirect_to :back
                     return false
                   end
                   return true
                 end
               end

app/controllers/configurations_controller.rb ¶ +8 -3

               class ConfigurationsController < ApplicationController
                 before_filter :authenticate
                 before_filter { |controller| controller.authorization_by_roles(['admin'])}
                 def index
-            -     @configurations = GraderConfiguration.find(:all,
-            -                                          :order => '`key`')
+            +     @configurations = GraderConfiguration.order(:key)
+            +     @group = GraderConfiguration.pluck("grader_configurations.key").map{ |x| x[0...(x.index('.'))] }.uniq.sort
                 end
                 def reload
                   GraderConfiguration.reload
                   redirect_to :action => 'index'
                 end
                 def update
                   @config = GraderConfiguration.find(params[:id])
                   User.clear_last_login if @config.key == GraderConfiguration::MULTIPLE_IP_LOGIN_KEY and @config.value == 'true' and params[:grader_configuration][:value] == 'false'
                   respond_to do |format|
-            -       if @config.update_attributes(params[:grader_configuration])
+            +       if @config.update_attributes(configuration_params)
                       format.json { head :ok }
                     else
                       format.json { respond_with_bip(@config) }
                     end
                   end
                 end
+            + private
+            +   def configuration_params
+            +     params.require(:grader_configuration).permit(:key,:value_type,:value,:description)
+            +   end
+            +
               end

app/controllers/contest_management_controller.rb ¶ +2 -2

               class ContestManagementController < ApplicationController
                 before_filter :admin_authorization
                 def index
                   @num_contests = Contest.count()
                 end
                 def user_stat
                   if not GraderConfiguration.indv_contest_mode?
                     redirect_to :action => 'index' and return
                   end
-            -     @users = User.find(:all)
+            +     @users = User.all
                   @start_times = {}
-            -     UserContestStat.find(:all).each do |stat|
+            +     UserContestStat.all.each do |stat|
                     @start_times[stat.user_id] = stat.started_at
                   end
                 end
                 def clear_stat
                   user = User.find(params[:id])
                   if user.contest_stat!=nil
                     user.contest_stat.destroy
                   end
                   redirect_to :action => 'user_stat'
                 end
                 def clear_all_stat
                   if not GraderConfiguration.indv_contest_mode?
                     redirect_to :action => 'index' and return
                   end
                   UserContestStat.delete_all()
                   flash[:notice] = 'All start time statistic cleared.'
                   redirect_to :action => 'index'
                 end
                 def change_contest_mode
                   if ['standard', 'contest', 'indv-contest', 'analysis'].include? params[:id]

app/controllers/contests_controller.rb ¶ +7 -1

                 # POST /contests
                 # POST /contests.xml
                 def create
                   @contest = Contest.new(params[:contest])
                   respond_to do |format|
                     if @contest.save
                       flash[:notice] = 'Contest was successfully created.'
                       format.html { redirect_to(@contest) }
                       format.xml  { render :xml => @contest, :status => :created, :location => @contest }
                     else
                       format.html { render :action => "new" }
                       format.xml  { render :xml => @contest.errors, :status => :unprocessable_entity }
                     end
                   end
                 end
                 # PUT /contests/1
                 # PUT /contests/1.xml
                 def update
                   @contest = Contest.find(params[:id])
                   respond_to do |format|
-            -       if @contest.update_attributes(params[:contest])
+            +       if @contest.update_attributes(contests_params)
                       flash[:notice] = 'Contest was successfully updated.'
                       format.html { redirect_to(@contest) }
                       format.xml  { head :ok }
                     else
                       format.html { render :action => "edit" }
                       format.xml  { render :xml => @contest.errors, :status => :unprocessable_entity }
                     end
                   end
                 end
                 # DELETE /contests/1
                 # DELETE /contests/1.xml
                 def destroy
                   @contest = Contest.find(params[:id])
                   @contest.destroy
                   respond_to do |format|
                     format.html { redirect_to(contests_url) }
                     format.xml  { head :ok }
                   end
                 end
+            +   private
+            +
+            +     def contests_params
+            +       params.require(:contest).permit(:title,:enabled,:name)
+            +     end
+            +
               end

app/controllers/graders_controller.rb ¶ +3 -5

                     return true
                   else
                     unauthorized_redirect
                     return false
                   end
                 }
                 verify :method => :post, :only => ['clear_all',
                                                    'start_exam',
                                                    'start_grading',
                                                    'stop_all',
                                                    'clear_terminated'],
                        :redirect_to => {:action => 'index'}
                 def index
                   redirect_to :action => 'list'
                 end
                 def list
                   @grader_processes = GraderProcess.find_running_graders
                   @stalled_processes = GraderProcess.find_stalled_process
                   @terminated_processes = GraderProcess.find_terminated_graders
-            -     @last_task = Task.find(:first,
-            -                            :order => 'created_at DESC')
-            -     @last_test_request = TestRequest.find(:first,
-            -                                           :order => 'created_at DESC')
+            +     @last_task = Task.last
+            +     @last_test_request = TestRequest.last
                   @submission = Submission.order("id desc").limit(20)
                   @backlog_submission = Submission.where('graded_at is null')
                 end
                 def clear
                   grader_proc = GraderProcess.find(params[:id])
                   grader_proc.destroy if grader_proc!=nil
                   redirect_to :action => 'list'
                 end
                 def clear_terminated
                   GraderProcess.find_terminated_graders.each do |p|
                     p.destroy
                   end
                   redirect_to :action => 'list'
                 end
                 def clear_all
-            -     GraderProcess.find(:all).each do |p|
+            +     GraderProcess.all.each do |p|
                     p.destroy
                   end
                   redirect_to :action => 'list'
                 end
                 def view
                   if params[:type]=='Task'
                     redirect_to :action => 'task', :id => params[:id]
                   else
                     redirect_to :action => 'test_request', :id => params[:id]
                   end
                 end
                 def test_request
                   @test_request = TestRequest.find(params[:id])
                 end
                 def task
                   @task = Task.find(params[:id])
                 end
                 def submission
                   @submission = Submission.find(params[:id])
                   formatter = Rouge::Formatters::HTML.new(css_class: 'highlight', line_numbers: true )

app/controllers/heartbeat_controller.rb ¶ +22 -7

               class HeartbeatController < ApplicationController
                 before_filter :admin_authorization, :only => ['index']
                 def edit
-            -     @user = User.find_by_login(params[:id])
-            -     unless @user
-            -       render text: "LOGIN_NOT_FOUND"
-            -       return
-            -     end
+            +     #@user = User.find_by_login(params[:id])
+            +     #unless @user
+            +     #  render text: "LOGIN_NOT_FOUND"
+            +     #  return
+            +     #end
                   #hb = HeartBeat.where(user_id: @user.id, ip_address: request.remote_ip).first
                   #puts "status = #{params[:status]}"
                   #if hb
                   #  if params[:status]
                   #    hb.status = params[:status]
                   #    hb.save
                   #  end
                   #  hb.touch
                   #else
                   #  HeartBeat.creae(user_id: @user.id, ip_address: request.remote_ip)
                   #end
-            -     HeartBeat.create(user_id: @user.id, ip_address: request.remote_ip, status: params[:status])
+            +     #HeartBeat.create(user_id: @user.id, ip_address: request.remote_ip, status: params[:status])
+            +
+            +     res = GraderConfiguration['right.heartbeat_response']
+            +     res.strip! if res
+            +     full = GraderConfiguration['right.heartbeat_response_full']
+            +     full.strip! if full
-            -     render text: (GraderConfiguration['right.heartbeat_response'] || 'OK')
+            +     if full and full != ''
+            +       l = Login.where(ip_address: request.remote_ip).last
+            +       @user = l.user
+            +       if @user.solve_all_available_problems?
+            +         render text: (full || 'OK')
+            +       else
+            +         render text: (res || 'OK')
+            +       end
+            +     else
+            +       render text: (GraderConfiguration['right.heartbeat_response'] || 'OK')
+            +     end
                 end
                 def index
                   @hb = HeartBeat.where("updated_at >= ?",Time.zone.now-2.hours).includes(:user).order(:user_id).all
                   @num = HeartBeat.where("updated_at >= ?",Time.zone.now-5.minutes).count(:user_id,distinct: true)
                 end
               end

app/controllers/main_controller.rb ¶ +6 -23

                 # COMMENT OUT: only need when having high load
                 # caches_action :index, :login
                 # NOTE: This method is not actually needed, 'config/routes.rb' has
                 # assigned action login as a default action.
                 def index
                   redirect_to :action => 'login'
                 end
                 def login
                   saved_notice = flash[:notice]
                   reset_session
                   flash.now[:notice] = saved_notice
                   # EXPERIMENT:
                   # Hide login if in single user mode and the url does not
                   # explicitly specify /login
                   #
                   # logger.info "PATH: #{request.path}"
                   # if GraderConfiguration['system.single_user_mode'] and
                   #     request.path!='/main/login'
                   #   @hidelogin = true
                   # end
-            -     @announcements = Announcement.find_for_frontpage
+            +     @announcements = Announcement.frontpage
                   render :action => 'login', :layout => 'empty'
                 end
                 def list
                   prepare_list_information
                 end
                 def help
                   @user = User.find(session[:user_id])
                 end
                 def submit
                   user = User.find(session[:user_id])
                   @submission = Submission.new
                   @submission.problem_id = params[:submission][:problem_id]
                   @submission.user = user
                   @submission.language_id = 0
                   if (params['file']) and (params['file']!='')
                     @submission.source = File.open(params['file'].path,'r:UTF-8',&:read)
                     @submission.source.encode!('UTF-8','UTF-8',invalid: :replace, replace: '')
                     @submission.source_filename = params['file'].original_filename
                   end
                   if (params[:editor_text])
                     language = Language.find_by_id(params[:language_id])
                     @submission.source = params[:editor_text]
                     @submission.source_filename = "live_edit.#{language.ext}"
                     @submission.language = language
                   end
                   @submission.submitted_at = Time.new.gmtime
                   @submission.ip_address = request.remote_ip
                   if GraderConfiguration.time_limit_mode? and user.contest_finished?
                     @submission.errors.add(:base,"The contest is over.")
                     prepare_list_information
                     render :action => 'list' and return
                   end
                   if @submission.valid?
                     if @submission.save == false
-            - 	flash[:notice] = 'Error saving your submission'
+            +         flash[:notice] = 'Error saving your submission'
                     elsif Task.create(:submission_id => @submission.id,
                                       :status => Task::STATUS_INQUEUE) == false
-            - 	flash[:notice] = 'Error adding your submission to task queue'
+            +         flash[:notice] = 'Error adding your submission to task queue'
                     end
                   else
                     prepare_list_information
                     render :action => 'list' and return
                   end
                   redirect_to :action => 'list'
                 end
                 def source
                   submission = Submission.find(params[:id])
                   if ((submission.user_id == session[:user_id]) and
                       (submission.problem != nil) and
                       (submission.problem.available))
                     send_data(submission.source,
-            - 		{:filename => submission.download_filename,
+            +                 {:filename => submission.download_filename,
                                 :type => 'text/plain'})
                   else
                     flash[:notice] = 'Error viewing source'
                     redirect_to :action => 'list'
                   end
                 end
                 def compiler_msg
                   @submission = Submission.find(params[:id])
                   if @submission.user_id == session[:user_id]
                     render :action => 'compiler_msg', :layout => 'empty'
                   else
                     flash[:notice] = 'Error viewing source'
                     redirect_to :action => 'list'
                   end
                 end
-            -   def submission
-            -     @user = User.find(session[:user_id])
-            -     @problems = @user.available_problems
-            -     if params[:id]==nil
-            -       @problem = nil
-            -       @submissions = nil
-            -     else
-            -       @problem = Problem.find_by_id(params[:id])
-            -       if (@problem == nil) or (not @problem.available)
-            -         redirect_to :action => 'list'
-            -         flash[:notice] = 'Error: submissions for that problem are not viewable.'
-            -         return
-            -       end
-            -       @submissions = Submission.find_all_by_user_problem(@user.id, @problem.id)
-            -     end
-            -   end
+            -
                 def result
                   if !GraderConfiguration.show_grading_result
                     redirect_to :action => 'list' and return
                   end
                   @user = User.find(session[:user_id])
                   @submission = Submission.find(params[:id])
                   if @submission.user!=@user
                     flash[:notice] = 'You are not allowed to view result of other users.'
                     redirect_to :action => 'list' and return
                   end
                   prepare_grading_result(@submission)
                 end
                 def load_output
                   if !GraderConfiguration.show_grading_result or params[:num]==nil
                     redirect_to :action => 'list' and return
                   end
                   @user = User.find(session[:user_id])
                   @submission = Submission.find(params[:id])
                   if @submission.user!=@user
                     flash[:notice] = 'You are not allowed to view result of other users.'
                     redirect_to :action => 'list' and return
                   end
                   case_num = params[:num].to_i
                     prepare_announcements(params[:recent])
                   else
                     prepare_announcements
                   end
                   render(:partial => 'announcement',
                          :collection => @announcements,
                          :locals => {:announcement_effect => true})
                 end
                 def confirm_contest_start
                   user = User.find(session[:user_id])
                   if request.method == 'POST'
                     user.update_start_time
                     redirect_to :action => 'list'
                   else
                     @contests = user.contests
                     @user = user
                   end
                 end
                 protected
                 def prepare_announcements(recent=nil)
                   if GraderConfiguration.show_tasks_to?(@user)
-            -       @announcements = Announcement.find_published(true)
+            +       @announcements = Announcement.published(true)
                   else
-            -       @announcements = Announcement.find_published
+            +       @announcements = Announcement.published
                   end
                   if recent!=nil
                     recent_id = recent.to_i
                     @announcements = @announcements.find_all { |a| a.id > recent_id }
                   end
                 end
                 def prepare_list_information
                   @user = User.find(session[:user_id])
                   if not GraderConfiguration.multicontests?
                     @problems = @user.available_problems
                   else
                     @contest_problems = @user.available_problems_group_by_contests
                     @problems = @user.available_problems
                   end
                   @prob_submissions = {}
                   @problems.each do |p|
                     sub = Submission.find_last_by_user_and_problem(@user.id,p.id)
                     if sub!=nil
                       @prob_submissions[p.id] = { :count => sub.number, :submission => sub }
                     else
                       @prob_submissions[p.id] = { :count => 0, :submission => nil }
                     end
                   end

app/controllers/problems_controller.rb ¶ +23 -10

               class ProblemsController < ApplicationController
-            -   before_filter :authenticate, :authorization
+            +   before_action :authenticate, :authorization
+            +   before_action :testcase_authorization, only: [:show_testcase]
                 in_place_edit_for :problem, :name
                 in_place_edit_for :problem, :full_name
                 in_place_edit_for :problem, :full_score
                 def index
-            -     @problems = Problem.find(:all, :order => 'date_added DESC')
+            +     @problems = Problem.order(date_added: :desc)
                 end
                 # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
                 verify :method => :post, :only => [ :create, :quick_create,
                                                     :do_manage,
                                                     :do_import,
                                                   ],
                        :redirect_to => { :action => :index }
                 def show
                   @problem = Problem.find(params[:id])
                 end
                 def new
                   @problem = Problem.new
                   @description = nil
                 end
                 def create
-            -     @problem = Problem.new(params[:problem])
+            +     @problem = Problem.new(problem_params)
                   @description = Description.new(params[:description])
                   if @description.body!=''
                     if !@description.save
                       render :action => new and return
                     end
                   else
                     @description = nil
                   end
                   @problem.description = @description
                   if @problem.save
                     flash[:notice] = 'Problem was successfully created.'
                     redirect_to action: :index
                   else
                     render :action => 'new'
                   end
                 end
                 def quick_create
-            -     @problem = Problem.new(params[:problem])
+            +     @problem = Problem.new(problem_params)
                   @problem.full_name = @problem.name if @problem.full_name == ''
                   @problem.full_score = 100
                   @problem.available = false
                   @problem.test_allowed = true
                   @problem.output_only = false
                   @problem.date_added = Time.new
                   if @problem.save
                     flash[:notice] = 'Problem was successfully created.'
                     redirect_to action: :index
                   else
                     flash[:notice] = 'Error saving problem'
                   redirect_to action: :index
                   end
                 end
                 def edit
                   @problem = Problem.find(params[:id])
                   @description = @problem.description
                 end
                 def update
                   @problem = Problem.find(params[:id])
                   @description = @problem.description
                   if @description.nil? and params[:description][:body]!=''
                     @description = Description.new(params[:description])
                     if !@description.save
                       flash[:notice] = 'Error saving description'
                       render :action => 'edit' and return
                     end
                     @problem.description = @description
                   elsif @description
                     if !@description.update_attributes(params[:description])
                       flash[:notice] = 'Error saving description'
                       render :action => 'edit' and return
                     end
                   end
                   if params[:file] and params[:file].content_type != 'application/pdf'
                       flash[:notice] = 'Error: Uploaded file is not PDF'
                       render :action => 'edit' and return
                   end
-            -     if @problem.update_attributes(params[:problem])
+            +     if @problem.update_attributes(problem_params)
                     flash[:notice] = 'Problem was successfully updated.'
                     unless params[:file] == nil or params[:file] == ''
                       flash[:notice] = 'Problem was successfully updated and a new PDF file is uploaded.'
                       out_dirname = "#{Problem.download_file_basedir}/#{@problem.id}"
                       if not FileTest.exists? out_dirname
                         Dir.mkdir out_dirname
                       end
                       out_filename = "#{out_dirname}/#{@problem.name}.pdf"
                       if FileTest.exists? out_filename
                         File.delete out_filename
                       end
                       File.open(out_filename,"wb") do |file|
                         file.write(params[:file].read)
                       end
                       @problem.description_filename = "#{@problem.name}.pdf"
                       @problem.save
                     end
                     redirect_to :action => 'show', :id => @problem
                   else
                     render :action => 'edit'
                   end
                 end
                 def destroy
                   p = Problem.find(params[:id]).destroy
                   redirect_to action: :index
                 end
                 def toggle
                   @problem = Problem.find(params[:id])
                   @problem.update_attributes(available: !(@problem.available) )
                   respond_to do |format|
                     format.js { }
                   end
                 end
                 def toggle_test
                   @problem = Problem.find(params[:id])
                   @problem.update_attributes(test_allowed: !(@problem.test_allowed?) )
                   respond_to do |format|
                     format.js { }
                   end
                 end
+            +   def toggle_view_testcase
+            +     @problem = Problem.find(params[:id])
+            +     @problem.update_attributes(view_testcase: !(@problem.view_testcase?) )
+            +     respond_to do |format|
+            +       format.js { }
+            +     end
+            +   end
+            +
                 def turn_all_off
-            -     Problem.find(:all,
-            -                  :conditions => "available = 1").each do |problem|
+            +     Problem.available.all.each do |problem|
                     problem.available = false
                     problem.save
                   end
                   redirect_to action: :index
                 end
                 def turn_all_on
-            -     Problem.find(:all,
-            -                  :conditions => "available = 0").each do |problem|
+            +     Problem.where.not(available: true).each do |problem|
                     problem.available = true
                     problem.save
                   end
                   redirect_to action: :index
                 end
                 def stat
                   @problem = Problem.find(params[:id])
                   unless @problem.available or session[:admin]
                     redirect_to :controller => 'main', :action => 'list'
                     return
                   end
                   @submissions = Submission.includes(:user).where(problem_id: params[:id]).order(:user_id,:id)
                   #stat summary
                   range =65
                   @histogram = { data: Array.new(range,0), summary: {} }
                   user = Hash.new(0)
                   @submissions.find_each do |sub|
                     d = (DateTime.now.in_time_zone - sub.submitted_at) / 24 / 60 / 60
                     @histogram[:data][d.to_i] += 1 if d < range
                     user[sub.user_id] = [user[sub.user_id], ((sub.try(:points) || 0) >= @problem.full_score) ? 1 : 0].max
                   end
                   @histogram[:summary][:max] = [@histogram[:data].max,1].max
                   @summary = { attempt: user.count, solve: 0 }
                   user.each_value { |v| @summary[:solve] += 1 if v == 1 }
                 end
                 def manage
-            -     @problems = Problem.find(:all, :order => 'date_added DESC')
+            +     @problems = Problem.order(date_added: :desc)
                 end
                 def do_manage
                   if params.has_key? 'change_date_added'
                     change_date_added
                   elsif params.has_key? 'add_to_contest'
                     add_to_contest
                   elsif params.has_key? 'enable_problem'
                     set_available(true)
                   elsif params.has_key? 'disable_problem'
                     set_available(false)
                   end
                   redirect_to :action => 'manage'
                 end
                 def import
                   @allow_test_pair_import = allow_test_pair_import?
                 end
                 def do_import
                   old_problem = Problem.find_by_name(params[:name])
                   if !allow_test_pair_import? and params.has_key? :import_to_db
                     params.delete :import_to_db
                   end
                 end
                 def set_available(avail)
                   problems = get_problems_from_params
                   problems.each do |p|
                     p.available = avail
                     p.save
                   end
                 end
                 def get_problems_from_params
                   problems = []
                   params.keys.each do |k|
                     if k.index('prob-')==0
                       name, id, order = k.split('-')
                       problems << Problem.find(id)
                     end
                   end
                   problems
                 end
                 def get_problems_stat
                 end
+            +   private
+            +
+            +     def problem_params
+            +       params.require(:problem).permit(:name, :full_name, :full_score, :date_added, :available, :test_allowed,:output_only, :url, :description)
+            +     end
+            +
               end

app/controllers/report_controller.rb ¶ +14 -16

               require 'csv'
               class ReportController < ApplicationController
                 before_filter :authenticate
                 before_filter :admin_authorization, only: [:login_stat,:submission_stat, :stuck, :cheat_report, :cheat_scruntinize, :show_max_score]
                 before_filter(only: [:problem_hof]) { |c|
                   return false unless authenticate
-            -     if GraderConfiguration["right.user_view_submission"]
-            -       return true;
-            -     end
+            -
-            -     admin_authorization
+            +     admin_authorization unless GraderConfiguration["right.user_view_submission"]
                 }
                 def max_score
                 end
                 def current_score
-            -     @problems = Problem.find_available_problems
+            +     @problems = Problem.available_problems
                   @users = User.includes(:contests).includes(:contest_stat).where(enabled: true)
                   @scorearray = calculate_max_score(@problems, @users,0,0,true)
                   #rencer accordingly
                   if params[:button] == 'download' then
                     csv = gen_csv_from_scorearray(@scorearray,@problems)
                     send_data csv, filename: 'max_score.csv'
                   else
                     #render template: 'user_admin/user_stat'
                     render 'current_score'
                   end
                 end
                 def show_max_score
                   #process parameters
                   #problems
                   @problems = []
-            -     params[:problem_id].each do |id|
-            -       next unless id.strip != ""
-            -       pid = Problem.find_by_id(id.to_i)
-            -       @problems << pid if pid
+            +     if params[:problem_id]
+            +       params[:problem_id].each do |id|
+            +         next unless id.strip != ""
+            +         pid = Problem.find_by_id(id.to_i)
+            +         @problems << pid if pid
+            +       end
                   end
                   #users
                   @users = if params[:user] == "all" then
-            -                User.find(:all, :include => [:contests, :contest_stat])
+            +                User.includes(:contests).includes(:contest_stat)
                            else
                              User.includes(:contests).includes(:contest_stat).where(enabled: true)
                            end
                   #set up range from param
-            -     since_id = params.fetch(:min_id, 0).to_i
-            -     until_id = params.fetch(:max_id, 0).to_i
+            +     @since_id = params.fetch(:from_id, 0).to_i
+            +     @until_id = params.fetch(:to_id, 0).to_i
                   #calculate the routine
-            -     @scorearray = calculate_max_score(@problems, @users,since_id,until_id)
+            +     @scorearray = calculate_max_score(@problems, @users, @since_id, @until_id)
                   #rencer accordingly
                   if params[:button] == 'download' then
                     csv = gen_csv_from_scorearray(@scorearray,@problems)
                     send_data csv, filename: 'max_score.csv'
                   else
                     #render template: 'user_admin/user_stat'
                     render 'max_score'
                   end
                 end
                 def score
                   if params[:commit] == 'download csv'
                     @problems = Problem.all
                   else
-            -       @problems = Problem.find_available_problems
+            +       @problems = Problem.available_problems
                   end
-            -     @users = User.includes(:contests, :contest_stat).where(enabled: true) #find(:all, :include => [:contests, :contest_stat]).where(enabled: true)
+            +     @users = User.includes(: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

app/controllers/site_controller.rb ¶ +6 -1

               class SiteController < ApplicationController
                 before_filter :site_admin_authorization, :except => 'login'
                 def login
                   # Site administrator login
-            -     @countries = Country.find(:all, :include => :sites)
+            +     @countries = Country.includes(:sites).all
                   @country_select = @countries.collect { |c| [c.name, c.id] }
                   @country_select_with_all = [['Any',0]]
                   @countries.each do |country|
                     @country_select_with_all << [country.name, country.id]
                   end
                   @site_select = []
                   @countries.each do |country|
                     country.sites.each do |site|
                       @site_select << ["#{site.name}, #{country.name}", site.id]
                     end
                   end
                   @default_site = Site.first if !GraderConfiguration['contest.multisites']
                   render :action => 'login', :layout => 'empty'
                 end
                 def index
                   if @site.started
                     render :action => 'started', :layout => 'empty'
                   else
                     render :action => 'prompt', :layout => 'empty'
                   @site.save
                   redirect_to :action => 'index'
                 end
                 def logout
                   reset_session
                   redirect_to :controller => 'main', :action => 'login'
                 end
                 protected
                 def site_admin_authorization
                   if session[:site_id]==nil
                     redirect_to :controller => 'site', :action => 'login' and return
                   end
                   begin
                     @site = Site.find(session[:site_id], :include => :country)
                   rescue ActiveRecord::RecordNotFound
                     @site = nil
                   end
                   if @site==nil
                     redirect_to :controller => 'site', :action => 'login' and return
                   end
                 end
+            +   private
+            +     def site_params
+            +       params.require(:site).permit()
+            +     end
+            +
               end

app/controllers/sites_controller.rb ¶ +8 -2

               class SitesController < ApplicationController
                 before_filter :admin_authorization
                 # GET /sites
                 # GET /sites.xml
                 def index
-            -     @sites = Site.find(:all, :order => 'country_id')
+            +     @sites = Site.order(:country_id)
                   respond_to do |format|
                     format.html # index.html.erb
                     format.xml  { render :xml => @sites }
                   end
                 end
                 # GET /sites/1
                 # GET /sites/1.xml
                 def show
                   @site = Site.find(params[:id])
                   respond_to do |format|
                     format.html # show.html.erb
                     format.xml  { render :xml => @site }
                   end
                 end
                 # GET /sites/new
                 # GET /sites/new.xml
                 def new
                   @site = Site.new
                   respond_to do |format|
                 # POST /sites.xml
                 def create
                   @site = Site.new(params[:site])
                   @site.clear_start_time_if_not_started
                   respond_to do |format|
                     if @site.save
                       flash[:notice] = 'Site was successfully created.'
                       format.html { redirect_to(@site) }
                       format.xml  { render :xml => @site, :status => :created, :location => @site }
                     else
                       format.html { render :action => "new" }
                       format.xml  { render :xml => @site.errors, :status => :unprocessable_entity }
                     end
                   end
                 end
                 # PUT /sites/1
                 # PUT /sites/1.xml
                 def update
                   @site = Site.find(params[:id])
                   @site.clear_start_time_if_not_started
                   respond_to do |format|
-            -       if @site.update_attributes(params[:site])
+            +       if @site.update_attributes(site_params)
                       flash[:notice] = 'Site was successfully updated.'
                       format.html { redirect_to(@site) }
                       format.xml  { head :ok }
                     else
                       format.html { render :action => "edit" }
                       format.xml  { render :xml => @site.errors, :status => :unprocessable_entity }
                     end
                   end
                 end
                 # DELETE /sites/1
                 # DELETE /sites/1.xml
                 def destroy
                   @site = Site.find(params[:id])
                   @site.destroy
                   respond_to do |format|
                     format.html { redirect_to(sites_url) }
                     format.xml  { head :ok }
                   end
                 end
+            +   private
+            +
+            +     def site_params
+            +       params.require(:site).permit(:name,:started,:start_time,:country_id,:password)
+            +     end
+            +
               end

app/controllers/submissions_controller.rb ¶ +29 -58

               class SubmissionsController < ApplicationController
-            -   before_filter :authenticate
-            -   before_filter :submission_authorization, only: [:show, :direct_edit_submission]
+            +   before_action :authenticate
+            +   before_action :submission_authorization, only: [:show, :direct_edit_submission, :download, :edit]
+            +   before_action :admin_authorization, only: [:rejudge]
                 # GET /submissions
                 # GET /submissions.json
                 # Show problem selection and user's submission of that problem
                 def index
                   @user = @current_user
                   @problems = @user.available_problems
                   if params[:problem_id]==nil
                     @problem = nil
                     @submissions = nil
                   else
                     @problem = Problem.find_by_id(params[:problem_id])
                     if (@problem == nil) or (not @problem.available)
                       redirect_to main_list_path
                       flash[:notice] = 'Error: submissions for that problem are not viewable.'
                       return
                     end
-            -       @submissions = Submission.find_all_by_user_problem(@user.id, @problem.id)
+            +       @submissions = Submission.find_all_by_user_problem(@user.id, @problem.id).order(id: :desc)
                   end
                 end
                 # GET /submissions/1
                 # GET /submissions/1.json
                 def show
                   @submission = Submission.find(params[:id])
                   #log the viewing
                   user = User.find(session[:user_id])
                   SubmissionViewLog.create(user_id: session[:user_id],submission_id: @submission.id) unless user.admin?
+            +
+            +     @task = @submission.task
+            +   end
+            +
+            +   def download
+            +     @submission = Submission.find(params[:id])
+            +     send_data(@submission.source, {:filename => @submission.download_filename, :type => 'text/plain'})
+            +   end
+            +
+            +   def compiler_msg
+            +     @submission = Submission.find(params[:id])
+            +     respond_to do |format|
+            +       format.js
+            +     end
                 end
                 #on-site new submission on specific problem
                 def direct_edit_problem
                   @problem = Problem.find(params[:problem_id])
                   @source = ''
                   render 'edit'
                 end
                 # GET /submissions/1/edit
                 def edit
                   @submission = Submission.find(params[:id])
                   @source = @submission.source.to_s
                   @problem = @submission.problem
                   @lang_id = @submission.language.id
                 end
                 def get_latest_submission_status
                   @problem = Problem.find(params[:pid])
                   @submission = Submission.find_last_by_user_and_problem(params[:uid],params[:pid])
                   puts User.find(params[:uid]).login
                   puts Problem.find(params[:pid]).name
                   puts 'nil' unless @submission
                   respond_to do |format|
                     format.js
                   end
                 end
-            - #  # GET /submissions/new
-            - #  # GET /submissions/new.json
-            - #  def new
-            - #    @submission = Submission.new
-            - #
-            - #    respond_to do |format|
-            - #      format.html # new.html.erb
-            - #      format.json { render json: @submission }
-            - #    end
-            - #  end
-            - #
-            - #
-            - #  # POST /submissions
-            - #  # POST /submissions.json
-            - #  def create
-            - #    @submission = Submission.new(params[:submission])
-            - #
-            - #    respond_to do |format|
-            - #      if @submission.save
-            - #        format.html { redirect_to @submission, notice: 'Submission was successfully created.' }
-            - #        format.json { render json: @submission, status: :created, location: @submission }
-            - #      else
-            - #        format.html { render action: "new" }
-            - #        format.json { render json: @submission.errors, status: :unprocessable_entity }
-            - #      end
-            - #    end
-            - #  end
-            - #
-            - #  # PUT /submissions/1
-            - #  # PUT /submissions/1.json
-            - #  def update
-            - #    @submission = Submission.find(params[:id])
-            - #
-            - #    respond_to do |format|
-            - #      if @submission.update_attributes(params[:submission])
-            - #        format.html { redirect_to @submission, notice: 'Submission was successfully updated.' }
-            - #        format.json { head :no_content }
-            - #      else
-            - #        format.html { render action: "edit" }
-            - #        format.json { render json: @submission.errors, status: :unprocessable_entity }
-            - #      end
-            - #    end
-            - #  end
-            - #
-            - #  # DELETE /submissions/1
-            - #  # DELETE /submissions/1.json
-            - #  def destroy
-            - #    @submission = Submission.find(params[:id])
-            - #    @submission.destroy
-            - #
-            - #    respond_to do |format|
-            - #      format.html { redirect_to submissions_url }
-            - #      format.json { head :no_content }
-            - #    end
-            - #  end
+            +   # GET /submissions/:id/rejudge
+            +   def rejudge
+            +     @submission = Submission.find(params[:id])
+            +     @task = @submission.task
+            +     @task.status_inqueue! if @task
+            +     respond_to do |format|
+            +       format.js
+            +     end
+            +   end
               protected
+            +
                 def submission_authorization
                   #admin always has privileged
                   if @current_user.admin?
                     return true
                   end
                   sub = Submission.find(params[:id])
                   if sub.problem.available?
                     puts "sub = #{sub.user.id}, current = #{@current_user.id}"
                     return true if GraderConfiguration["right.user_view_submission"] or sub.user == @current_user
                   end
                   #default to NO
                   unauthorized_redirect
                   return false
                 end
+            +
               end

app/controllers/user_admin_controller.rb ¶ +66 -16

                 # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
                 verify :method => :post, :only => [
                                                     :create, :create_from_list,
                                                     :update,
                                                     :manage_contest,
                                                     :bulk_mail
                                                   ],
                        :redirect_to => { :action => :list }
                 def index
                   @user_count = User.count
                   if params[:page] == 'all'
                     @users = User.all
                     @paginated = false
                   else
                     @users = User.paginate :page => params[:page]
                     @paginated = true
                   end
                   @hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at']
                   @contests = Contest.enabled
                 end
                 def active
-            -     sessions = ActiveRecord::SessionStore::Session.find(:all, :conditions => ["updated_at >= ?", 60.minutes.ago])
+            +     sessions = ActiveRecord::SessionStore::Session.where("updated_at >= ?", 60.minutes.ago)
                   @users = []
                   sessions.each do |session|
                     if session.data[:user_id]
                       @users << User.find(session.data[:user_id])
                     end
                   end
                 end
                 def show
                   @user = User.find(params[:id])
                 end
                 def new
                   @user = User.new
                 end
                 def create
-            -     @user = User.new(params[:user])
+            +     @user = User.new(user_params)
                   @user.activated = true
                   if @user.save
                     flash[:notice] = 'User was successfully created.'
                     redirect_to :action => 'index'
                   else
                     render :action => 'new'
                   end
                 end
                 def clear_last_ip
                   @user = User.find(params[:id])
                   @user.last_ip = nil
                   @user.save
                   redirect_to action: 'index', page: params[:page]
                 end
                 def create_from_list
                   lines = params[:user_list]
                   note = []
                   lines.split("\n").each do |line|
                     items = line.chomp.split(',')
                     if items.length>=2
                       login = items[0]
                       full_name = items[1]
+            +         remark =''
+            +         user_alias = ''
                       added_random_password = false
-            -         if items.length>=3
+            +         if items.length >= 3 and items[2].chomp(" ").length > 0;
                         password = items[2].chomp(" ")
-            -           user_alias = (items.length>=4) ? items[3] : login
                       else
                         password = random_password
-            -           user_alias = (items.length>=4) ? items[3] : login
-            -           added_random_password = true
+            +           add_random_password=true;
+            +         end
+            +
+            +         if items.length>= 4 and items[3].chomp(" ").length > 0;
+            +           user_alias = items[3].chomp(" ")
+            +         else
+            +           user_alias = login
+            +         end
+            +
+            +         if items.length>=5
+            +           remark = items[4].strip;
                       end
                       user = User.find_by_login(login)
                       if (user)
                         user.full_name = full_name
                         user.password = password
+            +           user.remark = remark
                       else
                         user = User.new({:login => login,
                                           :full_name => full_name,
                                           :password => password,
                                           :password_confirmation => password,
-            -                             :alias => user_alias})
+            +                             :alias => user_alias,
+            +                             :remark => remark})
                       end
                       user.activated = true
                       user.save
                       if added_random_password
                         note << "'#{login}' (+)"
                       else
                         note << login
                       end
                     end
                   end
-            -     flash[:notice] = 'User(s) ' + note.join(', ') +
+            +     flash[:success] = 'User(s) ' + note.join(', ') +
                     ' were successfully created.  ' +
                     '( (+) - created with random passwords.)'
                   redirect_to :action => 'index'
                 end
                 def edit
                   @user = User.find(params[:id])
                 end
                 def update
                   @user = User.find(params[:id])
-            -     if @user.update_attributes(params[:user])
+            +     if @user.update_attributes(user_params)
                     flash[:notice] = 'User was successfully updated.'
                     redirect_to :action => 'show', :id => @user
                   else
                     render :action => 'edit'
                   end
                 end
                 def destroy
                   User.find(params[:id]).destroy
                   redirect_to :action => 'index'
                 end
                 def user_stat
                   if params[:commit] == 'download csv'
                     @problems = Problem.all
                   else
-            -       @problems = Problem.find_available_problems
+            +       @problems = Problem.available_problems
                   end
-            -     @users = User.includes(:contests, :contest_stat).where(enabled: true) #find(:all, :include => [:contests, :contest_stat]).where(enabled: true)
+            +     @users = User.includes(: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 user_stat_max
                   if params[:commit] == 'download csv'
                     @problems = Problem.all
                   else
-            -       @problems = Problem.find_available_problems
+            +       @problems = Problem.available_problems
                   end
-            -     @users = User.find(:all, :include => [:contests, :contest_stat])
+            +     @users = User.includes(:contests).includes(:contest_stat).all
                   @scorearray = Array.new
                   #set up range from param
                   since_id = params.fetch(:since_id, 0).to_i
                   until_id = params.fetch(:until_id, 0).to_i
                   @users.each do |u|
                     ustat = Array.new
                     ustat[0] = u
                     @problems.each do |p|
                       max_points = 0
                       Submission.find_in_range_by_user_and_problem(u.id,p.id,since_id,until_id).each do |sub|
                         max_points = sub.points if sub and sub.points and (sub.points > max_points)
                       end
                       ustat << [(max_points.to_f*100/p.full_score).round, (max_points>=p.full_score)]
                     end
                     @scorearray << ustat
                   end
                   if params[:commit] == 'download csv' then
                     csv = gen_csv_from_scorearray(@scorearray,@problems)
                     send_data csv, filename: 'max_score.csv'
                   else
                     render template: 'user_admin/user_stat'
                   end
                 end
                 def import
                   if params[:file]==''
                     flash[:notice] = 'Error importing no file'
                     redirect_to :action => 'index' and return
                   end
                   import_from_file(params[:file])
                 end
                 def random_all_passwords
-            -     users = User.find(:all)
+            +     users = User.all
                   @prefix = params[:prefix] || ''
                   @non_admin_users = User.find_non_admin_with_prefix(@prefix)
                   @changed = false
                   if request.request_method == 'POST'
                     @non_admin_users.each do |user|
                       password = random_password
                       user.password = password
                       user.password_confirmation = password
                       user.save
                     end
                     @changed = true
                   end
                 end
                 # contest management
                 def contests
                   @contest, @users = find_contest_and_user_from_contest_id(params[:id])
                   @contests = Contest.enabled
                 end
                 def assign_from_list
                   contest_id = params[:users_contest_id]
                   org_contest, users = find_contest_and_user_from_contest_id(contest_id)
                         user.contest_stat.reset_timer_and_save
                       end
                       if params[:notification_emails]
                         send_contest_update_notification_email(user, contest)
                       end
                       note << user.login
                       users << user
                     end
                   end
                   if params[:reset_timer]
                     logout_users(users)
                   end
                   flash[:notice] = 'User(s) ' + note.join(', ') +
                     ' were successfully modified.  '
                   redirect_to :action => 'contest_management'
                 end
                 # admin management
                 def admin
-            -     @admins = User.find(:all).find_all {|user| user.admin? }
+            +     @admins = User.all.find_all {|user| user.admin? }
                 end
                 def grant_admin
                   login = params[:login]
                   user = User.find_by_login(login)
                   if user!=nil
                     admin_role = Role.find_by_name('admin')
                     user.roles << admin_role
                   else
                     flash[:notice] = 'Unknown user'
                   end
                   flash[:notice] = 'User added as admins'
                   redirect_to :action => 'admin'
                 end
                 def revoke_admin
                   user = User.find(params[:id])
                   if user==nil
                     flash[:notice] = 'Unknown user'
                     redirect_to :action => 'admin' and return
                   elsif user.login == 'root'
                     flash[:notice] = 'You cannot revoke admisnistrator permission from root.'
                     redirect_to :action => 'admin' and return
                   end
                     redirect_to :action => 'mass_mailing' and return
                   end
                   mail_body = params[:email_body]
                   if !mail_body or mail_body.blank?
                     flash[:notice] = 'You entered an empty mail body.'
                     redirect_to :action => 'mass_mailing' and return
                   end
                   note = []
                   users = []
                   lines.split("\n").each do |line|
                     user = User.find_by_login(line.chomp)
                     if user
                       send_mail(user.email, mail_subject, mail_body)
                       note << user.login
                     end
                   end
                   flash[:notice] = 'User(s) ' + note.join(', ') +
                     ' were successfully modified.  '
                   redirect_to :action => 'mass_mailing'
                 end
+            +   #bulk manage
+            +   def bulk_manage
+            +
+            +     begin
+            +       @users = User.where('login REGEXP ?',params[:regex]) if params[:regex]
+            +       @users.count if @users #i don't know why I have to call count, but if I won't exception is not raised
+            +     rescue Exception
+            +       flash[:error] = 'Regular Expression is malformed'
+            +       @users = nil
+            +     end
+            +
+            +     if params[:commit]
+            +       @action = {}
+            +       @action[:set_enable] = params[:enabled]
+            +       @action[:enabled] = params[:enable] == "1"
+            +       @action[:gen_password] = params[:gen_password]
+            +     end
+            +
+            +     if params[:commit] == "Perform"
+            +       if @action[:set_enable]
+            +         @users.update_all(enabled: @action[:enabled])
+            +       end
+            +       if @action[:gen_password]
+            +         @users.each do |u|
+            +           password = random_password
+            +           u.password = password
+            +           u.password_confirmation = password
+            +           u.save
+            +         end
+            +       end
+            +     end
+            +   end
+            +
                 protected
                 def random_password(length=5)
                   chars = 'abcdefghijkmnopqrstuvwxyz23456789'
                   newpass = ""
                   length.times { newpass << chars[rand(chars.size-1)] }
                   return newpass
                 end
                 def import_from_file(f)
                   data_hash = YAML.load(f)
                   @import_log = ""
                   country_data = data_hash[:countries]
                   site_data = data_hash[:sites]
                   user_data = data_hash[:users]
                   # import country
                   countries = {}
                   country_data.each_pair do |id,country|
                     c = Country.find_by_name(country[:name])
                     if c!=nil
                       countries[id] = c
                       @import_log << "Found #{country[:name]}\n"
                   if @contest
                     @users = @contest.users
                   else
                     @users = User.find_users_with_no_contest
                   end
                   return [@contest, @users]
                 end
                 def gen_csv_from_scorearray(scorearray,problem)
                   CSV.generate do |csv|
                     #add header
                     header = ['User','Name', 'Activated?', 'Logged in', 'Contest']
                     problem.each { |p| header << p.name }
                     header += ['Total','Passed']
                     csv << header
                     #add data
                     scorearray.each do |sc|
                       total = num_passed = 0
                       row = Array.new
                       sc.each_index do |i|
                         if i == 0
                           row << sc[i].login
                           row << sc[i].full_name
                           row << sc[i].activated
-            -             row << (sc[i].try(:contest_stat).try(:started_at).nil? 'no' : 'yes')
+            +             row << (sc[i].try(:contest_stat).try(:started_at).nil? ? 'no' : 'yes')
                           row << sc[i].contests.collect {|c| c.name}.join(', ')
                         else
                           row << sc[i][0]
                           total += sc[i][0]
                           num_passed += 1 if sc[i][1]
                         end
                       end
                       row << total
                       row << num_passed
                       csv << row
                     end
                   end
                 end
+            +
+            +   private
+            +     def user_params
+            +       params.require(:user).permit(:login,:password,:password_confirmation,:email, :alias, :full_name,:remark)
+            +     end
               end

app/controllers/users_controller.rb ¶ +6 -2

                 end
                 def chg_passwd
                   user = User.find(session[:user_id])
                   user.password = params[:passwd]
                   user.password_confirmation = params[:passwd_verify]
                   if user.save
                     flash[:notice] = 'password changed'
                   else
                     flash[:notice] = 'Error: password changing failed'
                   end
                   redirect_to :action => 'index'
                 end
                 def new
                   @user = User.new
                   render :action => 'new', :layout => 'empty'
                 end
                 def register
                   if(params[:cancel])
                     redirect_to :controller => 'main', :action => 'login'
                     return
                   end
-            -     @user = User.new(params[:user])
+            +     @user = User.new(user_params)
                   @user.password_confirmation = @user.password = User.random_password
                   @user.activated = false
                   if (@user.valid?) and (@user.save)
                     if send_confirmation_email(@user)
                       render :action => 'new_splash', :layout => 'empty'
                     else
                       @admin_email = GraderConfiguration['system.admin_email']
                       render :action => 'email_error', :layout => 'empty'
                     end
                   else
                     @user.errors.add(:base,"Email cannot be blank") if @user.email==''
                     render :action => 'new', :layout => 'empty'
                   end
                 end
                 def confirm
                   login = params[:login]
                   key = params[:activation]
                   @user = User.find_by_login(login)
                   if (@user) and (@user.verify_activation_key(key))
                     if @user.valid?  # check uniquenss of email
                       @user.activated = true
                       @user.save
                       @result = :successful
                                   :contest_name => contest_name,
                                   :login => user.login,
                                   :password => user.password,
                                   :admin_email => GraderConfiguration['system.admin_email']
                                 })
                   logger.info mail_body
                   send_mail(user.email, mail_subject, mail_body)
                 end
                 # allow viewing of regular user profile only when options allow so
                 # only admins can view admins profile
                 def profile_authorization
                   #if view admins' profile, allow only admin
                   return false unless(params[:id])
                   user = User.find(params[:id])
                   return false unless user
                   return admin_authorization if user.admin?
                   return true if GraderConfiguration["right.user_view_submission"]
                   #finally, we allow only admin
                   admin_authorization
                 end
+            -
+            +
+            +   private
+            +     def user_params
+            +       params.require(:user).permit(:login, :full_name, :email)
+            +     end
               end

app/helpers/application_helper.rb ¶ +23 -1

                   right_menu = ''
                   user = User.find(session[:user_id])
                   if (user!=nil) and (GraderConfiguration.show_tasks_to?(user))
                     left_menu << add_menu("#{I18n.t 'menu.tasks'}", 'tasks', 'list')
                     left_menu << add_menu("#{I18n.t 'menu.submissions'}", 'main', 'submission')
                     left_menu << add_menu("#{I18n.t 'menu.test'}", 'test', 'index')
                   end
                   if GraderConfiguration['right.user_hall_of_fame']
                     left_menu << add_menu("#{I18n.t 'menu.hall_of_fame'}", 'report', 'problem_hof')
                   end
                   right_menu << add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-question-sign')}".html_safe, 'main', 'help')
                   right_menu << add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-comment')}".html_safe, 'messages', 'list', {title: I18n.t('menu.messages'), data: {toggle: 'tooltip'}})
                   if GraderConfiguration['system.user_setting_enabled']
                     right_menu << add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-cog')}".html_safe, 'users', 'index', {title: I18n.t('menu.settings'), data: {toggle: 'tooltip'}})
                   end
                   right_menu << add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-log-out')} #{user.full_name}".html_safe, 'main', 'login', {title: I18n.t('menu.log_out'), data: {toggle: 'tooltip'}})
                   result = content_tag(:ul,left_menu.html_safe,class: 'nav navbar-nav') + content_tag(:ul,right_menu.html_safe,class: 'nav navbar-nav navbar-right')
                 end
-            -   def add_menu(title, controller, action,html_option = {})
+            +   def add_menu(title, controller, action, html_option = {})
                   link_option = {controller: controller, action: action}
                   html_option[:class] = (html_option[:class] || '') + " active" if current_page?(link_option)
                   content_tag(:li, link_to(title,link_option),html_option)
                 end
                 def user_header
                   menu_items = ''
                   user = User.find(session[:user_id])
                   if (user!=nil) and (session[:admin])
                     # admin menu
                     menu_items << "<b>Administrative task:</b> "
                     append_to menu_items, '[Announcements]', 'announcements', 'index'
                     append_to menu_items, '[Msg console]', 'messages', 'console'
                     append_to menu_items, '[Problems]', 'problems', 'index'
                     append_to menu_items, '[Users]', 'user_admin', 'index'
                     append_to menu_items, '[Results]', 'user_admin', 'user_stat'
                     append_to menu_items, '[Report]', 'report', 'multiple_login'
                     append_to menu_items, '[Graders]', 'graders', 'list'
                     append_to menu_items, '[Contests]', 'contest_management', 'index'
                     append_to menu_items, '[Sites]', 'sites', 'index'
                     append_to menu_items, '[System config]', 'configurations', 'index'
                     menu_items << "<br/>"
                   end
                   result = <<TITLEBAR
               <div class="title">
               <table>
               #{header}
               <tr>
               <td class="left-col">
               #{user.full_name}<br/>
               #{t 'title_bar.current_time'} #{format_short_time(Time.zone.now)}
               #{time_left}
               <br/>
               </td>
               <td class="right-col">#{contest_name}</td>
               </tr>
               </table>
               </div>
               TITLEBAR
                   result.html_safe
                 end
                 def markdown(text)
                   markdown = RDiscount.new(text)
                   markdown.to_html.html_safe
                 end
+            +
+            +   BOOTSTRAP_FLASH_MSG = {
+            +     success: 'alert-success',
+            +     error: 'alert-danger',
+            +     alert: 'alert-block',
+            +     notice: 'alert-info'
+            +   }
+            +
+            +   def bootstrap_class_for(flash_type)
+            +     BOOTSTRAP_FLASH_MSG.fetch(flash_type.to_sym, flash_type.to_s)
+            +   end
+            +
+            +   def flash_messages
+            +     flash.each do |msg_type, message|
+            +       concat(content_tag(:div, message, class: "alert #{bootstrap_class_for(msg_type)} fade in") do
+            +               concat content_tag(:button, 'x', class: "close", data: { dismiss: 'alert' })
+            +               concat message
+            +             end)
+            +     end
+            +     nil
+            +   end
+            +
               end

app/models/announcement.rb ¶ +5 -11

               class Announcement < ActiveRecord::Base
-            -   def self.find_published(contest_started=false)
+            +   def self.published(contest_started=false)
                   if contest_started
-            -       Announcement.find(:all,
-            -                         :conditions => "(published = 1) AND (frontpage = 0)",
-            -                         :order => "created_at DESC")
+            +       where(published: true).where(frontpage: false).order(created_at: :desc)
                   else
-            -       Announcement.find(:all,
-            -                         :conditions => "(published = 1) AND (frontpage = 0) AND (contest_only = 0)",
-            -                         :order => "created_at DESC")
+            +       where(published: true).where(frontpage: false).where(contest_only: false).order(created_at: :desc)
                   end
                 end
-            -   def self.find_for_frontpage
-            -     Announcement.find(:all,
-            -                       :conditions => "(published = 1) AND (frontpage = 1)",
-            -                       :order => "created_at DESC")
+            +   def self.frontpage
+            +     where(published: 1).where(frontpage: 1).order(created_at: :desc)
                 end
               end

app/models/contest.rb ¶ +1 -1

               class Contest < ActiveRecord::Base
                 has_and_belongs_to_many :users
                 has_and_belongs_to_many :problems
-            -   scope :enabled, :conditions => {:enabled => true}
+            +   scope :enabled, -> { where(enabled: true) }
               end

app/models/grader_configuration.rb ¶ +7 -1

               require 'yaml'
               #
               # This class also contains various login of the system.
               #
               class GraderConfiguration < ActiveRecord::Base
                 SYSTEM_MODE_CONF_KEY = 'system.mode'
                 TEST_REQUEST_EARLY_TIMEOUT_KEY = 'contest.test_request.early_timeout'
                 MULTICONTESTS_KEY = 'system.multicontests'
                 CONTEST_TIME_LIMIT_KEY = 'contest.time_limit'
                 MULTIPLE_IP_LOGIN_KEY = 'right.multiple_ip_login'
+            +   VIEW_TESTCASE = 'right.view_testcase'
+            +   SINGLE_USER_KEY = 'system.single_user_mode'
                 cattr_accessor :config_cache
                 cattr_accessor :task_grading_info_cache
                 cattr_accessor :contest_time_str
                 cattr_accessor :contest_time
                 GraderConfiguration.config_cache = nil
                 GraderConfiguration.task_grading_info_cache = nil
                 def self.config_cached?
                   (defined? CONFIGURATION_CACHE_ENABLED) and (CONFIGURATION_CACHE_ENABLED)
                 end
                 def self.get(key)
                   if GraderConfiguration.config_cached?
                     if GraderConfiguration.config_cache == nil
                       self.read_config
                     end
                     return GraderConfiguration.config_cache[key]
                   else
                     return GraderConfiguration.read_one_key(key)
                   end
                 end
                 #
                 # View decision
                 #
                 def self.show_submitbox_to?(user)
                   mode = get(SYSTEM_MODE_CONF_KEY)
                   return false if mode=='analysis'
                   if (mode=='contest')
                     return false if (user.site!=nil) and
                       ((user.site.started!=true) or (user.site.finished?))
                   end
                   return true
                 end
                 def self.show_tasks_to?(user)
                   if time_limit_mode?
                     return false if not user.contest_started?
                   end
                   return true
                 end
                 def self.show_grading_result
                   return (get(SYSTEM_MODE_CONF_KEY)=='analysis')
                 end
+            +   def  self.show_testcase
+            +     return get(VIEW_TESTCASE)
+            +   end
+            +
                 def self.allow_test_request(user)
                   mode = get(SYSTEM_MODE_CONF_KEY)
                   early_timeout = get(TEST_REQUEST_EARLY_TIMEOUT_KEY)
                   if (mode=='contest')
                     return false if ((user.site!=nil) and
                       ((user.site.started!=true) or
                        (early_timeout and (user.site.time_left < 30.minutes))))
                   end
                   return false if mode=='analysis'
                   return true
                 end
                 def self.task_grading_info
                   if GraderConfiguration.task_grading_info_cache==nil
                     read_grading_info
                   end
                   return GraderConfiguration.task_grading_info_cache
                 end
                 def self.standard_mode?
                   return get(SYSTEM_MODE_CONF_KEY) == 'standard'
                 end
                 def self.contest_mode?
                     else
                       GraderConfiguration.contest_time = nil
                     end
                   end
                   return GraderConfiguration.contest_time
                 end
                 protected
                 def self.convert_type(val,type)
                   case type
                   when 'string'
                     return val
                   when 'integer'
                     return val.to_i
                   when 'boolean'
                     return (val=='true')
                   end
                 end
                 def self.read_config
                   GraderConfiguration.config_cache = {}
-            -     GraderConfiguration.find(:all).each do |conf|
+            +     GraderConfiguration.all.each do |conf|
                     key = conf.key
                     val = conf.value
                     GraderConfiguration.config_cache[key] = GraderConfiguration.convert_type(val,conf.value_type)
                   end
                 end
                 def self.read_one_key(key)
                   conf = GraderConfiguration.find_by_key(key)
                   if conf
                     return GraderConfiguration.convert_type(conf.value,conf.value_type)
                   else
                     return nil
                   end
                 end
                 def self.read_grading_info
                   f = File.open(TASK_GRADING_INFO_FILENAME)
                   GraderConfiguration.task_grading_info_cache = YAML.load(f)
                   f.close
                 end
               end

app/models/grader_process.rb ¶ +4 -13

               class GraderProcess < ActiveRecord::Base
                 def self.find_by_host_and_pid(host,pid)
-            -     return GraderProcess.find(:first,
-            -                               :conditions => {
-            -                                 :host => host,
-            -                                 :pid => pid
-            -                               })
+            +     return GraderProcess.where(host:host).where(pid: pid).first
                 end
                 def self.register(host,pid,mode)
                   grader = GraderProcess.find_by_host_and_pid(host,pid)
                   if grader
                     grader.mode = mode
                     grader.active = nil
                     grader.task_id = nil
                     grader.task_type = nil
                     grader.terminated = false
                     grader.save
                   else
                     grader = GraderProcess.create(:host => host,
                                                   :pid => pid,
                                                   :mode => mode,
                                                   :terminated => false)
                   end
                   grader
                 end
                 def self.find_running_graders
-            -     GraderProcess.find(:all,
-            -                        :conditions => {:terminated => 0})
+            +     where(terminated: false)
                 end
                 def self.find_terminated_graders
-            -     GraderProcess.find(:all,
-            -                        :conditions => "`terminated`")
+            +     where(terminated: true)
                 end
                 def self.find_stalled_process
-            -     GraderProcess.find(:all,
-            -                        :conditions => ["(`terminated` = 0) AND active AND " +
-            -                                        "(updated_at < ?)",
-            -                                        Time.now.gmtime - GraderProcess.stalled_time])
+            +     where(terminated: false).where(active: true).where("updated_at < ?",Time.now.gmtime - GraderProcess.stalled_time)
                 end
                 def report_active(task=nil)
                   self.active = true
                   if task!=nil
                     self.task_id = task.id
                     self.task_type = task.class.to_s
                   else
                     self.task_id = nil
                     self.task_type = nil
                   end
                   self.save
                 end
                 def report_inactive(task=nil)
                   self.active = false
                   if task!=nil
                     self.task_id = task.id
                     self.task_type = task.class.to_s
                   else
                     self.task_id = nil
                     self.task_type = nil
                   end
                   self.save

app/models/language.rb ¶ +1 -1

               class Language < ActiveRecord::Base
                 @@languages_by_ext = {}
                 def self.cache_ext_hash
                   @@languages_by_ext = {}
-            -     Language.find(:all).each do |language|
+            +     Language.all.each do |language|
                     language.common_ext.split(',').each do |ext|
                       @@languages_by_ext[ext] = language
                     end
                   end
                 end
                 def self.find_by_extension(ext)
                   if @@languages_by_ext.length == 0
                     Language.cache_ext_hash
                   end
                   if @@languages_by_ext.has_key? ext
                     return @@languages_by_ext[ext]
                   else
                     return nil
                   end
                 end
               end

app/models/login.rb ¶ -1

               class Login < ActiveRecord::Base
                 belongs_to :user
-            -   attr_accessible :ip_address, :logged_in_at, :user_id
               end

app/models/message.rb ¶ +2 -4

                 belongs_to :sender, :class_name => "User"
                 belongs_to :receiver, :class_name => "User"
                 belongs_to :replying_message, :class_name => "Message"
                 # commented manually do it
                 #
                 #has_many :replied_messages, {
                 #  :class_name => "Message",
                 #  :foreign_key => "replying_message_id"
                 #}
                 #
                 attr_accessor :replied_messages
                 def self.find_all_sent_by_user(user)
                   messages = user.messages
                   replied_messages = user.replied_messages
                   Message.build_replying_message_hierarchy messages, replied_messages
                   return messages
                 end
                 def self.find_all_system_unreplied_messages
-            -     self.find(:all,
-            -               :conditions => 'ISNULL(receiver_id) ' +
-            -                              'AND (ISNULL(replied) OR replied=0)',
-            -               :order => 'created_at')
+            +     where('ISNULL(receiver_id) ' +
+            +           'AND (ISNULL(replied) OR replied=0)')
                 end
                 def self.build_replying_message_hierarchy(*args)
                   # manually build replies hierarchy (to improve efficiency)
                   all_messages = {}
                   args.each do |collection|
                     collection.each do |m|
                       all_messages[m.id] = m
                       m.replied_messages = []
                     end
                   end
                   all_messages.each_value do |m|
                     rep_id = m.replying_message_id
                     if all_messages[rep_id]!=nil
                       all_messages[rep_id].add_replied_message(m)
                     end
                   end
                 end
                 def add_replied_message(m)
                   if @replied_messages==nil
                     @replied_messages = [m]

app/models/problem.rb ¶ +8 -5

               class Problem < ActiveRecord::Base
                 belongs_to :description
                 has_and_belongs_to_many :contests, :uniq => true
                 has_many :test_pairs, :dependent => :delete_all
                 has_many :testcases, :dependent => :destroy
                 validates_presence_of :name
-            -   validates_format_of :name, :with => /^\w+$/
+            +   validates_format_of :name, :with => /\A\w+\z/
                 validates_presence_of :full_name
-            -   scope :available, :conditions => {:available => true}
+            +   scope :available, -> { where(available: true) }
                 DEFAULT_TIME_LIMIT = 1
                 DEFAULT_MEMORY_LIMIT = 32
-            -   def self.find_available_problems
-            -     Problem.available.all(:order => "date_added DESC, name ASC")
+            +   def self.available_problems
+            +     available.order(date_added: :desc).order(:name)
+            +     #Problem.available.all(:order => "date_added DESC, name ASC")
                 end
                 def self.create_from_import_form_params(params, old_problem=nil)
                   org_problem = old_problem || Problem.new
                   import_params, problem = Problem.extract_params_and_check(params,
                                                                             org_problem)
                   if !problem.errors.empty?
                     return problem, 'Error importing'
                   end
                   problem.full_score = 100
                   problem.date_added = Time.new
                   problem.test_allowed = true
                   problem.output_only = false
                   problem.available = false
                   if not problem.save
                     return problem, 'Error importing'
                   end
                   import_to_db = params.has_key? :import_to_db
                   importer = TestdataImporter.new(problem)
                   if not importer.import_from_file(import_params[:file],
                                                    import_params[:time_limit],
                                                    import_params[:memory_limit],
                                                    import_params[:checker_name],
                                                    import_to_db)
                     problem.errors.add(:base,'Import error.')
                   end
                   return problem, importer.log_msg
                 end
                 def self.download_file_basedir
                   return "#{Rails.root}/data/tasks"
                 end
                 def get_submission_stat
                   result = Hash.new
                   #total number of submission
                   result[:total_sub] = Submission.where(problem_id: self.id).count
-            -     result[:attempted_user] = Submission.where(problem_id: self.id).group_by(:user_id)
+            +     result[:attempted_user] = Submission.where(problem_id: self.id).group(:user_id)
+            +     result[:pass] = Submission.where(problem_id: self.id).where("points >= ?",self.full_score).count
+            +     return result
                 end
                 def long_name
                   "[#{name}] #{full_name}"
                 end
                 protected
                 def self.to_i_or_default(st, default)
                   if st!=''
                     result = st.to_i
                   end
                   result ||= default
                 end
                 def self.to_f_or_default(st, default)
                   if st!=''
                     result = st.to_f
                   end
                   result ||= default
                 end
                 def self.extract_params_and_check(params, problem)
                   time_limit = Problem.to_f_or_default(params[:time_limit],

app/models/submission.rb ¶ +6 -17

               class Submission < ActiveRecord::Base
                 belongs_to :language
                 belongs_to :problem
                 belongs_to :user
                 before_validation :assign_problem
                 before_validation :assign_language
                 validates_presence_of :source
                 validates_length_of :source, :maximum => 100_000, :allow_blank => true, :message => 'too long'
                 validates_length_of :source, :minimum => 1, :allow_blank => true, :message => 'too short'
                 validate :must_have_valid_problem
                 validate :must_specify_language
+            +   has_one :task
+            +
                 before_save :assign_latest_number_if_new_recond
                 def self.find_last_by_user_and_problem(user_id, problem_id)
-            -     last_sub = find(:first,
-            -                     :conditions => {:user_id => user_id,
-            -                       :problem_id => problem_id},
-            -                     :order => 'number DESC')
-            -     return last_sub
+            +     where("user_id = ? AND problem_id = ?",user_id,problem_id).last
                 end
                 def self.find_all_last_by_problem(problem_id)
                   # need to put in SQL command, maybe there's a better way
                   Submission.includes(:user).find_by_sql("SELECT * FROM submissions " +
               			   "WHERE id = " +
               			   "(SELECT MAX(id) FROM submissions AS subs " +
               			   "WHERE subs.user_id = submissions.user_id AND " +
                                          "problem_id = " + problem_id.to_s + " " +
               			   "GROUP BY user_id) " +
                                          "ORDER BY user_id")
                 end
                 def self.find_in_range_by_user_and_problem(user_id, problem_id,since_id,until_id)
                   records = Submission.where(problem_id: problem_id,user_id: user_id)
                   records = records.where('id >= ?',since_id) if since_id > 0
                   records = records.where('id <= ?',until_id) if until_id > 0
                   records.all
                 end
                 def self.find_last_for_all_available_problems(user_id)
                   submissions = Array.new
-            -     problems = Problem.find_available_problems
+            +     problems = Problem.available_problems
                   problems.each do |problem|
                     sub = Submission.find_last_by_user_and_problem(user_id, problem.id)
                     submissions << sub if sub!=nil
                   end
                   submissions
                 end
                 def self.find_by_user_problem_number(user_id, problem_id, number)
-            -     Submission.find(:first,
-            -                     :conditions => {
-            -                       :user_id => user_id,
-            -                       :problem_id => problem_id,
-            -                       :number => number
-            -                     })
+            +     where("user_id = ? AND problem_id = ? AND number = ?",user_id,problem_id,number).first
                 end
                 def self.find_all_by_user_problem(user_id, problem_id)
-            -     Submission.find(:all,
-            -                     :conditions => {
-            -                       :user_id => user_id,
-            -                       :problem_id => problem_id,
-            -                     })
+            +     where("user_id = ? AND problem_id = ?",user_id,problem_id)
                 end
                 def download_filename
                   if self.problem.output_only
                     return self.source_filename
                   else
                     timestamp = self.submitted_at.localtime.strftime("%H%M%S")
                     return "#{self.problem.name}-#{timestamp}.#{self.language.ext}"
                   end
                 end
                 protected
                 def self.find_option_in_source(option, source)
                   if source==nil
                     return nil
                   end
                   i = 0
                   source.each_line do |s|
                     if s =~ option
               	words = s.split
               	return words[1]
                     end
                     i = i + 1

app/models/submission_view_log.rb ¶ +1 -1

               class SubmissionViewLog < ActiveRecord::Base
-            -   attr_accessible :submission_id, :user_id
+            +   #attr_accessible :submission_id, :user_id
               end

app/models/task.rb ¶ +1 -4

                 def status_complete
                   self.status = Task::STATUS_COMPLETE
                 end
                 def status_complete!
                   status_complete
                   self.save
                 end
                 def status_str
                   case self.status
                   when Task::STATUS_INQUEUE
                     "inqueue"
                   when Task::STATUS_GRADING
                     "grading"
                   when Task::STATUS_COMPLETE
                     "complete"
                   end
                 end
                 def self.get_inqueue_and_change_status(status)
                   task = nil
                   begin
                     Task.transaction do
-            -         task = Task.find(:first,
-            -                          :order => "created_at",
-            -                          :conditions => {:status=> Task::STATUS_INQUEUE},
-            -                          :lock => true)
+            +         task = Task.where(status: Task::STATUS_INQUEUE).lock(true).first
                       if task!=nil
                         task.status = status
                         task.save!
                       end
                     end
                   rescue
                     task = nil
                   end
                   task
                 end
               end

app/models/test_request.rb ¶ +2 -5

               #
               # A TestRequest is a composition of submission with user's testdata.
               #
               # Note about TestRequest#problem: Usually, A TestRequest has to be
               #   associated with a problem, so that execution environment can be
               #   determined.  However, to be more flexible, we have to ensure that
               #   it works as well with problem=nil.  In this case, we shall provide
               #   a "default" execution environment for it.  This can be done
               #   seamlessly by using TestRequest#problem_name or
               #   TestRequest#name_of(problem) when retrieving the name of the
               #   problem: #name_of would return problem.name when problem!=nil and
               #   it would return "default" when problem=nil, #problem_name just
               #   call #name_of.
               #
               require 'fileutils'
               class TestRequest < Task
+            -
-            -   set_table_name "test_requests"
+            +   self.table_name = "test_requests"
                 belongs_to :user
                 belongs_to :problem
                 belongs_to :submission
                 validates_presence_of :submission
                 validate :must_have_valid_problem
                 def problem_name
                   TestRequest.name_of(self.problem)
                 end
                 def language
                   self.submission.language
                 end
                 def self.get_inqueue_and_change_status(status)
                   # since there will be only one grader grading TestRequest
                   # we do not need locking (hopefully)
-            -     test_request = TestRequest.find(:first,
-            -                                     :order => "created_at",
-            -                                     :conditions => {:status=> Task::STATUS_INQUEUE})
+            +     test_request = TestRequest.where(status: Task::STATUS_INQUEUE).first
                   if test_request!=nil
                     test_request.status = status
                     test_request.save!
                   end
                   test_request
                 end
                 # interfacing with form
                 def self.new_from_form_params(user,params)
                   test_request = TestRequest.new
                   test_request.user = user
                   begin
                     problem = Problem.find(params[:problem_id])
                   rescue ActiveRecord::RecordNotFound
                     problem = nil
                   end
                   test_request.problem = problem
                   if problem!=nil
                     test_request.submission =
                       Submission.find_by_user_problem_number(user.id,
                                                              problem.id,
                                                              params[:submission_number])
                   else

app/models/testcase.rb ¶ +1 -1

               class Testcase < ActiveRecord::Base
                 belongs_to :problem
-            -   attr_accessible :group, :input, :num, :score, :sol
+            +   #attr_accessible :group, :input, :num, :score, :sol
               end

app/models/user.rb ¶ +20 -13

               require 'digest/sha1'
               require 'net/pop'
               require 'net/https'
               require 'net/http'
               require 'json'
               class User < ActiveRecord::Base
                 has_and_belongs_to_many :roles
-            -   has_many :test_requests, :order => "submitted_at DESC"
+            +   has_many :test_requests, -> {order(submitted_at: DESC)}
-            -   has_many :messages,
+            +   has_many :messages, -> { order(created_at: DESC) },
                          :class_name => "Message",
-            -            :foreign_key => "sender_id",
-            -            :order => 'created_at DESC'
+            +            :foreign_key => "sender_id"
-            -   has_many :replied_messages,
+            +   has_many :replied_messages, -> { order(created_at: DESC) },
                          :class_name => "Message",
-            -            :foreign_key => "receiver_id",
-            -            :order => 'created_at DESC'
+            +            :foreign_key => "receiver_id"
                 has_one :contest_stat, :class_name => "UserContestStat", :dependent => :destroy
                 belongs_to :site
                 belongs_to :country
-            -   has_and_belongs_to_many :contests, :uniq => true, :order => 'name'
+            +   has_and_belongs_to_many :contests, -> { order(:name); uniq}
-            -   scope :activated_users, :conditions => {:activated => true}
+            +   scope :activated_users, -> {where activated: true}
                 validates_presence_of :login
                 validates_uniqueness_of :login
-            -   validates_format_of :login, :with => /^[\_A-Za-z0-9]+$/
+            +   validates_format_of :login, :with => /\A[\_A-Za-z0-9]+\z/
                 validates_length_of :login, :within => 3..30
                 validates_presence_of :full_name
                 validates_length_of :full_name, :minimum => 1
                 validates_presence_of :password, :if => :password_required?
                 validates_length_of :password, :within => 4..20, :if => :password_required?
                 validates_confirmation_of :password, :if => :password_required?
                 validates_format_of :email,
                                     :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i,
                                     :if => :email_validation?
                 validate :uniqueness_of_email_from_activated_users,
                          :if => :email_validation?
                 validate :enough_time_interval_between_same_email_registrations,
                          :if => :email_validation?
                 # these are for ytopc
                 # disable for now
                 #validates_presence_of :province
                 attr_accessor :password
                 before_save :encrypt_new_password
                 def alias_for_editing=(e)
                   self.alias=e
                 end
                 def activation_key
                   if self.hashed_password==nil
                     encrypt_new_password
                   end
                   Digest::SHA1.hexdigest(self.hashed_password)[0..7]
                 end
                 def verify_activation_key(key)
                   key == activation_key
                 end
                 def self.random_password(length=5)
                   chars = 'abcdefghjkmnopqrstuvwxyz'
                   password = ''
                   length.times { password << chars[rand(chars.length - 1)] }
                   password
                 end
                 def self.find_non_admin_with_prefix(prefix='')
-            -     users = User.find(:all)
+            +     users = User.all
                   return users.find_all { |u| !(u.admin?) and u.login.index(prefix)==0 }
                 end
                 # Contest information
                 def self.find_users_with_no_contest()
-            -     users = User.find(:all)
+            +     users = User.all
                   return users.find_all { |u| u.contests.length == 0 }
                 end
                 def contest_time_left
                   if GraderConfiguration.contest_mode?
                     return nil if site==nil
                     return site.time_left
                   elsif GraderConfiguration.indv_contest_mode?
                     time_limit = GraderConfiguration.contest_time_limit
                     if time_limit == nil
                       return nil
                     end
                     if contest_stat==nil or contest_stat.started_at==nil
                       return (Time.now.gmtime + time_limit) - Time.now.gmtime
                     else
                       finish_time = contest_stat.started_at + time_limit
                       current_time = Time.now.gmtime
                       if current_time > finish_time
                         return 0
                       else
                         return finish_time - current_time
                       end
                     end
                     end
                   end
                   return false
                 end
                 def available_problems_group_by_contests
                   contest_problems = []
                   pin = {}
                   contests.enabled.each do |contest|
                     available_problems = contest.problems.available
                     contest_problems << {
                       :contest => contest,
                       :problems => available_problems
                     }
                     available_problems.each {|p| pin[p.id] = true}
                   end
                   other_avaiable_problems = Problem.available.find_all {|p| pin[p.id]==nil and p.contests.length==0}
                   contest_problems << {
                     :contest => nil,
                     :problems => other_avaiable_problems
                   }
                   return contest_problems
                 end
+            +   def solve_all_available_problems?
+            +     available_problems.each do |p|
+            +       u = self
+            +       sub = Submission.find_last_by_user_and_problem(u.id,p.id)
+            +       return false if !p or !sub or sub.points < p.full_score
+            +     end
+            +     return true
+            +   end
+            +
                 def available_problems
                   if not GraderConfiguration.multicontests?
-            -       return Problem.find_available_problems
+            +       return Problem.available_problems
                   else
                     contest_problems = []
                     pin = {}
                     contests.enabled.each do |contest|
                       contest.problems.available.each do |problem|
                         if not pin.has_key? problem.id
                           contest_problems << problem
                         end
                         pin[problem.id] = true
                       end
                     end
                     other_avaiable_problems = Problem.available.find_all {|p| pin[p.id]==nil and p.contests.length==0}
                     return contest_problems + other_avaiable_problems
                   end
                 end
                 def can_view_problem?(problem)
                   if not GraderConfiguration.multicontests?
                     return problem.available
                   else
                     return problem_in_user_contests? problem
                   end
                 end

app/views/application/_submission.html.haml ¶ +2 -2

               %tr
                 %td{:align => "center"}
-            -     = submission_counter+1
-            -   %td{:align => "center"}
+            +     = submission.number
+            +   %td.text-right
                   = link_to "##{submission.id}", submission_path(submission.id)
                 %td
                   = l submission.submitted_at, format: :long
                   = "( #{time_ago_in_words(submission.submitted_at)} ago)"
                 %td
                   = submission.source_filename
                   = " (#{submission.language.pretty_name}) "
                   = link_to('[load]',{:action => 'source', :id => submission.id})
                 %td
                   - if submission.graded_at
                     = "Graded at #{format_short_time(submission.graded_at)}."
                     %br/
                     = "Score: #{(submission.points*100/submission.problem.full_score).to_i} " if GraderConfiguration['ui.show_score']
                     = " ["
                     %tt
                       = submission.grader_comment
                     = "]"
                 %td
                   = render :partial => 'compiler_message', :locals => {:compiler_message => submission.compiler_message }
                 %td
                   = link_to 'Edit', edit_submission_path(submission.id), class: 'btn btn-success'

app/views/application/_submission_short.html.haml ¶ +11 -11

               - if submission.nil?
                 = "-"
               - else
-            -   - if submission.graded_at.nil?
+            +   - unless submission.graded_at
                   = t 'main.submitted_at'
                   = format_short_time(submission.submitted_at.localtime)
                 - else
-            -     = t 'main.graded_at'
-            -     = "#{format_short_time(submission.graded_at.localtime)}, "
+            +     %strong= t 'main.graded_at'
+            +     = "#{format_short_time(submission.graded_at.localtime)} "
+            +     %br
                   - if GraderConfiguration['ui.show_score']
-            -       = t 'main.score'
+            +       %strong=t 'main.score'
                     = "#{(submission.points*100/submission.problem.full_score).to_i} "
                   = " ["
                   %tt
                     = submission.grader_comment
                   = "]"
+            +     %br
+            +     %strong View:
                   - if GraderConfiguration.show_grading_result
-            -       = " | "
                     = link_to '[detailed result]', :action => 'result', :id => submission.id
-            -     = " | "
-            -     = link_to("[#{t 'main.cmp_msg'}]", {:action => 'compiler_msg', :id => submission.id}, {:popup => true})
-            -   = " | "
-            -   = link_to("[#{t 'main.src_link'}]",{:action => 'source', :id => submission.id})
-            -   //= " | "
-            -   //= link_to "[#{t 'main.submissions_link'}]", main_submission_path(submission.problem.id)
+            +     = link_to "#{t 'main.cmp_msg'}", {:action => 'compiler_msg', :id => submission.id}, {popup: true,class: 'btn btn-xs btn-info'}
+            +   = link_to "#{t 'main.src_link'}", download_submission_path(submission.id), class: 'btn btn-xs btn-info'
+            +   = link_to "#{t 'main.submissions_link'}", problem_submissions_path(problem_id), class: 'btn btn-xs btn-info'
+            +

app/views/configurations/index.html.haml ¶ +21 -18

               /- content_for :header do
               /  = javascript_include_tag 'local_jquery'
               %h1 System configuration
-            - %table.info
-            -   %tr.info-head
-            -     %th Key
-            -     %th Type
-            -     %th Value
-            -     %th Description
-            -   - @configurations.each do |conf|
-            -     - @grader_configuration = conf
-            -     %tr{:class => cycle("info-odd", "info-even")}
-            -       %td
-            -         /= in_place_editor_field :grader_configuration, :key, {}, :rows=>1
-            -         = @grader_configuration.key
-            -       %td
-            -         /= in_place_editor_field :grader_configuration, :value_type, {}, :rows=>1
-            -         = @grader_configuration.value_type
-            -       %td
-            -         = best_in_place @grader_configuration, :value, ok_button: "ok", cancel_button: "cancel"
-            -       %td= conf.description
+            + - @group.each do |g|
+            +   %h2= g
+            +   %table.table.table-striped
+            +     %thead
+            +       %th{style: 'width: 25%'} Key
+            +       %th{style: 'width: 10%'}Type
+            +       %th{style: 'width: 15%'} Value
+            +       %th Description
+            +     - @configurations.each do |conf|
+            +       - next if conf.key[0...(conf.key.index('.'))] != g
+            +       - @grader_configuration = conf
+            +       %tr
+            +         %td
+            +           /= in_place_editor_field :grader_configuration, :key, {}, :rows=>1
+            +           = @grader_configuration.key
+            +         %td
+            +           /= in_place_editor_field :grader_configuration, :value_type, {}, :rows=>1
+            +           = @grader_configuration.value_type
+            +         %td
+            +           = best_in_place @grader_configuration, :value, ok_button: "ok", cancel_button: "cancel"
+            +         %td= conf.description
               - if GraderConfiguration.config_cached?
                 %br/
                 Your config is saved, but it does not automatically take effect.
                 %br/
                 If you have one mongrel process running, you can
                 = link_to '[click]', :action => 'reload'
                 here to reload.
                 %br/
                 If you have more than one process running, you should restart
                 them manually.

app/views/graders/list.html.haml ¶ +4 -4

                   %h2 Stalled graders
                   = render :partial => 'grader_list', :locals => {:grader_list => @stalled_processes}
                   %h2 Terminated graders
                   %p= link_to 'Clear data for terminated graders', { action: 'clear_terminated'}, class: 'btn btn-default', method: 'post'
                   = render :partial => 'grader_list', :locals => {:grader_list => @terminated_processes}
                 .col-md-6
                   %h2 Last 20 submissions
                   %table.table.table-striped.table-condensed
                     %thead
                       %th ID
                       %th User
                       %th Problem
                       %th Submitted
                       %th Graded
                       %th Result
                     %tbody
                       - @submission.each do |sub|
                         %tr.inactive
                           %td= link_to sub.id, submission_path(sub.id)
-            -             %td= ("" unless sub.user) || link_to sub.try(:user).try(:full_name), stat_user_path(sub.user.id)
-            -             %td= ("" unless sub.problem) || link_to sub.try(:problem).try(:full_name), stat_problem_path(sub.problem.id)
+            +             %td= ("" unless sub.user) || link_to(sub.try(:user).try(:full_name), stat_user_path(sub.user.id))
+            +             %td= ("" unless sub.problem) || link_to(sub.try(:problem).try(:full_name), stat_problem_path(sub.problem.id))
                           %td= "#{time_ago_in_words(sub.submitted_at)} ago"
                           %td= sub.graded_at ? "#{time_ago_in_words(sub.graded_at)} ago" : " "
                           %td= sub.grader_comment
                   %h2 Ungraded submission
                   %table.table.table-striped.table-condensed
                     %thead
                       %th ID
                       %th User
                       %th Problem
                       %th Submitted
                       %th Graded
                       %th Result
                     %tbody
                       - @backlog_submission.each do |sub|
                         %tr.inactive
                           %td= link_to sub.id, submission_path(sub.id)
-            -             %td= ("" unless sub.user) || link_to sub.try(:user).try(:full_name), stat_user_path(sub.user.id)
-            -             %td= ("" unless sub.problem) || link_to sub.try(:problem).try(:full_name), stat_problem_path(sub.problem.id)
+            +             %td= ("" unless sub.user) || link_to( sub.try(:user).try(:full_name), stat_user_path(sub.user.id))
+            +             %td= ("" unless sub.problem) || link_to( sub.try(:problem).try(:full_name), stat_problem_path(sub.problem.id))
                           %td= "#{time_ago_in_words(sub.submitted_at)} ago"
                           %td= sub.graded_at ? "#{time_ago_in_words(sub.graded_at)} ago" : " "
                           %td= sub.grader_comment

app/views/layouts/_header.html.haml ¶ +13 -4

               %header.navbar.navbar-default.navbar-fixed-top
                 %nav
                   .container-fluid
                     .navbar-header
+            +         %button.navbar-toggle.collapsed{ data: {toggle: 'collapse', target: '#navbar-collapse'} }
+            +           %span.sr-only Togggle Navigation
+            +           %span.icon-bar
+            +           %span.icon-bar
+            +           %span.icon-bar
                       %a.navbar-brand{href: main_list_path}
                         %span.glyphicon.glyphicon-home
                         MAIN
-            -       .collapse.navbar-collapse
+            +       .collapse.navbar-collapse#navbar-collapse
                       %ul.nav.navbar-nav
+            +           / submission
                         - if (@current_user!=nil) and (GraderConfiguration.show_tasks_to?(@current_user))
-            -             //= add_menu("#{I18n.t 'menu.tasks'}", 'tasks', 'list')
                           %li.dropdown
                             %a.dropdown-toggle{href: '#', data: {toggle:'dropdown'},  aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               = "#{I18n.t 'menu.submissions'}"
                               %span.caret
                             %ul.dropdown-menu
-            -                 = add_menu("View", 'main', 'submission')
+            +                 = add_menu("View", 'submissions', 'index')
                               = add_menu("Self Test", 'test', 'index')
+            +           / hall of fame
                         - if GraderConfiguration['right.user_hall_of_fame']
                           = add_menu("#{I18n.t 'menu.hall_of_fame'}", 'report', 'problem_hof')
                         / display MODE button (with countdown in contest mode)
                         - if GraderConfiguration.analysis_mode?
                           %div.navbar-btn.btn.btn-success#countdown= "ANALYSIS MODE"
                         - elsif GraderConfiguration.time_limit_mode?
                           - if @current_user.contest_finished?
                             %div.navbar-btn.btn.btn-danger#countdown= "Contest is over"
                           - elsif !@current_user.contest_started?
                             %div.navbar-btn.btn.btn-primary#countdown= (t 'title_bar.contest_not_started')
                           - else
                             %div.navbar-btn.btn.btn-primary#countdown asdf
                             :javascript
                               $("#countdown").countdown({until: "+#{@current_user.contest_time_left.to_i}s", layout: 'Time left: {hnn}:{mnn}:{snn}'});
                         / admin section
                         - if (@current_user!=nil) and (session[:admin])
+            +             / management
                           %li.dropdown
                             %a.dropdown-toggle{href: '#', data: {toggle:'dropdown'},  aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               Manage
                               %span.caret
                             %ul.dropdown-menu
                               = add_menu( 'Announcements', 'announcements', 'index')
                               = add_menu( 'Problems', 'problems', 'index')
                               = add_menu( 'Users', 'user_admin', 'index')
                               = add_menu( 'Graders', 'graders', 'list')
                               = add_menu( 'Message ', 'messages', 'console')
                               %li.divider{role: 'separator'}
                               = add_menu( 'System config', 'configurations', 'index')
                               %li.divider{role: 'separator'}
                               = add_menu( 'Sites', 'sites', 'index')
                               = add_menu( 'Contests', 'contest_management', 'index')
+            +             / report
                           %li.dropdown
                             %a.dropdown-toggle{href: '#', data: {toggle:'dropdown'},  aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               Report
                               %span.caret
                             %ul.dropdown-menu
-            -                 = add_menu( 'Results', 'report', 'current_score')
+            +                 = add_menu( 'Current Score', 'report', 'current_score')
+            +                 = add_menu( 'Score Report', 'report', 'max_score')
                               = add_menu( 'Report', 'report', 'multiple_login')
                           - if (ungraded = Submission.where('graded_at is null').where('submitted_at < ?', 1.minutes.ago).count) > 0
                             =link_to "#{ungraded} backlogs!",
                               grader_list_path,
                               class: 'navbar-btn btn btn-default btn-warning', data: {toggle: 'tooltip'},title: 'Number of ungraded submission'
                       %ul.nav.navbar-nav.navbar-right
                         = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-question-sign')}".html_safe, 'main', 'help')
                         = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-comment')}".html_safe, 'messages', 'list', {title: I18n.t('menu.messages'), data: {toggle: 'tooltip'}})
                         - if GraderConfiguration['system.user_setting_enabled']
                           = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-cog')}".html_safe, 'users', 'index', {title: I18n.t('menu.settings'), data: {toggle: 'tooltip'}})
                         = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-log-out')} #{@current_user.full_name}".html_safe, 'main', 'login', {title: I18n.t('menu.log_out'), data: {toggle: 'tooltip'}})
               /
                 - if (@current_user!=nil) and (session[:admin])
                   %nav.navbar.navbar-fixed-top.navbar-inverse.secondnavbar
                     .container-fluid
                       .collapse.navbar-collapse
                         %ul.nav.navbar-nav
                           = add_menu( '[Announcements]', 'announcements', 'index')
                           = add_menu( '[Msg console]', 'messages', 'console')
                           = add_menu( '[Problems]', 'problems', 'index')
                           = add_menu( '[Users]', 'user_admin', 'index')
                           = add_menu( '[Results]', 'user_admin', 'user_stat')

app/views/layouts/application.html.haml ¶ +2 -1

               <!DOCTYPE html>
               %html
               %head
                 %title= GraderConfiguration['contest.name']
                 = stylesheet_link_tag "application", params[:controller], :media => "all"
                 = javascript_include_tag "application", params[:controller]
                 = csrf_meta_tags
                 = content_for :header
                 = yield :head
               %body
                 = render 'layouts/header'
-            -   = content_tag(:p,flash[:notice],class: 'alert alert-success') if flash[:notice]!=nil
+            +   /= content_tag(:p,flash[:notice],class: 'alert alert-success') if flash[:notice]!=nil
+            +   = flash_messages
                 = yield

app/views/main/_login_box.html.haml ¶ +1 -1

               %b= GraderConfiguration['ui.front.welcome_message']
               %br/
               - if !@hidelogin
                 =t 'login.message'
                 %br/
                 %br/
                 - if flash[:notice]
                   %hr/
                   %b= flash[:notice]
                   %hr/
                 %div{ :style => "border: solid 1px gray; padding: 4px; background: #eeeeff;"}
-            -     = form_tag :controller => 'login', :action => 'login' do
+            +     = form_tag login_login_path do
                     %table
                       %tr
                         %td{:align => "right"}
                           ="#{t 'login_label'}:"
                         %td= text_field_tag 'login'
                       %tr
                         %td{:align => "right"}
                           ="#{t 'password_label'}:"
                         %td= password_field_tag
                       - unless GraderConfiguration['right.bypass_agreement']
                         %tr
                           %td{:align => "right"}= check_box_tag 'accept_agree'
                           %td ยอมรับข้อตกลงการใช้งาน
                     = submit_tag t('login.login_submit')
               %br/
               - if GraderConfiguration['system.online_registration']
                 =t 'login.participation'
                 %b
                   = "#{t 'login.please'} "
                   = link_to "#{t 'login.register'}", :controller => :users, :action => :new
                 %br/
                 = link_to "#{t 'login.forget_password'}", :controller => :users, :action => :forget

app/views/main/_problem.html.haml ¶ +5 -1

               %tr
                 %td
-            -     = "#{problem.name}"
+            +     - if @current_user and @current_user.admin?
+            +       = link_to problem.name, stat_problem_path(problem)
+            +     - else
+            +       = "#{problem.name}"
                 %td
                   = "#{problem.full_name}"
+            +
                   %br
                   = link_to_description_if_any "[#{t 'main.problem_desc'}] <span class='glyphicon glyphicon-file'></span>".html_safe, problem
                 %td
                   = @prob_submissions[problem.id][:count]
                   = link_to "[subs]", main_submission_path(problem.id)
                 %td
                   = render :partial => 'submission_short',
                     :locals => {:submission => @prob_submissions[problem.id][:submission], :problem_name => problem.name, :problem_id => problem.id }
                 %td
                   - if @prob_submissions[problem.id][:submission]
                     = link_to 'Edit', edit_submission_path(@prob_submissions[problem.id][:submission]), class: 'btn btn-success'
                   - else
                     = link_to 'New', direct_edit_problem_submissions_path(problem.id), class: 'btn btn-success'

app/views/main/_submission_box.html.haml ¶ +1 -1

               = form_tag({:action => 'submit'}, :multipart => true, class: 'form') do
                 - if @submission and @submission.errors.any?
                   #error_explanation
                     .alert.alert-danger
                       %h3= "#{pluralize(@submission.errors.count, "error")} prohibited this user from being saved:"
                       %ul
                         - @submission.errors.full_messages.each do |msg|
                           %li= msg
                 .form-group
                   = label_tag :submission, 'Problem:'
-            -     = select 'submission', 'problem_id', [[(t 'main.specified_in_header'),'-1']] + @problems.collect {|p| ["[#{p.name}] #{p.full_name}", p.id]}, {:selected => '-1'}, { class: 'select2 form-control' }
+            +     = select 'submission', 'problem_id', [[(t 'main.specified_in_header'),'-1']] + @problems.collect {|p| ["[#{p.name}] #{p.full_name}", p.id]}, {:selected => '-1'}, { class: 'select2 form-control', style: "width: 100%" }
                 .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'

app/views/main/_submission_short.html.haml ¶ +6 -3

               - if submission.nil?
                 = "-"
               - else
                 - unless submission.graded_at
-            -     =t 'main.submitted_at'
+            +     = t 'main.submitted_at'
                   = format_short_time(submission.submitted_at.localtime)
                 - else
                   %strong= t 'main.graded_at'
                   = "#{format_short_time(submission.graded_at.localtime)} "
                   %br
                   - if GraderConfiguration['ui.show_score']
-            -       =t 'main.score'
+            +       %strong=t 'main.score'
                     = "#{(submission.points*100/submission.problem.full_score).to_i} "
                   = " ["
                   %tt
                     = submission.grader_comment
                   = "]"
                   %br
                   %strong View:
                   - if GraderConfiguration.show_grading_result
                     = link_to '[detailed result]', :action => 'result', :id => submission.id
-            -     = link_to "#{t 'main.cmp_msg'}", {:action => 'compiler_msg', :id => submission.id}, {popup: true,class: 'btn btn-xs btn-info'}
+            +     /= link_to "#{t 'main.cmp_msg'}", {:action => 'compiler_msg', :id => submission.id}, {popup: true,class: 'btn btn-xs btn-info'}
+            +     = link_to "#{t 'main.cmp_msg'}", compiler_msg_submission_path(submission.id), {popup: true,remote: true,class: 'btn btn-xs btn-info'}
                 = link_to "#{t 'main.src_link'}",{:action => 'source', :id => submission.id}, class: 'btn btn-xs btn-info'
                 = link_to "#{t 'main.submissions_link'}", problem_submissions_path(problem_id), class: 'btn btn-xs btn-info'
+            +   - if GraderConfiguration.show_testcase
+            +     = link_to "testcases", show_problem_testcases_path(problem_id), class: 'btn btn-xs btn-info'

app/views/main/list.html.haml ¶ +12

                             %th Task name
                             %th Full name
                             %th # of sub(s)
                             %th Results
                             %th
                         %tbody
                           = render :partial => 'problem', :collection => @problems
                     - else
                       - @contest_problems.each do |cp|
                         - if cp[:problems].length > 0
                           %h2{:class =>'contest-title'}
                             = "#{cp[:contest] ? cp[:contest].title : 'Public problems'}"
                           %table.info
                             %tr.info-head
                               %th Task name
                               %th Full name
                               %th # of sub(s)
                               %th Results
                               %th
                             = render :partial => 'problem', :collection => cp[:problems]
                 .col-md-5
                   .panel.panel-info
                     .panel-heading
                       Announcement
+            +         = link_to 'Manage', announcements_path, class: 'btn btn-xs btn-default'
                     %ul.list-group
                       = render :partial => 'announcement', :collection => @announcements
               %script{:type => 'text/javascript'}
                 = "Announcement.refreshUrl = '#{url_for :controller => 'main', :action => 'announcements'}';"
                 Announcement.registerRefreshEventTimer();
+            + .modal.fade#compiler{tabindex: -1,role: 'dialog'}
+            +   .modal-dialog.modal-lg{role:'document'}
+            +     .modal-content
+            +       .modal-header
+            +         %button.close{type: 'button', data: {dismissed: :modal}, aria: {label: 'close'}}
+            +           %span{aria: {hidden: 'true'}, data: {dismiss: 'modal'}} &times;
+            +         %h4 Compiler message
+            +       .modal-body
+            +         %pre#compiler_msg
+            +       .modal-footer
+            +         %button.btn.btn-default{type: 'button', data: {dismiss: 'modal'}} Close

app/views/problems/index.html.haml ¶ +4

                 = link_to 'New problem', new_problem_path, class: 'btn btn-default btn-sm'
                 = link_to 'Manage problems', { action: 'manage'}, class: 'btn btn-default btn-sm'
                 = link_to 'Import problems', {:action => 'import'}, class: 'btn btn-default btn-sm'
                 = link_to 'Turn off all problems', {:action => 'turn_all_off'}, class: 'btn btn-default btn-sm'
                 = link_to 'Turn on all problems', {:action => 'turn_all_on'}, class: 'btn btn-default btn-sm'
               .submitbox
                 = form_tag :action => 'quick_create' do
                   %b Quick New:
                   %label{:for => "problem_name"} Name
                   = text_field 'problem', 'name'
                   |
                   %label{:for => "problem_full_name"} Full name
                   = text_field 'problem', 'full_name'
                   = submit_tag "Create"
               %table.table.table-condense.table-hover
                 %thead
                   %th Name
                   %th Full name
                   %th.text-right Full score
                   %th Date added
                   %th.text-center
                     Avail?
                     %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Let user submits to this problem?' } [?]
                   %th.text-center
+            +       View Data?
+            +       %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Let user view the testcase of this problem?' } [?]
+            +     %th.text-center
                     Test?
                     %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Let user uses test interface on this problem?' } [?]
                   - if GraderConfiguration.multicontests?
                     %th Contests
                 - for problem in @problems
                   %tr{:class => "#{(problem.available) ? "success" : "danger"}", :id => "prob-#{problem.id}", :name => "prob-#{problem.id}"}
                     - @problem=problem
                     %td= problem.name #in_place_editor_field :problem, :name, {}, :rows=>1
                     %td= problem.full_name #in_place_editor_field :problem, :full_name, {}, :rows=>1
                     %td.text-right= problem.full_score #in_place_editor_field :problem, :full_score, {}, :rows=>1
                     %td= problem.date_added
                     %td= toggle_button(@problem.available?, toggle_problem_path(@problem), "problem-avail-#{@problem.id}")
+            +       %td= toggle_button(@problem.view_testcase?, toggle_view_testcase_problem_path(@problem), "problem-view-testcase-#{@problem.id}")
                     %td= toggle_button(@problem.test_allowed?, toggle_test_problem_path(@problem), "problem-test-#{@problem.id}")
                     - if GraderConfiguration.multicontests?
                       %td
                         = problem.contests.collect { |c| c.name }.join(', ')
                     %td= link_to 'Stat', {:action => 'stat', :id => problem.id}, class: 'btn btn-info btn-xs btn-block'
                     %td= link_to 'Show', {:action => 'show', :id => problem}, class: 'btn btn-info btn-xs btn-block'
                     %td= link_to 'Edit', {:action => 'edit', :id => problem}, class: 'btn btn-info btn-xs btn-block'
                     %td= link_to 'Destroy', { :action => 'destroy', :id => problem }, :confirm => 'Are you sure?', :method => :delete, class: 'btn btn-danger btn-xs btn-block'
               %br/
               = link_to '[New problem]', :action => 'new'

app/views/problems/show.html.erb ¶ +1 -1

               <% for column in Problem.content_columns %>
               <p>
                 <b><%= column.human_name %>:</b>
                 <%=h @problem.send(column.name) %>
               </p>
               <% end %>
               <p>
               <b>Description:</b><br/>
                 <% if @problem.description!=nil %>
                   <% if @problem.description.markdowned %>
               <%= markdown(@problem.description.body) %>
                   <% else %>
               <pre>
               <%= @problem.description.body %>
               </pre>
                   <% end %>
                 <% else %>
                   (not available)
                 <% end %>
               </p>
               <%= link_to 'Edit', :action => 'edit', :id => @problem %> |
-            - <%= link_to 'Back', :action => 'list' %>
+            + <%= link_to 'Back', problems_path %>

app/views/report/_score_table.html.haml ¶ +8 -8

               %table.table.sortable.table-striped.table-bordered.table-condensed
                 %thead
                   %tr
                     %th Login
                     %th Name
-            -       %th Activated?
-            -       %th Logged_in
-            -       %th Contest(s)
+            +       / %th Activated?
+            +       / %th Logged_in
+            +       / %th Contest(s)
                     %th Remark
                     - @problems.each do |p|
-            -         %th.text-right= p.name
+            +         %th.text-right= p.name.gsub('_',' ')
                     %th.text-right Total
                     %th.text-right Passed
                 %tbody
                   - @scorearray.each do |sc|
                     %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= link_to sc[i].login, stat_user_path(sc[i])
                           %td= sc[i].full_name
-            -             %td= sc[i].activated
-            -             %td= sc[i].try(:contest_stat).try(:started_at) ? 'yes' : 'no'
-            -             %td= sc[i].contests.collect {|c| c.name}.join(', ')
+            +             / %td= sc[i].activated
+            +             / %td= sc[i].try(:contest_stat).try(:started_at) ? 'yes' : 'no'
+            +             / %td= sc[i].contests.collect {|c| c.name}.join(', ')
                           %td= sc[i].remark
                         - else
                           %td.text-right= sc[i][0]
                           - total += sc[i][0]
                           - num_passed += 1 if sc[i][1]
                       %td.text-right= total
                       %td.text-right= num_passed
               :javascript
                 $.bootstrapSortable(true,'reversed')

app/views/report/_task_hof.html.haml ¶ +8 -8

                   overflow: auto;
                 }
               .container
                 .row
                   .col-md-4
                     %h2 Overall Stat
                     %table.table.table-hover
                       %thead
                         %tr
                           %th
                           %th
                       %tbody
                         %tr
                           %td.info_param Submissions
                           %td= @summary[:count]
                         %tr
                           %td.info_param Solved/Attempted User
                           %td #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
                         - if @best
                           %tr
                             %td.info_param Best Runtime
                             %td
-            -                 by #{link_to @best[:runtime][:user], controller:'users', action:'profile', id:@best[:memory][:user_id]}
+            +                 by #{link_to @best[:runtime][:user], stat_user_path(@best[:runtime][:user_id])}
                               %br
                               using <span class="text-success">#{@best[:runtime][:lang]}</span>
                               %br
                               with <span class="text-success">#{@best[:runtime][:value] * 1000} milliseconds</span>
                               %br
                               at submission
                               = link_to "#" + @best[:runtime][:sub_id].to_s, submission_path(@best[:runtime][:sub_id])
                           %tr
                             %td.info_param
                               Best Memory Usage
                               %sup{ id: "xmem_remark",
                                 style: "position:relative; color: blue;",
                                 data: {toggle: 'tooltip', placement: 'top', animation: 'false', delay: 20},
                                 title: "This counts only for submission with 100% score.  Right now, java is excluded from memory usage competition. (Because it always uses 2GB memory...)"}
                                 [?]
                             %td
-            -                 by #{link_to @best[:memory][:user], controller:'users', action:'profile', id:@best[:memory][:user_id]}
+            +                 by #{link_to @best[:memory][:user], stat_user_path(@best[:memory][:user_id])}
                               %br
                               using <span class="text-success">#{@best[:memory][:lang]}</span>
                               %br
                               with <span class="text-success">#{number_with_delimiter(@best[:memory][:value])} kbytes </span>
                               %br
                               at submission
                               = link_to "#" + @best[:memory][:sub_id].to_s, submission_path(@best[:memory][:sub_id])
                           %tr
                             %td.info_param Shortest Code
                             %td
-            -                 by #{link_to @best[:length][:user], controller:'users', action:'profile', id:@best[:length][:user_id]}
+            +                 by #{link_to @best[:length][:user], stat_user_path(@best[:length][:user_id])}
                               %br
                               using <span class="text-success">#{@best[:length][:lang]}</span>
                               %br
                               with  <span class="text-success">#{@best[:length][:value]} bytes</span>
                               %br
                               at submission
                               = link_to "#" + @best[:length][:sub_id].to_s, submission_path(@best[:length][:sub_id])
                           %tr
                             %td.info_param First solver
                             %td
                               - if @best[:first][:user] != '(NULL)'
-            -                   #{link_to @best[:first][:user], controller:'users', action:'profile', id:@best[:first][:user_id]} is the first solver
+            +                   #{link_to @best[:first][:user], stat_user_path(@best[:first][:user_id])} is the first solver
                                 %br
                                 using <span class="text-success">#{@best[:first][:lang]}</span>
                                 %br
                                 on <span class="text-success">#{@best[:first][:value]}</span>
                                 %br
                                 at submission
                                 = link_to "#" + @best[:first][:sub_id].to_s, submission_path( @best[:first][:sub_id])
                               - else
                                 no first solver
                   .col-md-8
                     - if @best
                       %h2 By Language
                       %table.table.table-hover
                         %thead
                           %tr
                             %th Language
                             %th Best runtime (ms)
                             %th Best memory (kbytes)
                             %th Shortest Code (bytes)
                             %th First solver
                         %tbody
                           - @by_lang.each do |lang,value|
                             %tr
                               %td= lang
                               %td
-            -                   = link_to value[:runtime][:user], controller: 'users', action: 'profile', id: value[:runtime][:user_id]
+            +                   = link_to value[:runtime][:user], stat_user_path(value[:runtime][:user_id])
                                 %br
                                 = "#{(value[:runtime][:value] * 1000).to_i} @"
                                 = link_to "#" + value[:runtime][:sub_id].to_s, submission_path( value[:runtime][:sub_id])
                               %td
-            -                   = link_to value[:memory][:user], controller: 'users', action: 'profile', id: value[:memory][:user_id]
+            +                   = link_to value[:memory][:user], stat_user_path( value[:memory][:user_id])
                                 %br
                                 = "#{number_with_delimiter(value[:memory][:value])} @"
                                 = link_to "#" + value[:memory][:sub_id].to_s, submission_path(value[:memory][:sub_id])
                               %td
-            -                   = link_to value[:length][:user], controller: 'users', action: 'profile', id: value[:length][:user_id]
+            +                   = link_to value[:length][:user], stat_user_path(value[:length][:user_id])
                                 %br
                                 = "#{value[:length][:value]} @"
                                 = link_to "#" + value[:length][:sub_id].to_s, submission_path(value[:length][:sub_id])
                               %td
                                 - if value[:first][:user] != '(NULL)' #TODO: i know... this is wrong...
-            -                     = link_to value[:first][:user], controller: 'users', action: 'profile', id: value[:first][:user_id]
+            +                     = link_to value[:first][:user], stat_user_path(value[:first][:user_id])
                                   %br
                                   = "#{value[:first][:value]} @"
                                   = link_to "#" + value[:first][:sub_id].to_s, submission_path( value[:first][:sub_id])

app/views/report/max_score.html.haml ¶ +2 -2

               %h1 Maximum score
               = form_tag report_show_max_score_path
               .row
                 .col-md-4
                   .panel.panel-primary
                     .panel-heading
                       Problems
                     .panel-body
                       %p
                         Select problem(s) that we wish to know the score.
                       = label_tag :problem_id, "Problems"
                       = select_tag 'problem_id[]',
                           options_for_select(Problem.all.collect {|p| ["[#{p.name}] #{p.full_name}", p.id]},params[:problem_id]),
                           { class: 'select2 form-control', multiple: "true" }
                 .col-md-4
                   .panel.panel-primary
                     .panel-heading
                       Submission range
                     .panel-body
                       %p
                         Input minimum and maximum range of submission ID that should be included. A blank value for min and max means -1 and infinity, respectively.
                       .form-group
                         = label_tag :from, "Min"
-            -           = text_field_tag 'from_id', nil, class: "form-control"
+            +           = text_field_tag 'from_id', @since_id, class: "form-control"
                       .form-group
                         = label_tag :from, "Max"
-            -           = text_field_tag 'to_id', nil, class: "form-control"
+            +           = text_field_tag 'to_id', @until_id, class: "form-control"
                 .col-md-4
                   .panel.panel-primary
                     .panel-heading
                       Users
                     .panel-body
                       .radio
                         %label
                           = radio_button_tag 'users', 'all', true
                           All users
                       .radio
                         %label
                           = radio_button_tag 'users', 'enabled'
                           Only enabled users
               .row
                 .col-md-12
                   = button_tag 'Show', class: "btn btn-primary btn-large", value: "show"
                   = button_tag 'Download CSV', class: "btn btn-primary btn-large", value: "download"
               - if @scorearray
                 %h2 Result
                 =render "score_table"

app/views/submissions/edit.html.haml ¶ +4 -3

               %h2 Live submit
               %br
-            - %textarea#text_haha{style: "display:none"}~ @source
+            + %textarea#text_sourcecode{style: "display:none"}~ @source
               .container
                 .row
                   .col-md-12
                     .alert.alert-info
                       Write your code in the following box, choose language, and click submit button when finished
                 .row
                   .col-md-8
                     %div#editor{style: 'height: 500px; border-radius: 7px; font-size: 14px;'}
                   .col-md-4
                     = form_tag({controller: :main, :action => 'submit'}, :multipart => true, class: 'form') do
                       = hidden_field_tag 'editor_text', @source
                       = hidden_field_tag 'submission[problem_id]', @problem.id
                       .form-group
                         = label_tag "Task:"
                         = text_field_tag 'asdf', "#{@problem.long_name}", class: 'form-control', disabled: true
                       .form-group
                         = label_tag 'Language'
                         = select_tag 'language_id', options_from_collection_for_select(Language.all, 'id', 'pretty_name', @lang_id || Language.find_by_pretty_name("Python").id || Language.first.id), class: 'form-control select', style: "width: 100px"
                       .form-group
                         = submit_tag 'Submit', class: 'btn btn-success', id: 'live_submit',
                           data: {confirm: "Submitting this source code for task #{@problem.long_name}?"}
                     .panel.panel-info
                       .panel-heading
                         Latest Submission Status
+            +           = link_to "Refresh",get_latest_submission_status_submissions_path(@submission.user,@problem), class: "btn btn-default btn-sm", remote: true if @submission
                       .panel-body
                         - if @submission
                           = render :partial => 'submission_short',
-            -               :locals => {:submission => @submission, :problem_name => @problem.name }
+            +               :locals => {submission: @submission, problem_name: @problem.name, problem_id: @problem.id }
                 .row
                   .col-md-12
                     %h2 Console
                     %textarea#console{style: 'height: 100%; width: 100%;background-color:#000;color:#fff;font-family: consolas, monaco, "Droid Sans Mono";',rows: 20}
               :javascript
                 $(document).ready(function() {
                   e = ace.edit("editor")
-            -     e.setValue($("#text_haha").val());
+            +     e.setValue($("#text_sourcecode").val());
                   e.gotoLine(1);
                   $("#language_id").trigger('change');
                   brython();
                 });
               %script#__main__{type:'text/python3'}
                 :plain
                   import sys
                   import traceback
                   from browser import document as doc
                   from browser import window, alert, console
                   _credits = """    Thanks to CWI, CNRI, BeOpen.com, Zope Corporation and a cast of thousands
                       for supporting Python development.  See www.python.org for more information."""
                   _copyright = """Copyright (c) 2012, Pierre Quentel pierre.quentel@gmail.com
                   All Rights Reserved.
                   Copyright (c) 2001-2013 Python Software Foundation.
                   All Rights Reserved.
                   Copyright (c) 2000 BeOpen.com.

app/views/submissions/get_latest_submission_status.js.haml ¶ +1 -1

		@@ -1,2 +1,2
1		- :javascript
	1	+ :plain
2	2	$("#latest_status").html("#{j render({partial: 'submission_short', locals: {submission: @submission, problem_name: @problem.name}})}")

app/views/submissions/index.html.haml ¶ +1 -1

               .panel.panel-info
                 .panel-heading
                   Select Problems
                 .panel-body
                   .form-inline
                     = select 'submission',
                       'problem_id',
                       @problems.collect {|p| ["[#{p.name}] #{p.full_name}", problem_submissions_url(p.id)]},
                       { selected: (@problem ? problem_submissions_url(@problem) : -1) },
                       { class: 'select2 form-control'}
                     %button.btn.btn-primary.btn-sm.go-button#problem_go{data: {source: '#submission_problem_id'}} Go
               - if @problem!=nil
                 %h2= "Task: #{@problem.full_name} (#{@problem.name})"
               - if @submissions!=nil
                 - if @submissions.length>0
                   %table.table
                     %thead
                       %th No.
-            -         %th #
+            +         %th.text-right #
                       %th At
                       %th Source
                       %th Result
                       %th{:width => "300px"} Compiler message
                       %th
                     = render :partial => 'submission', :collection => @submissions
                 - else
                   No submission

app/views/submissions/show.html.haml ¶ +25 -2

               %h1= "Submission: #{@submission.id}"
               %textarea#data{style: "display:none;"}
                 :preserve
                   #{@submission.source}
               //%div.highlight{:style => "border: 1px solid black;"}
               //=@formatted_code.html_safe
+            +
+            +
               .containter
                 .row
                   .col-md-7
                     %h2 Source Code
                   .col-md-5
                     %h2 Stat
                 .row
                   .col-md-7
                     %div#editor{ style: "font-size: 14px; height: 400px; border-radius:5px;" }
                     :javascript
                       e = ace.edit("editor")
                       e.setOptions({ maxLines: Infinity })
                       e.setValue($("#data").text())
                       e.gotoLine(1)
                       e.getSession().setMode("#{get_ace_mode(@submission.language)}")
                       e.setReadOnly(true)
                   .col-md-5
                     %table.table.table-striped
                       %tr
                         %td.text-right
                           %strong User
                         %td
                           - if @submission.user
                             = link_to "#{@submission.user.login}", stat_user_path(@submission.user)
                           - else
                             = "(n/a)"
                       %tr
                         %td.text-right
                           %strong Tries
                         %td= @submission.number
                       %tr
                         %td.text-right
                           %strong Language
                         %td= @submission.language.pretty_name
                       %tr
                         %td.text-right
                           %strong Submitted
                         %td #{time_ago_in_words(@submission.submitted_at)} ago (at #{@submission.submitted_at.to_formatted_s(:long)})
                       %tr
                         %td.text-right
                           %strong Graded
                         - if @submission.graded_at
                           %td #{time_ago_in_words(@submission.graded_at)} ago (at #{@submission.graded_at.to_formatted_s(:long)})
                         - else
                           %td -
                       %tr
                         %td.text-right
                           %strong Points
-            -           %td #{@submission.points}/#{@submission.problem.full_score}
+            +           %td #{@submission.points}/#{@submission.try(:problem).try(:full_score)}
                       %tr
                         %td.text-right
                           %strong Comment
                         %td #{@submission.grader_comment}
                       %tr
                         %td.text-right
                           %strong Runtime (s)
                         %td #{@submission.max_runtime}
                       %tr
                         %td.text-right
                           %strong Memory (kb)
                         %td #{@submission.peak_memory}
                       %tr
                         %td.text-right
                           %strong Compiler result
                         %td
-            -             %pre= @submission.compiler_message
+            +             %button.btn.btn-info.btn-xs{type: 'button', data: {toggle: 'modal', target: '#compiler'}}
+            +               view
                       - if session[:admin]
                         %tr
                           %td.text-right
                             %strong IP
                           %td #{@submission.ip_address}
+            +         %tr
+            +           %td.text-right
+            +             %strong Grading Task Status
+            +           %td
+            +             = @task.status_str if @task
+            +             - if session[:admin]
+            +               = link_to "rejudge", rejudge_submission_path, data: {remote: true}, class: 'btn btn-info btn-xs'
+            +
+            +
+            + .modal.fade#compiler{tabindex: -1,role: 'dialog'}
+            +   .modal-dialog.modal-lg{role:'document'}
+            +     .modal-content
+            +       .modal-header
+            +         %button.close{type: 'button', data: {dismissed: :modal}, aria: {label: 'close'}}
+            +           %span{aria: {hidden: 'true'}, data: {dismiss: 'modal'}} &times;
+            +         %h4 Compiler message
+            +       .modal-body
+            +         %pre#compiler_msg= @submission.compiler_message
+            +       .modal-footer
+            +         %button.btn.btn-default{type: 'button', data: {dismiss: 'modal'}} Close

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

                       = 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 '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
                 %thead
                   %th Login
                   %th Full name
                   %th email
                   %th Remark
                   %th
                     Activated
                     %sup{class: 'text-primary',data: {toggle: 'tooltip', placement: 'top'}, title: 'User has already confirmed the email?' } [?]
                   %th
                     Enabled
                     %sup{class: 'text-primary',data: {toggle: 'tooltip', placement: 'top'}, title: 'Allow the user to login?' } [?]
                   %th Last IP
                   %th
                   %th
                   %th
                   %th
                 - for user in @users
                   %tr
-            -       %td= link_to user.login, controller: :users, :action => 'profile', :id => user
+            +       %td= link_to user.login, stat_user_path(user)
                     %td= user.full_name
                     %td= user.email
                     %td= user.remark
                     %td= toggle_button(user.activated?, toggle_activate_user_path(user),"toggle_activate_user_#{user.id}")
                     %td= toggle_button(user.enabled?, toggle_enable_user_path(user),"toggle_enable_user_#{user.id}")
                     %td= user.last_ip
                     %td= link_to 'Clear IP', {:action => 'clear_last_ip', :id => user, :page=>params[:page]}, :confirm => 'This will reset last logging in ip of the user, are you sure?', class: 'btn btn-default btn-xs btn-block'
                     %td= link_to 'Show', {:action => 'show', :id => user}, class: 'btn btn-default btn-xs btn-block'
                     %td= link_to 'Edit', {:action => 'edit', :id => user}, class: 'btn btn-default btn-xs btn-block'
                     %td= link_to 'Destroy', { :action => 'destroy', :id => user }, :confirm => 'Are you sure?', :method => :delete, class: 'btn btn-danger btn-xs btn-block'
               %br/
               = link_to '+ New user', { :action => 'new' }, { class: 'btn btn-success '}
               = link_to '+ New list of users', { :action => 'new_list' }, { class: 'btn btn-success '}

app/views/user_admin/new_list.html.erb ¶ +4 -3

               <h1>Adding list of users</h1>
               <%= form_tag :action => 'create_from_list' do %>
-            - <%= submit_tag 'create users' %><br/>
-            - List of user information in this format: <tt>user_id,name(,passwd(,alias))</tt><br/>
-            - Note that <tt>passwd</tt> and <tt>alias</tt> is optional.<br/>
+            +   <%= submit_tag 'create users',class: 'btn btn-success'%><br/>
+            + List of user information in this format: <tt>user_id,name(,passwd(,alias(,remark)))</tt><br/>
+            + Note that <tt>passwd, alias</tt> and <tt> remark </tt>is optional.<br />
+            + When <tt>passwd</tt> or <tt>alias</tt> is empty, the original value will be used instead.<br/>
               <%= text_area_tag 'user_list', nil, :rows => 50, :cols => 80 %>
               <% end %>

config/environments/development.rb ¶ +9 -7

               CafeGrader::Application.configure do
                 # Settings specified here will take precedence over those in config/application.rb
                 # In the development environment your application's code is reloaded on
                 # every request. This slows down response time but is perfect for development
                 # since you don't have to restart the web server when you make code changes.
                 config.cache_classes = false
-            -   # Log error messages when you accidentally call methods on nil.
-            -   config.whiny_nils = true
+            +   # Log error messages when you accidentally call methods on nil.  //DEPRICATED
+            +   # config.whiny_nils = true // DEPRICATED
                 # Show full error reports and disable caching
                 config.consider_all_requests_local       = true
                 config.action_controller.perform_caching = false
                 # Don't care if the mailer can't send
                 config.action_mailer.raise_delivery_errors = false
                 # Print deprecation notices to the Rails logger
                 config.active_support.deprecation = :log
                 # Only use best-standards-support built into browsers
                 config.action_dispatch.best_standards_support = :builtin
                 # Raise exception on mass assignment protection for Active Record models
-            -   config.active_record.mass_assignment_sanitizer = :strict
+            +   # config.active_record.mass_assignment_sanitizer = :strict //DEPRICATED
-            -   # Log the query plan for queries taking more than this (works
-            -   # with SQLite, MySQL, and PostgreSQL)
-            -   config.active_record.auto_explain_threshold_in_seconds = 0.5
+            +   # Log the query plan for queries taking more than this (works // DEPRICATED
+            +   # with SQLite, MySQL, and PostgreSQL) // DEPRICATED
+            +   # config.active_record.auto_explain_threshold_in_seconds = 0.5 // DEPRICATED
                 # Do not compress assets
                 config.assets.compress = false
                 # Expands the lines which load the assets
                 config.assets.debug = true
                 # Prevents assets from rendering twice
-            -   config.serve_static_assets = true
+            +   config.serve_static_files = true
+            +
+            +   config.eager_load = false
               end

config/environments/production.rb ¶ +3 -1

               CafeGrader::Application.configure do
                 # Settings specified here will take precedence over those in config/application.rb
                 # Code is not reloaded between requests
                 config.cache_classes = true
                 # Full error reports are disabled and caching is turned on
                 config.consider_all_requests_local       = false
                 config.action_controller.perform_caching = true
                 # Disable Rails's static asset server (Apache or nginx will already do this)
-            -   config.serve_static_assets = false
+            +   config.serve_static_files = false
                 # Compress JavaScripts and CSS
                 config.assets.compress = true
                 # Don't fallback to assets pipeline if a precompiled asset is missed
                 config.assets.compile = false
                 # Generate digests for assets URLs
                 config.assets.digest = true
                 # Defaults to nil and saved in location specified by config.assets.prefix
                 # config.assets.manifest = YOUR_PATH
                 # Specifies the header that your server uses for sending files
                 # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
                 # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
                 # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
                 # config.force_ssl = true
                 # See everything in the log (default is :info)
                 # config.log_level = :debug
                 # Prepend all log lines with the following tags
                 # config.cache_store = :mem_cache_store
                 # Enable serving of images, stylesheets, and JavaScripts from an asset server
                 # config.action_controller.asset_host = "http://assets.example.com"
                 # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
                 # config.assets.precompile += %w( search.js )
                 # Disable delivery errors, bad email addresses will be ignored
                 # config.action_mailer.raise_delivery_errors = false
                 # Enable threaded mode
                 # config.threadsafe!
                 # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
                 # the I18n.default_locale when a translation can not be found)
                 config.i18n.fallbacks = true
                 # Send deprecation notices to registered listeners
                 config.active_support.deprecation = :notify
                 # Log the query plan for queries taking more than this (works
                 # with SQLite, MySQL, and PostgreSQL)
                 # config.active_record.auto_explain_threshold_in_seconds = 0.5
+            +
+            +   config.eager_load = true
               end

config/environments/test.rb ¶ +8 -2

               CafeGrader::Application.configure do
                 # Settings specified here will take precedence over those in config/application.rb
                 # The test environment is used exclusively to run your application's
                 # test suite. You never need to work with it otherwise. Remember that
                 # your test database is "scratch space" for the test suite and is wiped
                 # and recreated between test runs. Don't rely on the data there!
                 config.cache_classes = true
                 # Configure static asset server for tests with Cache-Control for performance
-            -   config.serve_static_assets = true
+            +   config.serve_static_files = true
                 config.static_cache_control = "public, max-age=3600"
                 # Log error messages when you accidentally call methods on nil
                 config.whiny_nils = true
                 # Show full error reports and disable caching
                 config.consider_all_requests_local       = true
                 config.action_controller.perform_caching = false
                 # Raise exceptions instead of rendering exception templates
                 config.action_dispatch.show_exceptions = false
                 # Disable request forgery protection in test environment
                 config.action_controller.allow_forgery_protection    = false
                 # Tell Action Mailer not to deliver emails to the real world.
                 # The :test delivery method accumulates sent emails in the
                 # ActionMailer::Base.deliveries array.
                 config.action_mailer.delivery_method = :test
                 # Raise exception on mass assignment protection for Active Record models
-            -   config.active_record.mass_assignment_sanitizer = :strict
+            +   #config.active_record.mass_assignment_sanitizer = :strict // DEPRICATED
                 # Print deprecation notices to the stderr
                 config.active_support.deprecation = :stderr
+            +
+            +   config.eager_load = false
+            +
+            +   #test order
+            +   config.active_support.test_order = :sorted
+            +
               end

config/initializers/mime_types.rb ¶ -1

               # Be sure to restart your server when you modify this file.
               # Add new mime types for use in respond_to blocks:
               # Mime::Type.register "text/richtext", :rtf
               # Mime::Type.register_alias "text/html", :iphone
-            - Mime::Type.register 'application/pdf', :pdf

config/routes.rb ¶ +31 -6

               CafeGrader::Application.routes.draw do
                 get "sources/direct_edit"
                 root :to => 'main#login'
+            +   #logins
+            +   get 'login/login',  to: 'login#login'
+            +
                 resources :contests
                 resources :sites
                 resources :announcements do
                   member do
                     get 'toggle','toggle_front'
                   end
                 end
                 resources :problems do
                   member do
                     get 'toggle'
                     get 'toggle_test'
+            +       get 'toggle_view_testcase'
                     get 'stat'
                   end
                   collection do
                     get 'turn_all_off'
                     get 'turn_all_on'
                     get 'import'
                     get 'manage'
                   end
+            +
+            +   end
+            +
+            +   resources :testcases, only: [] do
+            +     member do
+            +       get 'download_input'
+            +       get 'download_sol'
+            +     end
+            +     collection do
+            +       get 'show_problem/:problem_id(/:test_num)' => 'testcases#show_problem', as: 'show_problem'
+            +     end
                 end
                 resources :grader_configuration, controller: 'configurations'
                 resources :users do
                   member do
                     get 'toggle_activate', 'toggle_enable'
                     get 'stat'
                   end
                 end
                 resources :submissions do
+            +     member do
+            +       get 'download'
+            +       get 'compiler_msg'
+            +       get 'rejudge'
+            +     end
                   collection do
                     get 'prob/:problem_id', to: 'submissions#index', as: 'problem'
                     get 'direct_edit_problem/:problem_id', to: 'submissions#direct_edit_problem', as: 'direct_edit_problem'
                     get 'get_latest_submission_status/:uid/:pid', to: 'submissions#get_latest_submission_status', as: 'get_latest_submission_status'
                   end
                 end
-            -   match 'tasks/view/:file.:ext' => 'tasks#view'
-            -   match 'tasks/download/:id/:file.:ext' => 'tasks#download'
-            -   match 'heartbeat/:id/edit' => 'heartbeat#edit'
+            +
                 #main
                 get "main/list"
                 get 'main/submission(/:id)', to: 'main#submission', as: 'main_submission'
+            +   #user admin
+            +   get 'user_admin/bulk_manage', to: 'user_admin#bulk_manage', as: 'bulk_manage_user_admin'
+            +
                 #report
                 get 'report/current_score', to: 'report#current_score', as: 'report_current_score'
                 get 'report/problem_hof(/:id)', to: 'report#problem_hof', as: 'report_problem_hof'
                 get "report/login"
                 get 'report/max_score', to: 'report#max_score', as: 'report_max_score'
                 post 'report/show_max_score', to: 'report#show_max_score', as: 'report_show_max_score'
+            +
+            +   #
+            +   get 'tasks/view/:file.:ext' => 'tasks#view'
+            +   get 'tasks/download/:id/:file.:ext' => 'tasks#download'
+            +   get 'heartbeat/:id/edit' => 'heartbeat#edit'
+            +
                 #grader
                 get 'graders/list', to: 'graders#list', as: 'grader_list'
+            -
-            -   match 'heartbeat/:id/edit' => 'heartbeat#edit'
                 # See how all your routes lay out with "rake routes"
                 # This is a legacy wild controller route that's not recommended for RESTful applications.
                 # Note: This route will make all actions in every controller accessible via GET requests.
-            -   match ':controller(/:action(/:id))(.:format)'
+            +   match ':controller(/:action(/:id))(.:format)', via:  [:get, :post]
               end

db/schema.rb ¶ +181 -178

               # encoding: UTF-8
               # This file is auto-generated from the current state of the database. Instead
               # of editing this file, please use the migrations feature of Active Record to
               # incrementally modify your database, and then regenerate this schema definition.
               #
               # Note that this schema.rb definition is the authoritative source for your
               # database schema. If you need to create the application database on another
               # system, you should be using db:schema:load, not running all the migrations
               # from scratch. The latter is a flawed and unsustainable approach (the more migrations
               # you'll amass, the slower it'll run and the greater likelihood for issues).
               #
-            - # It's strongly recommended to check this file into your version control system.
+            + # It's strongly recommended that you check this file into your version control system.
-            - ActiveRecord::Schema.define(:version => 20161014091417) do
+            + ActiveRecord::Schema.define(version: 20170427070345) do
-            -   create_table "announcements", :force => true do |t|
-            -     t.string   "author"
-            -     t.text     "body"
+            +   create_table "announcements", force: :cascade do |t|
+            +     t.string   "author",       limit: 255
+            +     t.text     "body",         limit: 65535
                   t.boolean  "published"
-            -     t.datetime "created_at",                      :null => false
-            -     t.datetime "updated_at",                      :null => false
-            -     t.boolean  "frontpage",    :default => false
-            -     t.boolean  "contest_only", :default => false
-            -     t.string   "title"
-            -     t.string   "notes"
+            +     t.datetime "created_at",                                 null: false
+            +     t.datetime "updated_at",                                 null: false
+            +     t.boolean  "frontpage",                  default: false
+            +     t.boolean  "contest_only",               default: false
+            +     t.string   "title",        limit: 255
+            +     t.string   "notes",        limit: 255
                 end
-            -   create_table "contests", :force => true do |t|
-            -     t.string   "title"
+            +   create_table "contests", force: :cascade do |t|
+            +     t.string   "title",      limit: 255
                   t.boolean  "enabled"
-            -     t.datetime "created_at", :null => false
-            -     t.datetime "updated_at", :null => false
-            -     t.string   "name"
+            +     t.datetime "created_at",             null: false
+            +     t.datetime "updated_at",             null: false
+            +     t.string   "name",       limit: 255
                 end
-            -   create_table "contests_problems", :id => false, :force => true do |t|
-            -     t.integer "contest_id"
-            -     t.integer "problem_id"
+            +   create_table "contests_problems", id: false, force: :cascade do |t|
+            +     t.integer "contest_id", limit: 4
+            +     t.integer "problem_id", limit: 4
                 end
-            -   create_table "contests_users", :id => false, :force => true do |t|
-            -     t.integer "contest_id"
-            -     t.integer "user_id"
+            +   create_table "contests_users", id: false, force: :cascade do |t|
+            +     t.integer "contest_id", limit: 4
+            +     t.integer "user_id",    limit: 4
                 end
-            -   create_table "countries", :force => true do |t|
-            -     t.string   "name"
-            -     t.datetime "created_at", :null => false
-            -     t.datetime "updated_at", :null => false
+            +   create_table "countries", force: :cascade do |t|
+            +     t.string   "name",       limit: 255
+            +     t.datetime "created_at",             null: false
+            +     t.datetime "updated_at",             null: false
                 end
-            -   create_table "descriptions", :force => true do |t|
-            -     t.text     "body"
+            +   create_table "descriptions", force: :cascade do |t|
+            +     t.text     "body",       limit: 65535
                   t.boolean  "markdowned"
-            -     t.datetime "created_at", :null => false
-            -     t.datetime "updated_at", :null => false
+            +     t.datetime "created_at",               null: false
+            +     t.datetime "updated_at",               null: false
                 end
-            -   create_table "grader_configurations", :force => true do |t|
-            -     t.string   "key"
-            -     t.string   "value_type"
-            -     t.string   "value"
-            -     t.datetime "created_at",  :null => false
-            -     t.datetime "updated_at",  :null => false
-            -     t.text     "description"
+            +   create_table "grader_configurations", force: :cascade do |t|
+            +     t.string   "key",         limit: 255
+            +     t.string   "value_type",  limit: 255
+            +     t.string   "value",       limit: 255
+            +     t.datetime "created_at",                null: false
+            +     t.datetime "updated_at",                null: false
+            +     t.text     "description", limit: 65535
                 end
-            -   create_table "grader_processes", :force => true do |t|
-            -     t.string   "host"
-            -     t.integer  "pid"
-            -     t.string   "mode"
+            +   create_table "grader_processes", force: :cascade do |t|
+            +     t.string   "host",       limit: 255
+            +     t.integer  "pid",        limit: 4
+            +     t.string   "mode",       limit: 255
                   t.boolean  "active"
-            -     t.datetime "created_at", :null => false
-            -     t.datetime "updated_at", :null => false
-            -     t.integer  "task_id"
-            -     t.string   "task_type"
+            +     t.datetime "created_at",             null: false
+            +     t.datetime "updated_at",             null: false
+            +     t.integer  "task_id",    limit: 4
+            +     t.string   "task_type",  limit: 255
                   t.boolean  "terminated"
                 end
-            -   add_index "grader_processes", ["host", "pid"], :name => "index_grader_processes_on_ip_and_pid"
+            +   add_index "grader_processes", ["host", "pid"], name: "index_grader_processes_on_ip_and_pid", using: :btree
-            -   create_table "heart_beats", :force => true do |t|
-            -     t.integer  "user_id"
-            -     t.string   "ip_address"
-            -     t.datetime "created_at", :null => false
-            -     t.datetime "updated_at", :null => false
-            -     t.string   "status"
+            +   create_table "heart_beats", force: :cascade do |t|
+            +     t.integer  "user_id",    limit: 4
+            +     t.string   "ip_address", limit: 255
+            +     t.datetime "created_at",             null: false
+            +     t.datetime "updated_at",             null: false
+            +     t.string   "status",     limit: 255
                 end
-            -   add_index "heart_beats", ["updated_at"], :name => "index_heart_beats_on_updated_at"
+            +   add_index "heart_beats", ["updated_at"], name: "index_heart_beats_on_updated_at", using: :btree
-            -   create_table "languages", :force => true do |t|
-            -     t.string "name",        :limit => 10
-            -     t.string "pretty_name"
-            -     t.string "ext",         :limit => 10
-            -     t.string "common_ext"
+            +   create_table "languages", force: :cascade do |t|
+            +     t.string "name",        limit: 10
+            +     t.string "pretty_name", limit: 255
+            +     t.string "ext",         limit: 10
+            +     t.string "common_ext",  limit: 255
                 end
-            -   create_table "logins", :force => true do |t|
-            -     t.integer  "user_id"
-            -     t.string   "ip_address"
-            -     t.datetime "created_at", :null => false
-            -     t.datetime "updated_at", :null => false
+            +   create_table "logins", force: :cascade do |t|
+            +     t.integer  "user_id",    limit: 4
+            +     t.string   "ip_address", limit: 255
+            +     t.datetime "created_at",             null: false
+            +     t.datetime "updated_at",             null: false
                 end
-            -   create_table "messages", :force => true do |t|
-            -     t.integer  "sender_id"
-            -     t.integer  "receiver_id"
-            -     t.integer  "replying_message_id"
-            -     t.text     "body"
+            +   create_table "messages", force: :cascade do |t|
+            +     t.integer  "sender_id",           limit: 4
+            +     t.integer  "receiver_id",         limit: 4
+            +     t.integer  "replying_message_id", limit: 4
+            +     t.text     "body",                limit: 65535
                   t.boolean  "replied"
-            -     t.datetime "created_at",          :null => false
-            -     t.datetime "updated_at",          :null => false
+            +     t.datetime "created_at",                        null: false
+            +     t.datetime "updated_at",                        null: false
                 end
-            -   create_table "problems", :force => true do |t|
-            -     t.string  "name",                 :limit => 30
-            -     t.string  "full_name"
-            -     t.integer "full_score"
+            +   create_table "problems", force: :cascade do |t|
+            +     t.string  "name",                 limit: 30
+            +     t.string  "full_name",            limit: 255
+            +     t.integer "full_score",           limit: 4
                   t.date    "date_added"
                   t.boolean "available"
-            -     t.string  "url"
-            -     t.integer "description_id"
+            +     t.string  "url",                  limit: 255
+            +     t.integer "description_id",       limit: 4
                   t.boolean "test_allowed"
                   t.boolean "output_only"
-            -     t.string  "description_filename"
+            +     t.string  "description_filename", limit: 255
+            +     t.boolean "view_testcase"
                 end
-            -   create_table "rights", :force => true do |t|
-            -     t.string "name"
-            -     t.string "controller"
-            -     t.string "action"
+            +   create_table "rights", force: :cascade do |t|
+            +     t.string "name",       limit: 255
+            +     t.string "controller", limit: 255
+            +     t.string "action",     limit: 255
                 end
-            -   create_table "rights_roles", :id => false, :force => true do |t|
-            -     t.integer "right_id"
-            -     t.integer "role_id"
+            +   create_table "rights_roles", id: false, force: :cascade do |t|
+            +     t.integer "right_id", limit: 4
+            +     t.integer "role_id",  limit: 4
                 end
-            -   add_index "rights_roles", ["role_id"], :name => "index_rights_roles_on_role_id"
+            +   add_index "rights_roles", ["role_id"], name: "index_rights_roles_on_role_id", using: :btree
-            -   create_table "roles", :force => true do |t|
-            -     t.string "name"
+            +   create_table "roles", force: :cascade do |t|
+            +     t.string "name", limit: 255
                 end
-            -   create_table "roles_users", :id => false, :force => true do |t|
-            -     t.integer "role_id"
-            -     t.integer "user_id"
+            +   create_table "roles_users", id: false, force: :cascade do |t|
+            +     t.integer "role_id", limit: 4
+            +     t.integer "user_id", limit: 4
                 end
-            -   add_index "roles_users", ["user_id"], :name => "index_roles_users_on_user_id"
+            +   add_index "roles_users", ["user_id"], name: "index_roles_users_on_user_id", using: :btree
-            -   create_table "sessions", :force => true do |t|
-            -     t.string   "session_id"
-            -     t.text     "data"
+            +   create_table "sessions", force: :cascade do |t|
+            +     t.string   "session_id", limit: 255
+            +     t.text     "data",       limit: 65535
                   t.datetime "updated_at"
                 end
-            -   add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
-            -   add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
+            +   add_index "sessions", ["session_id"], name: "index_sessions_on_session_id", using: :btree
+            +   add_index "sessions", ["updated_at"], name: "index_sessions_on_updated_at", using: :btree
-            -   create_table "sites", :force => true do |t|
-            -     t.string   "name"
+            +   create_table "sites", force: :cascade do |t|
+            +     t.string   "name",       limit: 255
                   t.boolean  "started"
                   t.datetime "start_time"
-            -     t.datetime "created_at", :null => false
-            -     t.datetime "updated_at", :null => false
-            -     t.integer  "country_id"
-            -     t.string   "password"
+            +     t.datetime "created_at",             null: false
+            +     t.datetime "updated_at",             null: false
+            +     t.integer  "country_id", limit: 4
+            +     t.string   "password",   limit: 255
                 end
-            -   create_table "submission_view_logs", :force => true do |t|
-            -     t.integer  "user_id"
-            -     t.integer  "submission_id"
-            -     t.datetime "created_at",    :null => false
-            -     t.datetime "updated_at",    :null => false
+            +   create_table "submission_view_logs", force: :cascade do |t|
+            +     t.integer  "user_id",       limit: 4
+            +     t.integer  "submission_id", limit: 4
+            +     t.datetime "created_at",              null: false
+            +     t.datetime "updated_at",              null: false
                 end
-            -   create_table "submissions", :force => true do |t|
-            -     t.integer  "user_id"
-            -     t.integer  "problem_id"
-            -     t.integer  "language_id"
-            -     t.text     "source"
-            -     t.binary   "binary"
+            +   create_table "submissions", force: :cascade do |t|
+            +     t.integer  "user_id",               limit: 4
+            +     t.integer  "problem_id",            limit: 4
+            +     t.integer  "language_id",           limit: 4
+            +     t.text     "source",                limit: 65535
+            +     t.binary   "binary",                limit: 65535
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
-            -     t.text     "compiler_message"
+            +     t.text     "compiler_message",      limit: 65535
                   t.datetime "graded_at"
-            -     t.integer  "points"
-            -     t.text     "grader_comment"
-            -     t.integer  "number"
-            -     t.string   "source_filename"
-            -     t.float    "max_runtime"
-            -     t.integer  "peak_memory"
-            -     t.integer  "effective_code_length"
-            -     t.string   "ip_address"
+            +     t.integer  "points",                limit: 4
+            +     t.text     "grader_comment",        limit: 65535
+            +     t.integer  "number",                limit: 4
+            +     t.string   "source_filename",       limit: 255
+            +     t.float    "max_runtime",           limit: 24
+            +     t.integer  "peak_memory",           limit: 4
+            +     t.integer  "effective_code_length", limit: 4
+            +     t.string   "ip_address",            limit: 255
                 end
-            -   add_index "submissions", ["user_id", "problem_id", "number"], :name => "index_submissions_on_user_id_and_problem_id_and_number", :unique => true
-            -   add_index "submissions", ["user_id", "problem_id"], :name => "index_submissions_on_user_id_and_problem_id"
+            +   add_index "submissions", ["user_id", "problem_id", "number"], name: "index_submissions_on_user_id_and_problem_id_and_number", unique: true, using: :btree
+            +   add_index "submissions", ["user_id", "problem_id"], name: "index_submissions_on_user_id_and_problem_id", using: :btree
-            -   create_table "tasks", :force => true do |t|
-            -     t.integer  "submission_id"
+            +   create_table "tasks", force: :cascade do |t|
+            +     t.integer  "submission_id", limit: 4
                   t.datetime "created_at"
-            -     t.integer  "status"
+            +     t.integer  "status",        limit: 4
                   t.datetime "updated_at"
                 end
-            -   create_table "test_pairs", :force => true do |t|
-            -     t.integer  "problem_id"
-            -     t.text     "input",      :limit => 16777215
-            -     t.text     "solution",   :limit => 16777215
-            -     t.datetime "created_at",                     :null => false
-            -     t.datetime "updated_at",                     :null => false
+            +   add_index "tasks", ["submission_id"], name: "index_tasks_on_submission_id", using: :btree
+            +
+            +   create_table "test_pairs", force: :cascade do |t|
+            +     t.integer  "problem_id", limit: 4
+            +     t.text     "input",      limit: 16777215
+            +     t.text     "solution",   limit: 16777215
+            +     t.datetime "created_at",                  null: false
+            +     t.datetime "updated_at",                  null: false
                 end
-            -   create_table "test_requests", :force => true do |t|
-            -     t.integer  "user_id"
-            -     t.integer  "problem_id"
-            -     t.integer  "submission_id"
-            -     t.string   "input_file_name"
-            -     t.string   "output_file_name"
-            -     t.string   "running_stat"
-            -     t.integer  "status"
-            -     t.datetime "updated_at",       :null => false
+            +   create_table "test_requests", force: :cascade do |t|
+            +     t.integer  "user_id",          limit: 4
+            +     t.integer  "problem_id",       limit: 4
+            +     t.integer  "submission_id",    limit: 4
+            +     t.string   "input_file_name",  limit: 255
+            +     t.string   "output_file_name", limit: 255
+            +     t.string   "running_stat",     limit: 255
+            +     t.integer  "status",           limit: 4
+            +     t.datetime "updated_at",                     null: false
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
-            -     t.text     "compiler_message"
+            +     t.text     "compiler_message", limit: 65535
                   t.datetime "graded_at"
-            -     t.string   "grader_comment"
-            -     t.datetime "created_at",       :null => false
-            -     t.float    "running_time"
-            -     t.string   "exit_status"
-            -     t.integer  "memory_usage"
+            +     t.string   "grader_comment",   limit: 255
+            +     t.datetime "created_at",                     null: false
+            +     t.float    "running_time",     limit: 24
+            +     t.string   "exit_status",      limit: 255
+            +     t.integer  "memory_usage",     limit: 4
                 end
-            -   add_index "test_requests", ["user_id", "problem_id"], :name => "index_test_requests_on_user_id_and_problem_id"
+            +   add_index "test_requests", ["user_id", "problem_id"], name: "index_test_requests_on_user_id_and_problem_id", using: :btree
-            -   create_table "testcases", :force => true do |t|
-            -     t.integer  "problem_id"
-            -     t.integer  "num"
-            -     t.integer  "group"
-            -     t.integer  "score"
-            -     t.text     "input"
-            -     t.text     "sol"
-            -     t.datetime "created_at", :null => false
-            -     t.datetime "updated_at", :null => false
+            +   create_table "testcases", force: :cascade do |t|
+            +     t.integer  "problem_id", limit: 4
+            +     t.integer  "num",        limit: 4
+            +     t.integer  "group",      limit: 4
+            +     t.integer  "score",      limit: 4
+            +     t.text     "input",      limit: 4294967295
+            +     t.text     "sol",        limit: 4294967295
+            +     t.datetime "created_at"
+            +     t.datetime "updated_at"
                 end
-            -   add_index "testcases", ["problem_id"], :name => "index_testcases_on_problem_id"
+            +   add_index "testcases", ["problem_id"], name: "index_testcases_on_problem_id", using: :btree
-            -   create_table "user_contest_stats", :force => true do |t|
-            -     t.integer  "user_id"
+            +   create_table "user_contest_stats", force: :cascade do |t|
+            +     t.integer  "user_id",       limit: 4
                   t.datetime "started_at"
-            -     t.datetime "created_at",    :null => false
-            -     t.datetime "updated_at",    :null => false
+            +     t.datetime "created_at",              null: false
+            +     t.datetime "updated_at",              null: false
                   t.boolean  "forced_logout"
                 end
-            -   create_table "users", :force => true do |t|
-            -     t.string   "login",           :limit => 50
-            -     t.string   "full_name"
-            -     t.string   "hashed_password"
-            -     t.string   "salt",            :limit => 5
-            -     t.string   "alias"
-            -     t.string   "email"
-            -     t.integer  "site_id"
-            -     t.integer  "country_id"
-            -     t.boolean  "activated",                     :default => false
+            +   create_table "users", force: :cascade do |t|
+            +     t.string   "login",           limit: 50
+            +     t.string   "full_name",       limit: 255
+            +     t.string   "hashed_password", limit: 255
+            +     t.string   "salt",            limit: 5
+            +     t.string   "alias",           limit: 255
+            +     t.string   "email",           limit: 255
+            +     t.integer  "site_id",         limit: 4
+            +     t.integer  "country_id",      limit: 4
+            +     t.boolean  "activated",                   default: false
                   t.datetime "created_at"
                   t.datetime "updated_at"
-            -     t.boolean  "enabled",                       :default => true
-            -     t.string   "remark"
-            -     t.string   "last_ip"
-            -     t.string   "section"
+            +     t.boolean  "enabled",                     default: true
+            +     t.string   "remark",          limit: 255
+            +     t.string   "last_ip",         limit: 255
+            +     t.string   "section",         limit: 255
                 end
-            -   add_index "users", ["login"], :name => "index_users_on_login", :unique => true
+            +   add_index "users", ["login"], name: "index_users_on_login", unique: true, using: :btree
               end

db/seeds.rb ¶ +28

                    :description => 'Time limit in format hh:mm, or "unlimited" for contests with no time limits.  This config is CACHED.  Restart the server before the change can take effect.'
                  },
                  {
                    :key => 'system.mode',
                    :value_type => 'string',
                    :default_value => 'standard',
                    :description => 'Current modes are "standard", "contest", "indv-contest", and "analysis".'
                  },
                  {
                    :key => 'contest.name',
                    :value_type => 'string',
                    :default_value => 'Grader',
                    :description => 'This name will be shown on the user header bar.'
                  },
                  {
                    :key => 'contest.multisites',
                    :value_type => 'boolean',
                    :default_value => 'false',
                    :description => 'If the server is in contest mode and this option is true, on the log in of the admin a menu for site selections is shown.'
                  },
+            +    #---------------------------- right --------------------------------
                  {
                    :key => 'right.user_hall_of_fame',
                    :value_type => 'boolean',
                    :default_value => 'false',
                    :description => 'If true, any user can access hall of fame page.'
                  },
                  {
                    :key => 'right.multiple_ip_login',
                    :value_type => 'boolean',
                    :default_value => 'true',
                    :description => 'When change from true to false, a user can login from the first IP they logged into afterward.'
                  },
                  {
                    :key => 'right.user_view_submission',
                    :value_type => 'boolean',
                    :default_value => 'false',
                    :description => 'If true, any user can view submissions of every one.'
                  },
+            +    {
+            +      :key => 'right.bypass_agreement',
+            +      :value_type => 'boolean',
+            +      :default_value => 'true',
+            +      :description => 'When false, a user must accept usage agreement before login'
+            +    },
+            +
+            +    {
+            +      :key => 'right.heartbeat_response',
+            +      :value_type => 'string',
+            +      :default_value => 'OK',
+            +      :description => 'Heart beat response text'
+            +    },
+            +
+            +    {
+            +      :key => 'right.heartbeat_response_full',
+            +      :value_type => 'string',
+            +      :default_value => 'OK',
+            +      :description => 'Heart beat response text when user got full score (set this value to the empty string to disable this feature)'
+            +    },
+            +
+            +    {
+            +      :key => 'right.view_testcase',
+            +      :value_type => 'boolean',
+            +      :default_value => 'false',
+            +      :description => 'When true, any user can view/download test data'
+            +    },
                  # If Configuration['system.online_registration'] is true, the
                  # system allows online registration, and will use these
                  # information for sending confirmation emails.
                  {
                    :key => 'system.online_registration.smtp',
                    :value_type => 'string',
                    :default_value => 'smtp.somehost.com'
                  },
                  {
                    :key => 'system.online_registration.from',
                    :value_type => 'string',
                    :default_value => 'your.email@address'
                  },
                  {
                    :key => 'system.admin_email',
                    :value_type => 'string',
                    :default_value => 'admin@admin.email'
                  },
                  {
                    :key => 'system.user_setting_enabled',
                    :value_type => 'boolean',

lib/grader_script.rb ¶ +16 -1

                   GraderScript.call_grader "stop #{pid_str}"
                 end
                 def self.start_grader(env)
                   GraderScript.call_grader "#{env} queue --err-log &"
                   GraderScript.call_grader "#{env} test_request -err-log &"
                 end
                 def self.call_import_problem(problem_name,
                                              problem_dir,
                                              time_limit=1,
                                              memory_limit=32,
                                              checker_name='text')
                   if GraderScript.grader_control_enabled?
                     cur_dir = `pwd`.chomp
                     Dir.chdir(GRADER_ROOT_DIR)
                     script_name = File.join(GRADER_ROOT_DIR, "scripts/import_problem")
                     cmd = "#{script_name} #{problem_name} #{problem_dir} #{checker_name}" +
                       " -t #{time_limit} -m #{memory_limit}"
                     output = `#{cmd}`
                     Dir.chdir(cur_dir)
+            -
+            +
                     return "import CMD: #{cmd}\n" + output
                   end
                   return ''
                 end
+            +   def self.call_import_testcase(problem_name)
+            +     if GraderScript.grader_control_enabled?
+            +       cur_dir = `pwd`.chomp
+            +       Dir.chdir(GRADER_ROOT_DIR)
+            +
+            +       script_name = File.join(GRADER_ROOT_DIR, "scripts/load_testcase")
+            +       cmd = "#{script_name} #{problem_name}"
+            +
+            +       output = `#{cmd}`
+            +
+            +       Dir.chdir(cur_dir)
+            +       return "Testcase import result:\n" + output
+            +     end
+            +   end
+            +
               end

lib/testdata_importer.rb ¶ +3

                   dirname = extract(tempfile)
                   return false if not dirname
                   if not import_to_db
                     @log_msg = GraderScript.call_import_problem(@problem.name,
                                                                 dirname,
                                                                 time_limit,
                                                                 memory_limit,
                                                                 checker_name)
                   else
                     # Import test data to test pairs.
                     @problem.test_pairs.clear
                     if import_test_pairs(dirname)
                       test_pair_count = TestPair.count :conditions => "problem_id = #{@problem.id}"
                       @log_msg = "Importing test pair successful. (#{test_pair_count} test pairs imported)"
                     else
                       @log_msg = "Importing test pair failed. (0 test pairs imported)"
                     end
                   end
                   @log_msg << import_problem_description(dirname)
                   @log_msg << import_problem_pdf(dirname)
                   @log_msg << import_full_score(dirname)
+            +     #import test data
+            +     @log_msg << GraderScript.call_import_testcase(@problem.name)
+            +
                   return true
                 end
                 protected
                 def self.long_ext(filename)
                   i = filename.index('.')
                   len = filename.length
                   return filename.slice(i..len)
                 end
                 def extract(tempfile)
                   testdata_filename = save_testdata_file(tempfile)
                   ext = TestdataImporter.long_ext(tempfile.original_filename)
                   extract_dir = File.join(GraderScript.raw_dir, @problem.name)
                   if File.exists? extract_dir
                     backup_count = 0
                     begin
                       backup_count += 1
                       backup_dirname = "#{extract_dir}.backup.#{backup_count}"
                     end while File.exists? backup_dirname
                     File.rename(extract_dir, backup_dirname)
                   end

test/concurrent/task_test_setup.rb ¶ +1 -1

               ENV["RAILS_ENV"] = "test"
               require File.expand_path(File.dirname(__FILE__) + "/../../config/environment")
               def clear_all_tasks
-            -   Task.find(:all).each do |task|
+            +   Task.all.each do |task|
                   task.destroy
                 end
               end
               clear_all_tasks
               (1..1000).each do |i|
                 Task.create(:id => i,
                             :submission_id => i,
                             :status => Task::STATUS_INQUEUE)
               end

test/concurrent/task_test_teardown.rb ¶ +2 -3

               ENV["RAILS_ENV"] = "test"
               require File.expand_path(File.dirname(__FILE__) + "/../../config/environment")
               def clear_all_tasks
-            -   Task.find(:all).each do |task|
+            +   Task.all.each do |task|
                   task.destroy
                 end
               end
-            - puts Task.find(:all,
-            -                :conditions => {:status => Task::STATUS_COMPLETE}).length
+            + puts Task.where(status: Task::STATUS_COMPLETE).length
               clear_all_tasks

test/fixtures/languages.yml ¶ +36 -5

		@@ -1,5 +1,36
1		- # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
2		- one:
3		- id: 1
4		- two:
5		- id: 2
	1	+ Language_1:
	2	+ name: c
	3	+ pretty_name: C
	4	+ ext: c
	5	+ common_ext: c
	6	+
	7	+ Language_2:
	8	+ name: cpp
	9	+ pretty_name: C++
	10	+ ext: cpp
	11	+ common_ext: cpp,cc
	12	+
	13	+ Language_3:
	14	+ name: pas
	15	+ pretty_name: Pascal
	16	+ ext: pas
	17	+ common_ext: pas
	18	+
	19	+ Language_4:
	20	+ name: ruby
	21	+ pretty_name: Ruby
	22	+ ext: rb
	23	+ common_ext: rb
	24	+
	25	+ Language_5:
	26	+ name: python
	27	+ pretty_name: Python
	28	+ ext: py
	29	+ common_ext: py
	30	+
	31	+ Language_6:
	32	+ name: java
	33	+ pretty_name: Java
	34	+ ext: java
	35	+ common_ext: java
	36	+

test/fixtures/users.yml ¶ +4 -4

               # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
               <%
               User.public_class_method :encrypt
               salt = "abc"
               %>
               john:
                 login: john
                 full_name: john
                 hashed_password: <%= User.encrypt("hello",salt) %>
                 salt: <%= salt %>
                 activated: true
-            - mary:
-            -   login: mary
-            -   full_name: mary
-            -   hashed_password: <%= User.encrypt("goodbye",salt) %>
+            + admin:
+            +   login: admin
+            +   full_name: admin
+            +   hashed_password: <%= User.encrypt("admin",salt) %>
                 salt: <%= salt %>
                 roles: admin
                 activated: true
               james:
                 login: james
                 full_name: James
                 hashed_password: <%= User.encrypt("morning",salt) %>
                 salt: <%= salt %>
                 contests: contest_a
                 activated: true
               jack:
                 login: jack
                 full_name: Jack
                 hashed_password: <%= User.encrypt("morning",salt) %>
                 salt: <%= salt %>
                 contests: contest_a, contest_b
                 activated: true

test/test_helper.rb ¶ +11

               ENV["RAILS_ENV"] = "test"
               require File.expand_path('../../config/environment', __FILE__)
               require 'rails/test_help'
+            + #reporter for beautiful result
+            + require "minitest/reporters"
+            + Minitest::Reporters.use!
+            +
+            + module SignInHelper
+            +   def sign_in_as(user,password)
+            +     post login_login_path, {login: user, password: password }
+            +   end
+            + end
+            +
               class ActiveSupport::TestCase
+            +   include SignInHelper
                 # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
                 #
                 # Note: You'll currently still have to declare fixtures explicitly in integration tests
                 # -- they do not yet inherit this setting
                 fixtures :all
                 # Add more helper methods to be used by all tests here...
                 self.use_transactional_fixtures = true
                 self.use_instantiated_fixtures  = false
               end

app/views/announcements/edit.html.erb removed ¶ -47

deleted file

app/views/main/submission.html.haml removed ¶ -31

deleted file

app/views/problems/_form.html.erb removed ¶ -54

deleted file

app/views/problems/edit.html.erb removed ¶ -9

deleted file

config/initializers/secret_token.rb removed ¶ -7

deleted file

spec/config_spec_helper.rb removed ¶ -38

deleted file

spec/controllers/main_controller_spec.rb removed ¶ -193

deleted file

spec/controllers/sources_controller_spec.rb removed ¶ -12

deleted file

spec/controllers/submissions_controller_spec.rb removed ¶ -160

deleted file

spec/controllers/test_controller_spec.rb removed ¶ -28

deleted file

spec/controllers/user_admin_controller_spec.rb removed ¶ -73

deleted file

spec/controllers/users_controller_spec.rb removed ¶ -100

deleted file

spec/helpers/sources_helper_spec.rb removed ¶ -15

deleted file

spec/helpers/submissions_helper_spec.rb removed ¶ -15

deleted file

spec/integration/contest_managements_spec.rb removed ¶ -136

deleted file

spec/models/configuration_spec.rb removed ¶ -95

deleted file

spec/models/login_spec.rb removed ¶ -5

deleted file

spec/models/site_spec.rb removed ¶ -48

deleted file

spec/models/submission_spec.rb removed ¶ -37

deleted file

spec/models/submission_view_logs_spec.rb removed ¶ -5

deleted file

spec/models/test_request_spec.rb removed ¶ -39

deleted file

spec/models/user_spec.rb removed ¶ -163

deleted file

spec/rcov.opts removed ¶ -2

deleted file

spec/requests/submissions_spec.rb removed ¶ -11

deleted file

spec/routing/submissions_routing_spec.rb removed ¶ -35

deleted file

spec/spec.opts removed ¶ -4

deleted file

spec/spec_helper.rb removed ¶ -38

deleted file

spec/views/sources/direct_edit.html.haml_spec.rb removed ¶ -5

deleted file

spec/views/submissions/edit.html.haml_spec.rb removed ¶ -15

deleted file

spec/views/submissions/index.html.haml_spec.rb removed ¶ -15

deleted file

spec/views/submissions/new.html.haml_spec.rb removed ¶ -15

deleted file

spec/views/submissions/show.html.haml_spec.rb removed ¶ -12

deleted file

test/fixtures/configurations.yml removed ¶ -7

deleted file

test/performance/browsing_test.rb removed ¶ -12

deleted file

test/unit/.gitkeep removed ¶

deleted file

test/unit/announcement_test.rb removed ¶ -8

deleted file

test/unit/configuration_test.rb removed ¶ -8

deleted file

test/unit/contest_test.rb removed ¶ -8

deleted file

test/unit/country_test.rb removed ¶ -8

deleted file

test/unit/description_test.rb removed ¶ -8

deleted file

test/unit/grader_process_test.rb removed ¶ -8

deleted file

test/unit/helpers/contest_management_helper_test.rb removed ¶ -4

deleted file

test/unit/helpers/contests_helper_test.rb removed ¶ -4

deleted file

test/unit/language_test.rb removed ¶ -10

deleted file

test/unit/message_test.rb removed ¶ -8

deleted file

test/unit/problem_test.rb removed ¶ -10

deleted file

test/unit/right_test.rb removed ¶ -10

deleted file

test/unit/role_test.rb removed ¶ -10

deleted file

test/unit/site_test.rb removed ¶ -8

deleted file

test/unit/submission_test.rb removed ¶ -10

deleted file

test/unit/task_test.rb removed ¶ -41

deleted file

test/unit/test_pair_test.rb removed ¶ -8

deleted file

test/unit/test_request_test.rb removed ¶ -8

deleted file

test/unit/user_contest_stat_test.rb removed ¶ -8

deleted file

test/unit/user_test.rb removed ¶ -10

deleted file

Write
Preview

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

Sign in to your account

Author

r661:50e8e6077bb9 - Sat, 17 Jun 2017 05:49:44 - 146 files changed: 1465 inserted, 2374 deleted

	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

Commit r661:50e8e6077bb9 public

Author

r661:50e8e6077bb9 - Sat, 17 Jun 2017 05:49:44 - 146 files changed: 1465 inserted, 2374 deleted

Commit `r661:50e8e6077bb9` public