cafe-grader-web Commit - r228:9e664dd71888

cafe-grader-web

Commit `r228:9e664dd71888` public

parent | child

Description:

added timeout related javascripts

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

r228:9e664dd71888 - Thu, 28 Jan 2010 02:05:35 - 5 files changed: 91 inserted, 2 deleted

app/views/main/_submission_timeouts.html.haml created 644 ¶ +7

			@@ -0,0 +1,7
		1	+ CodejomTimeout.timeouts = [
		2	+ - @submission_timeouts.each_pair do \|id, t\|
		3	+ - if t!=nil
		4	+ = "{problem: #{id}, timeout: #{t}},"
		5	+ - else
		6	+ = "{problem: #{id}, timeout: null},"
		7	+ ];

public/javascripts/codejom_timeout.js created 644 ¶ +58

			@@ -0,0 +1,58
		1	+ var CodejomTimeout = {
		2	+
		3	+ timeStarted: null,
		4	+
		5	+ inputDataDuration: 5, // 5 minutes
		6	+
		7	+ timeouts: [],
		8	+
		9	+ updateProblemMessages: function() {
		10	+ CodejomTimeout.timeouts.each(function(data) {
		11	+ if(data.timeout==null) {
		12	+ $("problem-submission-form-" + data.problem).hide();
		13	+ } else if(data.timeout==0) {
		14	+ $("problem-timing-message-" + data.problem).innerHTML =
		15	+ "The recent input data is expired. Please download a new one. You'll have 5 minute to submit.";
		16	+ $("problem-submission-form-" + data.problem).hide();
		17	+ } else {
		18	+ $("problem-timing-message-" + data.problem).innerHTML =
		19	+ "You have about " + parseInt(data.timeout/60) + " minute(s) and " + parseInt(data.timeout % 60) + " second(s) to submit.";
		20	+ $("problem-submission-form-" + data.problem).show();
		21	+ }
		22	+ });
		23	+ },
		24	+
		25	+ refreshProblemMessages: function() {
		26	+ var timeElapsed = ((new Date()).getTime() - CodejomTimeout.timeStarted)/1000;
		27	+ // update timeout info
		28	+ CodejomTimeout.timeouts.each(function(data) {
		29	+ if(data.timeout > timeElapsed) {
		30	+ data.timeout -= timeElapsed;
		31	+ } else if(data.timeout > 0) {
		32	+ data.timeout = 0;
		33	+ }
		34	+ });
		35	+
		36	+ CodejomTimeout.updateProblemMessages();
		37	+ CodejomTimeout.registerRefreshEvent();
		38	+ },
		39	+
		40	+ registerRefreshEvent: function() {
		41	+ CodejomTimeout.timeStarted = (new Date()).getTime(),
		42	+ setTimeout(function () {
		43	+ CodejomTimeout.refreshProblemMessages();
		44	+ }, 2700);
		45	+ },
		46	+
		47	+ updateTimeoutAfterDownloadClick: function(problem) {
		48	+ CodejomTimeout.timeouts
		49	+ .filter(function(data) { return data.problem==problem; })
		50	+ .each(function(data) {
		51	+ if(data.timeout==0 \|\| data.timeout==null) {
		52	+ // TODO: use value from rails app.
		53	+ data.timeout = CodejomTimeout.inputDataDuration * 60;
		54	+ }
		55	+ });
		56	+ CodejomTimeout.updateProblemMessages();
		57	+ },
		58	+ };

app/controllers/main_controller.rb ¶ +20

                   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.'
                     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?
+            +           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])
                   if (!Configuration.show_tasks_to?(@user)) and
                       ((action_name=='submission') or (action_name=='submit'))
                     redirect_to :action => 'list' and return
                   end
                 end
                 def prepare_grading_result(submission)
                   if Configuration.task_grading_info.has_key? submission.problem.name
                     grading_info = Configuration.task_grading_info[submission.problem.name]
                   else
                     # guess task info from problem.full_score
                     cases = submission.problem.full_score / 10
                     grading_info = {
                       'testruns' => cases,
                       'testcases' => cases
                     }
                   end
                   @test_runs = []
                   if grading_info['testruns'].is_a? Integer
                     trun_count = grading_info['testruns']
                     trun_count.times do |i|
                       @test_runs << [ read_grading_result(@user.login,
                                                           submission.problem.name,
                                                           submission.id,
                                                           i+1) ]
                     end
                   else
                     grading_info['testruns'].keys.sort.each do |num|
                       run = []
                       testrun = grading_info['testruns'][num]
                       testrun.each do |c|
                         run << read_grading_result(@user.login,
                                                    submission.problem.name,
                                                    submission.id,
                                                    c)

app/views/main/_problem.html.haml ¶ +1 -1

               .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"}
+            +       %input{:type => "submit", :value => "Download input", :onclick => "CodejomTimeout.updateTimeoutAfterDownloadClick(#{problem.id}); return true;"}
                     %span{:id => "problem-timing-message-#{problem.id}"}
                       = "After downloading, you have #{TEST_ASSIGNMENT_EXPIRATION_DURATION/60} minutes to submit."
                   %div{:id => "problem-submission-form-#{problem.id}"}
                     - form_tag({ :action => 'submit_solution', :id => problem.id }, :method => :post, :multipart => true) do
                       %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 -1

               - content_for :head do
                 = javascript_include_tag :defaults
                 = javascript_include_tag 'announcement_refresh.js'
+            +   = javascript_include_tag 'codejom_timeout.js'
               = user_title_bar(@user)
               .announcementbox{:style => (@announcements.length==0 ? "display:none" : "")}
                 %span{:class => 'title'}
                   Announcements
                 #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", :style => (@current_problem_id!=nil) ? "display:none" : ""}
                     %b Welcome to Code Jom
                     %br/
                     Choose problems from the list on the right.
                   = render :partial => 'problem', :collection => @problems
               %br{:clear=>'both'}/
               %hr/
-            - :javascript
+            + %script{:type => "text/javascript"}
                 Announcement.registerRefreshEventTimer();
+            +   = render :partial => 'submission_timeouts'
+            +   CodejomTimeout.updateProblemMessages();
+            +   CodejomTimeout.registerRefreshEvent();

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

r228:9e664dd71888 - Thu, 28 Jan 2010 02:05:35 - 5 files changed: 91 inserted, 2 deleted

Sign in to your account

Commit r228:9e664dd71888 public

Author

r228:9e664dd71888 - Thu, 28 Jan 2010 02:05:35 - 5 files changed: 91 inserted, 2 deleted

Commit `r228:9e664dd71888` public