cafe-grader-web Commit - r383:31aa87b1b1e9

cafe-grader-web

Commit `r383:31aa87b1b1e9` public

parent | child

Description:

saves submitted output, checks time outs; updated submission front-end flows

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

r383:31aa87b1b1e9 - Thu, 29 Jan 2015 03:09:12 - 8 files changed: 116 inserted, 20 deleted

db/migrate/20150129021221_add_output_to_submissions.rb created 644 ¶ +5

			@@ -0,0 +1,5
		1	+ class AddOutputToSubmissions < ActiveRecord::Migration
		2	+ def change
		3	+ add_column :submissions, :output, :text
		4	+ end
		5	+ end

app/assets/javascripts/toicontest.js ¶ +43 -3

               var TOIContest = {
                   NO_TIMEOUT: -1,
+            +     SUBMISSION_TIMEOUT: 300,
                   timeOuts: {},
+            +     timeStarted: 0,
                   problemSelectClick: function() {
                       $$(".submission-submit-divs").each(function(item) {
                           item.hide();
                       });
                       var problem_id = $('submission_problem_id').value;
                       if ( problem_id < 0 ) {
                           return;
                       }
                       $("submission_submit_div_" + problem_id + "_id").show();
                   },
-            -     confirmDownload: function() {
-            -         return confirm("แน่ใจ?");
+            +     confirmDownload: function(pid) {
+            +         result = confirm("คุณแน่ใจที่จะส่งข้อนี้หรือไม่?\nเมื่อคุณดาวน์โหลดข้อมูลชุดทดสอบแล้ว คุณจะต้องส่งข้อมูลส่งออกและโปรแกรมภายในเวลา 5 นาที");
+            +         if ( result ) {
+            +             if ( TOIContest.timeOuts[ pid ] == TOIContest.NO_TIMEOUT ) {
+            +                 TOIContest.refreshTimeOuts();
+            +
+            +                 TOIContest.timeOuts[ pid ] = TOIContest.SUBMISSION_TIMEOUT;
+            +
+            +                 TOIContest.refreshTimeOutMessages();
+            +             }
+            +         }
+            +         return result;
                   },
                   refreshTimeOutMessages: function() {
                       for ( var pid in TOIContest.timeOuts ) {
                           var timeOut = TOIContest.timeOuts[ pid ];
                           if ( timeOut != TOIContest.NO_TIMEOUT ) {
                               if ( timeOut > 0 ) {
                                   var minLeft = parseInt(timeOut / 60);
                                   var secLeft = parseInt(timeOut % 60);
                                   $('submission_time_left_' + pid + '_id').innerHTML = '| <b>เหลือเวลาอีก ' + minLeft + ':' + secLeft + ' นาที</b>';
+            +                     $('submission_form_'+ pid + '_id').show();
                               } else {
                                   $('submission_time_left_' + pid + '_id').innerHTML = '| <b>หมดเวลาส่ง</a>';
                                   $('submission_form_'+ pid + '_id').hide();
                               }
-            -             }
+            +             } else {
+            +                 $('submission_form_'+ pid + '_id').hide();
                       }
                   }
+            +     },
+            +
+            +     refreshTimeOuts: function() {
+            +         if ( TOIContest.timeStarted == 0 ) {
+            +             TOIContest.timeStarted = (new Date()).getTime();
+            +         }
+            +
+            +         var timeElapsed = ((new Date()).getTime() - TOIContest.timeStarted)/1000;
+            +         for ( var pid in TOIContest.timeOuts ) {
+            +             var timeOut = TOIContest.timeOuts[ pid ];
+            +             if ( timeOut > timeElapsed ) {
+            +                 TOIContest.timeOuts[ pid ] -= timeElapsed;
+            +             } else if ( timeOut > 0 ) {
+            +                 TOIContest.timeOuts[ pid ] = 0;
+            +             }
+            +         }
+            +     },
+            +
+            +     registerRefreshEvent: function() {
+            +         TOIContest.timeStarted = (new Date()).getTime();
+            +         setTimeout(function () {
+            +             TOIContest.refreshTimeOuts();
+            +             TOIContest.refreshTimeOutMessages();
+            +             TOIContest.registerRefreshEvent();
+            +         }, 1000);
+            +     },
               };

app/controllers/main_controller.rb ¶ +41 -11

+            + # coding: utf-8
               class MainController < ApplicationController
                 before_filter :authenticate, :except => [:index, :login]
                 before_filter :check_viewability, :except => [:index, :login]
                 append_before_filter :confirm_and_update_start_time,
                   @announcements = Announcement.find_for_frontpage
                   render :action => 'login', :layout => 'empty'
                 end
                 def list
+            +     if session[:current_problem_id]
+            +       @current_problem = Problem.find(session[:current_problem_id])
+            +       session[:current_problem_id] = nil
+            +     end
                   prepare_list_information
                 end
                 def help
                   @user = User.find(session[:user_id])
                 end
                 def submit
                   user = User.find(session[:user_id])
                   @submission = Submission.new
-            -     @submission.problem_id = params[:submission][:problem_id]
+            +     @current_problem = Problem.find(params[:submission][:problem_id])
+            +
+            +     if !@current_problem
+            +       flash[:notice] = 'Error: คุณยังไม่ได้ระบุข้อที่ต้องการส่ง'
+            +       redirect_to :action => 'list'
+            +     end
+            +
+            +     assignment = user.get_test_pair_assignment_for(@current_problem)
+            +     if !assignment
+            +       flash[:notice] = 'Error: คุณยังไม่ได้ดาวน์โหลดข้อมูลทดสอบ'
+            +       prepare_list_information
+            +       render :action => 'list' and return
+            +     end
+            +     if assignment.expired?
+            +       flash[:notice] = 'Error: หมดเวลาส่งสำหรับข้อนี้'
+            +       prepare_list_information
+            +       render :action => 'list' and return
+            +     end
+            +
+            +     @submission.problem = @current_problem
                   @submission.user = user
                   @submission.language_id = 0
                   if (params['file']) and (params['file']!='')
                     @submission.source = params['file'].read
                     @submission.source_filename = params['file'].original_filename
                   end
+            +     if (params['output_file']) and (params['output_file']!='')
+            +       @submission.output = params['output_file'].read
+            +     end
                   @submission.submitted_at = Time.new.gmtime
                   if GraderConfiguration.time_limit_mode? and user.contest_finished?
                     @submission.errors.add(:base,"The contest is over.")
                     prepare_list_information
                     render :action => 'list' and return
                   if @submission.valid?
                     if @submission.save == false
               	flash[:notice] = 'Error saving your submission'
                     elsif Task.create(:submission_id => @submission.id,
                                       :status => Task::STATUS_INQUEUE) == false
               	flash[:notice] = 'Error adding your submission to task queue'
+            +       else
+            +         flash[:notice] = 'จัดเก็บคำตอบและโปรแกรมที่คุณส่งเรียบร้อย'
                     end
                   else
                     prepare_list_information
                     render :action => 'list' and return
                   end
+            +
+            +     if @current_problem
+            +       session[:current_problem_id] = @current_problem.id
+            +     end
                   redirect_to :action => 'list'
                 end
                 def source
                   submission = Submission.find(params[:id])
                   if ((submission.user_id == session[:user_id]) and
                     flash[:notice] = 'Error: problem is not available'
                     redirect_to :action => 'list'
                   else
                     test_pair = TestPair.get_for(problem, true)
                     user = User.find(session[:user_id])
-            -       assignent = user.get_test_pair_assignment_for(problem)
+            +       assignment = user.get_test_pair_assignment_for(problem)
-            -       if !assignent
-            -         assignent = TestPairAssignment.new
-            -         assignent.user = user
-            -         assignent.problem = problem
-            -         assignent.test_pair = test_pair
-            -         assignent.submitted = false
-            -         assignent.save
+            +       if !assignment
+            +         assignment = TestPairAssignment.create_for(user, problem, test_pair)
+            +         assignment.save
                     end
                     send_data(test_pair.input,
               		{:filename => problem.name + '-input.txt',
                                :type => 'text/plain'})
                   end
                   if !problem or !problem.available
                     flash[:notice] = 'Error: problem is not available'
                     redirect_to :action => 'list' and return
                   end
+            +     @current_problem = problem
                   test_pair = TestPair.get_for(problem, false)
                   if (params['output_file']) and (params['output_file']!='')
                     output = params['output_file'].read
-            -       @current_problem = problem
                     @grading_result = grade(output, test_pair.solution)
                     prepare_list_information
                     render :action => 'list' and return
                   else
                     flash[:notice] = 'Error: output file errors'
-            -       redirect_to :action => 'list'
+            +       prepare_list_information
+            +       render :action => 'list' and return
                   end
                 end
                 protected
                 def grade(output, solution)

app/models/submission.rb ¶ +5

                 before_validation :assign_problem
                 before_validation :assign_language
                 validates_presence_of :source
                 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'
+            +
+            +   validates_presence_of :output
+            +   validates_length_of :output, :maximum => 100_000, :allow_blank => true, :message => 'too long'
+            +   validates_length_of :output, :minimum => 1, :allow_blank => true, :message => 'too short'
+            +
                 validate :must_have_valid_problem
                 validate :must_specify_language
                 before_save :assign_latest_number_if_new_recond
                 def self.find_last_by_user_and_problem(user_id, problem_id)

app/models/test_pair_assignment.rb ¶ +10

                 belongs_to :test_pair
                 belongs_to :user
                 def expired?
                   return created_at + TEST_ASSIGNMENT_EXPIRATION_DURATION < Time.new.gmtime
                 end
+            +
+            +   def self.create_for(user, problem, test_pair)
+            +     assignment = TestPairAssignment.new
+            +     assignment.user = user
+            +     assignment.problem = problem
+            +     assignment.test_pair = test_pair
+            +     assignment.submitted = false
+            +     assignment.save
+            +     return assignment
               end
+            + end

app/views/main/_submission_box.html.erb ¶ +7 -5

+            + <% selected_problem_id = @current_problem ? @current_problem.id : -1 %>
               <div class="submitbox">
                 <b>Problem:</b> <%= select 'submission', 'problem_id',
                            	      [['กรุณาเลือกข้อที่ต้องการส่งหรือทดสอบ','-1']] +
               		      @problems.collect {|p| [p.full_name, p.id]},
-            - 		      { :selected => '-1' },
+            + 		      { :selected => selected_problem_id },
                                     { :onchange => 'TOIContest.problemSelectClick()' } %>
               </div>
               <% @problems.each do |problem| %>
-            -   <div class="submission-submit-divs" id="submission_submit_div_<%= problem.id %>_id" style="displanny: none;">
+            +   <div class="submission-submit-divs" id="submission_submit_div_<%= problem.id %>_id" style="display: none;">
                   <div style="border: 1px solid #c0c0c0; padding: 5px; margin: 5px 0 5px 0;">
                     <b><%= problem.full_name %>: ข้อมูลสำหรับตรวจสอบ</b> (สามารถดาวน์โหลดและส่งกี่ครั้งก็ได้,ไม่มีคะแนน):
                     <%= link_to 'ดาวน์โหลด input', :action => 'verifying_testcase', :id => problem.id %>
                     <% if @current_problem and @current_problem.id == problem.id %>
                       <% if @grading_result %>
                         | <b>ผลการตรวจ:</b> <%= "#{@grading_result[:score]}/#{@grading_result[:full_score]} [#{@grading_result[:msg]}]" %>
                       <%= file_field_tag 'output_file' %>
                       <%= submit_tag 'Submit' %>
                     <% end %>
                   </div>
                   <div style="border: 1px solid #c0c0c0; padding: 5px; margin: 5px 0 5px 0;">
                     <b><%= problem.full_name %>: ข้อมูลทดสอบจริง</b> (ส่งกี่ครั้งก็ได้ภายในเวลา 5 นาทีหลังดาวน์โหลด):
-            -       <%= link_to 'ดาวน์โหลด input และเริ่มจับเวลา', { :action => 'testcase', :id => problem.id}, { :onclick => 'return TOIContest.confirmDownload()' } %>
+            +       <%= link_to 'ดาวน์โหลด input และเริ่มจับเวลา', { :action => 'testcase', :id => problem.id}, { :onclick => "return TOIContest.confirmDownload(#{problem.id})" } %>
                     <span id="submission_time_left_<%= problem.id %>_id"></span>
-            -       <%= form_tag({:controller => 'main', :action => 'submit', :id => problem.id}, {:method => 'post', :multipart => true, :id => "submission_form_#{problem.id}_id" }) do %>
+            +       <%= form_tag({:controller => 'main', :action => 'submit'}, {:method => 'post', :multipart => true, :id => "submission_form_#{problem.id}_id" }) do %>
+            +         <%= hidden_field_tag 'submission[problem_id]', problem.id %>
                       ข้อมูลส่งออก: <%= file_field_tag 'output_file' %>
-            -         โปรแกรมคำตอบ: <%= file_field_tag 'source_file' %>
+            +         โปรแกรมคำตอบ: <%= file_field_tag 'file' %>
                       <%= submit_tag 'Submit' %>
                     <% end %>
                   </div>
                 </div>
               <% end %>

app/views/main/list.html.haml ¶ +3

               %hr/
               %script{:type => 'text/javascript'}
                 = "Announcement.refreshUrl = '#{url_for :controller => 'main', :action => 'announcements'}';"
                 Announcement.registerRefreshEventTimer();
+            +   TOIContest.problemSelectClick()
+            +
                 TOIContest.timeOuts = {};
                 - @problems.each do |p|
                   - if (@submission_timeouts.has_key? p.id) and (@submission_timeouts[p.id] != nil)
                     = "TOIContest.timeOuts[#{p.id}] = #{@submission_timeouts[p.id]};"
                   - else
                     = "TOIContest.timeOuts[#{p.id}] = TOIContest.NO_TIMEOUT;"
                 TOIContest.refreshTimeOutMessages();
+            +   TOIContest.registerRefreshEvent();

db/schema.rb ¶ +2 -1

               # system, you should be using db:schema:load, not running all the migrations
               # from scratch. The latter is a flawed and unsustainable approach (the more migrations
               # you'll amass, the slower it'll run and the greater likelihood for issues).
               #
               # It's strongly recommended to check this file into your version control system.
-            - ActiveRecord::Schema.define(:version => 20150128165518) do
+            + ActiveRecord::Schema.define(:version => 20150129021221) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
                   t.text     "body"
                   t.boolean  "published"
                   t.datetime "created_at",                      :null => false
                   t.text     "compiler_message"
                   t.datetime "graded_at"
                   t.integer  "points"
                   t.text     "grader_comment"
                   t.integer  "number"
                   t.string   "source_filename"
+            +     t.text     "output"
                 end
                 add_index "submissions", ["user_id", "problem_id", "number"], :name => "index_submissions_on_user_id_and_problem_id_and_number", :unique => true
                 add_index "submissions", ["user_id", "problem_id"], :name => "index_submissions_on_user_id_and_problem_id"
                 create_table "tasks", :force => true do |t|

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

r383:31aa87b1b1e9 - Thu, 29 Jan 2015 03:09:12 - 8 files changed: 116 inserted, 20 deleted

Sign in to your account

Commit r383:31aa87b1b1e9 public

Author

r383:31aa87b1b1e9 - Thu, 29 Jan 2015 03:09:12 - 8 files changed: 116 inserted, 20 deleted

Commit `r383:31aa87b1b1e9` public