cafe-grader-web Commit - r522:dd2e569af6cb

cafe-grader-web

Commit `r522:dd2e569af6cb` public

parent | child

Description:

modernize java-bm, merge with algo-bm,master

Commit status:

[Not Reviewed]

References:

merge java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r522:dd2e569af6cb - Thu, 19 Feb 2015 15:28:54 - 39 files changed: 203 inserted, 314 deleted

app/views/user_admin/edit.html.haml created 644 ¶ +11

@@ -0,0 +1,11
	1	+ %h1 Editing user
	2	+
	3	+ = form_tag :action => 'update', :id => @user do
	4	+ = error_messages_for 'user'
	5	+ = render partial: "form"
	6	+ = submit_tag "Edit"
	7	+
	8	+
	9	+ = link_to 'Show', :action => 'show', :id => @user
	10	+ \|
	11	+ = link_to 'Back', :action => 'list'

db/migrate/20150203153534_add_more_to_users.rb created 644 ¶ +6

@@ -0,0 +1,6
	1	+ class AddMoreToUsers < ActiveRecord::Migration
	2	+ def change
	3	+ add_column :users, :enabled, :boolean, default: 1
	4	+ add_column :users, :remark, :string
	5	+ end
	6	+ end

Gemfile ¶ +14 -11

               source 'https://rubygems.org'
-            - gem 'rails', '3.2.19'
+            + gem 'rails', '3.2.21'
               # Bundle edge Rails instead:
               # gem 'rails', :git => 'git://github.com/rails/rails.git'
               # Gems used only for assets and not required
               # in production environments by default.
               group :assets do
-            -   gem 'sass-rails',   '~> 3.2.3'
+            +   gem 'sass-rails',   '~> 3.2.6'
-            -   gem 'coffee-rails', '~> 3.2.1'
+            +   gem 'coffee-rails', '~> 3.2.2'
                 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
                 # gem 'therubyracer', :platforms => :ruby
-            -   gem 'uglifier', '>= 1.0.3'
+            +   gem 'uglifier'
               end
               gem 'prototype-rails'
               # gem 'debugger'
               #
+            + #in-place editor
+            + gem 'best_in_place', '~> 3.0.1'
+            +
               # jquery addition
               gem 'jquery-rails'
               gem 'jquery-ui-sass-rails'
               #syntax highlighter
               gem 'rouge'
-            - gem "haml"
+            + gem 'haml'
-            - gem "mail"
+            + gem 'mail'
-            - gem "rdiscount"
+            + gem 'rdiscount'
-            - gem "test-unit"
+            + gem 'test-unit'
-            - gem 'will_paginate', '~> 3.0.0'
+            + gem 'will_paginate', '~> 3.0.7'
               gem 'dynamic_form'
               gem 'in_place_editing'
-            - gem 'verification', :git => 'git://github.com/sikachu/verification.git'
+            + gem 'verification', :git => 'https://github.com/sikachu/verification.git'
               group :test, :development do
-            -   gem "rspec-rails", "~> 2.0"
+            +   gem 'rspec-rails', '~> 2.99.0'
               end

Gemfile.lock ¶ +55 -51

               GIT
-            -   remote: git://github.com/sikachu/verification.git
+            +   remote: https://github.com/sikachu/verification.git
                 revision: 76eaf51b13276ecae54bd9cd115832595d2ff56d
                 specs:
                   verification (1.0.3)
               GEM
                 remote: https://rubygems.org/
                 specs:
-            -     actionmailer (3.2.19)
+            +     actionmailer (3.2.21)
-            -       actionpack (= 3.2.19)
+            +       actionpack (= 3.2.21)
                     mail (~> 2.5.4)
-            -     actionpack (3.2.19)
+            +     actionpack (3.2.21)
-            -       activemodel (= 3.2.19)
+            +       activemodel (= 3.2.21)
-            -       activesupport (= 3.2.19)
+            +       activesupport (= 3.2.21)
                     builder (~> 3.0.0)
                     erubis (~> 2.7.0)
                     journey (~> 1.0.4)
                     rack-cache (~> 1.2)
                     rack-test (~> 0.6.1)
                     sprockets (~> 2.2.1)
-            -     activemodel (3.2.19)
+            +     activemodel (3.2.21)
-            -       activesupport (= 3.2.19)
+            +       activesupport (= 3.2.21)
                     builder (~> 3.0.0)
-            -     activerecord (3.2.19)
+            +     activerecord (3.2.21)
-            -       activemodel (= 3.2.19)
+            +       activemodel (= 3.2.21)
-            -       activesupport (= 3.2.19)
+            +       activesupport (= 3.2.21)
                     arel (~> 3.0.2)
                     tzinfo (~> 0.3.29)
-            -     activeresource (3.2.19)
+            +     activeresource (3.2.21)
-            -       activemodel (= 3.2.19)
+            +       activemodel (= 3.2.21)
-            -       activesupport (= 3.2.19)
+            +       activesupport (= 3.2.21)
-            -     activesupport (3.2.19)
+            +     activesupport (3.2.21)
                     i18n (~> 0.6, >= 0.6.4)
                     multi_json (~> 1.0)
                   arel (3.0.3)
+            +     best_in_place (3.0.3)
+            +       actionpack (>= 3.2)
+            +       railties (>= 3.2)
                   builder (3.0.4)
                   coffee-rails (3.2.2)
                     coffee-script (>= 2.2.0)
                   coffee-script (2.3.0)
                     coffee-script-source
                     execjs
-            -     coffee-script-source (1.7.1)
+            +     coffee-script-source (1.9.0)
                   diff-lcs (1.2.5)
                   dynamic_form (1.1.4)
                   erubis (2.7.0)
-            -     execjs (2.2.1)
+            +     execjs (2.3.0)
-            -     haml (4.0.5)
+            +     haml (4.0.6)
                     tilt
                   hike (1.2.3)
-            -     i18n (0.6.11)
+            +     i18n (0.7.0)
                   in_place_editing (1.2.0)
                   journey (1.0.4)
-            -     jquery-rails (3.1.1)
+            +     jquery-rails (3.1.2)
                     railties (>= 3.0, < 5.0)
                     thor (>= 0.14, < 2.0)
-            -     jquery-tablesorter (1.12.7)
+            +     jquery-tablesorter (1.13.4)
                     railties (>= 3.1, < 5)
                   jquery-timepicker-addon-rails (1.4.1)
                     railties (>= 3.1)
                     jquery-rails
                     jquery-ui-rails (= 4.0.3)
                     railties (>= 3.1.0)
-            -     json (1.8.1)
+            +     json (1.8.2)
                   mail (2.5.4)
                     mime-types (~> 1.16)
                     treetop (~> 1.4.8)
                   mime-types (1.25.1)
                   multi_json (1.10.1)
-            -     mysql2 (0.3.16)
+            +     mysql2 (0.3.17)
                   polyglot (0.3.5)
-            -     power_assert (0.1.3)
+            +     power_assert (0.2.2)
                   prototype-rails (3.2.1)
                     rails (~> 3.2)
                   rack (1.4.5)
                     rack (>= 0.4)
                   rack-ssl (1.3.4)
                     rack
-            -     rack-test (0.6.2)
+            +     rack-test (0.6.3)
                     rack (>= 1.0)
-            -     rails (3.2.19)
+            +     rails (3.2.21)
-            -       actionmailer (= 3.2.19)
+            +       actionmailer (= 3.2.21)
-            -       actionpack (= 3.2.19)
+            +       actionpack (= 3.2.21)
-            -       activerecord (= 3.2.19)
+            +       activerecord (= 3.2.21)
-            -       activeresource (= 3.2.19)
+            +       activeresource (= 3.2.21)
-            -       activesupport (= 3.2.19)
+            +       activesupport (= 3.2.21)
                     bundler (~> 1.0)
-            -       railties (= 3.2.19)
+            +       railties (= 3.2.21)
-            -     railties (3.2.19)
+            +     railties (3.2.21)
-            -       actionpack (= 3.2.19)
+            +       actionpack (= 3.2.21)
-            -       activesupport (= 3.2.19)
+            +       activesupport (= 3.2.21)
                     rack-ssl (~> 1.3.2)
                     rake (>= 0.8.7)
                     rdoc (~> 3.4)
                     thor (>= 0.14.6, < 2.0)
-            -     rake (10.3.2)
+            +     rake (10.4.2)
-            -     rdiscount (2.1.7.1)
+            +     rdiscount (2.1.8)
                   rdoc (3.12.2)
                     json (~> 1.4)
-            -     rouge (1.6.2)
+            +     rouge (1.8.0)
-            -     rspec-collection_matchers (1.0.0)
+            +     rspec-collection_matchers (1.1.2)
                     rspec-expectations (>= 2.99.0.beta1)
                   rspec-core (2.99.2)
                   rspec-expectations (2.99.2)
                     diff-lcs (>= 1.1.3, < 2.0)
-            -     rspec-mocks (2.99.2)
+            +     rspec-mocks (2.99.3)
                   rspec-rails (2.99.0)
                     actionpack (>= 3.0)
                     activemodel (>= 3.0)
                     rspec-core (~> 2.99.0)
                     rspec-expectations (~> 2.99.0)
                     rspec-mocks (~> 2.99.0)
-            -     sass (3.4.1)
+            +     sass (3.4.11)
                   sass-rails (3.2.6)
                     railties (~> 3.2.0)
                     sass (>= 3.1.10)
                     tilt (~> 1.3)
-            -     sprockets (2.2.2)
+            +     sprockets (2.2.3)
                     hike (~> 1.2)
                     multi_json (~> 1.0)
                     rack (~> 1.0)
                     tilt (~> 1.1, != 1.3.0)
-            -     test-unit (3.0.1)
+            +     test-unit (3.0.9)
                     power_assert
                   thor (0.19.1)
                   tilt (1.4.1)
                   treetop (1.4.15)
                     polyglot
                     polyglot (>= 0.3.1)
-            -     tzinfo (0.3.41)
+            +     tzinfo (0.3.43)
-            -     uglifier (2.5.3)
+            +     uglifier (2.7.0)
                     execjs (>= 0.3.0)
                     json (>= 1.8.0)
                   will_paginate (3.0.7)
                 ruby
               DEPENDENCIES
-            -   coffee-rails (~> 3.2.1)
+            +   best_in_place (~> 3.0.1)
+            +   coffee-rails (~> 3.2.2)
                 dynamic_form
                 haml
                 in_place_editing
                 mail
                 mysql2
                 prototype-rails
-            -   rails (= 3.2.19)
+            +   rails (= 3.2.21)
                 rdiscount
                 rouge
-            -   rspec-rails (~> 2.0)
+            +   rspec-rails (~> 2.99.0)
-            -   sass-rails (~> 3.2.3)
+            +   sass-rails (~> 3.2.6)
                 test-unit
-            -   uglifier (>= 1.0.3)
+            +   uglifier
                 verification!
-            -   will_paginate (~> 3.0.0)
+            +   will_paginate (~> 3.0.7)

README ¶ +6 -178

@@ -1,182 +1,10
1	- == Welcome to Rails	1	+ == cafe grader
2	-
3	- Rails is a web-application and persistence framework that includes everything
4	- needed to create database-backed web-applications according to the
5	- Model-View-Control pattern of separation. This pattern splits the view (also
6	- called the presentation) into "dumb" templates that are primarily responsible
7	- for inserting pre-built data in between HTML tags. The model contains the
8	- "smart" domain objects (such as Account, Product, Person, Post) that holds all
9	- the business logic and knows how to persist themselves to a database. The
10	- controller handles the incoming requests (such as Save New Account, Update
11	- Product, Show Post) by manipulating the model and directing data to the view.
12	-
13	- In Rails, the model is handled by what's called an object-relational mapping
14	- layer entitled Active Record. This layer allows you to present the data from
15	- database rows as objects and embellish these data objects with business logic
16	- methods. You can read more about Active Record in
17	- link:files/vendor/rails/activerecord/README.html.
18	-
19	- The controller and view are handled by the Action Pack, which handles both
20	- layers by its two parts: Action View and Action Controller. These two layers
21	- are bundled in a single package due to their heavy interdependence. This is
22	- unlike the relationship between the Active Record and Action Pack that is much
23	- more separate. Each of these packages can be used independently outside of
24	- Rails. You can read more about Action Pack in
25	- link:files/vendor/rails/actionpack/README.html.
26	-
27	-
28	- == Getting started
29	-
30	- 1. At the command prompt, start a new rails application using the rails command
31	- and your application name. Ex: rails myapp
32	- (If you've downloaded rails in a complete tgz or zip, this step is already done)
33	- 2. Change directory into myapp and start the web server: <tt>script/server</tt> (run with --help for options)
34	- 3. Go to http://localhost:3000/ and get "Welcome aboard: You’re riding the Rails!"
35	- 4. Follow the guidelines to start developing your application
36	-
37	-
38	- == Web Servers
39	-
40	- By default, Rails will try to use Mongrel and lighttpd if they are installed, otherwise
41	- Rails will use the WEBrick, the webserver that ships with Ruby. When you run script/server,
42	- Rails will check if Mongrel exists, then lighttpd and finally fall back to WEBrick. This ensures
43	- that you can always get up and running quickly.
44		2
45	- Mongrel is a Ruby-based webserver with a C-component (which requires compilation) that is	3	+ cafe grader is a programming contest platform used in Thailand IOI training.
46	- suitable for development and deployment of Rails applications. If you have Ruby Gems installed,	4	+ The package includes 2 repositories, jittat/cafe-grader-web and jittat/cafe-grader-judge-scripts.
47	- getting up and running with mongrel is as easy as: <tt>gem install mongrel</tt>.
48	- More info at: http://mongrel.rubyforge.org
49	-
50	- If Mongrel is not installed, Rails will look for lighttpd. It's considerably faster than
51	- Mongrel and WEBrick and also suited for production use, but requires additional
52	- installation and currently only works well on OS X/Unix (Windows users are encouraged
53	- to start with Mongrel). We recommend version 1.4.11 and higher. You can download it from
54	- http://www.lighttpd.net.
55	-
56	- And finally, if neither Mongrel or lighttpd are installed, Rails will use the built-in Ruby
57	- web server, WEBrick. WEBrick is a small Ruby web server suitable for development, but not
58	- for production.
59	-
60	- But of course its also possible to run Rails on any platform that supports FCGI.
61	- Apache, LiteSpeed, IIS are just a few. For more information on FCGI,
62	- please visit: http://wiki.rubyonrails.com/rails/pages/FastCGI
63	-
64	-
65	- == Debugging Rails
66	-
67	- Have "tail -f" commands running on the server.log and development.log. Rails will
68	- automatically display debugging and runtime information to these files. Debugging
69	- info will also be shown in the browser on requests from 127.0.0.1.
70	-
71	-
72	- == Breakpoints
73	-
74	- Breakpoint support is available through the script/breakpointer client. This
75	- means that you can break out of execution at any point in the code, investigate
76	- and change the model, AND then resume execution! Example:
77	-
78	- class WeblogController < ActionController::Base
79	- def index
80	- @posts = Post.find(:all)
81	- breakpoint "Breaking out from the list"
82	- end
83	- end
84	-
85	- So the controller will accept the action, run the first line, then present you
86	- with a IRB prompt in the breakpointer window. Here you can do things like:
87	-
88	- Executing breakpoint "Breaking out from the list" at .../webrick_server.rb:16 in 'breakpoint'
89		5
90	- >> @posts.inspect	6	+ === Installation
91	- => "[#<Post:0x14a6be8 @attributes={\"title\"=>nil, \"body\"=>nil, \"id\"=>\"1\"}>,
92	- #<Post:0x14a6620 @attributes={\"title\"=>\"Rails you know!\", \"body\"=>\"Only ten..\", \"id\"=>\"2\"}>]"
93	- >> @posts.first.title = "hello from a breakpoint"
94	- => "hello from a breakpoint"
95	-
96	- ...and even better is that you can examine how your runtime objects actually work:
97	-
98	- >> f = @posts.first
99	- => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>
100	- >> f.
101	- Display all 152 possibilities? (y or n)
102	-
103	- Finally, when you're ready to resume execution, you press CTRL-D
104	-
105	-
106	- == Console
107	-
108	- You can interact with the domain model by starting the console through <tt>script/console</tt>.
109	- Here you'll have all parts of the application configured, just like it is when the
110	- application is running. You can inspect domain models, change values, and save to the
111	- database. Starting the script without arguments will launch it in the development environment.
112	- Passing an argument will specify a different environment, like <tt>script/console production</tt>.
113	-
114	- To reload your controllers and models after launching the console run <tt>reload!</tt>
115	-
116	- To reload your controllers and models after launching the console run <tt>reload!</tt>
117	-
118	-
119	-
120	- == Description of contents
121	-
122	- app
123	- Holds all the code that's specific to this particular application.
124	-
125	- app/controllers
126	- Holds controllers that should be named like weblogs_controller.rb for
127	- automated URL mapping. All controllers should descend from ApplicationController
128	- which itself descends from ActionController::Base.
129	-
130	- app/models
131	- Holds models that should be named like post.rb.
132	- Most models will descend from ActiveRecord::Base.
133		7
134	- app/views	8	+ The system is tested on ubuntu 14.04 LTS. Use the installation script in
135	- Holds the template files for the view that should be named like	9	+ cafe-grader-judge-scripts/installer/install.sh . See http://theory.cpe.ku.ac.th/wiki/index.php/%E0%B8%81%E0%B8%B2%E0%B8%A3%E0%B8%95%E0%B8%B4%E0%B8%94%E0%B8%95%E0%B8%B1%E0%B9%89%E0%B8%87_Cafe_grader for the detail.
136	- weblogs/index.rhtml for the WeblogsController#index action. All views use eRuby
137	- syntax.
138	-
139	- app/views/layouts
140	- Holds the template files for layouts to be used with views. This models the common
141	- header/footer method of wrapping views. In your views, define a layout using the
142	- <tt>layout :default</tt> and create a file named default.rhtml. Inside default.rhtml,
143	- call <% yield %> to render the view using this layout.
144	-
145	- app/helpers
146	- Holds view helpers that should be named like weblogs_helper.rb. These are generated
147	- for you automatically when using script/generate for controllers. Helpers can be used to
148	- wrap functionality for your views into methods.
149	-
150	- config
151	- Configuration files for the Rails environment, the routing map, the database, and other dependencies.
152	-
153	- components
154	- Self-contained mini-applications that can bundle together controllers, models, and views.
155		10
156	- db
157	- Contains the database schema in schema.rb. db/migrate contains all
158	- the sequence of Migrations for your schema.
159	-
160	- doc
161	- This directory is where your application documentation will be stored when generated
162	- using <tt>rake doc:app</tt>
163	-
164	- lib
165	- Application specific libraries. Basically, any kind of custom code that doesn't
166	- belong under controllers, models, or helpers. This directory is in the load path.
167	-
168	- public
169	- The directory available for the web server. Contains subdirectories for images, stylesheets,
170	- and javascripts. Also contains the dispatchers and the default HTML files. This should be
171	- set as the DOCUMENT_ROOT of your web server.
172	-
173	- script
174	- Helper scripts for automation and generation.
175	-
176	- test
177	- Unit and functional tests along with fixtures. When using the script/generate scripts, template
178	- test files will be generated for you and placed in this directory.
179	-
180	- vendor
181	- External libraries that the application depends on. Also includes the plugins subdirectory.
182	- This directory is in the load path.

app/assets/javascripts/local_jquery.js ¶ +7

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

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

@@ -3,9 +3,6
3	before_filter :authenticate	3	before_filter :authenticate
4	before_filter { \|controller\| controller.authorization_by_roles(['admin'])}	4	before_filter { \|controller\| controller.authorization_by_roles(['admin'])}
5		5
6	- in_place_edit_for :grader_configuration, :key
7	- in_place_edit_for :grader_configuration, :type
8	- in_place_edit_for :grader_configuration, :value
9		6
10	def index	7	def index
11	@configurations = GraderConfiguration.find(:all,	8	@configurations = GraderConfiguration.find(:all,
@@ -17,4 +14,15
17	redirect_to :action => 'index'	14	redirect_to :action => 'index'
18	end	15	end
19		16
		17	+ def update
		18	+ @config = GraderConfiguration.find(params[:id])
		19	+ respond_to do \|format\|
		20	+ if @config.update_attributes(params[:grader_configuration])
		21	+ format.json { head :ok }
		22	+ else
		23	+ format.json { respond_with_bip(@config) }
20	end	24	end
		25	+ end
		26	+ end
		27	+
		28	+ end

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

                 end
                 def change_contest_mode
-            -     if ['standard', 'contest', 'indv-contest'].include? params[:id]
+            +     if ['standard', 'contest', 'indv-contest', 'analysis'].include? params[:id]
                     config = GraderConfiguration.find_by_key('system.mode')
                     config.value = params[:id]
                     config.save

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

                   @submission.ip_address = request.remote_ip
                   if GraderConfiguration.time_limit_mode? and user.contest_finished?
-            -       @submission.errors.add_to_base "The contest is over."
+            +       @submission.errors.add(:base,"The contest is over.")
                     prepare_list_information
                     render :action => 'list' and return
                   end
                 def confirm_contest_start
                   user = User.find(session[:user_id])
-            -     if request.method == :post
+            +     if request.method == 'POST'
                     user.update_start_time
                     redirect_to :action => 'list'
                   else

app/controllers/messages_controller.rb ¶ +7 -6

                   user = User.find(session[:user_id])
                   @message = Message.new(params[:message])
                   @message.sender = user
-            -     if !@message.save
+            +     if @message.body == '' or !@message.save
-            -       render :action => 'list' and return
+            +       flash[:notice] = 'An error occurred'
                   else
                     flash[:notice] = 'New message posted'
+            +     end
                   redirect_to :action => 'list'
                 end
-            -   end
                 def reply
                   user = User.find(session[:user_id])
                   @message = Message.new(params[:r_message])
                   @message.sender = user
-            -     if !@message.save
+            +     if @message.body == '' or !@message.save
-            -       render :action => 'show' and return
+            +       flash[:notice] = 'An error occurred'
+            +       redirect_to :action => 'show', :id => @message.replying_message_id
                   else
                     flash[:notice] = 'Message replied'
                     rep_msg = @message.replying_message
                   message = Message.find(params[:id])
                   message.replied = true
                   message.save
-            -     flash[:notice] = 'Message hided (just marked replied)'
+            +     flash[:notice] = 'Message hidden (just marked replied)'
                   redirect_to :action => 'console'
                 end

app/controllers/report_controller.rb ¶ +3 -2

               class ReportController < ApplicationController
-            -   before_filter :admin_authorization, only: [:login_stat,:submission_stat]
+            +   before_filter :admin_authorization, only: [:login_stat,:submission_stat, :stuck]
                 before_filter(only: [:problem_hof]) { |c|
                   return false unless authenticate
                     d = (DateTime.now.in_time_zone - sub.submitted_at) / 24 / 60 / 60
                     @histogram[:data][d.to_i] += 1 if d < range
+            +       next unless sub.points
                     @summary[:count] += 1
                     user[sub.user_id] = [user[sub.user_id], (sub.points >= @problem.full_score) ? 1 : 0].max
                   @struggle = Array.new
                   record = {}
                   Submission.includes(:problem,:user).order(:problem_id,:user_id).find_each do |sub|
-            -       next unless sub.user and sub.problem
+            +       next unless sub.problem and sub.user
                     if user != sub.user_id or problem != sub.problem_id
                       @struggle << { user: record[:user], problem: record[:problem], tries: tries } unless solve
                       record = {user: sub.user, problem: sub.problem}

app/controllers/test_controller.rb ¶ +1 -1

                   if GraderConfiguration.time_limit_mode?
                     if @user.contest_finished?
-            -         @submitted_test_request.errors.add_to_base('Contest is over.')
+            +         @submitted_test_request.errors.add(:base,'Contest is over.')
                       prepare_index_information
                       render :action => 'index' and return
                     end

app/controllers/user_admin_controller.rb ¶ +2 -3

               class UserAdminController < ApplicationController
                 include MailHelperMethods
                 before_filter :admin_authorization
                       end
                       user = User.find_by_login(login)
-            -         if user
+            +         if (user)
+            +           user.full_name = full_name
                         user.password = password
                       else
                         user = User.new({:login => login,
                     end
                     @scorearray << ustat
                   end
                   if params[:commit] == 'download csv' then
                     csv = gen_csv_from_scorearray(@scorearray,@problems)
                     send_data csv, filename: 'last_score.csv'

app/controllers/users_controller.rb ¶ +3 -3

                       render :action => 'email_error', :layout => 'empty'
                     end
                   else
-            -       @user.errors.add_to_base("Email cannot be blank") if @user.email==''
+            +       @user.errors.add(:base,"Email cannot be blank") if @user.email==''
                     render :action => 'new', :layout => 'empty'
                   end
                 end
                                   :login => user.login,
                                   :password => user.password,
                                   :activation_url => activation_url,
-            -                     :admin_email => admin_email
+            +                     :admin_email => GraderConfiguration['system.admin_email']
                                 })
                   logger.info mail_body
                                   :contest_name => contest_name,
                                   :login => user.login,
                                   :password => user.password,
-            -                     :admin_email => admin_email
+            +                     :admin_email => GraderConfiguration['system.admin_email']
                                 })
                   logger.info mail_body

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

               <tr>
               <td class="left-col">
               #{user.full_name}<br/>
-            - #{t 'title_bar.current_time'} #{format_short_time(Time.new)}
+            + #{t 'title_bar.current_time'} #{format_short_time(Time.zone.now)}
               #{time_left}
               <br/>
               </td>

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

                                                    import_params[:memory_limit],
                                                    import_params[:checker_name],
                                                    import_to_db)
-            -       problem.errors.add_to_base('Import error.')
+            +       problem.errors.add(:base,'Import error.')
                   end
                   return problem, importer.log_msg
                                                          DEFAULT_MEMORY_LIMIT)
                   if time_limit<=0 or time_limit >60
-            -       problem.errors.add_to_base('Time limit out of range.')
+            +       problem.errors.add(:base,'Time limit out of range.')
                   end
                   if memory_limit==0 and params[:memory_limit]!='0'
-            -       problem.errors.add_to_base('Memory limit format errors.')
+            +       problem.errors.add(:base,'Memory limit format errors.')
                   elsif memory_limit<=0 or memory_limit >512
-            -       problem.errors.add_to_base('Memory limit out of range.')
+            +       problem.errors.add(:base,'Memory limit out of range.')
                   end
                   if params[:file]==nil or params[:file]==''
-            -       problem.errors.add_to_base('No testdata file.')
+            +       problem.errors.add(:base,'No testdata file.')
                   end
                   checker_name = 'text'

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

                   # checks if the user submits any input file
                   if params[:input_file]==nil or params[:input_file]==""
-            -       test_request.errors.add_to_base("No input submitted.")
+            +       test_request.errors.add(:base,"No input submitted.")
                     test_request.input_file_name = nil
                   else
                     test_request.input_file_name = save_input_file(params[:input_file], user, problem)
                     if test_request.input_file_name == nil
-            -         test_request.errors.add_to_base("No input submitted.")
+            +         test_request.errors.adds(:base,"No input submitted.")
                     end
                     if params[:additional_file]!=nil and params[:additional_file]!=""
                       save_additional_file(params[:additional_file],

app/models/user.rb ¶ +7 -7

                   user = find_by_login(login)
                   if user
                     return user if user.authenticated?(password)
-            - #      if user.authenticated_by_cucas?(password) or user.authenticated_by_pop3?(password)
+            +       if user.authenticated_by_cucas?(password) or user.authenticated_by_pop3?(password)
-            - #        user.password = password
+            +         user.password = password
-            - #        user.save
+            +         user.save
-            - #        return user
+            +         return user
-            - #      end
+            +       end
                   end
                 end
                   def uniqueness_of_email_from_activated_users
                     user = User.activated_users.find_by_email(self.email)
                     if user and (user.login != self.login)
-            -         self.errors.add_to_base("Email has already been taken")
+            +         self.errors.add(:base,"Email has already been taken")
                     end
                   end
                                                    :order => 'created_at DESC')
                     if open_user and open_user.created_at and
                         (open_user.created_at > Time.now.gmtime - 5.minutes)
-            -         self.errors.add_to_base("There are already unactivated registrations with this e-mail address (please wait for 5 minutes)")
+            +         self.errors.add(:base,"There are already unactivated registrations with this e-mail address (please wait for 5 minutes)")
                     end
                   end

app/views/configurations/index.html.haml ¶ +4 -1

+            + - content_for :header do
+            +   = javascript_include_tag 'local_jquery'
+            +
               %h1 System configuration
               %table.info
                     %td
                       = in_place_editor_field :grader_configuration, :value_type, {}, :rows=>1
                     %td
-            -         = in_place_editor_field :grader_configuration, :value, {}, :rows=>1
+            +         = best_in_place @grader_configuration, :value, ok_button: "ok", cancel_button: "cancel"
                     %td= conf.description
               - if GraderConfiguration.config_cached?

app/views/contest_management/index.html.haml ¶ +10 -7

               .infobox
                 %b Web interface mode:
-            -   - if (not GraderConfiguration.contest_mode?) and (not GraderConfiguration.indv_contest_mode?)
+            +   - if GraderConfiguration.analysis_mode?
-            -     standard mode
+            +     Analysis Mode
+            +   - elsif (not GraderConfiguration.contest_mode?) and (not GraderConfiguration.indv_contest_mode?)
+            +     Standard Mode
                 - elsif GraderConfiguration.contest_mode?
-            -     normal contest mode.
+            +     Normal Contest Mode
                 - else
-            -     individual contest mode.
+            +     Individual Contest Mode
                 %br/
                 Change mode to:
-            -   =raw "[#{link_to 'standard', :action => 'change_contest_mode', :id => 'standard'}]"
+            +   =raw "[#{link_to 'Standard', :action => 'change_contest_mode', :id => 'standard'}]"
-            -   =raw "[#{link_to 'contest', :action => 'change_contest_mode', :id => 'contest'}]"
+            +   =raw "[#{link_to 'Contest', :action => 'change_contest_mode', :id => 'contest'}]"
-            -   =raw "[#{link_to 'individual contest', :action => 'change_contest_mode', :id => 'indv-contest'}]"
+            +   =raw "[#{link_to 'Individual Contest', :action => 'change_contest_mode', :id => 'indv-contest'}]"
+            +   =raw "[#{link_to 'Analysis', :action => 'change_contest_mode', :id => 'analysis'}]"
               - if GraderConfiguration.indv_contest_mode?
                 = render :partial => 'indv_contest_mode_index'

app/views/graders/list.html.haml ¶ +2 -1

               - content_for :head do
                 = stylesheet_link_tag 'graders'
+            +   = javascript_include_tag 'local_jquery'
                 <meta http-equiv ="refresh" content="60"/>
               %h1 Grader information
                         %td= sub.try(:user).try(:full_name)
                         %td= sub.try(:problem).try(:full_name)
                         %td= "#{time_ago_in_words(sub.submitted_at)} ago"
-            -           %td= "#{sub.graded_at ? time_ago_in_words(sub.graded_at) : ''} ago"
+            +           %td= sub.graded_at ? "#{time_ago_in_words(sub.graded_at)} ago" : " "
                         %td= sub.grader_comment

app/views/graders/test_request.html.haml ¶ +1 -1

               - if @test_request.compiler_message!=nil and @test_request.compiler_message!=''
                 %b Compiler Message
                 %div{:style => "border: 1px solid black; background: lightgrey"}
-            -     = simple_format(truncate((@test_request.compiler_message or ''),200))
+            +     = simple_format(truncate((@test_request.compiler_message or ''), :length => 200))
               %b Input (first 2kb)
               %div{:style => "border: 1px solid black; background: lightgrey"}

app/views/main/_compiler_message.html.erb ¶ +1 -1

-            - <% if compiler_message==nil or compiler_message=='' %>
+            + <% if compiler_message == nil or compiler_message.chomp == '' %>
                 No message
               <% else %>
                 <div><div><a href="#" onClick="n = this.parentNode.parentNode.lastChild;

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

                   = submission_counter+1
                 %td.info{:align => "center"}
                   = link_to "##{submission.id}", controller: :graders, action: :submission, id: submission.id
-            -   %td.info= format_short_time(submission.submitted_at)
+            +   %td.info
+            +     = l submission.submitted_at, format: :long
+            +     = "( #{time_ago_in_words(submission.submitted_at)} ago)"
                 %td.info{:align => "center"}
+            +     = submission.source_filename
+            +     = " (#{submission.language.pretty_name}) "
                   = link_to('[load]',{:action => 'source', :id => submission.id})
                 %td.info
                   - if submission.graded_at!=nil

app/views/main/compiler_msg.html.haml ¶ +2 -2

               %h2= "Compiler message for submission \##{@submission.number}, task: #{@submission.problem.name}"
               %p
-            -   - if @submission.compiler_message.chomp == ''
+            +   - if @submission.compiler_message == nil or @submission.compiler_message.chomp == ''
-            -     no message
+            +     No message
                 - else
                   = simple_format(@submission.compiler_message)

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

                     =t 'main.confirm_contest_start.timer_starts_after_click'
-            -       = form_tag :action => 'confirm_contest_start', :method => 'post' do
+            +       = form_tag :action => 'confirm_contest_start' do
                       = submit_tag t('main.confirm_contest_start.start_button'), :confirm => t('main.confirm_contest_start.start_button_confirm')

app/views/problems/do_import.html.haml ¶ +1 -2

                 %b Problem:
                 = "#{@problem.full_name} (#{@problem.name})"
                 %br/
-            -   Note that the full score has be assigned to the default value, 100.
+            +   = "Note that the full score has been set to #{@problem.full_score}."
-            -   You should change it to the correct full score.
               %p
                 = link_to '[Back to problem list]', :action => 'list'

app/views/report/_task_hof.html.haml ¶ -1

                     $("#mem_remark_box").hide();
                   });
                 });
-            -   alert("hahaha");
               :css
                 .hof_user { color: orangered; font-style: italic; }
                 .hof_language { color: green; font-style: italic; }

app/views/user_admin/_form.html.erb ¶ +4 -1

               <%= password_field 'user', 'password_confirmation'  %></p>
               <p><label for="user_email">E-mail</label><br/>
-            - <%= text_field 'user', 'email'  %></p>
+            + <%= email_field 'user', 'email'  %></p>
               <p><label for="user_alias">Alias</label><br/>
               <%= text_field 'user', 'alias'  %></p>
+            +
+            + <p><label for="user_remark">Remark</label><br/>
+            + <%= text_field 'user', 'remark'  %></p>
               <!--[eoform:user]-->

app/views/user_admin/list.html.erb ¶ +1 -1

               	<td><%= text_field 'user', 'full_name', :size => 30  %></td>
               	<td><%= password_field 'user', 'password', :size => 10  %></td>
               	<td><%= password_field 'user', 'password_confirmation', :size => 10 %></td>
-            - 	<td><%= text_field 'user', 'email', :size => 15 %></td>
+            + 	<td><%= email_field 'user', 'email', :size => 15 %></td>
               	<td><%= submit_tag "Create" %></td>
                   </tr>
                   </table>

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

                     %th Activated?
                     %th Logged in
                     %th Contest(s)
-            -       %th Section
+            +       %th Remark
                     - @problems.each do |p|
                       %th= p.name
                     %th Total
                           %td= sc[i].activated
                           %td= sc[i].try(:contest_stat).try(:started_at)!=nil ? 'yes' : 'no'
                           %td= sc[i].contests.collect {|c| c.name}.join(', ')
-            -             %td= sc[i].section
+            +             %td= sc[i].remark
                         - else
                           %td= sc[i][0]
                           - total += sc[i][0]

app/views/users/forget.html.haml ¶ +2 -1

               = form_tag :action => 'retrieve_password' do
                 =t 'registration.password_retrieval.instructions'
-            -   = text_field 'email', nil, :size => 20
+            +   %br/
+            +   = email_field 'email', nil, :size => 20
                 %br/
                 = submit_tag(t 'registration.password_retrieval.button_label')

app/views/users/new.html.haml ¶ +2 -2

                   %tr
                     %td{:align => "right"}
                       = "#{t 'email_label'}:"
-            -       %td= f.text_field :email
+            +       %td= f.email_field :email
                   %tr
                     %td
                     %td
                       %small
-            -           =t 'registration.email_guide'
+            +           =t('registration.email_guide').html_safe
                   %tr
                     %td/
                     %td

config/environments/development.rb ¶ +3

                 # Expands the lines which load the assets
                 config.assets.debug = true
+            +
+            +   # Prevents assets from rendering twice
+            +   config.serve_static_assets = false
               end

config/routes.rb ¶ +2

                 resources :announcements
                 resources :sites
+            +   resources :grader_configuration, controller: 'configurations'
+            +
                 # The priority is based upon order of creation:
                 # first created -> highest priority.

db/schema.rb ¶ +3 -2

               #
               # It's strongly recommended to check this file into your version control system.
-            - ActiveRecord::Schema.define(:version => 20140917150629) do
+            + ActiveRecord::Schema.define(:version => 20150203153534) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
                   t.boolean  "activated",                     :default => false
                   t.datetime "created_at"
                   t.datetime "updated_at"
-            -     t.string   "section"
+            +     t.boolean  "enabled",                       :default => true
+            +     t.string   "remark"
                 end
                 add_index "users", ["login"], :name => "index_users_on_login", :unique => true

db/seeds.rb ¶ +1 -1

                    :value_type => 'boolean',
                    :default_value => 'true',
                    :description => 'If this option is true, users can change their settings'
-            -    }
+            +    },
                  # If Configuration['contest.test_request.early_timeout'] is true
                  # the user will not be able to use test request at 30 minutes

lib/mail_helper_methods.rb ¶ +12 -1

@@ -22,7 +22,18
22	body mail_body	22	body mail_body
23	end	23	end
24		24
25	- mail.delivery_settings = { :address => smtp_server }	25	+ mail_option = {
		26	+ :address => smtp_server,
		27	+ # :domain => nil,
		28	+ # :port => 25,
		29	+ # :user_name => nil,
		30	+ # :password => nil,
		31	+ # :authentication=>'plain',
		32	+ # :enable_starttls_auto => true
		33	+ }
		34	+
		35	+ mail.delivery_method :smtp, mail_option
		36	+
26	mail.deliver	37	mail.deliver
27	end	38	end
28		39

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

deleted file

Write
Preview

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

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

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

Sign in to your account

Author

r522:dd2e569af6cb - Thu, 19 Feb 2015 15:28:54 - 39 files changed: 203 inserted, 314 deleted

Sign in to your account

Commit r522:dd2e569af6cb public

Author

r522:dd2e569af6cb - Thu, 19 Feb 2015 15:28:54 - 39 files changed: 203 inserted, 314 deleted

Commit `r522:dd2e569af6cb` public