cafe-grader-web Commit - r388:b5766b7ed3ec

cafe-grader-web

Commit `r388:b5766b7ed3ec` public

parent | child

Description:

saves and grades submission in standard mode

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

r388:b5766b7ed3ec - Tue, 03 Feb 2015 14:46:22 - 2 files changed: 18 inserted, 6 deleted

app/controllers/main_controller.rb ¶ +17 -5

                 def login
                   saved_notice = flash[:notice]
                   reset_session
                   flash.now[:notice] = saved_notice
                   # EXPERIMENT:
                   # Hide login if in single user mode and the url does not
                   # explicitly specify /login
                   #
                   # logger.info "PATH: #{request.path}"
                   # if GraderConfiguration['system.single_user_mode'] and
                   #     request.path!='/main/login'
                   #   @hidelogin = true
                   # end
                   @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
                   @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?
+            +     if (assignment.expired?) and (!GraderConfiguration.standard_mode?)
                     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
                   end
+            +     if GraderConfiguration.standard_mode?
+            +       test_pair = assignment.test_pair
+            +       result = test_pair.grade(@submission.output)
+            +       @submission.points = result[:score]*100 / result[:full_score]
+            +       @submission.grader_comment = result[:msg]
+            +       @submission.graded_at = Time.now.gmtime
+            +     end
+            +
                   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
                       (submission.problem != nil) and
                       (submission.problem.available))
                     send_data(submission.source,
               		{:filename => submission.download_filename,
                                 :type => 'text/plain'})
                   else
                     flash[:notice] = 'Error viewing source'
                     redirect_to :action => 'list'
                   end
                 end
                 def compiler_msg
                   @submission = Submission.find(params[:id])
                   if @submission.user_id == session[:user_id]
                     render :action => 'compiler_msg', :layout => 'empty'
                   else
                     flash[:notice] = 'Error viewing source'
                     redirect_to :action => 'list'
                   end
                 end
                 def submission
                   @user = User.find(session[:user_id])
                   @problems = @user.available_problems
                   if params[:id]==nil
               		{:filename => problem.name + '-input.txt',
                                :type => 'text/plain'})
                   end
                 end
                 def verifying_submit
                   user = User.find(session[:user_id])
                   problem_id = params[:id]
                   problem = Problem.find(problem_id)
                   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
                     @grading_result = test_pair.grade(output)
                     prepare_list_information
                     render :action => 'list' and return
                   else
                     flash[:notice] = 'Error: output file errors'
                     prepare_list_information
                     render :action => 'list' and return
                   end
                 end
                 protected
                 def prepare_announcements(recent=nil)
                   if GraderConfiguration.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_test_pair_assignment_for(problem)
-            -       if assignment == nil
+            +       if GraderConfiguration.standard_mode?
                       timeout = nil
                     else
-            -         if (assignment.expired?) or (assignment.submitted)
-            -           timeout = 0
+            +         if assignment == nil
+            +           timeout = nil
                       else
-            -           timeout = assignment.created_at + TEST_ASSIGNMENT_EXPIRATION_DURATION - Time.new.gmtime
+            +           if (assignment.expired?) or (assignment.submitted)
+            +             timeout = 0
+            +           else
+            +             timeout = assignment.created_at + TEST_ASSIGNMENT_EXPIRATION_DURATION - Time.new.gmtime
+            +           end
                       end
                     end
                     @submission_timeouts[problem.id] = timeout
                   end
                 end
                 def prepare_list_information
                   @user = User.find(session[:user_id])
                   if not GraderConfiguration.multicontests?
                     @problems = @user.available_problems
                   else
                     @contest_problems = @user.available_problems_group_by_contests
                     @problems = @user.available_problems
                   end
                   @prob_submissions = {}
                   @problems.each do |p|
                     sub = Submission.find_last_by_user_and_problem(@user.id,p.id)
                     if sub!=nil
                       @prob_submissions[p.id] = { :count => sub.number, :submission => sub }
                     else
                       @prob_submissions[p.id] = { :count => 0, :submission => nil }
                     end
                   end
                   prepare_announcements
                   prepare_timeout_information(@problems)
                 end
                 def check_viewability
                   @user = User.find(session[:user_id])
                   if (!GraderConfiguration.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 GraderConfiguration.task_grading_info.has_key? submission.problem.name
                     grading_info = GraderConfiguration.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

app/views/main/_submission_box.html.erb ¶ +1 -1

               <% 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 => selected_problem_id },
                                     { :onchange => 'TOIContest.problemSelectClick()' } %>
               </div>
               <% @problems.each do |problem| %>
                 <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]}]" %>
                       <% end %>
                     <% end %>
                     <%= form_tag({:controller => 'main', :action => 'verifying_submit', :id => problem.id}, {:method => 'post', :multipart => true }) do %>
                       ส่งคำตอบของข้อมูลสำหรับตรวจสอบ:
                       <%= 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(#{problem.id})" } %>
                     <span id="submission_time_left_<%= problem.id %>_id"></span>
                     <%= 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 'file' %>
+            +         โปรแกรมของคุณ: <%= file_field_tag 'file' %>
                       <%= submit_tag 'Submit' %>
                     <% end %>
                   </div>
                 </div>
               <% end %>

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

r388:b5766b7ed3ec - Tue, 03 Feb 2015 14:46:22 - 2 files changed: 18 inserted, 6 deleted

Sign in to your account

Commit r388:b5766b7ed3ec public

Author

r388:b5766b7ed3ec - Tue, 03 Feb 2015 14:46:22 - 2 files changed: 18 inserted, 6 deleted

Commit `r388:b5766b7ed3ec` public