cafe-grader-web Commit - r320:c31111f6e4b5

cafe-grader-web

Commit `r320:c31111f6e4b5` public

parent | child

Description:

renamed model Configuration to GraderConfiguration, renamed rhtml views to erb, fixed other small errors

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r320:c31111f6e4b5 - Mon, 01 Oct 2012 06:48:46 - 61 files changed: 710 inserted, 654 deleted

app/models/grader_configuration.rb created 644 ¶ +176

@@ -0,0 +1,176
	1	+ require 'yaml'
	2	+
	3	+ #
	4	+ # This class also contains various login of the system.
	5	+ #
	6	+ class GraderConfiguration < ActiveRecord::Base
	7	+
	8	+ SYSTEM_MODE_CONF_KEY = 'system.mode'
	9	+ TEST_REQUEST_EARLY_TIMEOUT_KEY = 'contest.test_request.early_timeout'
	10	+ MULTICONTESTS_KEY = 'system.multicontests'
	11	+ CONTEST_TIME_LIMIT_KEY = 'contest.time_limit'
	12	+
	13	+ cattr_accessor :config_cache
	14	+ cattr_accessor :task_grading_info_cache
	15	+ cattr_accessor :contest_time_str
	16	+ cattr_accessor :contest_time
	17	+
	18	+ GraderConfiguration.config_cache = nil
	19	+ GraderConfiguration.task_grading_info_cache = nil
	20	+
	21	+ def self.config_cached?
	22	+ (defined? CONFIGURATION_CACHE_ENABLED) and (CONFIGURATION_CACHE_ENABLED)
	23	+ end
	24	+
	25	+ def self.get(key)
	26	+ if GraderConfiguration.config_cached?
	27	+ if GraderConfiguration.config_cache == nil
	28	+ self.read_config
	29	+ end
	30	+ return GraderConfiguration.config_cache[key]
	31	+ else
	32	+ return GraderConfiguration.read_one_key(key)
	33	+ end
	34	+ end
	35	+
	36	+ def self.[](key)
	37	+ self.get(key)
	38	+ end
	39	+
	40	+ def self.reload
	41	+ self.read_config
	42	+ end
	43	+
	44	+ def self.clear
	45	+ GraderConfiguration.config_cache = nil
	46	+ end
	47	+
	48	+ #
	49	+ # View decision
	50	+ #
	51	+ def self.show_submitbox_to?(user)
	52	+ mode = get(SYSTEM_MODE_CONF_KEY)
	53	+ return false if mode=='analysis'
	54	+ if (mode=='contest')
	55	+ return false if (user.site!=nil) and
	56	+ ((user.site.started!=true) or (user.site.finished?))
	57	+ end
	58	+ return true
	59	+ end
	60	+
	61	+ def self.show_tasks_to?(user)
	62	+ if time_limit_mode?
	63	+ return false if not user.contest_started?
	64	+ end
	65	+ return true
	66	+ end
	67	+
	68	+ def self.show_grading_result
	69	+ return (get(SYSTEM_MODE_CONF_KEY)=='analysis')
	70	+ end
	71	+
	72	+ def self.allow_test_request(user)
	73	+ mode = get(SYSTEM_MODE_CONF_KEY)
	74	+ early_timeout = get(TEST_REQUEST_EARLY_TIMEOUT_KEY)
	75	+ if (mode=='contest')
	76	+ return false if ((user.site!=nil) and
	77	+ ((user.site.started!=true) or
	78	+ (early_timeout and (user.site.time_left < 30.minutes))))
	79	+ end
	80	+ return false if mode=='analysis'
	81	+ return true
	82	+ end
	83	+
	84	+ def self.task_grading_info
	85	+ if GraderConfiguration.task_grading_info_cache==nil
	86	+ read_grading_info
	87	+ end
	88	+ return GraderConfiguration.task_grading_info_cache
	89	+ end
	90	+
	91	+ def self.standard_mode?
	92	+ return get(SYSTEM_MODE_CONF_KEY) == 'standard'
	93	+ end
	94	+
	95	+ def self.contest_mode?
	96	+ return get(SYSTEM_MODE_CONF_KEY) == 'contest'
	97	+ end
	98	+
	99	+ def self.indv_contest_mode?
	100	+ return get(SYSTEM_MODE_CONF_KEY) == 'indv-contest'
	101	+ end
	102	+
	103	+ def self.multicontests?
	104	+ return get(MULTICONTESTS_KEY) == true
	105	+ end
	106	+
	107	+ def self.time_limit_mode?
	108	+ mode = get(SYSTEM_MODE_CONF_KEY)
	109	+ return ((mode == 'contest') or (mode == 'indv-contest'))
	110	+ end
	111	+
	112	+ def self.analysis_mode?
	113	+ return get(SYSTEM_MODE_CONF_KEY) == 'analysis'
	114	+ end
	115	+
	116	+ def self.contest_time_limit
	117	+ contest_time_str = GraderConfiguration[CONTEST_TIME_LIMIT_KEY]
	118	+
	119	+ if not defined? GraderConfiguration.contest_time_str
	120	+ GraderConfiguration.contest_time_str = nil
	121	+ end
	122	+
	123	+ if GraderConfiguration.contest_time_str != contest_time_str
	124	+ GraderConfiguration.contest_time_str = contest_time_str
	125	+ if tmatch = /(\d+):(\d+)/.match(contest_time_str)
	126	+ h = tmatch[1].to_i
	127	+ m = tmatch[2].to_i
	128	+
	129	+ GraderConfiguration.contest_time = h.hour + m.minute
	130	+ else
	131	+ GraderConfiguration.contest_time = nil
	132	+ end
	133	+ end
	134	+ return GraderConfiguration.contest_time
	135	+ end
	136	+
	137	+ protected
	138	+
	139	+ def self.convert_type(val,type)
	140	+ case type
	141	+ when 'string'
	142	+ return val
	143	+
	144	+ when 'integer'
	145	+ return val.to_i
	146	+
	147	+ when 'boolean'
	148	+ return (val=='true')
	149	+ end
	150	+ end
	151	+
	152	+ def self.read_config
	153	+ GraderConfiguration.config_cache = {}
	154	+ GraderConfiguration.find(:all).each do \|conf\|
	155	+ key = conf.key
	156	+ val = conf.value
	157	+ GraderConfiguration.config_cache[key] = GraderConfiguration.convert_type(val,conf.value_type)
	158	+ end
	159	+ end
	160	+
	161	+ def self.read_one_key(key)
	162	+ conf = GraderConfiguration.find_by_key(key)
	163	+ if conf
	164	+ return GraderConfiguration.convert_type(conf.value,conf.value_type)
	165	+ else
	166	+ return nil
	167	+ end
	168	+ end
	169	+
	170	+ def self.read_grading_info
	171	+ f = File.open(TASK_GRADING_INFO_FILENAME)
	172	+ GraderConfiguration.task_grading_info_cache = YAML.load(f)
	173	+ f.close
	174	+ end
	175	+
	176	+ end

app/views/problems/_form.html.erb created 644 ¶ +52

@@ -0,0 +1,52
	1	+ <%= error_messages_for 'problem' %>
	2	+
	3	+ <!--[form:problem]-->
	4	+ <p><label for="problem_name">Name</label><br/>
	5	+ <%= text_field 'problem', 'name' %></p>
	6	+
	7	+ <p><label for="problem_full_name">Full name</label><br/>
	8	+ <%= text_field 'problem', 'full_name' %></p>
	9	+
	10	+ <p><label for="problem_full_score">Full score</label><br/>
	11	+ <%= text_field 'problem', 'full_score' %></p>
	12	+
	13	+ <p><label for="problem_date_added">Date added</label><br/>
	14	+ <%= date_select 'problem', 'date_added' %></p>
	15	+
	16	+ <%
	17	+ # TODO: these should be put in model Problem, but I can't think of
	18	+ # nice default values for them. These values look fine only
	19	+ # in this case (of lazily adding new problems).
	20	+ @problem.available = true if @problem!=nil and @problem.available==nil
	21	+ @problem.test_allowed = true if @problem!=nil and @problem.test_allowed==nil
	22	+ @problem.output_only = false if @problem!=nil and @problem.output_only==nil
	23	+ %>
	24	+
	25	+ <p>
	26	+ <label for="problem_available">Available?</label>
	27	+ <%= check_box :problem, :available %>
	28	+
	29	+ <label for="problem_test_allowed">Test allowed?</label>
	30	+ <%= check_box :problem, :test_allowed %>
	31	+
	32	+ <label for="problem_output_only">Output only?</label>
	33	+ <%= check_box :problem, :output_only %>
	34	+ </p>
	35	+
	36	+ <%= error_messages_for 'description' %>
	37	+
	38	+ <p><label for="description_body">Description</label><br/>
	39	+ <%= text_area :description, :body, :rows => 10, :cols => 80 %></p>
	40	+
	41	+ <p><label for="description_markdowned">Markdowned?</label>
	42	+ <%= select "description",
	43	+ "markdowned",
	44	+ [['True',true],['False',false]],
	45	+ {:selected => (@description) ? @description.markdowned : false }
	46	+ %></p>
	47	+
	48	+ <p><label for="problem_url">URL</label><br/>
	49	+ <%= text_field 'problem', 'url' %></p>
	50	+
	51	+
	52	+ <!--[eoform:problem]-->

app/views/problems/edit.html.erb created 644 ¶ +9

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

app/views/problems/list.html.erb created 644 ¶ +67

@@ -0,0 +1,67
	1	+ <% content_for :head do %>
	2	+ <%= stylesheet_link_tag 'problems' %>
	3	+ <%= javascript_include_tag :defaults %>
	4	+ <% end %>
	5	+
	6	+ <h1>Listing problems</h1>
	7	+
	8	+ <p>
	9	+ <%= link_to '[New problem]', :action => 'new' %>
	10	+ <%= link_to '[Manage problems]', :action => 'manage' %>
	11	+ <%= link_to '[Import problems]', :action => 'import' %>
	12	+ <%= link_to '[Turn off all problems]', :action => 'turn_all_off' %>
	13	+ <%= link_to '[Turn on all problems]', :action => 'turn_all_on' %>
	14	+ </p>
	15	+
	16	+ <div class="submitbox">
	17	+ <%= form_tag :action => 'quick_create' do %>
	18	+ <b>Quick New:</b>
	19	+ <label for="problem_name">Name</label>
	20	+ <%= text_field 'problem', 'name' %> \|
	21	+ <label for="problem_full_name">Full name</label>
	22	+ <%= text_field 'problem', 'full_name' %>
	23	+ <%= submit_tag "Create" %>
	24	+ <% end %>
	25	+ </div>
	26	+
	27	+ <table>
	28	+ <tr>
	29	+ <th>Name</th>
	30	+ <th>Full name</th>
	31	+ <th>Full score</th>
	32	+ <th>Date added</th>
	33	+ <th>Avail?</th>
	34	+ <th>Test?</th>
	35	+ <% if GraderConfiguration.multicontests? %>
	36	+ <th>Contests</th>
	37	+ <% end %>
	38	+ </tr>
	39	+
	40	+ <% for problem in @problems %>
	41	+ <tr id="prob-<%= problem.id %>" name="prob-<%= problem.id %>" class="<%= (problem.available) ? "available" : "not-available" %>">
	42	+ <% @problem=problem %>
	43	+ <td><%= in_place_editor_field :problem, :name, {}, :rows=>1 %></td>
	44	+ <td><%= in_place_editor_field :problem, :full_name, {}, :rows=>1 %></td>
	45	+ <td><%= in_place_editor_field :problem, :full_score, {}, :rows=>1 %></td>
	46	+ <td><%= problem.date_added %></td>
	47	+ <td id="prob-<%= problem.id %>-avail"><%= problem.available %></td>
	48	+ <td><%= problem.test_allowed %></td>
	49	+
	50	+ <% if GraderConfiguration.multicontests? %>
	51	+ <td>
	52	+ <%= problem.contests.collect { \|c\| c.name }.join(', ') %>
	53	+ </td>
	54	+ <% end %>
	55	+
	56	+ <td><%= link_to_remote '[Toggle]', :url => {:action => 'toggle', :id => problem.id } %></td>
	57	+ <td><%= link_to '[Stat]', :action => 'stat', :id => problem.id %></td>
	58	+ <td><%= link_to '[Show]', :action => 'show', :id => problem %></td>
	59	+ <td><%= link_to '[Edit]', :action => 'edit', :id => problem %></td>
	60	+ <td><%= link_to '[Destroy]', { :action => 'destroy', :id => problem }, :confirm => 'Are you sure?', :method => :post %></td>
	61	+ </tr>
	62	+ <% end %>
	63	+ </table>
	64	+
	65	+ <br />
	66	+
	67	+ <%= link_to '[New problem]', :action => 'new' %>

app/views/problems/new.html.erb created 644 ¶ +8

@@ -0,0 +1,8
	1	+ <h1>New problem</h1>
	2	+
	3	+ <%= form_tag :action => 'create' do %>
	4	+ <%= render :partial => 'form' %>
	5	+ <%= submit_tag "Create" %>
	6	+ <% end %>
	7	+
	8	+ <%= link_to 'Back', :action => 'list' %>

app/views/problems/stat.html.erb created 644 ¶ +28

@@ -0,0 +1,28
	1	+ <h1>Problem stat: <%= @problem.name %></h1>
	2	+
	3	+ <i>This is just a hack. Really not efficient.</i><br/><br/>
	4	+
	5	+ <% if @submissions!=nil %>
	6	+ <table class="info">
	7	+ <tr class="info-head">
	8	+ <th>login</th>
	9	+ <th>name</th>
	10	+ <th>submitted_at</th>
	11	+ <th>points</th>
	12	+ <th>comment</th>
	13	+ </tr>
	14	+ <% count = 0 %>
	15	+ <% @submissions.each do \|sub\| %>
	16	+ <tr class="<%= (count % 2 ==0) ? "info-even" : "info-odd" %>">
	17	+ <td><%= sub.user.login %></td>
	18	+ <td><%= sub.user.full_name if sub.user %></td>
	19	+ <td><%= sub.submitted_at.to_s %></td>
	20	+ <td><%= sub.points %></td>
	21	+ <td><div style="font-family: monospace"><%= sub.grader_comment %></div></td>
	22	+ </tr>
	23	+ <% count += 1 %>
	24	+ <% end %>
	25	+ </table>
	26	+ <% else %>
	27	+ No submission
	28	+ <% end %>

app/views/user_admin/_form.html.erb created 644 ¶ +22

@@ -0,0 +1,22
	1	+ <%= error_messages_for 'user' %>
	2	+
	3	+ <!--[form:user]-->
	4	+ <p><label for="user_name">Login</label><br/>
	5	+ <%= text_field 'user', 'login' %></p>
	6	+
	7	+ <p><label for="user_name">Full name</label><br/>
	8	+ <%= text_field 'user', 'full_name' %></p>
	9	+
	10	+ <p><label for="password">Password</label><br/>
	11	+ <%= password_field 'user', 'password' %></p>
	12	+
	13	+ <p><label for="password_confirmation">Password (confirm)</label><br/>
	14	+ <%= password_field 'user', 'password_confirmation' %></p>
	15	+
	16	+ <p><label for="user_email">E-mail</label><br/>
	17	+ <%= text_field 'user', 'email' %></p>
	18	+
	19	+ <p><label for="user_alias">Alias</label><br/>
	20	+ <%= text_field 'user', 'alias' %></p>
	21	+ <!--[eoform:user]-->
	22	+

app/views/user_admin/edit.html.erb created 644 ¶ +9

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

app/views/user_admin/list.html.erb created 644 ¶ +86

@@ -0,0 +1,86
	1	+ <h1>Listing users</h1>
	2	+
	3	+ <div class="submitbox">
	4	+ <b>Quick add</b>
	5	+ <%= form_tag :action => 'create' do %>
	6	+ <table border="0">
	7	+ <tr>
	8	+ <td><label for="user_login">Login</label></td>
	9	+ <td><label for="user_full_name">Full name</label></td>
	10	+ <td><label for="user_password">Password</label></td>
	11	+ <td><label for="user_password_confirmation">Confirm</label></td>
	12	+ <td><label for="user_email">Email</label></td>
	13	+ </tr>
	14	+ <tr>
	15	+ <td><%= text_field 'user', 'login', :size => 10 %></td>
	16	+ <td><%= text_field 'user', 'full_name', :size => 30 %></td>
	17	+ <td><%= password_field 'user', 'password', :size => 10 %></td>
	18	+ <td><%= password_field 'user', 'password_confirmation', :size => 10 %></td>
	19	+ <td><%= text_field 'user', 'email', :size => 15 %></td>
	20	+ <td><%= submit_tag "Create" %></td>
	21	+ </tr>
	22	+ </table>
	23	+ <% end %>
	24	+ <br/>
	25	+ <b>Import from site management</b>
	26	+ <%= form_tag({:action => 'import'}, :multipart => true) do %>
	27	+ File: <%= file_field_tag 'file' %> <%= submit_tag 'Import' %>
	28	+ <% end %>
	29	+ <br/>
	30	+ <b>What else: </b>
	31	+ <%= link_to '[New user]', :action => 'new' %>
	32	+ <%= link_to '[New list of users]', :action => 'new_list' %>
	33	+ <%= link_to '[View administrators]', :action => 'admin' %>
	34	+ <%= link_to '[Random passwords]', :action => 'random_all_passwords' %>
	35	+ <%= link_to '[View active users]', :action => 'active' %>
	36	+ <%= link_to '[Mass mailing]', :action => 'mass_mailing' %>
	37	+ <% if GraderConfiguration.multicontests? %>
	38	+ <br/><b>Multi-contest:</b>
	39	+ <%= link_to '[Manage bulk users in contests]', :action => 'contest_management' %>
	40	+ View users in:
	41	+ <% @contests.each do \|contest\| %>
	42	+ <%= link_to "[#{contest.name}]", :action => 'contests', :id => contest.id %>
	43	+ <% end %>
	44	+ <%= link_to "[no contest]", :action => 'contests', :id => 'none' %>
	45	+ <% end %>
	46	+ </div>
	47	+
	48	+ Total <%= @user_count %> users \|
	49	+ <% if !@paginated %>
	50	+ Display all users.
	51	+ <%= link_to '[show in pages]', :action => 'list', :page => '1' %>
	52	+ <% else %>
	53	+ Display in pages.
	54	+ <%= link_to '[display all]', :action => 'list', :page => 'all' %> \|
	55	+ <%= will_paginate @users, :container => false %>
	56	+ <% end %>
	57	+ <table class="info">
	58	+ <tr class="info-head">
	59	+ <% for column in User.content_columns %>
	60	+ <% if !@hidden_columns.index(column.name) %>
	61	+ <th><%= column.human_name %></th>
	62	+ <% end %>
	63	+ <% end %>
	64	+ <th></th>
	65	+ <th></th>
	66	+ <th></th>
	67	+ </tr>
	68	+
	69	+ <% for user in @users %>
	70	+ <tr class="info-<%= cycle("odd","even") %>">
	71	+ <% for column in User.content_columns %>
	72	+ <% if !@hidden_columns.index(column.name) %>
	73	+ <td><%=h user.send(column.name) %></td>
	74	+ <% end %>
	75	+ <% end %>
	76	+ <td><%= link_to 'Show', :action => 'show', :id => user %></td>
	77	+ <td><%= link_to 'Edit', :action => 'edit', :id => user %></td>
	78	+ <td><%= link_to 'Destroy', { :action => 'destroy', :id => user }, :confirm => 'Are you sure?', :method => :post %></td>
	79	+ </tr>
	80	+ <% end %>
	81	+ </table>
	82	+
	83	+ <br />
	84	+
	85	+ <%= link_to '[New user]', :action => 'new' %>
	86	+ <%= link_to '[New list of users]', :action => 'new_list' %>

app/views/user_admin/new.html.erb created 644 ¶ +8

@@ -0,0 +1,8
	1	+ <h1>New user</h1>
	2	+
	3	+ <%= form_tag :action => 'create' do %>
	4	+ <%= render :partial => 'form' %>
	5	+ <%= submit_tag "Create" %>
	6	+ <% end %>
	7	+
	8	+ <%= link_to 'Back', :action => 'list' %>

app/views/user_admin/new_list.html.erb created 644 ¶ +8

@@ -0,0 +1,8
	1	+ <h1>Adding list of users</h1>
	2	+
	3	+ <%= form_tag :action => 'create_from_list' do %>
	4	+ <%= submit_tag 'create users' %><br/>
	5	+ List of user information in this format: <tt>user_id,name(,passwd(,alias))</tt><br/>
	6	+ Note that <tt>passwd</tt> and <tt>alias</tt> is optional.<br/>
	7	+ <%= text_area_tag 'user_list', nil, :rows => 50, :cols => 80 %>
	8	+ <% end %>

app/views/user_admin/show.html.erb created 644 ¶ +10

@@ -0,0 +1,10
	1	+ <h1>User information</h1>
	2	+
	3	+ <% for column in User.content_columns %>
	4	+ <p>
	5	+ <b><%= column.human_name %>:</b> <%=h @user.send(column.name) %>
	6	+ </p>
	7	+ <% end %>
	8	+
	9	+ <%= link_to 'Edit', :action => 'edit', :id => @user %> \|
	10	+ <%= link_to 'Back', :action => 'list' %>

app/views/user_admin/user_stat.html.erb created 644 ¶ +43

@@ -0,0 +1,43
	1	+ <h1>User grading results</h1>
	2	+
	3	+ <table class="info">
	4	+ <tr class="info-head">
	5	+ <th>User</th>
	6	+ <th>Name</th>
	7	+ <th>Activated?</th>
	8	+ <th>Logged in</th>
	9	+ <th>Contest(s)</th>
	10	+ <% @problems.each do \|p\| %>
	11	+ <th><%= p.name %></th>
	12	+ <% end %>
	13	+ <th>Total</th>
	14	+ <th>Passed</th>
	15	+ </tr>
	16	+ <% counter = 0 %>
	17	+ <% @scorearray.each do \|sc\| %>
	18	+ <tr class="<%= (counter %2 ==0) ? "info-even" : "info-odd" %>">
	19	+ <% total = 0 %>
	20	+ <% num_passed = 0 %>
	21	+ <% sc.each_index do \|i\| %>
	22	+ <% if i==0 %>
	23	+ <td><%= sc[i].login %></td>
	24	+ <td><%= sc[i].full_name %></td>
	25	+ <td><%= sc[i].activated %></td>
	26	+ <td>
	27	+ <%= sc[i].try(:contest_stat).try(:started_at)!=nil ? 'yes' : 'no' %>
	28	+ </td>
	29	+ <td>
	30	+ <%= sc[i].contests.collect {\|c\| c.name}.join(', ') %>
	31	+ </td>
	32	+ <% else %>
	33	+ <td><%= sc[i][0] %></td>
	34	+ <% total += sc[i][0] %>
	35	+ <% num_passed += 1 if sc[i][1] %>
	36	+ <% end %>
	37	+ <% end %>
	38	+ <td><%= total %></td>
	39	+ <td><%= num_passed %></td>
	40	+ </tr>
	41	+ <% counter += 1 %>
	42	+ <% end %>
	43	+ </table>

db/migrate/20121001033508_rename_configurations_to_grader_configurations.rb created 644 ¶ +5

@@ -0,0 +1,5
	1	+ class RenameConfigurationsToGraderConfigurations < ActiveRecord::Migration
	2	+ def change
	3	+ rename_table 'configurations', 'grader_configurations'
	4	+ end
	5	+ end

Gemfile ¶ +1

               gem "haml"
               gem "tmail"
               gem "rdiscount", :require => "rdiscount"
               gem "test-unit"
               gem 'will_paginate', '~> 3.0.0'
+            + gem 'dynamic_form'
               group :test, :development do
                 gem "rspec-rails", "~> 2.0"
               end

Gemfile.lock ¶ +2

                     railties (~> 3.2.0)
                   coffee-script (2.2.0)
                     coffee-script-source
                     execjs
                   coffee-script-source (1.3.3)
                   diff-lcs (1.1.3)
+            +     dynamic_form (1.1.4)
                   erubis (2.7.0)
                   execjs (1.4.0)
                     multi_json (~> 1.0)
                   haml (3.1.7)
                   hike (1.2.1)
                   i18n (0.6.1)
               PLATFORMS
                 ruby
               DEPENDENCIES
                 coffee-rails (~> 3.2.1)
+            +   dynamic_form
                 haml
                 mysql2
                 prototype-rails
                 rails (= 3.2.8)
                 rdiscount
                 rspec-rails (~> 2.0)

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

                   unless session[:user_id]
                     redirect_to :controller => 'main', :action => 'login'
                     return false
                   end
                   # check if run in single user mode
-            -     if Configuration[SINGLE_USER_MODE_CONF_KEY]
+            +     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 Configuration.multicontests?
+            +     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'

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

                 in_place_edit_for :configuration, :key
                 in_place_edit_for :configuration, :type
                 in_place_edit_for :configuration, :value
                 def index
-            -     @configurations = Configuration.find(:all,
+            +     @configurations = GraderConfiguration.find(:all,
                                                        :order => '`key`')
                 end
                 def reload
-            -     Configuration.reload
+            +     GraderConfiguration.reload
                   redirect_to :action => 'index'
                 end
               end

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

                 def index
                   @num_contests = Contest.count()
                 end
                 def user_stat
-            -     if not Configuration.indv_contest_mode?
+            +     if not GraderConfiguration.indv_contest_mode?
                     redirect_to :action => 'index' and return
                   end
                   @users = User.find(:all)
                   @start_times = {}
                   UserContestStat.find(:all).each do |stat|
                     user.contest_stat.destroy
                   end
                   redirect_to :action => 'user_stat'
                 end
                 def clear_all_stat
-            -     if not Configuration.indv_contest_mode?
+            +     if not GraderConfiguration.indv_contest_mode?
                     redirect_to :action => 'index' and return
                   end
                   UserContestStat.delete_all()
                   flash[:notice] = 'All start time statistic cleared.'
                   redirect_to :action => 'index'
                 end
                 def change_contest_mode
                   if ['standard', 'contest', 'indv-contest'].include? params[:id]
-            -       config = Configuration.find_by_key('system.mode')
+            +       config = GraderConfiguration.find_by_key('system.mode')
                     config.value = params[:id]
                     config.save
                   else
                     flash[:notice] = 'Wrong contest mode value'
                   end
                   redirect_to :action => 'index'

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

                 def login
                   if user = User.authenticate(params[:login], params[:password])
                     session[:user_id] = user.id
                     session[:admin] = user.admin?
                     # clear forced logout flag for multicontests contest change
-            -       if Configuration.multicontests?
+            +       if GraderConfiguration.multicontests?
                       contest_stat = user.contest_stat
                       if contest_stat.respond_to? :forced_logout
                         if contest_stat.forced_logout
                           contest_stat.forced_logout = false
                           contest_stat.save
                         end

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

                   # EXPERIMENT:
                   # Hide login if in single user mode and the url does not
                   # explicitly specify /login
                   #
                   # logger.info "PATH: #{request.path}"
-            -     # if Configuration['system.single_user_mode'] and
+            +     # if GraderConfiguration['system.single_user_mode'] and
                   #     request.path!='/main/login'
                   #   @hidelogin = true
                   # end
                   @announcements = Announcement.find_for_frontpage
                   render :action => 'login', :layout => 'empty'
                   if (params['file']) and (params['file']!='')
                     @submission.source = params['file'].read
                     @submission.source_filename = params['file'].original_filename
                   end
                   @submission.submitted_at = Time.new.gmtime
-            -     if Configuration.time_limit_mode? and user.contest_finished?
+            +     if GraderConfiguration.time_limit_mode? and user.contest_finished?
                     @submission.errors.add_to_base "The contest is over."
                     prepare_list_information
                     render :action => 'list' and return
                   end
                   if @submission.valid?
                     end
                     @submissions = Submission.find_all_by_user_problem(@user.id, @problem.id)
                   end
                 end
                 def result
-            -     if !Configuration.show_grading_result
+            +     if !GraderConfiguration.show_grading_result
                     redirect_to :action => 'list' and return
                   end
                   @user = User.find(session[:user_id])
                   @submission = Submission.find(params[:id])
                   if @submission.user!=@user
                     flash[:notice] = 'You are not allowed to view result of other users.'
                     redirect_to :action => 'list' and return
                   end
                   prepare_grading_result(@submission)
                 end
                 def load_output
-            -     if !Configuration.show_grading_result or params[:num]==nil
+            +     if !GraderConfiguration.show_grading_result or params[:num]==nil
                     redirect_to :action => 'list' and return
                   end
                   @user = User.find(session[:user_id])
                   @submission = Submission.find(params[:id])
                   if @submission.user!=@user
                     flash[:notice] = 'You are not allowed to view result of other users.'
                   end
                 end
                 protected
                 def prepare_announcements(recent=nil)
-            -     if Configuration.show_tasks_to?(@user)
+            +     if GraderConfiguration.show_tasks_to?(@user)
                     @announcements = Announcement.find_published(true)
                   else
                     @announcements = Announcement.find_published
                   end
                   if recent!=nil
                     recent_id = recent.to_i
                     @announcements = @announcements.find_all { |a| a.id > recent_id }
                   end
                 end
                 def prepare_list_information
                   @user = User.find(session[:user_id])
-            -     if not Configuration.multicontests?
+            +     if not GraderConfiguration.multicontests?
                     @problems = @user.available_problems
                   else
                     @contest_problems = @user.available_problems_group_by_contests
                     @problems = @user.available_problems
                   end
                   @prob_submissions = {}
                   end
                   prepare_announcements
                 end
                 def check_viewability
                   @user = User.find(session[:user_id])
-            -     if (!Configuration.show_tasks_to?(@user)) and
+            +     if (!GraderConfiguration.show_tasks_to?(@user)) and
                       ((action_name=='submission') or (action_name=='submit'))
                     redirect_to :action => 'list' and return
                   end
                 end
                 def prepare_grading_result(submission)
-            -     if Configuration.task_grading_info.has_key? submission.problem.name
+            +     if GraderConfiguration.task_grading_info.has_key? submission.problem.name
-            -       grading_info = Configuration.task_grading_info[submission.problem.name]
+            +       grading_info = GraderConfiguration.task_grading_info[submission.problem.name]
                   else
                     # guess task info from problem.full_score
                     cases = submission.problem.full_score / 10
                     grading_info = {
                       'testruns' => cases,
                       'testcases' => cases
                     :memory_usage => memory_used
                   }
                 end
                 def confirm_and_update_start_time
                   user = User.find(session[:user_id])
-            -     if (Configuration.indv_contest_mode? and
+            +     if (GraderConfiguration.indv_contest_mode? and
-            -         Configuration['contest.confirm_indv_contest_start'] and
+            +         GraderConfiguration['contest.confirm_indv_contest_start'] and
                       !user.contest_started?)
                     redirect_to :action => 'confirm_contest_start' and return
                   end
-            -     if not Configuration.analysis_mode?
+            +     if not GraderConfiguration.analysis_mode?
                     user.update_start_time
                   end
                 end
                 def reject_announcement_refresh_when_logged_out
                   if not session[:user_id]
                     render :text => 'Access forbidden', :status => 403
                   end
-            -     if Configuration.multicontests?
+            +     if GraderConfiguration.multicontests?
                     user = User.find(session[:user_id])
                     if user.contest_stat.forced_logout
                       render :text => 'Access forbidden', :status => 403
                     end
                   end
                 end

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

                   @countries.each do |country|
                     country.sites.each do |site|
                       @site_select << ["#{site.name}, #{country.name}", site.id]
                     end
                   end
-            -     @default_site = Site.first if !Configuration['contest.multisites']
+            +     @default_site = Site.first if !GraderConfiguration['contest.multisites']
                   render :action => 'login', :layout => 'empty'
                 end
                 def index
                   if @site.started

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

                     send_file filename, :stream => false, :filename => base_filename, :type => content_type
                   end
                 end
                 def check_viewability
                   @user = User.find(session[:user_id])
-            -     if @user==nil or !Configuration.show_tasks_to?(@user)
+            +     if @user==nil or !GraderConfiguration.show_tasks_to?(@user)
                     redirect_to :controller => 'main', :action => 'list'
                     return false
                   end
                 end
               end

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

                   if @submitted_test_request.errors.length != 0
                     prepare_index_information
                     render :action => 'index' and return
                   end
-            -     if Configuration.time_limit_mode?
+            +     if GraderConfiguration.time_limit_mode?
                     if @user.contest_finished?
                       @submitted_test_request.errors.add_to_base('Contest is over.')
                       prepare_index_information
                       render :action => 'index' and return
                     end
-            -       if !Configuration.allow_test_request(@user)
+            +       if !GraderConfiguration.allow_test_request(@user)
                       prepare_index_information
                       flash[:notice] = 'Test request is not allowed during the last 30 minutes'
                       redirect_to :action => 'index' and return
                     end
                   end
                     end
                   end
                 end
                 def check_viewability
                   user = User.find(session[:user_id])
-            -     if !Configuration.show_tasks_to?(user)
+            +     if !GraderConfiguration.show_tasks_to?(user)
                     redirect_to :controller => 'main', :action => 'list'
                   end
-            -     if (!Configuration.show_submitbox_to?(user)) and (action_name=='submit')
+            +     if (!GraderConfiguration.show_submitbox_to?(user)) and (action_name=='submit')
                     redirect_to :controller => 'test', :action => 'index'
                   end
                 end
               end

app/controllers/user_admin_controller.rb ¶ +7 -7

               class UserAdminController < ApplicationController
-            -   include MailHelperMethods
+            +   #include MailHelperMethods
                 before_filter :admin_authorization
-            -   def index
-            -     list
-            -     render :action => 'list'
-            -   end
                 # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
                 verify :method => :post, :only => [ :destroy,
                                                     :create, :create_from_list,
                                                     :update,
                                                     :manage_contest,
                                                     :bulk_mail
                                                   ],
                        :redirect_to => { :action => :list }
+            +   def index
+            +     list
+            +     render :action => 'list'
+            +   end
+            +
                 def list
                   @user_count = User.count
                   if params[:page] == 'all'
                     @users = User.all
                     @paginated = false
                   else
                       contest_stat.save
                     end
                   end
                 end
                 def send_contest_update_notification_email(user, contest)
-            -     contest_title_name = Configuration['contest.name']
+            +     contest_title_name = GraderConfiguration['contest.name']
                   contest_name = contest.name
                   subject = t('contest.notification.email_subject', {
                                 :contest_title_name => contest_title_name,
                                 :contest_name => contest_name })
                   body = t('contest.notification.email_body', {
                              :full_name => user.full_name,

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

               require 'tmail'
               require 'net/smtp'
               class UsersController < ApplicationController
-            -   include MailHelperMethods
+            +   #include MailHelperMethods
                 before_filter :authenticate, :except => [:new,
                                                          :register,
                                                          :confirm,
                                                          :forget,
                                                          :retrieve_password]
                        :redirect_to => { :action => :index }
                 #in_place_edit_for :user, :alias_for_editing
                 #in_place_edit_for :user, :email_for_editing
                 def index
-            -     if !Configuration['system.user_setting_enabled']
+            +     if !GraderConfiguration['system.user_setting_enabled']
                     redirect_to :controller => 'main', :action => 'list'
                   else
                     @user = User.find(session[:user_id])
                   end
                 end
                   @user.password_confirmation = @user.password = User.random_password
                   @user.activated = false
                   if (@user.valid?) and (@user.save)
                     if send_confirmation_email(@user)
                       render :action => 'new_splash', :layout => 'empty'
                     else
-            -         @admin_email = Configuration['system.admin_email']
+            +         @admin_email = GraderConfiguration['system.admin_email']
                       render :action => 'email_error', :layout => 'empty'
                     end
                   else
                     @user.errors.add_to_base("Email cannot be blank") if @user.email==''
                     render :action => 'new', :layout => 'empty'
                   end
                   redirect_to :action => 'forget'
                 end
                 protected
                 def verify_online_registration
-            -     if !Configuration['system.online_registration']
+            +     if !GraderConfiguration['system.online_registration']
                     redirect_to :controller => 'main', :action => 'login'
                   end
                 end
                 def send_confirmation_email(user)
-            -     contest_name = Configuration['contest.name']
+            +     contest_name = GraderConfiguration['contest.name']
-            -     admin_email = Configuration['system.admin_email']
+            +     admin_email = GraderConfiguration['system.admin_email']
                   activation_url = url_for(:action => 'confirm',
                                            :login => user.login,
                                            :activation => user.activation_key)
                   home_url = url_for(:controller => 'main', :action => 'index')
                   subject = "[#{contest_name}] Confirmation"
                   body = t('registration.email_body', {
                   logger.info body
                   send_mail(user.email, subject, body)
                 end
                 def send_new_password_email(user)
-            -     contest_name = Configuration['contest.name']
+            +     contest_name = GraderConfiguration['contest.name']
-            -     admin_email = Configuration['system.admin_email']
+            +     admin_email = GraderConfiguration['system.admin_email']
                   subject = "[#{contest_name}] Password recovery"
                   body = t('registration.password_retrieval.email_body', {
                              :full_name => user.full_name,
                              :contest_name => contest_name,
                              :login => user.login,
                              :password => user.password,

app/helpers/application_helper.rb ¶ +8 -7

                   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 (Configuration.show_tasks_to?(user))
+            +     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
                   append_to menu_items, "[#{I18n.t 'menu.help'}]", 'main', 'help'
-            -     if Configuration['system.user_setting_enabled']
+            +     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
+            +     menu_items.html_safe
                 end
                 def append_to(option,label, controller, action)
                   option << ' ' if option!=''
                   option << link_to_unless_current(label,
                                                    :controller => controller,
                 def user_title_bar(user)
                   header = ''
                   time_left = ''
                   #
                   # if the contest is over
-            -     if Configuration.time_limit_mode?
+            +     if GraderConfiguration.time_limit_mode?
                     if user.contest_finished?
                       header = <<CONTEST_OVER
               <tr><td colspan="2" align="center">
               <span class="contest-over-msg">THE CONTEST IS OVER</span>
               </td></tr>
               CONTEST_OVER
                         " #{format_short_duration(user.contest_time_left)}"
                     end
                   end
                   #
                   # if the contest is in the anaysis mode
-            -     if Configuration.analysis_mode?
+            +     if GraderConfiguration.analysis_mode?
                     header = <<ANALYSISMODE
               <tr><td colspan="2" align="center">
               <span class="contest-over-msg">ANALYSIS MODE</span>
               </td></tr>
               ANALYSISMODE
                   end
-            -     contest_name = Configuration['contest.name']
+            +     contest_name = GraderConfiguration['contest.name']
                   #
                   # build real title bar
-            -     <<TITLEBAR
+            +     result = <<TITLEBAR
               <div class="title">
               <table>
               #{header}
               <tr>
               <td class="left-col">
               #{user.full_name}<br/>
               </td>
               <td class="right-col">#{contest_name}</td>
               </tr>
               </table>
               </div>
               TITLEBAR
+            +     result.html_safe
                 end
               end

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

                   if !self.started
                     self.start_time = nil
                   end
                 end
                 def time_left
-            -     contest_time = Configuration.contest_time_limit
+            +     contest_time = GraderConfiguration.contest_time_limit
                   return nil if contest_time == nil
                   return contest_time if !self.started
                   current_time = Time.now.gmtime
                 def finished?
                   if !self.started
                     return false
                   end
-            -     contest_time = Configuration.contest_time_limit
+            +     contest_time = GraderConfiguration.contest_time_limit
                   if contest_time!=nil
                     return Time.now.gmtime > (self.start_time + contest_time)
                   else
                     false
                   end
                 end

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

                   users = User.find(:all)
                   return users.find_all { |u| u.contests.length == 0 }
                 end
                 def contest_time_left
-            -     if Configuration.contest_mode?
+            +     if GraderConfiguration.contest_mode?
                     return nil if site==nil
                     return site.time_left
-            -     elsif Configuration.indv_contest_mode?
+            +     elsif GraderConfiguration.indv_contest_mode?
-            -       time_limit = Configuration.contest_time_limit
+            +       time_limit = GraderConfiguration.contest_time_limit
                     if time_limit == nil
                       return nil
                     end
                     if contest_stat==nil or contest_stat.started_at==nil
                       return (Time.now.gmtime + time_limit) - Time.now.gmtime
                     else
                   else
                     return nil
                   end
                 end
                 def contest_finished?
-            -     if Configuration.contest_mode?
+            +     if GraderConfiguration.contest_mode?
                     return false if site==nil
                     return site.finished?
-            -     elsif Configuration.indv_contest_mode?
+            +     elsif GraderConfiguration.indv_contest_mode?
                     return false if self.contest_stat(true)==nil
                     return contest_time_left == 0
                   else
                     return false
                   end
                 end
                 def contest_started?
-            -     if Configuration.indv_contest_mode?
+            +     if GraderConfiguration.indv_contest_mode?
                     stat = self.contest_stat
                     return ((stat != nil) and (stat.started_at != nil))
-            -     elsif Configuration.contest_mode?
+            +     elsif GraderConfiguration.contest_mode?
                     return true if site==nil
                     return site.started
                   else
                     return true
                   end
                 end
                     :problems => other_avaiable_problems
                   }
                   return contest_problems
                 end
                 def available_problems
-            -     if not Configuration.multicontests?
+            +     if not GraderConfiguration.multicontests?
                     return Problem.find_available_problems
                   else
                     contest_problems = []
                     pin = {}
                     contests.enabled.each do |contest|
                       contest.problems.available.each do |problem|
                     other_avaiable_problems = Problem.available.find_all {|p| pin[p.id]==nil and p.contests.length==0}
                     return contest_problems + other_avaiable_problems
                   end
                 end
                 def can_view_problem?(problem)
-            -     if not Configuration.multicontests?
+            +     if not GraderConfiguration.multicontests?
                     return problem.available
                   else
                     return problem_in_user_contests? problem
                   end
                 end
                   end
                   def assign_default_contest
                     # have to catch error when migrating (because self.site is not available).
                     begin
                       if self.contests.length == 0
-            -           default_contest = Contest.find_by_name(Configuration['contest.default_contest_name'])
+            +           default_contest = Contest.find_by_name(GraderConfiguration['contest.default_contest_name'])
                         if default_contest
                           self.contests = [default_contest]
                         end
                       end
                     rescue
                     end

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

                     %td
                       = in_place_editor_field :configuration, :value_type, {}, :rows=>1
                     %td
                       = in_place_editor_field :configuration, :value, {}, :rows=>1
                     %td= conf.description
-            - - if Configuration.config_cached?
+            + - if GraderConfiguration.config_cached?
                 %br/
                 Your config is saved, but it does not automatically take effect.
                 %br/
                 If you have one mongrel process running, you can
                 = link_to '[click]', :action => 'reload'
                 here to reload.

app/views/contest_management/index.html.haml ¶ +3 -3

                 - else
                   %b Single contest:
                 = "[#{link_to 'Add/remove contests', :controller => 'contests', :action => 'index'}]"
               .infobox
                 %b Web interface mode:
-            -   - if (not Configuration.contest_mode?) and (not Configuration.indv_contest_mode?)
+            +   - if (not GraderConfiguration.contest_mode?) and (not GraderConfiguration.indv_contest_mode?)
                   standard mode
-            -   - elsif Configuration.contest_mode?
+            +   - elsif GraderConfiguration.contest_mode?
                   normal contest mode.
                 - else
                   individual contest mode.
                 %br/
                 Change mode to:
                 = "[#{link_to 'standard', :action => 'change_contest_mode', :id => 'standard'}]"
                 = "[#{link_to 'contest', :action => 'change_contest_mode', :id => 'contest'}]"
                 = "[#{link_to 'individual contest', :action => 'change_contest_mode', :id => 'indv-contest'}]"
-            - - if Configuration.indv_contest_mode?
+            + - if GraderConfiguration.indv_contest_mode?
                 = render :partial => 'indv_contest_mode_index'
               %br/

app/views/layouts/application.html.erb ¶ +9 -2

               <!DOCTYPE html>
               <html>
               <head>
-            -   <title>CafeGraderWeb</title>
+            +   <title><%= GraderConfiguration['contest.name'] %></title>
-            -   <%= stylesheet_link_tag    "application", :media => "all" %>
+            +   <%= stylesheet_link_tag "application", :media => "all" %>
                 <%= javascript_include_tag "application" %>
                 <%= csrf_meta_tags %>
+            +   <%= yield :head %>
               </head>
               <body>
+            + <div class="userbar">
+            + <%= user_header %>
+            + </div>
+            +
+            + <%= content_tag(:p,flash[:notice],:style => "color:green") if flash[:notice]!=nil %>
+            +
               <%= yield %>
               </body>
               </html>

app/views/layouts/empty.html.erb ¶ +1 -1

               <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
               <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
               <head>
                 <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
-            -   <title><%= Configuration['contest.name'] %></title>
+            +   <title><%= GraderConfiguration['contest.name'] %></title>
                 <%= stylesheet_link_tag 'application' %>
               </head>
               <body>
               <%= yield  %>

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

-            - %b= Configuration['ui.front.welcome_message']
+            + %b= GraderConfiguration['ui.front.welcome_message']
               %br/
               - if !@hidelogin
                 =t 'login.message'
                 %br/
                 %br/
                         %td{:align => "right"}
                           ="#{t 'password_label'}:"
                         %td= password_field_tag
                     = submit_tag t('login.login_submit')
               %br/
-            - - if Configuration['system.online_registration']
+            + - if GraderConfiguration['system.online_registration']
                 =t 'login.participation'
                 %b
                   = "#{t 'login.please'} "
                   = link_to "#{t 'login.register'}", :controller => :users, :action => :new
                 %br/
                 = link_to "#{t 'login.forget_password'}", :controller => :users, :action => :forget

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

                 %td.info{:align => "center"}
                   = link_to('[load]',{:action => 'source', :id => submission.id})
                 %td.info
                   - if submission.graded_at!=nil
                     = "Graded at #{format_short_time(submission.graded_at)}."
                     %br/
-            -       = "Score: #{(submission.points*100/submission.problem.full_score).to_i} " if Configuration['ui.show_score']
+            +       = "Score: #{(submission.points*100/submission.problem.full_score).to_i} " if GraderConfiguration['ui.show_score']
                     = " ["
                     %tt
                       = submission.grader_comment
                     = "]"
                 %td.info
                   = render :partial => 'compiler_message', :locals => {:compiler_message => submission.compiler_message }

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

                 - if submission.graded_at==nil
                   =t 'main.submitted_at'
                   = format_short_time(submission.submitted_at.localtime)
                 - else
                   = t 'main.graded_at'
                   = "#{format_short_time(submission.graded_at.localtime)}, "
-            -     - if Configuration['ui.show_score']
+            +     - if GraderConfiguration['ui.show_score']
                     = t 'main.score'
                     = "#{(submission.points*100/submission.problem.full_score).to_i} "
                   = " ["
                   %tt
                     = submission.grader_comment
                   = "]"
-            -     - if Configuration.show_grading_result
+            +     - if GraderConfiguration.show_grading_result
                     = " | "
                     = link_to '[detailed result]', :action => 'result', :id => submission.id
                   = " | "
                   = link_to("[#{t 'main.cmp_msg'}]", {:action => 'compiler_msg', :id => submission.id}, {:popup => true})
                 = " | "
                 = link_to("[#{t 'main.src_link'}]",{:action => 'source', :id => submission.id})

app/views/main/help.html.haml ¶ +11 -11

               = user_title_bar(@user)
               .announcementbox
                 %span{:class => 'title'}
-            -     =t 'help.how_to_submit'
+            +     =raw t 'help.how_to_submit'
                 .announcement
                   %p
-            -       =t 'help.must_specify_language'
+            +       =raw t 'help.must_specify_language'
                   %p
-            -       =t 'help.list_available_language'
+            +       =raw t 'help.list_available_language'
                   %table{:border => '1'}
                     %tr
                       %th{:width => '150px'} C
                       %th{:width => '150px'} C++
                       %th{:width => '150px'} Pascal
                     %tr
-            -         %td= "<tt>/*<br/>LANG: C<br/>*/</tt>"
+            +         %td=raw "<tt>/*<br/>LANG: C<br/>*/</tt>"
-            -         %td= "<tt>/*<br/>LANG: C++<br/>*/</tt>"
+            +         %td=raw "<tt>/*<br/>LANG: C++<br/>*/</tt>"
-            -         %td= "<tt>{<br/>LANG: Pascal<br/>}</tt>"
+            +         %td=raw "<tt>{<br/>LANG: Pascal<br/>}</tt>"
                   %p
-            -       =t 'help.accept_only_language_specified'
+            +       =raw t 'help.accept_only_language_specified'
                   %p
-            -       =t 'help.specifying_task'
+            +       =raw t 'help.specifying_task'
                   %p
-            -       =t 'help.example_cpp'
+            +       =raw t 'help.example_cpp'
                   %table{:border => '1'}
                     %tr
                       %td{:width => '300px'}
                         %tt <tt>/*<br/>LANG: C++<br/>TASK: mobiles<br/>*/</tt>
                   %p
-            -       =t 'help.example_pas'
+            +       =raw t 'help.example_pas'
                   %table{:border => '1'}
                     %tr
                       %td{:width => '300px'}
                         %tt <tt>{<br/>LANG: Pascal<br/>TASK: mobiles<br/>}</tt>
                   %p
-            -       = (t('help.ask_questions_at_messages',:message_link_name => (t 'menu.messages'),:url => url_for(:controller => 'messages', :action => 'list')))
+            +       = raw(t('help.ask_questions_at_messages',:message_link_name => (t 'menu.messages'),:url => url_for(:controller => 'messages', :action => 'list')))

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

               .announcementbox{:style => (@announcements.length==0 ? "display:none" : "")}
                 %span{:class => 'title'}
                   Announcements
                 #announcementbox-body
                   = render :partial => 'announcement', :collection => @announcements
-            - - if Configuration.show_submitbox_to?(@user)
+            + - if GraderConfiguration.show_submitbox_to?(@user)
                 .submitbox
                   = error_messages_for 'submission'
                   = render :partial => 'submission_box'
               %hr/
-            - - if (Configuration.contest_mode?) and (@user.site!=nil) and (@user.site.started!=true)
+            + - if (GraderConfiguration.contest_mode?) and (@user.site!=nil) and (@user.site.started!=true)
                 %p=t 'main.start_soon'
-            - - if Configuration.show_tasks_to?(@user)
+            + - if GraderConfiguration.show_tasks_to?(@user)
-            -   - if not Configuration.multicontests?
+            +   - if not GraderConfiguration.multicontests?
                   %table.info
                     %tr.info-head
                       %th
                       %th Tasks
                       %th # of sub(s)
                       %th Results

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

-            - %h1= Configuration['ui.front.title']
+            + %h1= GraderConfiguration['ui.front.title']
               %table
                 %tr
                   %td
                     - if @announcements.length!=0
                       .announcementbox{:style => 'margin-top: 0px'}

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

                 = "Submission: #{@submission.number}"
                 %br/
                 = "Submitted at: #{format_short_time(@submission.submitted_at)}"
                 %br/
                 = "Graded at #{format_short_time(@submission.graded_at)} "
                 %br/
-            -   = "score: #{(@submission.points*100/@submission.problem.full_score).to_i} " if Configuration['ui.show_score']
+            +   = "score: #{(@submission.points*100/@submission.problem.full_score).to_i} " if GraderConfiguration['ui.show_score']
                 = " ["
                 %tt
                   = @submission.grader_comment
                 = "]"
               %table.info

app/views/problems/manage.html.haml ¶ +3 -3

                     %li
                       Change date added to
                       = select_date Date.current, :prefix => 'date_added'
                       &nbsp;&nbsp;&nbsp;
                       = submit_tag 'Change', :name => 'change_date_added'
-            -       - if Configuration.multicontests?
+            +       - if GraderConfiguration.multicontests?
                       %li
                         Add to
                         = select("contest","id",Contest.all.collect {|c| [c.title, c.id]})
                         = submit_tag 'Add', :name => 'add_to_contest'
                 %table
                   %tr
                     %th/
                     %th Name
                     %th Full name
                     %th Date added
-            -       - if Configuration.multicontests?
+            +       - if GraderConfiguration.multicontests?
                       %th Contests
                   - for problem in @problems
                     %tr{:id => "row-prob-#{problem.id}", :name=> "prob-#{problem.id}"}
                       %td= check_box_tag "prob-#{problem.id}"
                       %td= problem.name
                       %td= problem.full_name
                       %td= problem.date_added
-            -         - if Configuration.multicontests?
+            +         - if GraderConfiguration.multicontests?
                         %td
                           - problem.contests.each do |contest|
                             = "(#{contest.name} [#{link_to 'x', :action => 'remove_contest', :id => problem.id, :contest_id => contest.id }])"

app/views/test/index.html.erb ¶ +2 -2

               <%= user_title_bar(@user) %>
               <h2><%=t 'test.title' %></h2>
               <div class="test-desc">
                 <%=t 'test.intro' %><br/>
-            -   <% if Configuration['contest.test_request.early_timeout'] %>
+            +   <% if GraderConfiguration['contest.test_request.early_timeout'] %>
                   <%=t 'test.disabled_at_end_announcement' %>
                 <% end %>
               </div>
               <% if @problems.length==0 %>
                 There is no submission
                     submissionSelect.add(new Option(""+i,""+i,false,false));
                   }
                 }
               }
               </script>
-            - <% if Configuration.show_submitbox_to?(@user) and Configuration.allow_test_request(@user) %>
+            + <% if GraderConfiguration.show_submitbox_to?(@user) and GraderConfiguration.allow_test_request(@user) %>
                 <div class="submitbox">
                 <%= error_messages_for 'submitted_test_request' %>
                 <% form_for :test_request, nil,
                             :url => { :action => 'submit'},
                             :html => { :multipart => true } do |f| %>
                   <table>

app/views/user_admin/contests.html.erb ¶ +3 -3

                 List users in <% if @contest %><%= @contest.title %>
                 <% else %>Users not in any contests<% end %>
               </h1>
               <div class="submitbox">
                 <%= link_to '[View all users]', :action => 'list' %>
-            -   <% if Configuration.multicontests? %>
+            +   <% if GraderConfiguration.multicontests? %>
                   <%= link_to '[Manage bulk users in contests]', :action => 'contest_management' %>
                   <br/>
                   View users in:
                   <% @contests.each do |contest| %>
                     <%= link_to "[#{contest.name}]", :action => 'contests', :id => contest.id %>
                   <% end %>
                   <th>Full name</th>
                   <th>Email</th>
                   <th>Activated?</th>
                   <th></th>
                   <th></th>
                   <th></th>
-            -     <% if Configuration.multicontests? %>
+            +     <% if GraderConfiguration.multicontests? %>
                     <th>Contests</th>
                     <th>Other enabled contests</th>
                   <% end %>
                 </tr>
               <% for user in @users %>
                   <td><%=h user.full_name %></td>
                   <td><%=h user.email %></td>
                   <td><%=h user.activated %></td>
                   <td><%= link_to 'Show', :action => 'show', :id => user %></td>
                   <td><%= link_to 'Edit', :action => 'edit', :id => user %></td>
                   <td><%= link_to 'Destroy', { :action => 'destroy', :id => user }, :confirm => 'Are you sure?', :method => :post %></td>
-            -     <% if Configuration.multicontests? %>
+            +     <% if GraderConfiguration.multicontests? %>
                     <td>
                       <% user.contests.each do |contest| %>
               	  <%= contest.name %> [<%= link_to 'x', :action => 'remove_from_contest', :id => user.id, :contest_id => contest.id %>]
                       <% end %>
                     </td>
                     <td>

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

               .contest-title
                 %h1
-            -     = "#{Configuration['contest.name']}: #{t 'registration.password_retrieval.header'}"
+            +     = "#{GraderConfiguration['contest.name']}: #{t 'registration.password_retrieval.header'}"
               - if flash[:notice]
                 %hr/
                 %b= flash[:notice]
                 %hr/

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

               .contest-title
                 %h1
-            -     = "#{Configuration['contest.name']}: #{t 'registration.title'}"
+            +     = "#{GraderConfiguration['contest.name']}: #{t 'registration.title'}"
               .registration-desc
                 =t 'registration.description'
               = error_messages_for :user, :header_message => (t 'registration.errors.header')

config/application.rb ¶ +1 -1

                   # 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 = true
                   # Enable the asset pipeline
-            -     config.assets.enabled = true
+            +     config.assets.enabled = false
                   # Version of your assets, change this if you want to expire all your assets
                   config.assets.version = '1.0'
                 end
               end

db/schema.rb ¶ +65 -25

-            - # This file is auto-generated from the current state of the database. Instead of editing this file,
+            + # encoding: UTF-8
-            - # please use the migrations feature of Active Record to incrementally modify your database, and
+            + # This file is auto-generated from the current state of the database. Instead
-            - # then regenerate this schema definition.
+            + # of editing this file, please use the migrations feature of Active Record to
+            + # incrementally modify your database, and then regenerate this schema definition.
               #
-            - # Note that this schema.rb definition is the authoritative source for your database schema. If you need
+            + # Note that this schema.rb definition is the authoritative source for your
-            - # to create the application database on another system, you should be using db:schema:load, not running
+            + # database schema. If you need to create the application database on another
-            - # all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
+            + # system, you should be using db:schema:load, not running all the migrations
+            + # from scratch. The latter is a flawed and unsustainable approach (the more migrations
               # you'll amass, the slower it'll run and the greater likelihood for issues).
               #
               # It's strongly recommended to check this file into your version control system.
-            - ActiveRecord::Schema.define(:version => 20100506163112) do
+            + ActiveRecord::Schema.define(:version => 20121001033508) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
                   t.text     "body"
                   t.boolean  "published"
                   t.datetime "created_at"
                   t.boolean  "frontpage",    :default => false
                   t.boolean  "contest_only", :default => false
                   t.string   "title"
                   t.string   "notes"
                 end
-            -   create_table "configurations", :force => true do |t|
+            +   create_table "codejom_statuses", :force => true do |t|
-            -     t.string   "key"
+            +     t.integer  "user_id"
-            -     t.string   "value_type"
+            +     t.boolean  "alive"
-            -     t.string   "value"
+            +     t.integer  "num_problems_passed"
                   t.datetime "created_at"
                   t.datetime "updated_at"
-            -     t.text     "description"
                 end
                 create_table "contests", :force => true do |t|
                   t.string   "title"
                   t.boolean  "enabled"
                   t.datetime "created_at"
                   t.text     "body"
                   t.boolean  "markdowned"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
+            +   create_table "grader_configurations", :force => true do |t|
+            +     t.string   "key"
+            +     t.string   "value_type"
+            +     t.string   "value"
+            +     t.datetime "created_at"
+            +     t.datetime "updated_at"
+            +     t.text     "description"
+            +   end
+            +
                 create_table "grader_processes", :force => true do |t|
                   t.string   "host",       :limit => 20
                   t.integer  "pid"
                   t.string   "mode"
                   t.boolean  "active"
                   t.datetime "created_at"
                   t.boolean  "replied"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
                 create_table "problems", :force => true do |t|
-            -     t.string  "name",                 :limit => 30
+            +     t.string   "name",                 :limit => 30
-            -     t.string  "full_name"
+            +     t.string   "full_name"
-            -     t.integer "full_score"
+            +     t.integer  "full_score"
-            -     t.date    "date_added"
+            +     t.date     "date_added"
-            -     t.boolean "available"
+            +     t.boolean  "available"
-            -     t.string  "url"
+            +     t.string   "url"
-            -     t.integer "description_id"
+            +     t.integer  "description_id"
-            -     t.boolean "test_allowed"
+            +     t.boolean  "test_allowed"
-            -     t.boolean "output_only"
+            +     t.boolean  "output_only"
-            -     t.string  "description_filename"
+            +     t.integer  "level",                              :default => 0
+            +     t.datetime "updated_at"
+            +     t.string   "description_filename"
                 end
                 create_table "rights", :force => true do |t|
                   t.string "name"
                   t.string "controller"
                   t.string "action"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.integer  "country_id"
                   t.string   "password"
                 end
+            +   create_table "submission_statuses", :force => true do |t|
+            +     t.integer  "user_id"
+            +     t.integer  "problem_id"
+            +     t.boolean  "passed"
+            +     t.integer  "submission_count"
+            +     t.datetime "created_at"
+            +     t.datetime "updated_at"
+            +   end
+            +
                 create_table "submissions", :force => true do |t|
                   t.integer  "user_id"
                   t.integer  "problem_id"
                   t.integer  "language_id"
                   t.text     "source"
                   t.binary   "binary"
                   t.integer  "submission_id"
                   t.datetime "created_at"
                   t.integer  "status"
                   t.datetime "updated_at"
                 end
+            +   create_table "test_pair_assignments", :force => true do |t|
+            +     t.integer  "user_id"
+            +     t.integer  "problem_id"
+            +     t.integer  "test_pair_id"
+            +     t.integer  "test_pair_number"
+            +     t.integer  "request_number"
+            +     t.datetime "created_at"
+            +     t.datetime "updated_at"
+            +     t.boolean  "submitted"
+            +   end
+            +
                 create_table "test_pairs", :force => true do |t|
                   t.integer  "problem_id"
                   t.text     "input",      :limit => 16777215
                   t.text     "solution",   :limit => 16777215
                   t.datetime "created_at"
                   t.datetime "updated_at"
+            +     t.integer  "number"
                 end
                 create_table "test_requests", :force => true do |t|
                   t.integer  "user_id"
                   t.integer  "problem_id"
                   t.integer  "submission_id"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.boolean  "forced_logout"
                 end
                 create_table "users", :force => true do |t|
-            -     t.string   "login",           :limit => 50
+            +     t.string   "login",               :limit => 50
                   t.string   "full_name"
                   t.string   "hashed_password"
-            -     t.string   "salt",            :limit => 5
+            +     t.string   "salt",                :limit => 5
                   t.string   "alias"
                   t.string   "email"
                   t.integer  "site_id"
                   t.integer  "country_id"
-            -     t.boolean  "activated",                     :default => false
+            +     t.boolean  "activated",                         :default => false
                   t.datetime "created_at"
                   t.datetime "updated_at"
+            +     t.string   "member1_full_name"
+            +     t.string   "member2_full_name"
+            +     t.string   "member3_full_name"
+            +     t.boolean  "high_school"
+            +     t.string   "member1_school_name"
+            +     t.string   "member2_school_name"
+            +     t.string   "member3_school_name"
                 end
                 add_index "users", ["login"], :name => "index_users_on_login", :unique => true
               end

db/seeds.rb ¶ +2 -2

               def create_configuration_key(key,
                                            value_type,
                                            default_value,
                                            description='')
-            -   conf = (Configuration.find_by_key(key) ||
+            +   conf = (GraderConfiguration.find_by_key(key) ||
-            -           Configuration.new(:key => key,
+            +           GraderConfiguration.new(:key => key,
                                           :value_type => value_type,
                                           :value => default_value))
                 conf.description = description
                 conf.save
               end

app/models/configuration.rb removed ¶ -176

deleted file

app/views/problems/_form.rhtml removed ¶ -52

deleted file

app/views/problems/edit.rhtml removed ¶ -9

deleted file

app/views/problems/list.rhtml removed ¶ -67

deleted file

app/views/problems/new.rhtml removed ¶ -8

deleted file

app/views/problems/stat.rhtml removed ¶ -28

deleted file

app/views/user_admin/_form.rhtml removed ¶ -22

deleted file

app/views/user_admin/edit.rhtml removed ¶ -9

deleted file

app/views/user_admin/list.rhtml removed ¶ -86

deleted file

app/views/user_admin/new.rhtml removed ¶ -8

deleted file

app/views/user_admin/new_list.rhtml removed ¶ -8

deleted file

app/views/user_admin/show.rhtml removed ¶ -10

deleted file

app/views/user_admin/user_stat.rhtml removed ¶ -43

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

r320:c31111f6e4b5 - Mon, 01 Oct 2012 06:48:46 - 61 files changed: 710 inserted, 654 deleted

Sign in to your account

Commit r320:c31111f6e4b5 public

Author

r320:c31111f6e4b5 - Mon, 01 Oct 2012 06:48:46 - 61 files changed: 710 inserted, 654 deleted

Commit `r320:c31111f6e4b5` public