cafe-grader-web Commit - r429:82e5ff05bd49

cafe-grader-web

Commit `r429:82e5ff05bd49` public

parent | child

Description:

merge with algo-bm

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

r429:82e5ff05bd49 - Fri, 12 Sep 2014 11:00:08 - 18 files changed: 310 inserted, 30 deleted

app/views/report/_all_time_hof.html.haml created 644 ¶ +8

@@ -0,0 +1,8
	1	+ %h2 Paid in Full
	2	+ User with highest number of problem solved
	3	+
	4	+ %h2 Polymaths
	5	+ User with highest number of problems each solved by more than 1 languages.
	6	+
	7	+ %h2 Icebreakers
	8	+ If you solve the problem before 95% of your friends, you are an icebreaker.

app/views/report/_task_hof.html.haml created 644 ¶ +62

@@ -0,0 +1,62
	1	+ :css
	2	+ .hof_user { color: orangered; font-style: italic; }
	3	+ .hof_language { color: green; font-style: italic; }
	4	+ .hof_value { color: deeppink;font-style: italic; }
	5	+
	6	+ %h2 Overall
	7	+
	8	+ - if @best
	9	+ %b Best Runtime:
	10	+ by <span class="hof_user">#{@best[:runtime][:user]}</span> using <span class="hof_language">#{@best[:runtime][:lang]}</span> with <span class="hof_value">#{@best[:runtime][:value] * 1000} milliseconds</span> at submission
	11	+ = link_to("#" + @best[:runtime][:sub_id].to_s, controller: 'graders', action: 'submission', id:@best[:runtime][:sub_id])
	12	+ %br/
	13	+
	14	+ %b Best Memory Usage:
	15	+ by <span class="hof_user">#{@best[:memory][:user]}</span> using <span class="hof_language">#{@best[:memory][:lang]}</span> with <span class="hof_value">#{@best[:memory][:value]} kbytes </span> at submission
	16	+ = link_to("#" + @best[:memory][:sub_id].to_s, controller: 'graders' , action: 'submission', id:@best[:memory][:sub_id])
	17	+ %br/
	18	+
	19	+ %b Shortest Code:
	20	+ by <span class="hof_user">#{@best[:length][:user]}</span> using <span class="hof_language">#{@best[:length][:lang]}</span> with <span class="hof_value">#{@best[:length][:value]} bytes</span> at submission
	21	+ = link_to("#" + @best[:length][:sub_id].to_s, controller: 'graders' , action: 'submission', id: @best[:length][:sub_id])
	22	+ %br/
	23	+
	24	+ %b First solver:
	25	+ <span class="hof_user">#{@best[:first][:user]}</span> is the first solver using <span class="hof_language">#{@best[:first][:lang]}</span> on <span class="hof_value">#{@best[:first][:value]}</span> at submission
	26	+ = link_to("#" + @best[:first][:sub_id].to_s, controller: 'graders' , action: 'submission', id: @best[:first][:sub_id])
	27	+ %br/
	28	+
	29	+
	30	+ %p
	31	+ This counts only for submission with 100% score <br/>
	32	+ Right now, java is excluded from memory usage competition. (Because it always uses 2GB memory...)
	33	+
	34	+ %h2 By language
	35	+
	36	+ %table.info
	37	+ %thead
	38	+ %tr.info-head
	39	+ %th Language
	40	+ %th Best runtime (ms)
	41	+ %th Best memory (kbytes)
	42	+ %th Shortest Code (bytes)
	43	+ %th First solver
	44	+ %tbody
	45	+ - @by_lang.each do \|lang,value\|
	46	+ %tr{class: cycle('info-even','info-odd')}
	47	+ %td= lang
	48	+ %td
	49	+ = "#{value[:runtime][:user]} (#{(value[:runtime][:value] * 1000).to_i} @"
	50	+ = "#{link_to("#" + value[:runtime][:sub_id].to_s, controller: 'graders' , action: 'submission', id: value[:runtime][:sub_id])} )".html_safe
	51	+ %td
	52	+ = "#{value[:memory][:user]} (#{value[:memory][:value]} @"
	53	+ = "#{link_to("#" + value[:memory][:sub_id].to_s, controller: 'graders' , action: 'submission', id: value[:memory][:sub_id])} )".html_safe
	54	+ %td
	55	+ = "#{value[:length][:user]} (#{value[:length][:value]} @"
	56	+ = "#{link_to("#" + value[:length][:sub_id].to_s, controller: 'graders' , action: 'submission', id: value[:length][:sub_id])} )".html_safe
	57	+ %td
	58	+ = "#{value[:first][:user]} (#{value[:first][:value]} @"
	59	+ = "#{link_to("#" + value[:first][:sub_id].to_s, controller: 'graders' , action: 'submission', id: value[:first][:sub_id])} )".html_safe
	60	+
	61	+ - else
	62	+ %h3 No submissions

app/views/report/problem_hof.html.haml created 644 ¶ +22

@@ -0,0 +1,22
	1	+
	2	+ /- if params[:id]
	3	+ / %h1 Tasks Hall of Fame
	4	+ / = link_to('[back to All-Time Hall of Fame]', action: 'problem_hof', id: nil )
	5	+ /- else
	6	+ / %h1 All-Time Hall of Fame
	7	+
	8	+
	9	+ %h1 Tasks Hall of Fame
	10	+ .task-menu
	11	+ Tasks
	12	+ %br/
	13	+ - @problems.each do \|prob\|
	14	+ = link_to( "[#{prob.name}]", {id: prob.id})
	15	+
	16	+ - unless params[:id]
	17	+ /=render partial: 'all_time_hof'
	18	+ Please select a problem.
	19	+ - else
	20	+ =render partial: 'task_hof'
	21	+
	22	+

db/migrate/20140823031747_add_more_detail_to_submission.rb created 644 ¶ +7

@@ -0,0 +1,7
	1	+ class AddMoreDetailToSubmission < ActiveRecord::Migration
	2	+ def change
	3	+ add_column :submissions, :max_runtime, :float
	4	+ add_column :submissions, :peak_memory, :integer
	5	+ add_column :submissions, :effective_code_length, :integer
	6	+ end
	7	+ end

Gemfile ¶ +2

               end
               gem 'prototype-rails'
               # To use ActiveModel has_secure_password
               # gem 'bcrypt-ruby', '~> 3.0.0'
               # To use Jbuilder templates for JSON
               # gem 'jbuilder'
               # Use unicorn as the app server
               # gem 'unicorn'
               # Deploy with Capistrano
               # gem 'capistrano'
               # To use debugger
               # gem 'debugger'
               #
               gem 'jquery-rails'
               gem 'jquery-ui-sass-rails'
               gem 'jquery-timepicker-addon-rails'
+            + #syntax highlighter
+            + gem 'rouge'
               gem "haml"
               gem "mail"
               gem "rdiscount"
               gem "test-unit"
               gem 'will_paginate', '~> 3.0.0'
               gem 'dynamic_form'
               gem 'in_place_editing'
               gem 'verification', :git => 'git://github.com/sikachu/verification.git'
               group :test, :development do
                 gem "rspec-rails", "~> 2.0"
               end

Gemfile.lock ¶ +2

                     rack (>= 0.4)
                   rack-ssl (1.3.4)
                     rack
                   rack-test (0.6.2)
                     rack (>= 1.0)
                   rails (3.2.19)
                     actionmailer (= 3.2.19)
                     actionpack (= 3.2.19)
                     activerecord (= 3.2.19)
                     activeresource (= 3.2.19)
                     activesupport (= 3.2.19)
                     bundler (~> 1.0)
                     railties (= 3.2.19)
                   railties (3.2.19)
                     actionpack (= 3.2.19)
                     activesupport (= 3.2.19)
                     rack-ssl (~> 1.3.2)
                     rake (>= 0.8.7)
                     rdoc (~> 3.4)
                     thor (>= 0.14.6, < 2.0)
                   rake (10.3.2)
                   rdiscount (2.1.7.1)
                   rdoc (3.12.2)
                     json (~> 1.4)
+            +     rouge (1.6.2)
                   rspec-collection_matchers (1.0.0)
                     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-rails (2.99.0)
                     actionpack (>= 3.0)
                     activemodel (>= 3.0)
                     activesupport (>= 3.0)
                     railties (>= 3.0)
                     rspec-collection_matchers
                     rspec-core (~> 2.99.0)
                     rspec-expectations (~> 2.99.0)
                     rspec-mocks (~> 2.99.0)
                   sass (3.4.1)
                   sass-rails (3.2.6)
                     railties (~> 3.2.0)
                     sass (>= 3.1.10)
                     tilt (~> 1.3)
                   sprockets (2.2.2)
                     hike (~> 1.2)
                     multi_json (~> 1.0)
                     rack (~> 1.0)
                     polyglot
                     polyglot (>= 0.3.1)
                   tzinfo (0.3.41)
                   uglifier (2.5.3)
                     execjs (>= 0.3.0)
                     json (>= 1.8.0)
                   will_paginate (3.0.7)
               PLATFORMS
                 ruby
               DEPENDENCIES
                 coffee-rails (~> 3.2.1)
                 dynamic_form
                 haml
                 in_place_editing
                 jquery-rails
                 jquery-timepicker-addon-rails
                 jquery-ui-sass-rails
                 mail
                 mysql2
                 prototype-rails
                 rails (= 3.2.19)
                 rdiscount
+            +   rouge
                 rspec-rails (~> 2.0)
                 sass-rails (~> 3.2.3)
                 test-unit
                 uglifier (>= 1.0.3)
                 verification!
                 will_paginate (~> 3.0.0)

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

               class ApplicationController < ActionController::Base
                 protect_from_forgery
                 SINGLE_USER_MODE_CONF_KEY = 'system.single_user_mode'
                 def admin_authorization
                   return false unless authenticate
                   user = User.find(session[:user_id], :include => ['roles'])
-            -     redirect_to :controller => 'main', :action => 'login' unless user.admin?
+            +     unless user.admin?
+            +       flash[:notice] = 'You are not authorized to view the page you requested'
+            +       redirect_to :controller => 'main', :action => 'login' unless user.admin?
+            +       return false
+            +     end
+            +     return true
                 end
                 def authorization_by_roles(allowed_roles)
                   return false unless authenticate
                   user = User.find(session[:user_id])
                   unless user.roles.detect { |role| allowed_roles.member?(role.name) }
                     flash[:notice] = 'You are not authorized to view the page you requested'
                     redirect_to :controller => 'main', :action => 'login'
                     return false
                   end
                 end
                 protected
                 def authenticate
                   unless session[:user_id]
+            +       flash[:notice] = 'You need to login'
+            +       if GraderConfiguration[SINGLE_USER_MODE_CONF_KEY]
+            +         flash[:notice] = 'You need to login but you cannot log in at this time'
+            +       end
                     redirect_to :controller => 'main', :action => 'login'
                     return false
                   end
                   # check if run in single user mode
                   if GraderConfiguration[SINGLE_USER_MODE_CONF_KEY]
                     user = User.find(session[:user_id])
                     if user==nil or (not user.admin?)
                       flash[:notice] = 'You cannot log in at this time'
                       redirect_to :controller => 'main', :action => 'login'
                       return false
                     end
                     return true
                   end
                   if GraderConfiguration.multicontests?
                     user = User.find(session[:user_id])
                     return true if user.admin?
                     begin
                       if user.contest_stat(true).forced_logout
                         flash[:notice] = 'You have been automatically logged out.'
                         redirect_to :controller => 'main', :action => 'index'
                       end
                     rescue

app/controllers/graders_controller.rb ¶ +22 -1

               class GradersController < ApplicationController
-            -   before_filter :admin_authorization
+            +   before_filter :admin_authorization, except: [ :submission ]
+            +   before_filter(only: [:submission]) {
+            +     return false unless authenticate
+            +
+            +     if GraderConfiguration["right.user_view_submission"]
+            +       return true;
+            +     end
+            +
+            +     admin_authorization
+            +   }
                 verify :method => :post, :only => ['clear_all',
                                                    'start_exam',
                                                    'start_grading',
                                                    'stop_all',
                                                    'clear_terminated'],
                        :redirect_to => {:action => 'index'}
                 def index
                   redirect_to :action => 'list'
                 end
                 def list
                   @grader_processes = GraderProcess.find_running_graders
                   @stalled_processes = GraderProcess.find_stalled_process
                   @terminated_processes = GraderProcess.find_terminated_graders
                   @last_task = Task.find(:first,
                                          :order => 'created_at DESC')
                   @last_test_request = TestRequest.find(:first,
                                                         :order => 'created_at DESC')
                 end
                   GraderProcess.find(:all).each do |p|
                     p.destroy
                   end
                   redirect_to :action => 'list'
                 end
                 def view
                   if params[:type]=='Task'
                     redirect_to :action => 'task', :id => params[:id]
                   else
                     redirect_to :action => 'test_request', :id => params[:id]
                   end
                 end
                 def test_request
                   @test_request = TestRequest.find(params[:id])
                 end
                 def task
                   @task = Task.find(params[:id])
                 end
                 def submission
                   @submission = Submission.find(params[:id])
+            +     formatter = Rouge::Formatters::HTML.new(css_class: 'highlight', line_numbers: true )
+            +     lexer = case @submission.language.name
+            +       when "c"      then Rouge::Lexers::C.new
+            +       when "cpp"    then Rouge::Lexers::Cpp.new
+            +       when "pas"    then Rouge::Lexers::Pas.new
+            +       when "ruby"   then Rouge::Lexers::Ruby.new
+            +       when "python" then Rouge::Lexers::Python.new
+            +       when "java"   then Rouge::Lexers::Java.new
+            +     end
+            +     @formatted_code = formatter.format(lexer.lex(@submission.source))
+            +     @css_style = Rouge::Themes::ThankfulEyes.render(scope: '.highlight')
+            +
                 end
                 # various grader controls
                 def stop
                   grader_proc = GraderProcess.find(params[:id])
                   GraderScript.stop_grader(grader_proc.pid)
                   flash[:notice] = 'Grader stopped.  It may not disappear now, but it should disappear shortly.'
                   redirect_to :action => 'list'
                 end
                 def stop_all
                   GraderScript.stop_graders(GraderProcess.find_running_graders +
                                             GraderProcess.find_stalled_process)
                   flash[:notice] = 'Graders stopped.  They may not disappear now, but they should disappear shortly.'
                   redirect_to :action => 'list'
                 end
                 def start_grading
                   GraderScript.start_grader('grading')
                   flash[:notice] = '2 graders in grading env started, one for grading queue tasks, another for grading test request'
                   redirect_to :action => 'list'
                 end

app/controllers/report_controller.rb ¶ +116

@@ -1,25 +1,37
1	class ReportController < ApplicationController	1	class ReportController < ApplicationController
		2	+
		3	+ before_filter :admin_authorization, only: [:login_stat,:submission_stat]
		4	+ before_filter(only: [:problem_hof]) { \|c\|
		5	+ return false unless authenticate
		6	+
		7	+ if GraderConfiguration["right.user_view_submission"]
		8	+ return true;
		9	+ end
		10	+
		11	+ admin_authorization
		12	+ }
		13	+
2	def login_stat	14	def login_stat
3	@logins = Array.new	15	@logins = Array.new
4		16
5	date_and_time = '%Y-%m-%d %H:%M'	17	date_and_time = '%Y-%m-%d %H:%M'
6	begin	18	begin
7	@since_time = DateTime.strptime(params[:since_datetime],date_and_time)	19	@since_time = DateTime.strptime(params[:since_datetime],date_and_time)
8	rescue	20	rescue
9	@since_time = DateTime.new(1000,1,1)	21	@since_time = DateTime.new(1000,1,1)
10	end	22	end
11	begin	23	begin
12	@until_time = DateTime.strptime(params[:until_datetime],date_and_time)	24	@until_time = DateTime.strptime(params[:until_datetime],date_and_time)
13	rescue	25	rescue
14	@until_time = DateTime.new(3000,1,1)	26	@until_time = DateTime.new(3000,1,1)
15	end	27	end
16		28
17	User.all.each do \|user\|	29	User.all.each do \|user\|
18	@logins << { login: user.login,	30	@logins << { login: user.login,
19	full_name: user.full_name,	31	full_name: user.full_name,
20	count: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?",	32	count: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?",
21	user.id,@since_time,@until_time)	33	user.id,@since_time,@until_time)
22	.count(:id),	34	.count(:id),
23	min: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?",	35	min: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?",
24	user.id,@since_time,@until_time)	36	user.id,@since_time,@until_time)
25	.minimum(:created_at),	37	.minimum(:created_at),
@@ -48,25 +60,129
48		60
49	User.find_each do \|user\|	61	User.find_each do \|user\|
50	@submissions[user.id] = { login: user.login, full_name: user.full_name, count: 0, sub: { } }	62	@submissions[user.id] = { login: user.login, full_name: user.full_name, count: 0, sub: { } }
51	end	63	end
52		64
53	Submission.where("submitted_at >= ? AND submitted_at <= ?",@since_time,@until_time).find_each do \|s\|	65	Submission.where("submitted_at >= ? AND submitted_at <= ?",@since_time,@until_time).find_each do \|s\|
54	if @submissions[s.user_id]	66	if @submissions[s.user_id]
55	if not @submissions[s.user_id][:sub].has_key?(s.problem_id)	67	if not @submissions[s.user_id][:sub].has_key?(s.problem_id)
56	a = nil	68	a = nil
57	begin	69	begin
58	a = Problem.find(s.problem_id)	70	a = Problem.find(s.problem_id)
59	rescue	71	rescue
60	a = nil	72	a = nil
61	end	73	end
62	@submissions[s.user_id][:sub][s.problem_id] =	74	@submissions[s.user_id][:sub][s.problem_id] =
63	{ prob_name: (a ? a.full_name : '(NULL)'),	75	{ prob_name: (a ? a.full_name : '(NULL)'),
64	sub_ids: [s.id] }	76	sub_ids: [s.id] }
65	else	77	else
66	@submissions[s.user_id][:sub][s.problem_id][:sub_ids] << s.id	78	@submissions[s.user_id][:sub][s.problem_id][:sub_ids] << s.id
67	end	79	end
68	@submissions[s.user_id][:count] += 1	80	@submissions[s.user_id][:count] += 1
69	end	81	end
70	end	82	end
71	end	83	end
		84	+
		85	+ def problem_hof
		86	+ # gen problem list
		87	+ @user = User.find(session[:user_id])
		88	+ @problems = @user.available_problems
		89	+
		90	+ # get selected problems or the default
		91	+ if params[:id]
		92	+ begin
		93	+ @problem = Problem.available.find(params[:id])
		94	+ rescue
		95	+ redirect_to action: :problem_hof
		96	+ flash[:notice] = 'Error: submissions for that problem are not viewable.'
		97	+ return
		98	+ end
		99	+ end
		100	+
		101	+ if @problem
		102	+ #aggregrate by language
		103	+ @by_lang = {}
		104	+ Submission.where(problem_id: @problem.id).find_each do \|sub\|
		105	+ lang = Language.find_by_id(sub.language_id)
		106	+ next unless lang
		107	+ next unless sub.points >= @problem.full_score
		108	+
		109	+ #initialize
		110	+ unless @by_lang.has_key?(lang.pretty_name)
		111	+ @by_lang[lang.pretty_name] = {
		112	+ runtime: { avail: false, value: 2**30-1 },
		113	+ memory: { avail: false, value: 2**30-1 },
		114	+ length: { avail: false, value: 2**30-1 },
		115	+ first: { avail: false, value: DateTime.new(3000,1,1) }
		116	+ }
		117	+ end
		118	+
		119	+ if sub.max_runtime and sub.max_runtime < @by_lang[lang.pretty_name][:runtime][:value]
		120	+ @by_lang[lang.pretty_name][:runtime] = {
		121	+ avail: true,
		122	+ user_id: sub.user_id,
		123	+ value: sub.max_runtime,
		124	+ sub_id: sub.id
		125	+ }
		126	+ end
		127	+
		128	+ if sub.peak_memory and sub.peak_memory < @by_lang[lang.pretty_name][:memory][:value]
		129	+ @by_lang[lang.pretty_name][:memory] = {
		130	+ avail: true,
		131	+ user_id: sub.user_id,
		132	+ value: sub.peak_memory,
		133	+ sub_id: sub.id
		134	+ }
		135	+ end
		136	+
		137	+ if sub.submitted_at and sub.submitted_at < @by_lang[lang.pretty_name][:first][:value] and
		138	+ !sub.user.admin?
		139	+ @by_lang[lang.pretty_name][:first] = {
		140	+ avail: true,
		141	+ user_id: sub.user_id,
		142	+ value: sub.submitted_at,
		143	+ sub_id: sub.id
		144	+ }
		145	+ end
		146	+
		147	+ if @by_lang[lang.pretty_name][:length][:value] > sub.effective_code_length
		148	+ @by_lang[lang.pretty_name][:length] = {
		149	+ avail: true,
		150	+ user_id: sub.user_id,
		151	+ value: sub.effective_code_length,
		152	+ sub_id: sub.id
		153	+ }
		154	+ end
		155	+ end
		156	+
		157	+ #process user_id
		158	+ @by_lang.each do \|lang,prop\|
		159	+ prop.each do \|k,v\|
		160	+ v[:user] = User.exists?(v[:user_id]) ? User.find(v[:user_id]).full_name : "(NULL)"
		161	+ end
		162	+ end
		163	+
		164	+ #sum into best
		165	+ if @by_lang and @by_lang.first
		166	+ @best = @by_lang.first[1]
		167	+ @by_lang.each do \|lang,prop\|
		168	+ if @best[:runtime][:value] >= prop[:runtime][:value]
		169	+ @best[:runtime] = prop[:runtime]
		170	+ @best[:runtime][:lang] = lang
		171	+ end
		172	+ if @best[:memory][:value] >= prop[:memory][:value]
		173	+ @best[:memory] = prop[:memory]
		174	+ @best[:memory][:lang] = lang
		175	+ end
		176	+ if @best[:length][:value] >= prop[:length][:value]
		177	+ @best[:length] = prop[:length]
		178	+ @best[:length][:lang] = lang
		179	+ end
		180	+ if @best[:first][:value] >= prop[:first][:value]
		181	+ @best[:first] = prop[:first]
		182	+ @best[:first][:lang] = lang
		183	+ end
		184	+ end
		185	+ end
		186	+ end
		187	+ end
72	end	188	end

app/helpers/application_helper.rb ¶ +4

                     # admin menu
                     menu_items << "<b>Administrative task:</b> "
                     append_to menu_items, '[Announcements]', 'announcements', 'index'
                     append_to menu_items, '[Msg console]', 'messages', 'console'
                     append_to menu_items, '[Problems]', 'problems', 'index'
                     append_to menu_items, '[Users]', 'user_admin', 'index'
                     append_to menu_items, '[Results]', 'user_admin', 'user_stat'
                     append_to menu_items, '[Report]', 'report', 'login_stat'
                     append_to menu_items, '[Graders]', 'graders', 'list'
                     append_to menu_items, '[Contests]', 'contest_management', 'index'
                     append_to menu_items, '[Sites]', 'sites', 'index'
                     append_to menu_items, '[System config]', 'configurations', 'index'
                     menu_items << "<br/>"
                   end
                   # main page
                   append_to menu_items, "[#{I18n.t 'menu.main'}]", 'main', 'list'
                   append_to menu_items, "[#{I18n.t 'menu.messages'}]", 'messages', 'list'
                   if (user!=nil) and (GraderConfiguration.show_tasks_to?(user))
                     append_to menu_items, "[#{I18n.t 'menu.tasks'}]", 'tasks', 'list'
                     append_to menu_items, "[#{I18n.t 'menu.submissions'}]", 'main', 'submission'
                     append_to menu_items, "[#{I18n.t 'menu.test'}]", 'test', 'index'
                   end
+            +
+            +     if GraderConfiguration['right.user_hall_of_fame']
+            +       append_to menu_items, "[#{I18n.t 'menu.hall_of_fame'}]", 'report', 'problem_hof'
+            +     end
                   append_to menu_items, "[#{I18n.t 'menu.help'}]", 'main', 'help'
                   if GraderConfiguration['system.user_setting_enabled']
                     append_to menu_items, "[#{I18n.t 'menu.settings'}]", 'users', 'index'
                   end
                   append_to menu_items, "[#{I18n.t 'menu.log_out'}]", 'main', 'login'
                   menu_items.html_safe
                 end
                 def append_to(option,label, controller, action)
                   option << ' ' if option!=''
                   option << link_to_unless_current(label,
                                                    :controller => controller,
                                                    :action => action)
                 end
                 def format_short_time(time)
                   now = Time.now.gmtime
                   st = ''
                   if (time.yday != now.yday) or
               	(time.year != now.year)
                     st = time.strftime("%x ")
                   end

app/views/graders/submission.html.haml ¶ +10 -5

+            + %style{type: "text/css"}
+            +   = @css_style
+            +
               %h1= "Submission: #{@submission.id}"
               %p
                 User:
-            -   = "#{@submission.user.login}"
+            +   = "(#{@submission.user.login}) #{@submission.user.full_name}"
                 %br/
                 Problem:
                 - if @submission.problem!=nil
                   = "#{@submission.problem.full_name}"
                 - else
                   = "(n/a)"
                 %br/
                 = "Number: #{@submission.number}"
                 %br/
                 = "Submitted at: #{format_short_time(@submission.submitted_at)}"
+            +   %br/
+            +   = "Points : #{@submission.points}/#{@submission.problem.full_score}"
+            +   %br/
+            +   = "Comment : #{@submission.grader_comment}"
               %b Source code (first 10kb)
-            - %div{:style => "border: 1px solid black; background: lightgrey"}
+            + //%div.highlight{:style => "border: 1px solid black;"}
-            -   - if @submission.source
+            + =@formatted_code.html_safe
-            -     %pre
-            -       =h truncate @submission.source, :length => 10240

app/views/report/_report_menu.html.haml ¶ +1

               .task-menu
                 Reports
                 %br/
+            +   = link_to '[Hall of Fame]', :action => 'problem_hof'
                 = link_to '[Submission]', :action => 'submission_stat'
                 = link_to '[Login]', :action => 'login_stat'

app/views/report/login_stat.html.haml ¶ -2

               - content_for :header do
                 = javascript_include_tag 'new'
               %script{:type=>"text/javascript"}
                 $(function () {
                 $('#since_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
                 $('#until_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
                 });
               %h1 Login status
               =render partial: 'report_menu'
               =render partial: 'date_range', locals: {param_text: 'Login date range:', title: 'Query login stat in the range'  }
               %table.info
                 %thead
                   %tr.info-head
                     %th login
                     %th full name
                     %th login count
                     %th earliest
                     %th latest
                 %tbody
                   - @logins.each do |l|
                     %tr{class: cycle('info-even','info-odd')}
                       %td= l[:login]
                       %td= l[:full_name]
                       %td= l[:count]
                       %td= l[:min] ? l[:min].in_time_zone.strftime('%Y-%m-%d %H:%M') : ''
                       %td= l[:max] ? l[:max].in_time_zone.strftime('%Y-%m-%d %H:%M') : ''

app/views/report/submission_stat.html.haml ¶ -4

               - content_for :header do
                 = javascript_include_tag 'new'
               %script{:type=>"text/javascript"}
                 $(function () {
                 $('#since_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
                 $('#until_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
                 });
               %h1 Login status
               =render partial: 'report_menu'
               =render partial: 'date_range', locals: {param_text: 'Submission date range:', title: 'Query submission stat in the range'  }
               %table.info
                 %thead
                   %tr.info-head
                     %th login
                     %th full name
                     %th total submissions
                     %th submissions
                 %tbody
                   - @submissions.each do |user_id,data|
                     %tr{class: cycle('info-even','info-odd')}
                       %td= data[:login]
                       %td= data[:full_name]
                       %td= data[:count]
                       %td
                         - data[:sub].each do |prob_id,sub_data|
                           = "#{sub_data[:prob_name]}: ["
                           - st = []
                           - sub_data[:sub_ids].each do |id|
                             - st << link_to(id, controller: 'graders' , action: 'submission', id: id)
                           = raw st.join ', '
                           = ']'

config/application.rb.SAMPLE ¶ +1 -1

                   # Configure sensitive parameters which will be filtered from the log file.
                   config.filter_parameters += [:password]
                   # Enable escaping HTML in JSON.
                   config.active_support.escape_html_entities_in_json = true
                   # Use SQL instead of Active Record's schema dumper when creating the database.
                   # This is necessary if your schema can't be completely dumped by the schema dumper,
                   # like if you have constraints or database-specific column types
                   # config.active_record.schema_format = :sql
                   # Enforce whitelist mode for mass assignment.
                   # This will create an empty whitelist of attributes available for mass-assignment for all models
                   # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
                   # parameters by using an attr_accessible or attr_protected declaration.
                   config.active_record.whitelist_attributes = false
                   # Enable the asset pipeline
                   config.assets.enabled = true
                   # Version of your assets, change this if you want to expire all your assets
                   config.assets.version = '1.0'
-            -     config.assets.precompile += ['announcement_refresh.js','effects.js','site_update.js','graders.css','problems.css']
+            +     config.assets.precompile += ['announcement_refresh.js','effects.js','site_update.js','graders.css','problems.css','new.js']
                 end
               end

config/locales/en.yml ¶ +1

               # Sample localization file for English. Add more files in this directory for other locales.
               # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
               en:
                 cancel: 'Cancel'
                 login_label: 'Login'
                 full_name_label: 'Full name'
                 email_label: 'E-mail'
                 password_label: 'Password'
                 go_ahead_to: "Go ahead to"
                 go_back_to: "Go back to"
                 login_page: "login page"
                 home_page: "home page"
                 menu:
                   main: 'Main'
                   messages: 'Messages'
                   tasks: 'Tasks'
                   submissions: 'Submissions'
                   test: 'Test Interface'
+            +     hall_of_fame: 'Hall of Fame'
                   help: 'Help'
                   settings: 'Settings'
                   log_out: 'Log out'
                 title_bar:
                   current_time: "Current time is"
                   remaining_time: "Time left: "
                   contest_not_started: "The contest has not started."
                 login:
                   message: 'Please login to see the problem list'
                   login_submit: 'Login'
                   participation: 'Want to participate?'
                   please: 'Please'
                   register: 'register'
                   forget_password: 'Forget password?'
                 main:
                   start_soon: "The contest at your site will start soon.  Please wait."
                   specified_in_header: "Specified in header"
                   problem_desc: "desc"
                   submitted_at: "Submitted at"
                   graded_at: "Graded at"

config/locales/th.yml ¶ +1

               # Sample localization file for English. Add more files in this directory for other locales.
               # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
               th:
                 cancel: 'ยกเลิก'
                 login_label: 'ชื่อเข้าใช้ระบบ (login)'
                 full_name_label: 'ชื่อเต็ม'
                 email_label: 'E-mail'
                 password_label: 'รหัสผ่าน'
                 go_ahead_to: "ไปยัง"
                 go_back_to: "กลับไปยัง"
                 login_page: "หน้าเข้าใช้ระบบ"
                 home_page: "หน้าแรก"
                 menu:
                   main: 'หน้าหลัก'
                   messages: 'ข้อความ'
                   tasks: 'โจทย์'
                   submissions: 'โปรแกรมที่ส่ง'
                   test: 'ทดสอบโปรแกรม'
+            +     hall_of_fame: 'หอเกียรติยศ'
                   help: 'ความช่วยเหลือ'
                   settings: 'เปลี่ยนรหัสผ่าน'
                   log_out: 'ออกจากระบบ'
                 title_bar:
                   current_time: "เวลาปัจจุบันคือ"
                   remaining_time: "เหลือเวลาอีก"
                   contest_not_started: "ยังไม่เริ่มแข่งขัน"
                 login:
                   message: 'กรุณา login เพื่อเข้าสู่ระบบ'
                   login_submit: 'เข้าใช้ระบบ'
                   participation: 'ต้องการเข้าร่วม?'
                   please: 'กรุณา'
                   register: 'ลงทะเบียน'
                   forget_password: 'ลืมรหัสผ่าน?'
                 main:
                   start_soon: "การแข่งขันกำลังจะเริ่ม กรุณารอก่อน"
                   specified_in_header: "ระบุที่หัวโปรแกรมแล้ว"
                   problem_desc: "อ่าน"
                   submitted_at: "ส่งเมื่อเวลา"
                   graded_at: "ตรวจเมื่อเวลา"

db/seeds.rb ¶ +41 -16

               CONFIGURATIONS =
                 [
                  {
                    :key => 'system.single_user_mode',
                    :value_type => 'boolean',
                    :default_value => 'false',
                    :description => 'Only admins can log in to the system when running under single user mode.'
                  },
+            +
                  {
                    :key => 'ui.front.title',
                    :value_type => 'string',
                    :default_value => 'Grader'
                  },
+            +
                  {
                    :key => 'ui.front.welcome_message',
                    :value_type => 'string',
                    :default_value => 'Welcome!'
                  },
+            +
                  {
                    :key => 'ui.show_score',
                    :value_type => 'boolean',
                    :default_value => 'true'
                  },
+            +
                  {
                    :key => 'contest.time_limit',
                    :value_type => 'string',
                    :default_value => 'unlimited',
                    :description => 'Time limit in format hh:mm, or "unlimited" for contests with no time limits.  This config is CACHED.  Restart the server before the change can take effect.'
                  },
+            +
                  {
                    :key => 'system.mode',
                    :value_type => 'string',
                    :default_value => 'standard',
                    :description => 'Current modes are "standard", "contest", "indv-contest", and "analysis".'
                  },
+            +
                  {
                    :key => 'contest.name',
                    :value_type => 'string',
                    :default_value => 'Grader',
                    :description => 'This name will be shown on the user header bar.'
                  },
+            +
                  {
                    :key => 'contest.multisites',
                    :value_type => 'boolean',
                    :default_value => 'false',
                    :description => 'If the server is in contest mode and this option is true, on the log in of the admin a menu for site selections is shown.'
                  },
+            +
                  {
-            -      :key => 'system.online_registration',
+            +      :key => 'right.user_hall_of_fame',
                    :value_type => 'boolean',
                    :default_value => 'false',
-            -      :description => 'This option enables online registration.'
+            +      :description => 'If true, any user can access hall of fame page.'
                  },
+            +
+            +    {
+            +      :key => 'right.user_view_submission',
+            +      :value_type => 'boolean',
+            +      :default_value => 'false',
+            +      :description => 'If true, any user can view submissions of every one.'
+            +    },
+            +
                  # If Configuration['system.online_registration'] is true, the
                  # system allows online registration, and will use these
                  # information for sending confirmation emails.
                  {
                    :key => 'system.online_registration.smtp',
                    :value_type => 'string',
                    :default_value => 'smtp.somehost.com'
                  },
+            +
                  {
                    :key => 'system.online_registration.from',
                    :value_type => 'string',
                    :default_value => 'your.email@address'
                  },
+            +
                  {
                    :key => 'system.admin_email',
                    :value_type => 'string',
                    :default_value => 'admin@admin.email'
                  },
+            +
                  {
                    :key => 'system.user_setting_enabled',
                    :value_type => 'boolean',
                    :default_value => 'true',
                    :description => 'If this option is true, users can change their settings'
                  },
+            +
+            +    {
+            +      :key => 'system.user_setting_enabled',
+            +      :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
                  # before the contest ends.
                  {
                    :key => 'contest.test_request.early_timeout',
                    :value_type => 'boolean',
                    :default_value => 'false'
                  },
                  {
                    :key => 'system.multicontests',
                    :value_type => 'boolean',
                    :default_value => 'false'
                  },
                  {
                    :key => 'contest.confirm_indv_contest_start',
                    :value_type => 'boolean',
                    :default_value => 'false'
                  },
                  {
                    :key => 'contest.default_contest_name',
                    :value_type => 'string',
                    :default_value => 'none',
                    :description => "New user will be assigned to this contest automatically, if it exists.  Set to 'none' if there is no default contest."
                  }
+            +
                 ]
               def create_configuration_key(key,
                                            value_type,
                                            default_value,
                                            description='')
                 conf = (GraderConfiguration.find_by_key(key) ||
                         GraderConfiguration.new(:key => key,
                                           :value_type => value_type,
                                           :value => default_value))
                 conf.description = description
                 conf.save
               end
               def seed_config
                 CONFIGURATIONS.each do |conf|
                   if conf.has_key? :description
                     desc = conf[:description]
                   else
                     desc = ''
                   end
                   create_configuration_key(conf[:key],
                                            conf[:value_type],
                                 :full_name => 'Administrator',
                                 :alias => 'root')
                 root.password = 'ioionrails';
                 class << root
                   public :encrypt_new_password
                   def valid?(context=nil)
                     true
                   end
                 end
                 root.encrypt_new_password
                 root.roles << Role.find_by_name('admin')
                 root.activated = true
                 root.save
               end
               def seed_users_and_roles
                 seed_roles
                 seed_root
               end
+            + def seed_more_languages
+            +   Language.delete_all
+            +   Language.create( name: 'c', pretty_name: 'C', ext: 'c', common_ext: 'c' )
+            +   Language.create( name: 'cpp', pretty_name: 'C++', ext: 'cpp', common_ext: 'cpp,cc' )
+            +   Language.create( name: 'pas', pretty_name: 'Pascal', ext: 'pas', common_ext: 'pas' )
+            +   Language.create( name: 'ruby', pretty_name: 'Ruby', ext: 'rb', common_ext: 'rb' )
+            +   Language.create( name: 'python', pretty_name: 'Python', ext: 'py', common_ext: 'py' )
+            +   Language.create( name: 'java', pretty_name: 'Java', ext: 'java', common_ext: 'java' )
+            + end
+            +
               seed_config
               seed_users_and_roles
+            + seed_more_languages

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

r429:82e5ff05bd49 - Fri, 12 Sep 2014 11:00:08 - 18 files changed: 310 inserted, 30 deleted

Sign in to your account

Commit r429:82e5ff05bd49 public

Author

r429:82e5ff05bd49 - Fri, 12 Sep 2014 11:00:08 - 18 files changed: 310 inserted, 30 deleted

Commit `r429:82e5ff05bd49` public