cafe-grader-web Commit - r232:f00dec11b375

cafe-grader-web

Commit `r232:f00dec11b375` public

parent | child

Description:

fixed timeout bug for wrong submission (thanks to @dtinth), and js bugs occurring in IE

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

r232:f00dec11b375 - Thu, 28 Jan 2010 15:06:29 - 2 files changed: 6 inserted, 2 deleted

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

                                               :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.'
                     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
                   end
                   if recent!=nil
                     recent_id = recent.to_i
                     @announcements = @announcements.find_all { |a| a.id > recent_id }
                   end
                 end
                 def prepare_timeout_information(problems)
                   @submission_timeouts = {}
                   problems.each do |problem|
                     assignment = @user.get_recent_test_pair_assignment_for(problem)
                     if assignment == nil
                       timeout = nil
                     else
-            -         if assignment.expired?
+            +         if (assignment.expired?) or (assignment.submitted)
                         timeout = 0
                       else
                         timeout = assignment.created_at + TEST_ASSIGNMENT_EXPIRATION_DURATION - Time.new.gmtime
                       end
                     end
                     @submission_timeouts[problem.id] = timeout
                   end
                   @submission_timeouts.each_pair {|k,v| puts "#{k} => #{v}"}
                 end
                 def prepare_list_information
                   @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
                   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 }
                   prepare_timeout_information(@problems)
                   @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
                 def check_viewability
                   @user = User.find(session[:user_id])

public/javascripts/codejom_timeout.js ¶ +5 -1

               var CodejomTimeout = {
                   timeStarted: null,
                   inputDataDuration: 5,  // 5 minutes
                   timeouts: [],
                   updateProblemMessages: function() {
               	CodejomTimeout.timeouts.each(function(data) {
+            + 	    if(data==null)
+            + 		return;
               	    if(data.timeout==null) {
               		$("problem-submission-form-" + data.problem).hide();
               	    } else if(data.timeout==0) {
               		$("problem-timing-message-" + data.problem).innerHTML =
               		    "The recent input data is expired.  Please download a new one.  You'll have 5 minute to submit.";
               		$("problem-submission-form-" + data.problem).hide();
               	    } else {
               		$("problem-timing-message-" + data.problem).innerHTML =
               		    "You have about " + parseInt(data.timeout/60) + " minute(s) and " + parseInt(data.timeout % 60) + " second(s) to submit.";
               		$("problem-submission-form-" + data.problem).show();
               	    }
               	});
                   },
                   refreshProblemMessages: function() {
               	var timeElapsed = ((new Date()).getTime() - CodejomTimeout.timeStarted)/1000;
               	// update timeout info
               	CodejomTimeout.timeouts.each(function(data) {
+            + 	    if(data==null)
+            + 		return;
               	    if(data.timeout > timeElapsed) {
               		data.timeout -= timeElapsed;
               	    } else if(data.timeout > 0) {
               		data.timeout = 0;
               	    }
               	});
               	CodejomTimeout.updateProblemMessages();
               	CodejomTimeout.registerRefreshEvent();
                   },
                   registerRefreshEvent: function() {
               	CodejomTimeout.timeStarted = (new Date()).getTime(),
               	setTimeout(function () {
               	    CodejomTimeout.refreshProblemMessages();
               	}, 2700);
                   },
                   updateTimeoutAfterDownloadClick: function(problem) {
               	CodejomTimeout.timeouts
-            - 	    .filter(function(data) { return data.problem==problem; })
+            + 	    .filter(function(data) { return (data!=null) && (data.problem==problem); })
               	    .each(function(data) {
               		if(data.timeout==0 || data.timeout==null) {
               		    // TODO: use value from rails app.
               		    data.timeout = CodejomTimeout.inputDataDuration * 60;
               		}
               	    });
               	CodejomTimeout.updateProblemMessages();
                   },
               };

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

r232:f00dec11b375 - Thu, 28 Jan 2010 15:06:29 - 2 files changed: 6 inserted, 2 deleted

Sign in to your account

Commit r232:f00dec11b375 public

Author

r232:f00dec11b375 - Thu, 28 Jan 2010 15:06:29 - 2 files changed: 6 inserted, 2 deleted

Commit `r232:f00dec11b375` public