cafe-grader-web Commit - r223:1586858ff9d5

cafe-grader-web

Commit `r223:1586858ff9d5` public

parent | child

Description:

shows recent problem after wrong submissions

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

r223:1586858ff9d5 - Tue, 26 Jan 2010 02:08:22 - 4 files changed: 32 inserted, 12 deleted

app/controllers/main_controller.rb ¶ +13

                   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' })
                   end
                 end
                 def submit_solution
                   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
                     flash[:notice] = 'You have not requested for any input data for this problem.  Please download an input first.'
+            +       session[:current_problem_id] = problem.id
                     redirect_to :action => 'list' and return
                   end
                   if recent_assignment.expired?
                     flash[:notice] = 'The current input is expired.  Please download a new input data.'
+            +       session[:current_problem_id] = problem.id
                     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.'
+            +       session[:current_problem_id] = problem.id
                     redirect_to :action => 'list' and return
                   end
                   if params[:file] == nil
                     flash[:notice] = 'You have not submitted any output.'
+            +       session[:current_problem_id] = problem.id
                     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,
                   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.'
                     user.update_codejom_status
                   else
+            +       session[:current_problem_id] = problem.id
                     flash[:notice] = 'Incorrect solution.'
                   end
                   redirect_to :action => 'list'
                 end
                 protected
                 def prepare_announcements(recent=nil)
                   if Configuration.show_tasks_to?(@user)
                     @announcements = Announcement.find_published(true)
                   else
                     @announcements = Announcement.find_published
                   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
+            +     if session.has_key? :current_problem_id
+            +       @current_problem_id = session[:current_problem_id]
+            +       session.delete(:current_problem_id)
+            +     else
+            +       @current_problem_id = nil
+            +     end
+            +
                   @problems = all_problems.reject { |problem| passed.has_key? problem.id }
                   @prob_submissions = Array.new
                   @problems.each do |p|
                     if sub_count.has_key? p.id
                       @prob_submissions << { :count => sub_count[p.id] }
                     else
                       @prob_submissions << { :count => 0 }
                     end
                   end
                   prepare_announcements
                 end

app/models/problem.rb ¶ +6 -2

                 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)
-            -     begin
+            +     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 while forbidden_numbers!=nil and forbidden_numbers.include? test_num
+            +     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

app/views/main/_problem.html.haml ¶ +8 -6

-            - .problem-panel{:id => "problem-panel-#{problem.id}", :style => "display:none"}
+            + .problem-panel{:id => "problem-panel-#{problem.id}", :style => "#{(problem.id != @current_problem_id) ? "display:none" : ""}"}
                 .problem-form{:id => "problem-form-#{problem.id}"}
                   - form_tag({ :action => 'download_input', :id => problem.id }, :method => :post) do
                     %b Input:
                     %input{:type => "submit", :value => "Download input"}
-            -       = "After downloading, you have #{TEST_ASSIGNMENT_EXPIRATION_DURATION/60} minutes to submit."
+            +       %span{:id => "problem-timing-message-#{problem.id}"}
-            -     - form_tag({ :action => 'submit_solution', :id => problem.id }, :method => :post, :multipart => true) do
+            +         = "After downloading, you have #{TEST_ASSIGNMENT_EXPIRATION_DURATION/60} minutes to submit."
-            -       %b Submit output:
+            +     %div{:id => "problem-submission-form-#{problem.id}"}
-            -       %input{:type => "file", :name => "file"}
+            +       - form_tag({ :action => 'submit_solution', :id => problem.id }, :method => :post, :multipart => true) do
-            -       %input{:type => "submit", :value => "Submit solution"}
+            +         %b Submit output:
+            +         %input{:type => "file", :name => "file"}
+            +         %input{:type => "submit", :value => "Submit solution"}
                 .problem-description
                   - if problem.description!=nil
                     - if problem.description.markdowned
                       = markdown(problem.description.body)
                     - else
                       = problem.description.body
                   - else
                     (not available)

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

                   #announcementbox-body
                     = render :partial => 'announcement', :collection => @announcements
               %hr/
               - if (Configuration.contest_mode?) and (@user.site!=nil) and (@user.site.started!=true)
                 %p=t 'main.start_soon'
               - if Configuration.show_tasks_to?(@user)
                 .problem-list
                   = render :partial => 'problem_title', :collection => @problems, :as => :problem
                 .problem-content
-            -     %span{:id => "problem-panel-filler"}
+            +     - if @current_problem_id==nil
-            -       %b Welcome to Code Jom
+            +       %span{:id => "problem-panel-filler"}
-            -       %br/
+            +         %b Welcome to Code Jom
-            -       Choose problems from the list on the right.
+            +         %br/
+            +         Choose problems from the list on the right.
                   = render :partial => 'problem', :collection => @problems
               %br{:clear=>'both'}/
               %hr/
               :javascript
                 Announcement.registerRefreshEventTimer();

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

r223:1586858ff9d5 - Tue, 26 Jan 2010 02:08:22 - 4 files changed: 32 inserted, 12 deleted

Sign in to your account

Commit r223:1586858ff9d5 public

Author

r223:1586858ff9d5 - Tue, 26 Jan 2010 02:08:22 - 4 files changed: 32 inserted, 12 deleted

Commit `r223:1586858ff9d5` public