cafe-grader-web Commit - r216:fa11dca6b078

r216:fa11dca6b078 - Sat, 23 Jan 2010 16:17:06 - 10 files changed: 149 inserted, 74 deleted

app/models/submission_status.rb created 644 ¶ +6

			@@ -0,0 +1,6
		1	+ class SubmissionStatus < ActiveRecord::Base
		2	+
		3	+ belongs_to :user
		4	+ belongs_to :problem
		5	+
		6	+ end

app/views/main/_problem.html.haml created 644 ¶ +18

			@@ -0,0 +1,18
		1	+ .problem-panel{:id => "problem-panel-#{problem.id}", :style => "display:none"}
		2	+ .problem-form{:id => "problem-form-#{problem.id}"}
		3	+ - form_tag({ :action => 'download_input', :id => problem.id }, :method => :post) do
		4	+ %b Input:
		5	+ %input{:type => "submit", :value => "Download input"}
		6	+ - form_tag({ :action => 'submit_solution', :id => problem.id }, :method => :post, :multipart => true) do
		7	+ %b Submit output:
		8	+ %input{:type => "file", :name => "file"}
		9	+ %input{:type => "submit", :value => "Submit solution"}
		10	+
		11	+ .problem-description
		12	+ - if problem.description!=nil
		13	+ - if problem.description.markdowned
		14	+ = markdown(problem.description.body)
		15	+ - else
		16	+ = problem.description.body
		17	+ - else
		18	+ (not available)

db/migrate/20100123154326_create_submission_statuses.rb created 644 ¶ +16

			@@ -0,0 +1,16
		1	+ class CreateSubmissionStatuses < ActiveRecord::Migration
		2	+ def self.up
		3	+ create_table :submission_statuses do \|t\|
		4	+ t.integer :user_id
		5	+ t.integer :problem_id
		6	+ t.boolean :passed
		7	+ t.integer :submission_count
		8	+
		9	+ t.timestamps
		10	+ end
		11	+ end
		12	+
		13	+ def self.down
		14	+ drop_table :submission_statuses
		15	+ end
		16	+ end

test/fixtures/submission_statuses.yml created 644 ¶ +13

			@@ -0,0 +1,13
		1	+ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
		2	+
		3	+ one:
		4	+ user_id: 1
		5	+ problem_id: 1
		6	+ passed: false
		7	+ submission_count: 1
		8	+
		9	+ two:
		10	+ user_id: 1
		11	+ problem_id: 1
		12	+ passed: false
		13	+ submission_count: 1

test/unit/submission_status_test.rb created 644 ¶ +8

			@@ -0,0 +1,8
		1	+ require 'test_helper'
		2	+
		3	+ class SubmissionStatusTest < ActiveSupport::TestCase
		4	+ # Replace this with your real tests.
		5	+ test "the truth" do
		6	+ assert true
		7	+ end
		8	+ end

app/controllers/main_controller.rb ¶ +68 -46

                 # COMMENTED OUT: filter in each action instead
                 # before_filter :verify_time_limit, :only => [:submit]
-            -   verify :method => :post, :only => [:submit, :new_input, :download_input, :submit_solution],
+            +   verify :method => :post, :only => [:submit, :download_input, :submit_solution],
                        :redirect_to => { :action => :index }
                 # COMMENT OUT: only need when having high load
                          :locals => {:announcement_effect => true})
                 end
+            +   #
                 # actions for Code Jom
-            -   def new_input
+            +   #
+            +   def download_input
                   problem = Problem.find(params[:id])
                   user = User.find(session[:user_id])
                   if user.can_request_new_test_pair_for? problem
                     send_data(assignment.test_pair.input,
                               { :filename => "#{problem.name}-#{assignment.request_number}.in",
                                 :type => 'text/plain' })
-            -     else
-            -       flash[:notice] = 'You cannot request new input now.'
-            -       redirect_to :action => 'list'
-            -     end
-            -   end
+            -
-            -   def download_input
-            -     problem = Problem.find(params[:id])
-            -     user = User.find(session[:user_id])
-            -     recent_assignment = user.get_recent_test_pair_assignment_for problem
-            -     if recent_assignment != nil
+            +     else
+            +       recent_assignment = user.get_recent_test_pair_assignment_for problem
                     send_data(recent_assignment.test_pair.input,
                               { :filename => "#{problem.name}-#{recent_assignment.request_number}.in",
                                 :type => 'text/plain' })
-            -     else
-            -       flash[:notice] = 'You have not requested for any input data for this problem.'
-            -       redirect_to :action => 'list'
                   end
                 end
                   problem = Problem.find(params[:id])
                   user = User.find(session[:user_id])
                   recent_assignment = user.get_recent_test_pair_assignment_for problem
-            -     if recent_assignment != nil
-            -       submitted_solution = params[:file].read
-            -       test_pair = recent_assignment.test_pair
-            -       passed = test_pair.grade(submitted_solution)
-            -       points = passed ? 100 : 0
-            -       submission = Submission.new(:user => user,
-            -                                   :problem => problem,
-            -                                   :source => params[:file].read,
-            -                                   :source_filename => params['file'].original_filename,
-            -                                   :language_id => 0,
-            -                                   :submitted_at => Time.new.gmtime,
-            -                                   :graded_at => Time.new.gmtime,
-            -                                   :points => points)
-            -       submission.save
-            -       recent_assignment.submitted = true
-            -       recent_assignment.save
-            -       if passed
-            -         flash[:notice] = 'Correct solution'
-            -       else
-            -         flash[:notice] = 'Incorrect solution'
-            -       end
-            -       redirect_to :action => 'list'
+            +     if recent_assignment == nil
+            +       flash[:notice] = 'You have not requested for any input data for this problem.  Please download an input first.'
+            +       redirect_to :action => 'list' and return
+            +     end
+            +
+            +     if recent_assignment.submitted
+            +       flash[:notice] = 'You have already submitted an incorrect solution for this input.  Please download a new input data.'
+            +       redirect_to :action => 'list' and return
+            +     end
+            +
+            +     if params[:file] == nil
+            +       flash[:notice] = 'You have not submitted any output.'
+            +       redirect_to :action => 'list' and return
+            +     end
+            +
+            +     submitted_solution = params[:file].read
+            +     test_pair = recent_assignment.test_pair
+            +     passed = test_pair.grade(submitted_solution)
+            +     points = passed ? 100 : 0
+            +     submission = Submission.new(:user => user,
+            +                                 :problem => problem,
+            +                                 :source => submitted_solution,
+            +                                 :source_filename => params['file'].original_filename,
+            +                                 :language_id => 0,
+            +                                 :submitted_at => Time.new.gmtime,
+            +                                 :graded_at => Time.new.gmtime,
+            +                                 :points => points)
+            +     submission.save
+            +     recent_assignment.submitted = true
+            +     recent_assignment.save
+            +
+            +     status = user.get_submission_status_for(problem)
+            +     if status == nil
+            +       status = SubmissionStatus.new :user => user, :problem => problem, :submission_count => 0
+            +     end
+            +
+            +     status.submission_count += 1
+            +     status.passed = passed
+            +     status.save
+            +
+            +     if passed
+            +       flash[:notice] = 'Correct solution.'
                   else
-            -       flash[:notice] = 'You have not requested for any input data for this problem.'
-            -       redirect_to :action => 'list'
+            +       flash[:notice] = 'Incorrect solution.'
                   end
+            +     redirect_to :action => 'list'
                 end
                 protected
                 end
                 def prepare_list_information
-            -     @problems = Problem.find_available_problems
+            +     @user = User.find(session[:user_id])
+            +
+            +     all_problems = Problem.find_available_problems
+            +
+            +     passed = {}
+            +     sub_count = {}
+            +     @user.submission_statuses.each do |status|
+            +       if status.passed
+            +         passed[status.problem_id] = true
+            +       end
+            +       sub_count[status.problem_id] = status.submission_count
+            +     end
+            +
+            +     @problems = all_problems.reject { |problem| passed.has_key? problem.id }
+            +
                   @prob_submissions = Array.new
-            -     @user = User.find(session[:user_id])
                   @problems.each do |p|
-            -       sub = Submission.find_last_by_user_and_problem(@user.id,p.id)
-            -       if sub!=nil
-            -         @prob_submissions << { :count => sub.number, :submission => sub }
+            +       if sub_count.has_key? p.id
+            +         @prob_submissions << { :count => sub_count[p.id] }
                     else
-            -         @prob_submissions << { :count => 0, :submission => nil }
+            +         @prob_submissions << { :count => 0 }
                     end
                   end
                   prepare_announcements

app/models/submission.rb ¶ +1 -1

                 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_specify_language
                 before_save :assign_latest_number_if_new_recond

app/models/user.rb ¶ +9

                          :order => 'created_at DESC'
                 has_many :test_pair_assignments, :dependent => :delete_all
+            +   has_many :submission_statuses
                 belongs_to :site
                 belongs_to :country
                   end
                 end
+            +   def get_submission_status_for(problem)
+            +     SubmissionStatus.find(:first,
+            +                           :conditions => {
+            +                             :user_id => id,
+            +                             :problem_id => problem.id
+            +                           })
+            +   end
+            +
                 def email_for_editing
                   if self.email==nil
                     "(unknown)"

db/schema.rb ¶ +10 -1

               #
               # It's strongly recommended to check this file into your version control system.
-            - ActiveRecord::Schema.define(:version => 20100118174404) do
+            + ActiveRecord::Schema.define(:version => 20100123154326) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
                   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"

app/views/main/_problem.html.erb removed ¶ -26

deleted file

	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

r216:fa11dca6b078 - Sat, 23 Jan 2010 16:17:06 - 10 files changed: 149 inserted, 74 deleted

Sign in to your account

Commit r216:fa11dca6b078 public

Author

r216:fa11dca6b078 - Sat, 23 Jan 2010 16:17:06 - 10 files changed: 149 inserted, 74 deleted

Commit `r216:fa11dca6b078` public