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: 1434 inserted, 2343 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 rvm setting file
               .ruby-gemset
               .ruby-version
+            +
+            + /config/secrets.yml

Gemfile ¶ +26 -15

               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'
-            -   gem 'sass-rails',   '~> 3.2.6'
+            + gem 'coffee-rails'
-            -   gem 'coffee-rails', '~> 3.2.2'
                 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
                 # gem 'therubyracer', :platforms => :ruby
               gem 'uglifier'
-            - end
-            - gem 'prototype-rails'
+            + gem 'haml'
+            + gem 'haml-rails'
+            + # gem 'prototype-rails'
               # To use ActiveModel has_secure_password
               # gem 'bcrypt-ruby', '~> 3.0.0'
               # 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'
               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'
+            + #---------------- testiing -----------------------
-            - end
+            + gem 'minitest-reporters'
+            +
+            + #---------------- for console --------------------
+            + gem 'fuzzy-string-match'

Gemfile.lock ¶ +168 -141

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

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

               //
               //= require jquery
               //= require jquery_ujs
-            - //= require jquery.ui.all
+            + //= require jquery-ui
               //= require bootstrap-sprockets
               //= require moment
               //= require bootstrap-sortable
               //= 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

app/assets/javascripts/local_jquery.js ¶ -10

@@ -1,13 +1,3
1	- //= require jquery
2	- //= require jquery_ujs
3	- //= require jquery.ui.all
4	- //= require jquery.ui.datepicker
5	- //= require jquery.ui.slider
6	- //= require jquery-ui-timepicker-addon
7	- //= require jquery-tablesorter
8	- //= require best_in_place
9	- //= require best_in_place.jquery-ui
10	-
11	$(document).ready(function() {	1	$(document).ready(function() {
12	/* Activating Best In Place */	2	/* Activating Best In Place */
13	jQuery(".best_in_place").best_in_place();	3	jQuery(".best_in_place").best_in_place();

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

                * #   *= require_self
                */
-            - @import "jquery.ui.all";
+            + @import "jquery-ui";
-            - @import "jquery.ui.core";
+            + //@import "jquery.ui.core";
-            - @import "jquery.ui.theme";
+            + //@import "jquery.ui.theme";
-            - @import "jquery.ui.datepicker";
+            + //@import "jquery.ui.datepicker";
-            - @import "jquery.ui.slider";
+            + //@import "jquery.ui.slider";
               @import "jquery-ui-timepicker-addon";
               @import "jquery-tablesorter/theme.metro-dark";
               @import "jquery.countdown";

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

                 # GET /announcements
                 # GET /announcements.xml
                 def index
-            -     @announcements = Announcement.find(:all,
+            +     @announcements = Announcement.order(created_at: :desc)
-            -                                        :order => "created_at DESC")
                   respond_to do |format|
                     format.html # index.html.erb
                 # POST /announcements
                 # POST /announcements.xml
                 def create
-            -     @announcement = Announcement.new(params[:announcement])
+            +     @announcement = Announcement.new(announcement_params)
                   respond_to do |format|
                     if @announcement.save
                   @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 }
                   end
                 end
+            +
+            +   private
+            +
+            +     def announcement_params
+            +       params.require(:announcement).permit(:author, :body, :published, :frontpage, :contest_only, :title)
                   end
+            + end

app/controllers/application_controller.rb ¶ +13 -1

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

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

                 def index
-            -     @configurations = GraderConfiguration.find(:all,
+            +     @configurations = GraderConfiguration.order(:key)
-            -                                          :order => '`key`')
+            +     @group = GraderConfiguration.pluck("grader_configurations.key").map{ |x| x[0...(x.index('.'))] }.uniq.sort
                 end
                 def reload
                   @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
+            + private
+            +   def configuration_params
+            +     params.require(:grader_configuration).permit(:key,:value_type,:value,:description)
                 end
+            +
+            + end

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

                     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

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

                   @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 }
                   end
                 end
+            +   private
+            +
+            +     def contests_params
+            +       params.require(:contest).permit(:title,:enabled,:name)
                   end
+            +
+            + end

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

                   @terminated_processes = GraderProcess.find_terminated_graders
-            -     @last_task = Task.find(:first,
+            +     @last_task = Task.last
-            -                            :order => 'created_at DESC')
+            +     @last_test_request = TestRequest.last
-            -     @last_test_request = TestRequest.find(:first,
-            -                                           :order => 'created_at DESC')
                   @submission = Submission.order("id desc").limit(20)
                   @backlog_submission = Submission.where('graded_at is null')
                 end
                 end
                 def clear_all
-            -     GraderProcess.find(:all).each do |p|
+            +     GraderProcess.all.each do |p|
                     p.destroy
                   end
                   redirect_to :action => 'list'

app/controllers/heartbeat_controller.rb ¶ +21 -6

                 before_filter :admin_authorization, :only => ['index']
                 def edit
-            -     @user = User.find_by_login(params[:id])
+            +     #@user = User.find_by_login(params[:id])
-            -     unless @user
+            +     #unless @user
-            -       render text: "LOGIN_NOT_FOUND"
+            +     #  render text: "LOGIN_NOT_FOUND"
-            -       return
+            +     #  return
-            -     end
+            +     #end
                   #hb = HeartBeat.where(user_id: @user.id, ip_address: request.remote_ip).first
                   #puts "status = #{params[:status]}"
                   #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
+            +     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

app/controllers/main_controller.rb ¶ +3 -20

                   #   @hidelogin = true
                   # end
-            -     @announcements = Announcement.find_for_frontpage
+            +     @announcements = Announcement.frontpage
                   render :action => 'login', :layout => 'empty'
                 end
                   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
                 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

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)
                 end
                 def create
-            -     @problem = Problem.new(params[:problem])
+            +     @problem = Problem.new(problem_params)
                   @description = Description.new(params[:description])
                   if @description.body!=''
                     if !@description.save
                 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
                       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.'
                   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,
+            +     Problem.available.all.each do |problem|
-            -                  :conditions => "available = 1").each do |problem|
                     problem.available = false
                     problem.save
                   end
                 end
                 def turn_all_on
-            -     Problem.find(:all,
+            +     Problem.where.not(available: true).each do |problem|
-            -                  :conditions => "available = 0").each do |problem|
                     problem.available = true
                     problem.save
                   end
                 end
                 def manage
-            -     @problems = Problem.find(:all, :order => 'date_added DESC')
+            +     @problems = Problem.order(date_added: :desc)
                 end
                 def do_manage
                 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 ¶ +10 -12

                 before_filter(only: [:problem_hof]) { |c|
                   return false unless authenticate
-            -     if GraderConfiguration["right.user_view_submission"]
+            +     admin_authorization unless GraderConfiguration["right.user_view_submission"]
-            -       return true;
-            -     end
-            -     admin_authorization
                 }
                 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)
                   #process parameters
                   #problems
                   @problems = []
+            +     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
+            +     @since_id = params.fetch(:from_id, 0).to_i
-            -     until_id = params.fetch(:max_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
                   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

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

                 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]]
                   end
                 end
+            +   private
+            +     def site_params
+            +       params.require(:site).permit()
                   end
+            +
+            + end

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

                 # 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
                   @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 }
                   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

@@ -1,6 +1,7
1	class SubmissionsController < ApplicationController	1	class SubmissionsController < ApplicationController
2	- before_~~filter~~ :authenticate	2	+ before_action :authenticate
3	- before_~~filter~~ :submission_authorization, only: [:show, :direct_edit_submission]	3	+ before_action :submission_authorization, only: [:show, :direct_edit_submission, :download, :edit]
		4	+ before_action :admin_authorization, only: [:rejudge]
4		5
5	# GET /submissions	6	# GET /submissions
6	# GET /submissions.json	7	# GET /submissions.json
@@ -19,7 +20,7
19	flash[:notice] = 'Error: submissions for that problem are not viewable.'	20	flash[:notice] = 'Error: submissions for that problem are not viewable.'
20	return	21	return
21	end	22	end
22	- @submissions = Submission.find_all_by_user_problem(@user.id, @problem.id)	23	+ @submissions = Submission.find_all_by_user_problem(@user.id, @problem.id).order(id: :desc)
23	end	24	end
24	end	25	end
25		26
@@ -31,6 +32,20
31	#log the viewing	32	#log the viewing
32	user = User.find(session[:user_id])	33	user = User.find(session[:user_id])
33	SubmissionViewLog.create(user_id: session[:user_id],submission_id: @submission.id) unless user.admin?	34	SubmissionViewLog.create(user_id: session[:user_id],submission_id: @submission.id) unless user.admin?
		35	+
		36	+ @task = @submission.task
		37	+ end
		38	+
		39	+ def download
		40	+ @submission = Submission.find(params[:id])
		41	+ send_data(@submission.source, {:filename => @submission.download_filename, :type => 'text/plain'})
		42	+ end
		43	+
		44	+ def compiler_msg
		45	+ @submission = Submission.find(params[:id])
		46	+ respond_to do \|format\|
		47	+ format.js
		48	+ end
34	end	49	end
35		50
36	#on-site new submission on specific problem	51	#on-site new submission on specific problem
@@ -60,63 +75,18
60	end	75	end
61	end	76	end
62		77
63	- ~~# # GET /submissions/new~~	78	+ # GET /submissions/:id/rejudge
64	- # # GET /submissions/new.json	79	+ def rejudge
65	- # def new	80	+ @submission = Submission.find(params[:id])
66	- # @submission = Submission.new	81	+ @task = @submission.task
67	- #	82	+ @task.status_inqueue! if @task
68	- ~~# respond_to do \|format\|~~	83	+ respond_to do \|format\|
69	- # format.html # new.html.erb	84	+ format.js
70	- # format.json { render json: @submission }	85	+ end
71	- ~~# end~~	86	+ end
72	- # end
73	- #
74	- #
75	- # # POST /submissions
76	- # # POST /submissions.json
77	- # def create
78	- # @submission = Submission.new(params[:submission])
79	- #
80	- # respond_to do \|format\|
81	- # if @submission.save
82	- # format.html { redirect_to @submission, notice: 'Submission was successfully created.' }
83	- # format.json { render json: @submission, status: :created, location: @submission }
84	- # else
85	- # format.html { render action: "new" }
86	- # format.json { render json: @submission.errors, status: :unprocessable_entity }
87	- # end
88	- # end
89	- # end
90	- #
91	- # # PUT /submissions/1
92	- # # PUT /submissions/1.json
93	- # def update
94	- # @submission = Submission.find(params[:id])
95	- #
96	- # respond_to do \|format\|
97	- # if @submission.update_attributes(params[:submission])
98	- # format.html { redirect_to @submission, notice: 'Submission was successfully updated.' }
99	- # format.json { head :no_content }
100	- # else
101	- # format.html { render action: "edit" }
102	- # format.json { render json: @submission.errors, status: :unprocessable_entity }
103	- # end
104	- # end
105	- # end
106	- #
107	- # # DELETE /submissions/1
108	- # # DELETE /submissions/1.json
109	- # def destroy
110	- # @submission = Submission.find(params[:id])
111	- # @submission.destroy
112	- #
113	- # respond_to do \|format\|
114	- # format.html { redirect_to submissions_url }
115	- # format.json { head :no_content }
116	- # end
117	- # end
118		87
119	protected	88	protected
		89	+
120	def submission_authorization	90	def submission_authorization
121	#admin always has privileged	91	#admin always has privileged
122	if @current_user.admin?	92	if @current_user.admin?
@@ -134,4 +104,5
134	return false	104	return false
135	end	105	end
136		106
		107	+
137	end	108	end

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

                 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]
                 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.'
                     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
+            +           add_random_password=true;
-            -           added_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
                       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'
                 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
                   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
                   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
                 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
                 # 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
                   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)
                           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]
                     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 ¶ +5 -1

                     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)
                   admin_authorization
                 end
+            +   private
+            +     def user_params
+            +       params.require(:user).permit(:login, :full_name, :email)
+            +     end
               end

app/helpers/application_helper.rb ¶ +22

@@ -196,4 +196,26
196	markdown.to_html.html_safe	196	markdown.to_html.html_safe
197	end	197	end
198		198
		199	+
		200	+ BOOTSTRAP_FLASH_MSG = {
		201	+ success: 'alert-success',
		202	+ error: 'alert-danger',
		203	+ alert: 'alert-block',
		204	+ notice: 'alert-info'
		205	+ }
		206	+
		207	+ def bootstrap_class_for(flash_type)
		208	+ BOOTSTRAP_FLASH_MSG.fetch(flash_type.to_sym, flash_type.to_s)
199	end	209	end
		210	+
		211	+ def flash_messages
		212	+ flash.each do \|msg_type, message\|
		213	+ concat(content_tag(:div, message, class: "alert #{bootstrap_class_for(msg_type)} fade in") do
		214	+ concat content_tag(:button, 'x', class: "close", data: { dismiss: 'alert' })
		215	+ concat message
		216	+ end)
		217	+ end
		218	+ nil
		219	+ end
		220	+
		221	+ 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,
+            +       where(published: true).where(frontpage: false).order(created_at: :desc)
-            -                         :conditions => "(published = 1) AND (frontpage = 0)",
-            -                         :order => "created_at DESC")
                   else
-            -       Announcement.find(:all,
+            +       where(published: true).where(frontpage: false).where(contest_only: false).order(created_at: :desc)
-            -                         :conditions => "(published = 1) AND (frontpage = 0) AND (contest_only = 0)",
-            -                         :order => "created_at DESC")
                   end
                 end
-            -   def self.find_for_frontpage
+            +   def self.frontpage
-            -     Announcement.find(:all,
+            +     where(published: 1).where(frontpage: 1).order(created_at: :desc)
-            -                       :conditions => "(published = 1) AND (frontpage = 1)",
-            -                       :order => "created_at DESC")
                 end
               end

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

                 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

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

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

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

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

                 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

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

                 end
                 def self.find_all_system_unreplied_messages
-            -     self.find(:all,
+            +     where('ISNULL(receiver_id) ' +
-            -               :conditions => 'ISNULL(receiver_id) ' +
+            +           'AND (ISNULL(replied) OR replied=0)')
-            -                              'AND (ISNULL(replied) OR replied=0)',
-            -               :order => 'created_at')
                 end
                 def self.build_replying_message_hierarchy(*args)

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

                 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
+            +   def self.available_problems
-            -     Problem.available.all(:order => "date_added DESC, name ASC")
+            +     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)
                   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

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

                 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,
+            +     where("user_id = ? AND problem_id = ?",user_id,problem_id).last
-            -                     :conditions => {:user_id => user_id,
-            -                       :problem_id => problem_id},
-            -                     :order => 'number DESC')
-            -     return last_sub
                 end
                 def self.find_all_last_by_problem(problem_id)
                 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
                 def self.find_by_user_problem_number(user_id, problem_id, number)
-            -     Submission.find(:first,
+            +     where("user_id = ? AND problem_id = ? AND number = ?",user_id,problem_id,number).first
-            -                     :conditions => {
-            -                       :user_id => user_id,
-            -                       :problem_id => problem_id,
-            -                       :number => number
-            -                     })
                 end
                 def self.find_all_by_user_problem(user_id, problem_id)
-            -     Submission.find(:all,
+            +     where("user_id = ? AND problem_id = ?",user_id,problem_id)
-            -                     :conditions => {
-            -                       :user_id => user_id,
-            -                       :problem_id => problem_id,
-            -                     })
                 end
                 def download_filename

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

                   task = nil
                   begin
                     Task.transaction do
-            -         task = Task.find(:first,
+            +         task = Task.where(status: Task::STATUS_INQUEUE).lock(true).first
-            -                          :order => "created_at",
-            -                          :conditions => {:status=> Task::STATUS_INQUEUE},
-            -                          :lock => true)
                       if task!=nil
                         task.status = status
                         task.save!

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

               require 'fileutils'
               class TestRequest < Task
+            +   self.table_name = "test_requests"
-            -   set_table_name "test_requests"
                 belongs_to :user
                 belongs_to :problem
                   # since there will be only one grader grading TestRequest
                   # we do not need locking (hopefully)
-            -     test_request = TestRequest.find(:first,
+            +     test_request = TestRequest.where(status: Task::STATUS_INQUEUE).first
-            -                                     :order => "created_at",
-            -                                     :conditions => {:status=> Task::STATUS_INQUEUE})
                   if test_request!=nil
                     test_request.status = status
                     test_request.save!

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

                 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",
+            +            :foreign_key => "sender_id"
-            -            :order => 'created_at DESC'
-            -   has_many :replied_messages,
+            +   has_many :replied_messages, -> { order(created_at: DESC) },
                          :class_name => "Message",
-            -            :foreign_key => "receiver_id",
+            +            :foreign_key => "receiver_id"
-            -            :order => 'created_at DESC'
                 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
                 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
                   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 = {}

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

               %tr
                 %td{:align => "center"}
-            -     = submission_counter+1
+            +     = submission.number
-            -   %td{:align => "center"}
+            +   %td.text-right
                   = link_to "##{submission.id}", submission_path(submission.id)
                 %td
                   = l submission.submitted_at, format: :long

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'
+            +     %strong= t 'main.graded_at'
-            -     = "#{format_short_time(submission.graded_at.localtime)}, "
+            +     = "#{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})
+            +   = 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'
-            -   = link_to("[#{t 'main.src_link'}]",{:action => 'source', :id => submission.id})
-            -   //= " | "
-            -   //= link_to "[#{t 'main.submissions_link'}]", main_submission_path(submission.problem.id)

app/views/configurations/index.html.haml ¶ +9 -6

               %h1 System configuration
-            - %table.info
+            + - @group.each do |g|
-            -   %tr.info-head
+            +   %h2= g
-            -     %th Key
+            +   %table.table.table-striped
-            -     %th Type
+            +     %thead
-            -     %th Value
+            +       %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{:class => cycle("info-odd", "info-even")}
+            +       %tr
                       %td
                         /= in_place_editor_field :grader_configuration, :key, {}, :rows=>1
                         = @grader_configuration.key

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

                       - @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.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.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
                       - @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.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.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

                 %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)
                               $("#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
                               %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!",

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

               %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

                   %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"}

app/views/main/_problem.html.haml ¶ +4

               %tr
                 %td
+            +     - 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

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

                           %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

app/views/main/_submission_short.html.haml ¶ +5 -2

                   = "#{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
                   %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

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

                     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?
                     %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

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

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

                   %tr
                     %th Login
                     %th Name
-            -       %th Activated?
+            +       / %th Activated?
-            -       %th Logged_in
+            +       / %th Logged_in
-            -       %th Contest(s)
+            +       / %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
                       - 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].activated
-            -             %td= sc[i].try(:contest_stat).try(:started_at) ? 'yes' : 'no'
+            +             / %td= sc[i].try(:contest_stat).try(:started_at) ? 'yes' : 'no'
-            -             %td= sc[i].contests.collect {|c| c.name}.join(', ')
+            +             / %td= sc[i].contests.collect {|c| c.name}.join(', ')
                           %td= sc[i].remark
                         - else
                           %td.text-right= sc[i][0]

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

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

                         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

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
                     .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
               :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();

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

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

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

                   %table.table
                     %thead
                       %th No.
-            -         %th #
+            +         %th.text-right #
                       %th At
                       %th Source
                       %th Result

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

               //%div.highlight{:style => "border: 1px solid black;"}
               //=@formatted_code.html_safe
+            +
+            +
               .containter
                 .row
                   .col-md-7
                       %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.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

                 = 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 '}
                   %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

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/>
+            +   <%= submit_tag 'create users',class: 'btn btn-success'%><br/>
-            - List of user information in this format: <tt>user_id,name(,passwd(,alias))</tt><br/>
+            + List of user information in this format: <tt>user_id,name(,passwd(,alias(,remark)))</tt><br/>
-            - Note that <tt>passwd</tt> and <tt>alias</tt> is optional.<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

                 # 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.
+            +   # Log error messages when you accidentally call methods on nil.  //DEPRICATED
-            -   config.whiny_nils = true
+            +   # config.whiny_nils = true // DEPRICATED
                 # Show full error reports and disable caching
                 config.consider_all_requests_local       = true
                 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
+            +   # Log the query plan for queries taking more than this (works // DEPRICATED
-            -   # with SQLite, MySQL, and PostgreSQL)
+            +   # with SQLite, MySQL, and PostgreSQL) // DEPRICATED
-            -   config.active_record.auto_explain_threshold_in_seconds = 0.5
+            +   # config.active_record.auto_explain_threshold_in_seconds = 0.5 // DEPRICATED
                 # Do not compress assets
                 config.assets.compress = false
                 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

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

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

               # 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

                 root :to => 'main#login'
+            +   #logins
+            +   get 'login/login',  to: 'login#login'
+            +
                 resources :contests
                 resources :sites
                   member do
                     get 'toggle'
                     get 'toggle_test'
+            +       get 'toggle_view_testcase'
                     get 'stat'
                   end
                   collection do
                     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'
                 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'
                   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/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

@@ -9,272 +9,275
9	# from scratch. The latter is a flawed and unsustainable approach (the more migrations	9	# from scratch. The latter is a flawed and unsustainable approach (the more migrations
10	# you'll amass, the slower it'll run and the greater likelihood for issues).	10	# you'll amass, the slower it'll run and the greater likelihood for issues).
11	#	11	#
12	- # It's strongly recommended to check this file into your version control system.	12	+ # It's strongly recommended that you check this file into your version control system.
13		13
14	- ActiveRecord::Schema.define(:version => ~~20161014091417~~) do	14	+ ActiveRecord::Schema.define(version: 20170427070345) do
15		15
16	- create_table "announcements", :force => ~~tru~~e do \|t\|	16	+ create_table "announcements", force: :cascade do \|t\|
17	- t.string "author"	17	+ t.string "author", limit: 255
18	- t.text "body"	18	+ t.text "body", limit: 65535
19	t.boolean "published"	19	t.boolean "published"
20	- t.datetime "created_at", ~~:null~~ => false	20	+ t.datetime "created_at", null: false
21	- t.datetime "updated_at", ~~:null~~ => false	21	+ t.datetime "updated_at", null: false
22	- t.boolean "frontpage", ~~:default~~ => false	22	+ t.boolean "frontpage", default: false
23	- t.boolean "contest_only", ~~:default~~ => false	23	+ t.boolean "contest_only", default: false
24	- t.string "title"	24	+ t.string "title", limit: 255
25	- t.string "notes"	25	+ t.string "notes", limit: 255
26	end	26	end
27		27
28	- create_table "contests", :force => ~~tru~~e do \|t\|	28	+ create_table "contests", force: :cascade do \|t\|
29	- t.string "title"	29	+ t.string "title", limit: 255
30	t.boolean "enabled"	30	t.boolean "enabled"
31	- t.datetime "created_at", ~~:null~~ => false	31	+ t.datetime "created_at", null: false
32	- t.datetime "updated_at", ~~:null~~ => false	32	+ t.datetime "updated_at", null: false
33	- t.string "name"	33	+ t.string "name", limit: 255
34	end	34	end
35		35
36	- create_table "contests_problems", ~~:id~~ => false, :force => ~~tru~~e do \|t\|	36	+ create_table "contests_problems", id: false, force: :cascade do \|t\|
37	- t.integer "contest_id"	37	+ t.integer "contest_id", limit: 4
38	- t.integer "problem_id"	38	+ t.integer "problem_id", limit: 4
39	end	39	end
40		40
41	- create_table "contests_users", ~~:id~~ => false, :force => ~~tru~~e do \|t\|	41	+ create_table "contests_users", id: false, force: :cascade do \|t\|
42	- t.integer "contest_id"	42	+ t.integer "contest_id", limit: 4
43	- t.integer "user_id"	43	+ t.integer "user_id", limit: 4
44	end	44	end
45		45
46	- create_table "countries", :force => ~~tru~~e do \|t\|	46	+ create_table "countries", force: :cascade do \|t\|
47	- t.string "name"	47	+ t.string "name", limit: 255
48	- t.datetime "created_at", ~~:null~~ => false	48	+ t.datetime "created_at", null: false
49	- t.datetime "updated_at", ~~:null~~ => false	49	+ t.datetime "updated_at", null: false
50	end	50	end
51		51
52	- create_table "descriptions", :force => ~~tru~~e do \|t\|	52	+ create_table "descriptions", force: :cascade do \|t\|
53	- t.text "body"	53	+ t.text "body", limit: 65535
54	t.boolean "markdowned"	54	t.boolean "markdowned"
55	- t.datetime "created_at", ~~:null~~ => false	55	+ t.datetime "created_at", null: false
56	- t.datetime "updated_at", ~~:null~~ => false	56	+ t.datetime "updated_at", null: false
57	end	57	end
58		58
59	- create_table "grader_configurations", :force => ~~tru~~e do \|t\|	59	+ create_table "grader_configurations", force: :cascade do \|t\|
60	- t.string "key"	60	+ t.string "key", limit: 255
61	- t.string "value_type"	61	+ t.string "value_type", limit: 255
62	- t.string "value"	62	+ t.string "value", limit: 255
63	- t.datetime "created_at", ~~:null~~ => false	63	+ t.datetime "created_at", null: false
64	- t.datetime "updated_at", ~~:null~~ => false	64	+ t.datetime "updated_at", null: false
65	- t.text "description"	65	+ t.text "description", limit: 65535
66	end	66	end
67		67
68	- create_table "grader_processes", :force => ~~tru~~e do \|t\|	68	+ create_table "grader_processes", force: :cascade do \|t\|
69	- t.string "host"	69	+ t.string "host", limit: 255
70	- t.integer "pid"	70	+ t.integer "pid", limit: 4
71	- t.string "mode"	71	+ t.string "mode", limit: 255
72	t.boolean "active"	72	t.boolean "active"
73	- t.datetime "created_at", ~~:null~~ => false	73	+ t.datetime "created_at", null: false
74	- t.datetime "updated_at", ~~:null~~ => false	74	+ t.datetime "updated_at", null: false
75	- t.integer "task_id"	75	+ t.integer "task_id", limit: 4
76	- t.string "task_type"	76	+ t.string "task_type", limit: 255
77	t.boolean "terminated"	77	t.boolean "terminated"
78	end	78	end
79		79
80	- add_index "grader_processes", ["host", "pid"], ~~:name~~ => "index_grader_processes_on_ip_and_pid"	80	+ add_index "grader_processes", ["host", "pid"], name: "index_grader_processes_on_ip_and_pid", using: :btree
81		81
82	- create_table "heart_beats", :force => ~~tru~~e do \|t\|	82	+ create_table "heart_beats", force: :cascade do \|t\|
83	- t.integer "user_id"	83	+ t.integer "user_id", limit: 4
84	- t.string "ip_address"	84	+ t.string "ip_address", limit: 255
85	- t.datetime "created_at", ~~:null~~ => false	85	+ t.datetime "created_at", null: false
86	- t.datetime "updated_at", ~~:null~~ => false	86	+ t.datetime "updated_at", null: false
87	- t.string "status"	87	+ t.string "status", limit: 255
88	end	88	end
89		89
90	- add_index "heart_beats", ["updated_at"], ~~:name~~ => "index_heart_beats_on_updated_at"	90	+ add_index "heart_beats", ["updated_at"], name: "index_heart_beats_on_updated_at", using: :btree
91		91
92	- create_table "languages", :force => ~~tru~~e do \|t\|	92	+ create_table "languages", force: :cascade do \|t\|
93	- t.string "name", ~~:limit~~ => 10	93	+ t.string "name", limit: 10
94	- t.string "pretty_name"	94	+ t.string "pretty_name", limit: 255
95	- t.string "ext", ~~:limit~~ => 10	95	+ t.string "ext", limit: 10
96	- t.string "common_ext"	96	+ t.string "common_ext", limit: 255
97	end	97	end
98		98
99	- create_table "logins", :force => ~~tru~~e do \|t\|	99	+ create_table "logins", force: :cascade do \|t\|
100	- t.integer "user_id"	100	+ t.integer "user_id", limit: 4
101	- t.string "ip_address"	101	+ t.string "ip_address", limit: 255
102	- t.datetime "created_at", ~~:null~~ => false	102	+ t.datetime "created_at", null: false
103	- t.datetime "updated_at", ~~:null~~ => false	103	+ t.datetime "updated_at", null: false
104	end	104	end
105		105
106	- create_table "messages", :force => ~~tru~~e do \|t\|	106	+ create_table "messages", force: :cascade do \|t\|
107	- t.integer "sender_id"	107	+ t.integer "sender_id", limit: 4
108	- t.integer "receiver_id"	108	+ t.integer "receiver_id", limit: 4
109	- t.integer "replying_message_id"	109	+ t.integer "replying_message_id", limit: 4
110	- t.text "body"	110	+ t.text "body", limit: 65535
111	t.boolean "replied"	111	t.boolean "replied"
112	- t.datetime "created_at", ~~:null~~ => false	112	+ t.datetime "created_at", null: false
113	- t.datetime "updated_at", ~~:null~~ => false	113	+ t.datetime "updated_at", null: false
114	end	114	end
115		115
116	- create_table "problems", :force => ~~tru~~e do \|t\|	116	+ create_table "problems", force: :cascade do \|t\|
117	- t.string "name", ~~:limit~~ => 30	117	+ t.string "name", limit: 30
118	- t.string "full_name"	118	+ t.string "full_name", limit: 255
119	- t.integer "full_score"	119	+ t.integer "full_score", limit: 4
120	t.date "date_added"	120	t.date "date_added"
121	t.boolean "available"	121	t.boolean "available"
122	- t.string "url"	122	+ t.string "url", limit: 255
123	- t.integer "description_id"	123	+ t.integer "description_id", limit: 4
124	t.boolean "test_allowed"	124	t.boolean "test_allowed"
125	t.boolean "output_only"	125	t.boolean "output_only"
126	- t.string "description_filename"	126	+ t.string "description_filename", limit: 255
		127	+ t.boolean "view_testcase"
127	end	128	end
128		129
129	- create_table "rights", :force => ~~tru~~e do \|t\|	130	+ create_table "rights", force: :cascade do \|t\|
130	- t.string "name"	131	+ t.string "name", limit: 255
131	- t.string "controller"	132	+ t.string "controller", limit: 255
132	- t.string "action"	133	+ t.string "action", limit: 255
133	end	134	end
134		135
135	- create_table "rights_roles", ~~:id~~ => false, :force => ~~tru~~e do \|t\|	136	+ create_table "rights_roles", id: false, force: :cascade do \|t\|
136	- t.integer "right_id"	137	+ t.integer "right_id", limit: 4
137	- t.integer "role_id"	138	+ t.integer "role_id", limit: 4
138	end	139	end
139		140
140	- add_index "rights_roles", ["role_id"], ~~:name~~ => "index_rights_roles_on_role_id"	141	+ add_index "rights_roles", ["role_id"], name: "index_rights_roles_on_role_id", using: :btree
141		142
142	- create_table "roles", :force => ~~tru~~e do \|t\|	143	+ create_table "roles", force: :cascade do \|t\|
143	- t.string "name"	144	+ t.string "name", limit: 255
144	end	145	end
145		146
146	- create_table "roles_users", ~~:id~~ => false, :force => ~~tru~~e do \|t\|	147	+ create_table "roles_users", id: false, force: :cascade do \|t\|
147	- t.integer "role_id"	148	+ t.integer "role_id", limit: 4
148	- t.integer "user_id"	149	+ t.integer "user_id", limit: 4
149	end	150	end
150		151
151	- add_index "roles_users", ["user_id"], ~~:name~~ => "index_roles_users_on_user_id"	152	+ add_index "roles_users", ["user_id"], name: "index_roles_users_on_user_id", using: :btree
152		153
153	- create_table "sessions", :force => ~~tru~~e do \|t\|	154	+ create_table "sessions", force: :cascade do \|t\|
154	- t.string "session_id"	155	+ t.string "session_id", limit: 255
155	- t.text "data"	156	+ t.text "data", limit: 65535
156	t.datetime "updated_at"	157	t.datetime "updated_at"
157	end	158	end
158		159
159	- add_index "sessions", ["session_id"], ~~:name~~ => "index_sessions_on_session_id"	160	+ add_index "sessions", ["session_id"], name: "index_sessions_on_session_id", using: :btree
160	- add_index "sessions", ["updated_at"], ~~:name~~ => "index_sessions_on_updated_at"	161	+ add_index "sessions", ["updated_at"], name: "index_sessions_on_updated_at", using: :btree
161		162
162	- create_table "sites", :force => ~~tru~~e do \|t\|	163	+ create_table "sites", force: :cascade do \|t\|
163	- t.string "name"	164	+ t.string "name", limit: 255
164	t.boolean "started"	165	t.boolean "started"
165	t.datetime "start_time"	166	t.datetime "start_time"
166	- t.datetime "created_at", ~~:null~~ => false	167	+ t.datetime "created_at", null: false
167	- t.datetime "updated_at", ~~:null~~ => false	168	+ t.datetime "updated_at", null: false
168	- t.integer "country_id"	169	+ t.integer "country_id", limit: 4
169	- t.string "password"	170	+ t.string "password", limit: 255
170	end	171	end
171		172
172	- create_table "submission_view_logs", :force => ~~tru~~e do \|t\|	173	+ create_table "submission_view_logs", force: :cascade do \|t\|
173	- t.integer "user_id"	174	+ t.integer "user_id", limit: 4
174	- t.integer "submission_id"	175	+ t.integer "submission_id", limit: 4
175	- t.datetime "created_at", ~~:null~~ => false	176	+ t.datetime "created_at", null: false
176	- t.datetime "updated_at", ~~:null~~ => false	177	+ t.datetime "updated_at", null: false
177	end	178	end
178		179
179	- create_table "submissions", :force => ~~tru~~e do \|t\|	180	+ create_table "submissions", force: :cascade do \|t\|
180	- t.integer "user_id"	181	+ t.integer "user_id", limit: 4
181	- t.integer "problem_id"	182	+ t.integer "problem_id", limit: 4
182	- t.integer "language_id"	183	+ t.integer "language_id", limit: 4
183	- t.text "source"	184	+ t.text "source", limit: 65535
184	- t.binary "binary"	185	+ t.binary "binary", limit: 65535
185	t.datetime "submitted_at"	186	t.datetime "submitted_at"
186	t.datetime "compiled_at"	187	t.datetime "compiled_at"
187	- t.text "compiler_message"	188	+ t.text "compiler_message", limit: 65535
188	t.datetime "graded_at"	189	t.datetime "graded_at"
189	- t.integer "points"	190	+ t.integer "points", limit: 4
190	- t.text "grader_comment"	191	+ t.text "grader_comment", limit: 65535
191	- t.integer "number"	192	+ t.integer "number", limit: 4
192	- t.string "source_filename"	193	+ t.string "source_filename", limit: 255
193	- t.float "max_runtime"	194	+ t.float "max_runtime", limit: 24
194	- t.integer "peak_memory"	195	+ t.integer "peak_memory", limit: 4
195	- t.integer "effective_code_length"	196	+ t.integer "effective_code_length", limit: 4
196	- t.string "ip_address"	197	+ t.string "ip_address", limit: 255
197	end	198	end
198		199
199	- add_index "submissions", ["user_id", "problem_id", "number"], ~~:name~~ => "index_submissions_on_user_id_and_problem_id_and_number", :unique => true	200	+ add_index "submissions", ["user_id", "problem_id", "number"], name: "index_submissions_on_user_id_and_problem_id_and_number", unique: true, using: :btree
200	- add_index "submissions", ["user_id", "problem_id"], ~~:name~~ => "index_submissions_on_user_id_and_problem_id"	201	+ add_index "submissions", ["user_id", "problem_id"], name: "index_submissions_on_user_id_and_problem_id", using: :btree
201		202
202	- create_table "tasks", :force => ~~tru~~e do \|t\|	203	+ create_table "tasks", force: :cascade do \|t\|
203	- t.integer "submission_id"	204	+ t.integer "submission_id", limit: 4
204	t.datetime "created_at"	205	t.datetime "created_at"
205	- t.integer "status"	206	+ t.integer "status", limit: 4
206	t.datetime "updated_at"	207	t.datetime "updated_at"
207	end	208	end
208		209
209	- create_table "test_pairs", :force => true do \|t\|	210	+ add_index "tasks", ["submission_id"], name: "index_tasks_on_submission_id", using: :btree
210	- t.integer "problem_id"	211	+
211	- t.text "input", :limit => 16777215	212	+ create_table "test_pairs", force: :cascade do \|t\|
212	- t.text "solution", :limit => 16777215	213	+ t.integer "problem_id", limit: 4
213	- t.datetime "created_at", :null => false	214	+ t.text "input", limit: 16777215
214	- t.datetime "updated_at", :null => false	215	+ t.text "solution", limit: 16777215
		216	+ t.datetime "created_at", null: false
		217	+ t.datetime "updated_at", null: false
215	end	218	end
216		219
217	- create_table "test_requests", :force => ~~tru~~e do \|t\|	220	+ create_table "test_requests", force: :cascade do \|t\|
218	- t.integer "user_id"	221	+ t.integer "user_id", limit: 4
219	- t.integer "problem_id"	222	+ t.integer "problem_id", limit: 4
220	- t.integer "submission_id"	223	+ t.integer "submission_id", limit: 4
221	- t.string "input_file_name"	224	+ t.string "input_file_name", limit: 255
222	- t.string "output_file_name"	225	+ t.string "output_file_name", limit: 255
223	- t.string "running_stat"	226	+ t.string "running_stat", limit: 255
224	- t.integer "status"	227	+ t.integer "status", limit: 4
225	- t.datetime "updated_at", ~~:null~~ => false	228	+ t.datetime "updated_at", null: false
226	t.datetime "submitted_at"	229	t.datetime "submitted_at"
227	t.datetime "compiled_at"	230	t.datetime "compiled_at"
228	- t.text "compiler_message"	231	+ t.text "compiler_message", limit: 65535
229	t.datetime "graded_at"	232	t.datetime "graded_at"
230	- t.string "grader_comment"	233	+ t.string "grader_comment", limit: 255
231	- t.datetime "created_at", ~~:null~~ => false	234	+ t.datetime "created_at", null: false
232	- t.float "running_time"	235	+ t.float "running_time", limit: 24
233	- t.string "exit_status"	236	+ t.string "exit_status", limit: 255
234	- t.integer "memory_usage"	237	+ t.integer "memory_usage", limit: 4
235	end	238	end
236		239
237	- add_index "test_requests", ["user_id", "problem_id"], ~~:name~~ => "index_test_requests_on_user_id_and_problem_id"	240	+ add_index "test_requests", ["user_id", "problem_id"], name: "index_test_requests_on_user_id_and_problem_id", using: :btree
238		241
239	- create_table "testcases", :force => ~~tru~~e do \|t\|	242	+ create_table "testcases", force: :cascade do \|t\|
240	- t.integer "problem_id"	243	+ t.integer "problem_id", limit: 4
241	- t.integer "num"	244	+ t.integer "num", limit: 4
242	- t.integer "group"	245	+ t.integer "group", limit: 4
243	- t.integer "score"	246	+ t.integer "score", limit: 4
244	- t.text "input"	247	+ t.text "input", limit: 4294967295
245	- t.text "sol"	248	+ t.text "sol", limit: 4294967295
246	- t.datetime "created_at", ~~:null~~ => ~~false~~	249	+ t.datetime "created_at"
247	- t.datetime "updated_at", ~~:null~~ => ~~false~~	250	+ t.datetime "updated_at"
248	end	251	end
249		252
250	- add_index "testcases", ["problem_id"], ~~:name~~ => "index_testcases_on_problem_id"	253	+ add_index "testcases", ["problem_id"], name: "index_testcases_on_problem_id", using: :btree
251		254
252	- create_table "user_contest_stats", :force => ~~tru~~e do \|t\|	255	+ create_table "user_contest_stats", force: :cascade do \|t\|
253	- t.integer "user_id"	256	+ t.integer "user_id", limit: 4
254	t.datetime "started_at"	257	t.datetime "started_at"
255	- t.datetime "created_at", ~~:null~~ => false	258	+ t.datetime "created_at", null: false
256	- t.datetime "updated_at", ~~:null~~ => false	259	+ t.datetime "updated_at", null: false
257	t.boolean "forced_logout"	260	t.boolean "forced_logout"
258	end	261	end
259		262
260	- create_table "users", :force => ~~tru~~e do \|t\|	263	+ create_table "users", force: :cascade do \|t\|
261	- t.string "login", ~~:limit~~ => 50	264	+ t.string "login", limit: 50
262	- t.string "full_name"	265	+ t.string "full_name", limit: 255
263	- t.string "hashed_password"	266	+ t.string "hashed_password", limit: 255
264	- t.string "salt", ~~:limit~~ => 5	267	+ t.string "salt", limit: 5
265	- t.string "alias"	268	+ t.string "alias", limit: 255
266	- t.string "email"	269	+ t.string "email", limit: 255
267	- t.integer "site_id"	270	+ t.integer "site_id", limit: 4
268	- t.integer "country_id"	271	+ t.integer "country_id", limit: 4
269	- t.boolean "activated", :default => false	272	+ t.boolean "activated", default: false
270	t.datetime "created_at"	273	t.datetime "created_at"
271	t.datetime "updated_at"	274	t.datetime "updated_at"
272	- t.boolean "enabled", :default => true	275	+ t.boolean "enabled", default: true
273	- t.string "remark"	276	+ t.string "remark", limit: 255
274	- t.string "last_ip"	277	+ t.string "last_ip", limit: 255
275	- t.string "section"	278	+ t.string "section", limit: 255
276	end	279	end
277		280
278	- add_index "users", ["login"], ~~:name~~ => "index_users_on_login", :unique => true	281	+ add_index "users", ["login"], name: "index_users_on_login", unique: true, using: :btree
279		282
280	end	283	end

db/seeds.rb ¶ +28

@@ -53,6 +53,7
53	: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.'	53	: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.'
54	},	54	},
55		55
		56	+ #---------------------------- right --------------------------------
56	{	57	{
57	:key => 'right.user_hall_of_fame',	58	:key => 'right.user_hall_of_fame',
58	:value_type => 'boolean',	59	:value_type => 'boolean',
@@ -74,6 +75,33
74	:description => 'If true, any user can view submissions of every one.'	75	:description => 'If true, any user can view submissions of every one.'
75	},	76	},
76		77
		78	+ {
		79	+ :key => 'right.bypass_agreement',
		80	+ :value_type => 'boolean',
		81	+ :default_value => 'true',
		82	+ :description => 'When false, a user must accept usage agreement before login'
		83	+ },
		84	+
		85	+ {
		86	+ :key => 'right.heartbeat_response',
		87	+ :value_type => 'string',
		88	+ :default_value => 'OK',
		89	+ :description => 'Heart beat response text'
		90	+ },
		91	+
		92	+ {
		93	+ :key => 'right.heartbeat_response_full',
		94	+ :value_type => 'string',
		95	+ :default_value => 'OK',
		96	+ :description => 'Heart beat response text when user got full score (set this value to the empty string to disable this feature)'
		97	+ },
		98	+
		99	+ {
		100	+ :key => 'right.view_testcase',
		101	+ :value_type => 'boolean',
		102	+ :default_value => 'false',
		103	+ :description => 'When true, any user can view/download test data'
		104	+ },
77	# If Configuration['system.online_registration'] is true, the	105	# If Configuration['system.online_registration'] is true, the
78	# system allows online registration, and will use these	106	# system allows online registration, and will use these
79	# information for sending confirmation emails.	107	# information for sending confirmation emails.

lib/grader_script.rb ¶ +15

@@ -55,4 +55,19
55	return ''	55	return ''
56	end	56	end
57		57
		58	+ def self.call_import_testcase(problem_name)
		59	+ if GraderScript.grader_control_enabled?
		60	+ cur_dir = `pwd`.chomp
		61	+ Dir.chdir(GRADER_ROOT_DIR)
		62	+
		63	+ script_name = File.join(GRADER_ROOT_DIR, "scripts/load_testcase")
		64	+ cmd = "#{script_name} #{problem_name}"
		65	+
		66	+ output = `#{cmd}`
		67	+
		68	+ Dir.chdir(cur_dir)
		69	+ return "Testcase import result:\n" + output
58	end	70	end
		71	+ end
		72	+
		73	+ end

lib/testdata_importer.rb ¶ +3

                   @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

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

               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

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

               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,
+            + puts Task.where(status: Task::STATUS_COMPLETE).length
-            -                :conditions => {: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	1	+ Language_1:
2	- one:	2	+ name: c
3	- id: 1	3	+ pretty_name: C
4	- two:	4	+ ext: c
5	- id: 2	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

                 salt: <%= salt %>
                 activated: true
-            - mary:
+            + admin:
-            -   login: mary
+            +   login: admin
-            -   full_name: mary
+            +   full_name: admin
-            -   hashed_password: <%= User.encrypt("goodbye",salt) %>
+            +   hashed_password: <%= User.encrypt("admin",salt) %>
                 salt: <%= salt %>
                 roles: admin
                 activated: true

test/test_helper.rb ¶ +11

@@ -2,7 +2,18
2	require File.expand_path('../../config/environment', __FILE__)	2	require File.expand_path('../../config/environment', __FILE__)
3	require 'rails/test_help'	3	require 'rails/test_help'
4		4
		5	+ #reporter for beautiful result
		6	+ require "minitest/reporters"
		7	+ Minitest::Reporters.use!
		8	+
		9	+ module SignInHelper
		10	+ def sign_in_as(user,password)
		11	+ post login_login_path, {login: user, password: password }
		12	+ end
		13	+ end
		14	+
5	class ActiveSupport::TestCase	15	class ActiveSupport::TestCase
		16	+ include SignInHelper
6	# Setup all fixtures in test/fixtures/*.(yml\|csv) for all tests in alphabetical order.	17	# Setup all fixtures in test/fixtures/*.(yml\|csv) for all tests in alphabetical order.
7	#	18	#
8	# Note: You'll currently still have to declare fixtures explicitly in integration tests	19	# Note: You'll currently still have to declare fixtures explicitly in integration tests

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: 1434 inserted, 2343 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: 1434 inserted, 2343 deleted

Commit `r661:50e8e6077bb9` public