cafe-grader-web Commit - r99:ab383e0b489e

cafe-grader-web

Commit `r99:ab383e0b489e` public

parent | child

Description:

[web] added support for output only problems git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@188 6386c4cd-e34a-4fa8-8920-d93eb39b512e

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

r99:ab383e0b489e - Tue, 22 Apr 2008 00:25:26 - 5 files changed: 64 inserted, 21 deleted

db/migrate/031_add_supports_for_output_only_problems.rb created 644 ¶ +11

@@ -0,0 +1,11
	1	+ class AddSupportsForOutputOnlyProblems < ActiveRecord::Migration
	2	+ def self.up
	3	+ add_column :submissions, :source_filename, :string
	4	+ add_column :problems, :output_only, :boolean
	5	+ end
	6	+
	7	+ def self.down
	8	+ remove_column :submissions, :source_filename
	9	+ add_column :problems, :output_only, :boolean
	10	+ end
	11	+ end

app/controllers/main_controller.rb ¶ +4 -1

                 def index
                   redirect_to :action => 'login'
                 end
                 def login
                   saved_notice = flash[:notice]
                   reset_session
                   flash[:notice] = saved_notice
                   render :action => 'login', :layout => 'empty'
                 end
                 def list
                   prepare_list_information
                 end
                 def submit
                   user = User.find(session[:user_id])
                   @submission = Submission.new(params[:submission])
                   @submission.user = user
                   @submission.language_id = 0
-            -     @submission.source = params['file'].read if params['file']!=''
+            +     if params['file']!=''
+            +       @submission.source = params['file'].read
+            +       @submission.source_filename = params['file'].original_filename
+            +     end
                   @submission.submitted_at = Time.new
                   if user.site!=nil and user.site.finished?
                     @submission.errors.add_to_base "The contest is over."
                     prepare_list_information
                     render :action => 'list' and return
                   end
                   if @submission.valid?
                     if @submission.save == false
               	flash[:notice] = 'Error saving your submission'
                     elsif Task.create(:submission_id => @submission.id,
                                       :status => Task::STATUS_INQUEUE) == false
               	flash[:notice] = 'Error adding your submission to task queue'
                     end
                   else
                     prepare_list_information
                     render :action => 'list' and return
                   end
                   redirect_to :action => 'list'
                 end
                 def source
                   submission = Submission.find(params[:id])

app/models/submission.rb ¶ +28 -15

               class Submission < ActiveRecord::Base
                 belongs_to :language
                 belongs_to :problem
                 belongs_to :user
+            +   before_validation :assign_problem
+            +   before_validation :assign_language
+            +
                 validates_presence_of :source
                 validates_length_of :source, :maximum => 100_000, :allow_blank => true, :message => 'too long'
                 validates_length_of :source, :minimum => 1, :allow_blank => true, :message => 'too short'
+            +   validate :must_have_valid_problem
                 validate :must_specify_language
-            -   validate :must_have_valid_problem
                 before_save :assign_latest_number_if_new_recond
                 def self.find_last_by_user_and_problem(user_id, problem_id)
                   last_sub = find(:first,
                                   :conditions => {:user_id => user_id,
                                     :problem_id => problem_id},
                                   :order => 'number DESC')
                   return last_sub
                 end
                 def self.find_all_last_by_problem(problem_id)
                   # need to put in SQL command, maybe there's a better way
                   Submission.find_by_sql("SELECT * FROM submissions " +
               			   "WHERE id = " +
               			   "(SELECT MAX(id) FROM submissions AS subs " +
               			   "WHERE subs.user_id = submissions.user_id AND " +
                                          "problem_id = " + problem_id.to_s + " " +
               			   "GROUP BY user_id)")
                 end
                 def self.find_last_for_all_available_problems(user_id)
                   submissions = Array.new
                   problems = Problem.find_available_problems
                   end
                   return nil
                 end
                 def self.find_language_in_source(source)
                   langopt = find_option_in_source(/^LANG:/,source)
                   if language = Language.find_by_name(langopt)
                     return language
                   elsif language = Language.find_by_pretty_name(langopt)
                     return language
                   else
                     return nil
                   end
                 end
                 def self.find_problem_in_source(source)
                   prob_opt = find_option_in_source(/^TASK:/,source)
                   if problem = Problem.find_by_name(prob_opt)
                     return problem
                   else
                     return nil
                   end
                 end
+            +   def assign_problem
+            +     if self.problem_id!=-1
+            +       begin
+            +         self.problem = Problem.find(self.problem_id)
+            +       rescue ActiveRecord::RecordNotFound
+            +         self.problem = nil
+            +       end
+            +     else
+            +       self.problem = Submission.find_problem_in_source(self.source)
+            +     end
+            +   end
+            +
+            +   def assign_language
+            +     self.language = Submission.find_language_in_source(self.source)
+            +   end
+            +
                 # validation codes
                 def must_specify_language
                   return if self.source==nil
-            -     self.language = Submission.find_language_in_source(self.source)
+            +     # for output_only tasks
+            +     return if self.problem!=nil and self.problem.output_only
+            +
+            +     if self.language==nil
                     errors.add('source',"must specify programming language") unless self.language!=nil
                   end
+            +   end
                 def must_have_valid_problem
                   return if self.source==nil
-            -     if self.problem_id!=-1
+            +     if self.problem==nil
-            -       begin
-            -         problem = Problem.find(self.problem_id)
-            -       rescue ActiveRecord::RecordNotFound
-            -         problem = nil
-            -       end
-            -     else
-            -       problem = Submission.find_problem_in_source(self.source)
-            -     end
-            -     if problem==nil
                     errors.add('problem',"must be specified.")
-            -     elsif (!problem.available) and (self.new_record?)
+            +     elsif (!self.problem.available) and (self.new_record?)
                     errors.add('problem',"must be valid.")
-            -     else
-            -       self.problem = problem
                   end
                 end
                 # callbacks
                 def assign_latest_number_if_new_recond
                   return if !self.new_record?
                   latest = Submission.find_last_by_user_and_problem(self.user_id, self.problem_id)
                   self.number = (latest==nil) ? 1 : latest.number + 1;
                 end
               end

app/views/problems/_form.rhtml ¶ +18 -4

               <%= error_messages_for 'problem' %>
               <!--[form:problem]-->
               <p><label for="problem_name">Name</label><br/>
               <%= text_field 'problem', 'name'  %></p>
               <p><label for="problem_full_name">Full name</label><br/>
               <%= text_field 'problem', 'full_name'  %></p>
               <p><label for="problem_full_score">Full score</label><br/>
               <%= text_field 'problem', 'full_score'  %></p>
               <p><label for="problem_date_added">Date added</label><br/>
               <%= date_select 'problem', 'date_added'  %></p>
-            - <p><label for="problem_available">Available?</label>
+            + <%
-            - <%= select("problem","available",[['True',true],['False',false]]) %></p>
+            + # TODO: these should be put in model Problem, but I can't think of
+            + #       nice default values for them.  These values look fine only
+            + #       in this case (of lazily adding new problems).
+            + @problem.available = true if @problem!=nil and @problem.available==nil
+            + @problem.test_allowed = true if @problem!=nil and @problem.test_allowed==nil
+            + @problem.output_only = false if @problem!=nil and @problem.output_only==nil
+            + %>
-            - <p><label for="problem_test_allowed">Test allowed?</label>
+            + <p>
-            - <%= select("problem","test_allowed",[['True',true],['False',false]]) %></p>
+            + <label for="problem_available">Available?</label>
+            + <%= check_box :problem, :available %>
+            +
+            + <label for="problem_test_allowed">Test allowed?</label>
+            + <%= check_box :problem, :test_allowed %>
+            +
+            + <label for="problem_output_only">Output only?</label>
+            + <%= check_box :problem, :output_only %>
+            + </p>
               <%= error_messages_for 'description' %>
               <p><label for="description_body">Description</label><br/>
               <%= text_area :description, :body, :rows => 10, :cols => 80  %></p>
               <p><label for="description_markdowned">Markdowned?</label>
               <%= select "description",
                          "markdowned",
                          [['True',true],['False',false]],
                          {:selected => (@description) ? @description.markdowned : false }
               %></p>
               <p><label for="problem_url">URL</label><br/>
               <%= text_field 'problem', 'url'  %></p>
               <!--[eoform:problem]-->

db/schema.rb ¶ +3 -1

               # This file is auto-generated from the current state of the database. Instead of editing this file,
               # please use the migrations feature of ActiveRecord 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 => 30) do
+            + ActiveRecord::Schema.define(:version => 31) 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"
                 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"
                 end
                 create_table "descriptions", :force => true do |t|
                   t.text     "body"
                   t.boolean  "markdowned"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
                   t.string   "mode"
                   t.boolean  "active"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.integer  "task_id"
                 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
                 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"
                 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 "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"
                 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_requests", :force => true do |t|
                   t.integer  "user_id"
                   t.integer  "problem_id"
                   t.integer  "submission_id"
                   t.string   "input_file_name"
                   t.string   "output_file_name"
                   t.string   "running_stat"
                   t.integer  "status"
                   t.datetime "updated_at"
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
                   t.text     "compiler_message"

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

r99:ab383e0b489e - Tue, 22 Apr 2008 00:25:26 - 5 files changed: 64 inserted, 21 deleted

Sign in to your account

Commit r99:ab383e0b489e public

Author

r99:ab383e0b489e - Tue, 22 Apr 2008 00:25:26 - 5 files changed: 64 inserted, 21 deleted

Commit `r99:ab383e0b489e` public