cafe-grader-web Commit - r255:b7ca2d765156

cafe-grader-web

Commit `r255:b7ca2d765156` public

parent | child

Description:

added level to problems, randoms problem from each level

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

r255:b7ca2d765156 - Tue, 09 Feb 2010 15:46:54 - 9 files changed: 87 inserted, 7 deleted

db/migrate/20100209145331_add_level_to_problems.rb created 644 ¶ +9

@@ -0,0 +1,9
	1	+ class AddLevelToProblems < ActiveRecord::Migration
	2	+ def self.up
	3	+ add_column :problems, :level, :integer, :default => 0
	4	+ end
	5	+
	6	+ def self.down
	7	+ remove_column :problems, :level, :integer
	8	+ end
	9	+ end

app/controllers/codejom_controller.rb ¶ +26 -2

@@ -1,13 +1,37
1	class CodejomController < ApplicationController	1	class CodejomController < ApplicationController
2		2
3	before_filter :admin_authorization	3	before_filter :admin_authorization
4	- before_filter :authenticate
5		4
6	def index	5	def index
7	@user = User.find(session[:user_id])	6	@user = User.find(session[:user_id])
8	@problems = Problem.find(:all)	7	@problems = Problem.find(:all)
9	- @available_problems = @problems.find_all {\|p\| not p.available }	8	+ @levels = @problems.collect {\|p\| p.level}.uniq.sort
		9	+ @available_problems = {}
		10	+ @levels.each do \|level\|
		11	+ @available_problems[level] = []
		12	+ end
		13	+ @problems.find_all {\|p\| not p.available }.each do \|problem\|
		14	+ @available_problems[problem.level] << problem
		15	+ end
10	@activated_problems = @problems.find_all {\|p\| p.available }	16	@activated_problems = @problems.find_all {\|p\| p.available }
11	end	17	end
12		18
		19	+ def random_problem
		20	+ level = params[:id].to_i
		21	+
		22	+ problems = Problem.unavailable.level(level).all
		23	+ puts problems
		24	+ if problems.length!=0
		25	+ if problems.length != 1
		26	+ problem = problems[rand(problems.length)]
		27	+ else
		28	+ problem = problems[0]
13	end	29	end
		30	+ problem.available = true
		31	+ problem.save
		32	+ end
		33	+
		34	+ redirect_to :action => 'index'
		35	+ end
		36	+
		37	+ end

app/controllers/problems_controller.rb ¶ +3

               class ProblemsController < ApplicationController
                 before_filter :authenticate, :authorization
                 in_place_edit_for :problem, :name
                 in_place_edit_for :problem, :full_name
                 in_place_edit_for :problem, :full_score
+            +   # for codejom
+            +   in_place_edit_for :problem, :level
+            +
                 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, :quick_create,
                                                     :do_manage,
                                                     :do_import,
                                                     :update ],
                        :redirect_to => { :action => :list }
                 def list
                   @problems = Problem.find(:all, :order => 'date_added DESC')
                 end
                 def show
                   @problem = Problem.find(params[:id])
                 end
                 def new
                   @problem = Problem.new
                   @description = nil
                 end
                 def create
                   @problem = Problem.new(params[:problem])
                   @description = Description.new(params[:description])
                   if @description.body!=''
                     if !@description.save
                       render :action => new and return
                     end
                   else
                     @description = nil
                   end
                   @problem.description = @description
                   if @problem.save
                     flash[:notice] = 'Problem was successfully created.'
                     redirect_to :action => 'list'
                   else
                     render :action => 'new'
                   end
                 end
                 def quick_create
                   @problem = Problem.new(params[:problem])
                   @problem.full_name = @problem.name if @problem.full_name == ''
                   @problem.full_score = 100
                   @problem.available = false
                   @problem.test_allowed = true
                   @problem.output_only = false
                   @problem.date_added = Time.new
                   if @problem.save
                     flash[:notice] = 'Problem was successfully created.'
                     redirect_to :action => 'list'
                   else
                     flash[:notice] = 'Error saving problem'
                     redirect_to :action => 'list'
                   end
                 end
                 def edit
                   @problem = Problem.find(params[:id])
                   @description = @problem.description
                 end
                 def update
                   @problem = Problem.find(params[:id])
                   @description = @problem.description
                   if @description == nil and params[:description][:body]!=''
                     @description = Description.new(params[:description])
                     if !@description.save
                       flash[:notice] = 'Error saving description'
                       render :action => 'edit' and return
                     end
                     @problem.description = @description
                   elsif @description!=nil
                     if !@description.update_attributes(params[:description])
                       flash[:notice] = 'Error saving description'
                       render :action => 'edit' and return
                     end
                   end
                   if @problem.update_attributes(params[:problem])
                     flash[:notice] = 'Problem was successfully updated.'
                     redirect_to :action => 'show', :id => @problem
                   else
                     render :action => 'edit'
                   end
                 end
                 def destroy
                   Problem.find(params[:id]).destroy
                   redirect_to :action => 'list'
                 end

app/models/problem.rb ¶ +7

               class Problem < ActiveRecord::Base
                 belongs_to :description
                 has_many :test_pairs, :dependent => :delete_all
+            +   named_scope :level, lambda { |level|
+            +     { :conditions => { :level => level }}
+            +   }
+            +
+            +   named_scope :unavailable, { :conditions => { :available => false }}
+            +
+            +
                 validates_presence_of :name
                 validates_format_of :name, :with => /^\w+$/
                 validates_presence_of :full_name
                 DEFAULT_TIME_LIMIT = 1
                 DEFAULT_MEMORY_LIMIT = 32
                 def test_pair_count
                   @test_pair_count ||= test_pairs.size
                 end
                 def uses_random_test_pair?
                   test_pair_count != 0
                 end
                 def random_test_pair(forbidden_numbers=nil)
                   if forbidden_numbers.length < test_pair_count
                     begin
                       test_num = 1 + rand(test_pair_count)
                     end while forbidden_numbers!=nil and forbidden_numbers.include? test_num
                   else
                     test_num = 1 + rand(test_pair_count)
                   end
                   test_pairs.find_by_number test_num
                 end
                 def self.find_available_problems
                   find(:all, :conditions => {:available => true}, :order => "date_added DESC")
                 end
                 # TODO: may try to optimize this using cache
                 def self.available_problem_count
                   return Problem.find_available_problems.length
                 end
                 def self.create_from_import_form_params(params, old_problem=nil)
                   problem = old_problem || Problem.new
                   import_params = Problem.extract_params_and_check(params, problem)
                   if not problem.valid?
                     return problem, 'Error importing'
                   end
                   problem.full_score = 100
                   problem.date_added = Time.new
                   problem.test_allowed = true
                   problem.output_only = false
                   problem.available = false
                   if not problem.save
                     return problem, 'Error importing'
                   end
                   import_to_db = params.has_key? :import_to_db
                   importer = TestdataImporter.new(problem)
                   if not importer.import_from_file(import_params[:file],
                                                    import_params[:time_limit],
                                                    import_params[:memory_limit],
                                                    import_to_db)
                     problem.errors.add_to_base('Import error.')
                   end
                   return problem, importer.log_msg
                 end
                 protected
                 def self.to_i_or_default(st, default)
                   if st!=''
                     st.to_i
                   else
                     default
                   end
                 end
                 def self.extract_params_and_check(params, problem)
                   time_limit = Problem.to_i_or_default(params[:time_limit],
                                                        DEFAULT_TIME_LIMIT)
                   memory_limit = Problem.to_i_or_default(params[:memory_limit],
                                                          DEFAULT_MEMORY_LIMIT)
                   if time_limit==0 and time_limit_s!='0'
                     problem.errors.add_to_base('Time limit format errors.')
                   elsif time_limit<=0 or time_limit >60
                     problem.errors.add_to_base('Time limit out of range.')
                   end
                   if memory_limit==0 and memory_limit_s!='0'
                     problem.errors.add_to_base('Memory limit format errors.')
                   elsif memory_limit<=0 or memory_limit >512
                     problem.errors.add_to_base('Memory limit out of range.')
                   end
                   if params[:file]==nil or params[:file]==''

app/views/codejom/index.html.haml ¶ +16 -4

@@ -1,11 +1,23
1	%h1 Code Jom Control Panel	1	%h1 Code Jom Control Panel
2		2
3	- %h2= "Available problems (#{@available_problems.length})"	3	+ %h2 Available problems
4	- %ul	4	+ %table{:class => "codejom-problems"}
5	- - @available_problems.each do \|problem\|	5	+ %tr
6	- %li= problem.name	6	+ - @levels.each do \|level\|
		7	+ %th= "Level #{level} (#{@available_problems[level].length})"
		8	+ %tr
		9	+ - @levels.each do \|level\|
		10	+ %td
		11	+ - @available_problems[level].each do \|problem\|
		12	+ = problem.name
		13	+ %br/
		14	+ %tr
		15	+ - @levels.each do \|level\|
		16	+ %td{:class => 'random-button'}
		17	+ - form_tag :action => 'random_problem', :id => level do
		18	+ = submit_tag 'Random'
7		19
8	%h2= "Activated problems (#{@activated_problems.length})"	20	%h2= "Activated problems (#{@activated_problems.length})"
9	- @activated_problems.each do \|problem\|	21	- @activated_problems.each do \|problem\|
10	= problem.name	22	= problem.name
11		23

app/views/problems/list.rhtml ¶ +2

               <% content_for :head do %>
                 <%= stylesheet_link_tag 'problems' %>
                 <%= javascript_include_tag :defaults %>
               <% end %>
               <h1>Listing problems</h1>
               <p>
               <%= link_to '[New problem]', :action => 'new' %>
               <%= link_to '[Manage problems]', :action => 'manage' %>
               <%= link_to '[Import problems]', :action => 'import' %>
               <%= link_to '[Turn off all problems]', :action => 'turn_all_off' %>
               <%= link_to '[Turn on all problems]', :action => 'turn_all_on' %>
               </p>
               <div class="submitbox">
                 <% form_tag :action => 'quick_create' do %>
                   <b>Quick New:</b>
                   <label for="problem_name">Name</label>
                   <%= text_field 'problem', 'name'  %> |
                   <label for="problem_full_name">Full name</label>
                   <%= text_field 'problem', 'full_name'  %>
                   <%= submit_tag "Create" %>
                 <% end %>
               </div>
               <table>
                 <tr>
                   <th>Name</th>
                   <th>Full name</th>
+            +     <th>Level</th>
                   <th>Full score</th>
                   <th>Date added</th>
                   <th>Avail?</th>
                   <th>Test?</th>
                 </tr>
               <% for problem in @problems %>
                 <tr id="prob-<%= problem.id %>" name="prob-<%= problem.id %>" class="<%= (problem.available) ? "available" : "not-available" %>">
                   <% @problem=problem %>
                   <td><%= in_place_editor_field :problem, :name, {}, :rows=>1 %></td>
                   <td><%= in_place_editor_field :problem, :full_name, {}, :rows=>1 %></td>
+            +     <td><%= in_place_editor_field :problem, :level, {}, :rows=>1 %></td>
                   <td><%= in_place_editor_field :problem, :full_score, {}, :rows=>1 %></td>
                   <td><%= problem.date_added %></td>
                   <td id="prob-<%= problem.id %>-avail"><%= problem.available %></td>
                   <td><%= problem.test_allowed %></td>
                   <td><%= link_to_remote '[Toggle]', :url => {:action => 'toggle', :id => problem.id } %></td>
                   <td><%= link_to '[Stat]', :action => 'stat', :id => problem.id %></td>
                   <td><%= link_to '[Show]', :action => 'show', :id => problem %></td>
                   <td><%= link_to '[Edit]', :action => 'edit', :id => problem %></td>
                   <td><%= link_to '[Destroy]', { :action => 'destroy', :id => problem }, :confirm => 'Are you sure?', :method => :post %></td>
                 </tr>
               <% end %>
               </table>
               <br />
               <%= link_to '[New problem]', :action => 'new' %>

db/schema.rb ¶ +2 -1

               # This file is auto-generated from the current state of the database. Instead of editing this file,
               # please use the migrations feature of Active Record to incrementally modify your database, and
               # then regenerate this schema definition.
               #
               # Note that this schema.rb definition is the authoritative source for your database schema. If you need
               # to create the application database on another system, you should be using db:schema:load, not running
               # all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
               # you'll amass, the slower it'll run and the greater likelihood for issues).
               #
               # It's strongly recommended to check this file into your version control system.
-            - ActiveRecord::Schema.define(:version => 20100129041917) do
+            + ActiveRecord::Schema.define(:version => 20100209145331) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
                   t.text     "body"
                   t.boolean  "published"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.boolean  "frontpage",    :default => false
                   t.boolean  "contest_only", :default => false
                   t.string   "title"
                 end
                 create_table "codejom_statuses", :force => true do |t|
                   t.integer  "user_id"
                   t.boolean  "alive"
                   t.integer  "num_problems_passed"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
                 create_table "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 "countries", :force => true do |t|
                   t.string   "name"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
                 create_table "descriptions", :force => true do |t|
                   t.text     "body"
                   t.boolean  "markdowned"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 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.datetime "updated_at"
                   t.integer  "task_id"
                   t.string   "task_type"
                   t.boolean  "terminated"
                 end
                 add_index "grader_processes", ["host", "pid"], :name => "index_grader_processes_on_ip_and_pid"
                 create_table "languages", :force => true do |t|
                   t.string "name",        :limit => 10
                   t.string "pretty_name"
                   t.string "ext",         :limit => 10
                   t.string "common_ext"
                 end
                 create_table "messages", :force => true do |t|
                   t.integer  "sender_id"
                   t.integer  "receiver_id"
                   t.integer  "replying_message_id"
                   t.text     "body"
                   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  "full_name"
                   t.integer "full_score"
                   t.date    "date_added"
                   t.boolean "available"
                   t.string  "url"
                   t.integer "description_id"
                   t.boolean "test_allowed"
                   t.boolean "output_only"
+            +     t.integer "level",                        :default => 0
                 end
                 create_table "rights", :force => true do |t|
                   t.string "name"
                   t.string "controller"
                   t.string "action"
                 end
                 create_table "rights_roles", :id => false, :force => true do |t|
                   t.integer "right_id"
                   t.integer "role_id"
                 end
                 add_index "rights_roles", ["role_id"], :name => "index_rights_roles_on_role_id"
                 create_table "roles", :force => true do |t|
                   t.string "name"
                 end
                 create_table "roles_users", :id => false, :force => true do |t|
                   t.integer "role_id"
                   t.integer "user_id"
                 end
                 add_index "roles_users", ["user_id"], :name => "index_roles_users_on_user_id"
                 create_table "sessions", :force => true do |t|
                   t.string   "session_id"
                   t.text     "data"
                   t.datetime "updated_at"
                 end
                 add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
                 add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
                 create_table "sites", :force => true do |t|
                   t.string   "name"
                   t.boolean  "started"
                   t.datetime "start_time"
                   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.datetime "submitted_at"
                   t.datetime "compiled_at"
                   t.text     "compiler_message"
                   t.datetime "graded_at"
                   t.integer  "points"
                   t.text     "grader_comment"
                   t.integer  "number"
                   t.string   "source_filename"
                 end
                 add_index "submissions", ["user_id", "problem_id", "number"], :name => "index_submissions_on_user_id_and_problem_id_and_number", :unique => true
                 add_index "submissions", ["user_id", "problem_id"], :name => "index_submissions_on_user_id_and_problem_id"
                 create_table "tasks", :force => true do |t|
                   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"

public/stylesheets/application.css ¶ +10

                 .pub-info p {
                   text-align: right;
                   font-style: italic;
                   font-size: 9px; }
               .announcement .toggles {
                 font-weight: normal;
                 float: right;
                 font-size: 80%; }
               .announcement .announcement-title {
                 font-weight: bold; }
               .message {
                 margin: 10px 0 0; }
                 .message .message {
                   margin: 0 0 0 30px; }
                   .message .message .stat {
                     font-size: 10px;
                     line-height: 1.75em;
                     padding: 0 5px;
                     color: #444444;
                     background: #bbbbbb;
                     font-weight: bold; }
                 .message .body {
                   border: 2px solid #dddddd;
                   background: #fff8f8;
                   padding-left: 5px; }
                 .message .reply-body {
                   border: 2px solid #bbbbbb;
                   background: #fffff8;
                   padding-left: 5px; }
                 .message .stat {
                   font-size: 10px;
                   line-height: 1.75em;
                   padding: 0 5px;
                   color: #333333;
                   background: #dddddd;
                   font-weight: bold; }
               .contest-title {
                 color: white;
                 text-align: center;
                 line-height: 2em; }
               .registration-desc {
                 border: 1px dotted gray;
                 background: #f5f5f5;
                 padding: 5px;
                 margin: 10px 0;
                 font-size: 12px;
                 line-height: 1.5em; }
               .test-desc {
                 border: 1px dotted gray;
                 background: #f5f5f5;
                 padding: 5px;
                 margin: 10px 0;
                 font-size: 12px;
                 line-height: 1.5em; }
               .problem-list {
                 width: 200px;
                 float: left; }
               .problem-bar {
                 margin-top: 5px;
                 padding: 5px;
                 background: #e0e0e0; }
                 .problem-bar span.problem-title {
                   font-weight: bold;
                   font-size: 110%; }
               .problem-content {
                 float: left;
                 margin-left: 10px;
                 width: 700px; }
               .problem-panel {
                 border: 1px black solid;
                 padding: 5px; }
                 .problem-panel .problem-form {
                   border: 1px dotted #99aaee;
                   background: #eeeeff; }
               .notice-bar {
                 margin-top: 3px;
                 margin-bottom: 3px;
                 text-align: center; }
                 .notice-bar span.notice {
                   color: white;
                   font-weight: bold;
                   background: #000070;
                   padding: 3px 20px 3px 20px;
                   -moz-border-radius: 2px;
                   -webkit-border-radius: 5px;
                   border-radius: 5px; }
+            +
+            + table.codejom-problems th {
+            +   background: #000070;
+            +   color: white; }
+            + table.codejom-problems td {
+            +   width: 200px;
+            +   vertical-align: top;
+            +   text-align: center; }
+            +   table.codejom-problems td.random-button {
+            +     background: lightgrey; }

public/stylesheets/sass/application.sass ¶ +12

                 .announcement-title
                   font-weight: bold
               .message
                 margin: 10px 0 0
                 .message
                   margin: 0 0 0 30px
                   .stat
                     font-size: 10px
                     line-height: 1.75em
                     padding: 0 5px
                     color: #444444
                     background: #bbbbbb
                     font-weight: bold
                 .body
                   border: 2px solid #dddddd
                   background: #fff8f8
                   padding-left: 5px
                 .reply-body
                   border: 2px solid #bbbbbb
                   background: #fffff8
                   padding-left: 5px
                 .stat
                   font-size: 10px
                   line-height: 1.75em
                   padding: 0 5px
                   color: #333333
                   background: #dddddd
                   font-weight: bold
               .contest-title
                 color: white
                 text-align: center
                 line-height: 2em
               .registration-desc
                 border: 1px dotted gray
                 background: #f5f5f5
                 padding: 5px
                 margin: 10px 0
                 font-size: 12px
                 line-height: 1.5em
               .test-desc
                 border: 1px dotted gray
                 background: #f5f5f5
                 padding: 5px
                 margin: 10px 0
                 font-size: 12px
                 line-height: 1.5em
               .problem-list
                 width: 200px
                 float: left
               .problem-bar
                 margin-top: 5px
                 padding: 5px
                 background: #e0e0e0
                 span.problem-title
                   font-weight: bold
                   font-size: 110%
               .problem-content
                 float: left
                 margin-left: 10px
                 width: 700px
               .problem-panel
                 border: 1px black solid
                 padding: 5px
                 .problem-form
                   border: 1px dotted #99aaee
                   background: #eeeeff
               .notice-bar
                 margin-top: 3px
                 margin-bottom: 3px
                 text-align: center
                 span.notice
                   color: white
                   font-weight: bold
                   background: #000070
                   padding: 3px 20px 3px 20px
                   -moz-border-radius: 2px
                   -webkit-border-radius: 5px
                   border-radius: 5px
+            +
+            + table.codejom-problems
+            +   th
+            +     background: #000070
+            +     color: white
+            +   td
+            +     width: 200px
+            +     vertical-align: top
+            +     text-align: center
+            +
+            +     &.random-button
+            +       background: lightgrey
  No newline at end of 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

r255:b7ca2d765156 - Tue, 09 Feb 2010 15:46:54 - 9 files changed: 87 inserted, 7 deleted

Sign in to your account

Commit r255:b7ca2d765156 public

Author

r255:b7ca2d765156 - Tue, 09 Feb 2010 15:46:54 - 9 files changed: 87 inserted, 7 deleted

Commit `r255:b7ca2d765156` public