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

@@ -8,7 +8,7
8	# COMMENTED OUT: filter in each action instead	8	# COMMENTED OUT: filter in each action instead
9	# before_filter :verify_time_limit, :only => [:submit]	9	# before_filter :verify_time_limit, :only => [:submit]
10		10
11	- verify :method => :post, :only => [:submit, ~~:new_input~~, :download_input, :submit_solution],	11	+ verify :method => :post, :only => [:submit, :download_input, :submit_solution],
12	:redirect_to => { :action => :index }	12	:redirect_to => { :action => :index }
13		13
14	# COMMENT OUT: only need when having high load	14	# COMMENT OUT: only need when having high load
@@ -176,8 +176,10
176	:locals => {:announcement_effect => true})	176	:locals => {:announcement_effect => true})
177	end	177	end
178		178
		179	+ #
179	# actions for Code Jom	180	# actions for Code Jom
180	- def new_input	181	+ #
		182	+ def download_input
181	problem = Problem.find(params[:id])	183	problem = Problem.find(params[:id])
182	user = User.find(session[:user_id])	184	user = User.find(session[:user_id])
183	if user.can_request_new_test_pair_for? problem	185	if user.can_request_new_test_pair_for? problem
@@ -187,23 +189,11
187	send_data(assignment.test_pair.input,	189	send_data(assignment.test_pair.input,
188	{ :filename => "#{problem.name}-#{assignment.request_number}.in",	190	{ :filename => "#{problem.name}-#{assignment.request_number}.in",
189	:type => 'text/plain' })	191	:type => 'text/plain' })
190	- else	192	+ else
191	- flash[:notice] = 'You cannot request new input now.'	193	+ recent_assignment = user.get_recent_test_pair_assignment_for problem
192	- redirect_to :action => 'list'
193	- end
194	- end
195	-
196	- def download_input
197	- problem = Problem.find(params[:id])
198	- user = User.find(session[:user_id])
199	- recent_assignment = user.get_recent_test_pair_assignment_for problem
200	- if recent_assignment != nil
201	send_data(recent_assignment.test_pair.input,	194	send_data(recent_assignment.test_pair.input,
202	{ :filename => "#{problem.name}-#{recent_assignment.request_number}.in",	195	{ :filename => "#{problem.name}-#{recent_assignment.request_number}.in",
203	:type => 'text/plain' })	196	:type => 'text/plain' })
204	- else
205	- flash[:notice] = 'You have not requested for any input data for this problem.'
206	- redirect_to :action => 'list'
207	end	197	end
208	end	198	end
209		199
@@ -211,32 +201,52
211	problem = Problem.find(params[:id])	201	problem = Problem.find(params[:id])
212	user = User.find(session[:user_id])	202	user = User.find(session[:user_id])
213	recent_assignment = user.get_recent_test_pair_assignment_for problem	203	recent_assignment = user.get_recent_test_pair_assignment_for problem
214	- if recent_assignment != nil	204	+ if recent_assignment == nil
215	- submitted_solution = params[:file].read	205	+ flash[:notice] = 'You have not requested for any input data for this problem. Please download an input first.'
216	- test_pair = recent_assignment.test_pair	206	+ redirect_to :action => 'list' and return
217	- passed = test_pair.grade(submitted_solution)	207	+ end
218	- points = passed ? 100 : 0	208	+
219	- submission = Submission.new(:user => user,	209	+ if recent_assignment.submitted
220	- :problem => problem,	210	+ flash[:notice] = 'You have already submitted an incorrect solution for this input. Please download a new input data.'
221	- :source => params[:file].read,	211	+ redirect_to :action => 'list' and return
222	- :source_filename => params['file'].original_filename,	212	+ end
223	- :language_id => 0,	213	+
224	- :submitted_at => Time.new.gmtime,	214	+ if params[:file] == nil
225	- :graded_at => Time.new.gmtime,	215	+ flash[:notice] = 'You have not submitted any output.'
226	- :points => points)	216	+ redirect_to :action => 'list' and return
227	- submission.save	217	+ end
228	- recent_assignment.submitted = true	218	+
229	- recent_assignment.save	219	+ submitted_solution = params[:file].read
230	- if passed	220	+ test_pair = recent_assignment.test_pair
231	- flash[:notice] = 'Correct solution'	221	+ passed = test_pair.grade(submitted_solution)
232	- else	222	+ points = passed ? 100 : 0
233	- flash[:notice] = 'Incorrect solution'	223	+ submission = Submission.new(:user => user,
234	- end	224	+ :problem => problem,
235	- redirect_to :action => 'list'	225	+ :source => submitted_solution,
		226	+ :source_filename => params['file'].original_filename,
		227	+ :language_id => 0,
		228	+ :submitted_at => Time.new.gmtime,
		229	+ :graded_at => Time.new.gmtime,
		230	+ :points => points)
		231	+ submission.save
		232	+ recent_assignment.submitted = true
		233	+ recent_assignment.save
		234	+
		235	+ status = user.get_submission_status_for(problem)
		236	+ if status == nil
		237	+ status = SubmissionStatus.new :user => user, :problem => problem, :submission_count => 0
		238	+ end
		239	+
		240	+ status.submission_count += 1
		241	+ status.passed = passed
		242	+ status.save
		243	+
		244	+ if passed
		245	+ flash[:notice] = 'Correct solution.'
236	else	246	else
237	- flash[:notice] = 'You have not requested for any input data for this problem.'	247	+ flash[:notice] = 'Incorrect solution.'
238	- redirect_to :action => 'list'
239	end	248	end
		249	+ redirect_to :action => 'list'
240	end	250	end
241		251
242	protected	252	protected
@@ -254,15 +264,27
254	end	264	end
255		265
256	def prepare_list_information	266	def prepare_list_information
257	- @problems = Problem.find_available_problems	267	+ @user = User.find(session[:user_id])
		268	+
		269	+ all_problems = Problem.find_available_problems
		270	+
		271	+ passed = {}
		272	+ sub_count = {}
		273	+ @user.submission_statuses.each do \|status\|
		274	+ if status.passed
		275	+ passed[status.problem_id] = true
		276	+ end
		277	+ sub_count[status.problem_id] = status.submission_count
		278	+ end
		279	+
		280	+ @problems = all_problems.reject { \|problem\| passed.has_key? problem.id }
		281	+
258	@prob_submissions = Array.new	282	@prob_submissions = Array.new
259	- @user = User.find(session[:user_id])
260	@problems.each do \|p\|	283	@problems.each do \|p\|
261	- sub = Submission.find_last_by_user_and_problem(@user.id,p.id)	284	+ if sub_count.has_key? p.id
262	- if sub!=nil	285	+ @prob_submissions << { :count => sub_count[p.id] }
263	- @prob_submissions << { :count => sub.number, :submission => sub }
264	else	286	else
265	- @prob_submissions << { :count => 0, ~~:submission~~ => ~~nil~~ }	287	+ @prob_submissions << { :count => 0 }
266	end	288	end
267	end	289	end
268	prepare_announcements	290	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