cafe-grader-web Commit - r382:c141e39c9118

cafe-grader-web

Commit `r382:c141e39c9118` public

parent | child

Description:

shows submission timeouts

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

r382:c141e39c9118 - Thu, 29 Jan 2015 02:04:17 - 4 files changed: 57 inserted, 22 deleted

app/assets/javascripts/toicontest.js created 644 ¶ +37

			@@ -0,0 +1,37
		1	+ var TOIContest = {
		2	+ NO_TIMEOUT: -1,
		3	+
		4	+ timeOuts: {},
		5	+
		6	+ problemSelectClick: function() {
		7	+ $$(".submission-submit-divs").each(function(item) {
		8	+ item.hide();
		9	+ });
		10	+ var problem_id = $('submission_problem_id').value;
		11	+ if ( problem_id < 0 ) {
		12	+ return;
		13	+ }
		14	+ $("submission_submit_div_" + problem_id + "_id").show();
		15	+ },
		16	+
		17	+ confirmDownload: function() {
		18	+ return confirm("แน่ใจ?");
		19	+ },
		20	+
		21	+ refreshTimeOutMessages: function() {
		22	+ for ( var pid in TOIContest.timeOuts ) {
		23	+ var timeOut = TOIContest.timeOuts[ pid ];
		24	+ if ( timeOut != TOIContest.NO_TIMEOUT ) {
		25	+ if ( timeOut > 0 ) {
		26	+ var minLeft = parseInt(timeOut / 60);
		27	+ var secLeft = parseInt(timeOut % 60);
		28	+ $('submission_time_left_' + pid + '_id').innerHTML = '\| <b>เหลือเวลาอีก ' + minLeft + ':' + secLeft + ' นาที</b>';
		29	+ } else {
		30	+ $('submission_time_left_' + pid + '_id').innerHTML = '\| <b>หมดเวลาส่ง</a>';
		31	+ $('submission_form_'+ pid + '_id').hide();
		32	+ }
		33	+ }
		34	+ }
		35	+ }
		36	+ };
		37	+

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

                     user = User.find(session[:user_id])
                     assignent = 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
                     end
                     send_data(test_pair.input,
               		{: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
                   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'
                   end
                 end
                 protected
                 def grade(output, solution)
                   out_items = output.split
                   sol_items = solution.split
                   res = ''
+            +     f = 0
+            +     s = 0
                   sol_items.length.times do |i|
+            +       f += 1
                     if out_items[i] == sol_items[i]
                       res = res + 'P'
+            +         s += 1
                     else
                       res = res + '-'
                     end
                   end
-            -     return res
+            +     return { :score => s, :full_score => f, :msg => res }
                 end
                 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
                       timeout = nil
                     else
                       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
                 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

app/views/main/_submission_box.html.erb ¶ +6 -21

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

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

               - content_for :head do
                 = javascript_include_tag "announcement_refresh"
+            +   = javascript_include_tag "toicontest"
               = user_title_bar(@user)
               .announcementbox{:style => (@announcements.length==0 ? "display:none" : "")}
                 %span{:class => 'title'}
                   Announcements
                 #announcementbox-body
                   = render :partial => 'announcement', :collection => @announcements
               - if GraderConfiguration.show_submitbox_to?(@user)
                 = error_messages_for 'submission'
                 = render :partial => 'submission_box'
               %hr/
               - if (GraderConfiguration.contest_mode?) and (@user.site!=nil) and (@user.site.started!=true)
                 %p=t 'main.start_soon'
               - if GraderConfiguration.show_tasks_to?(@user)
                 - if not GraderConfiguration.multicontests?
                   %table.info
                     %tr.info-head
                       %th
                       %th Tasks
                       %th # of sub(s)
                       %th Results
                     = render :partial => 'problem', :collection => @problems
                 - else
                   - @contest_problems.each do |cp|
                     - if cp[:problems].length > 0
                       %h2{:class =>'contest-title'}
                         = "#{cp[:contest] ? cp[:contest].title : 'Public problems'}"
                       %table.info
                         %tr.info-head
                           %th
                           %th Tasks
                           %th # of sub(s)
                           %th Results
                         = render :partial => 'problem', :collection => cp[:problems]
               %hr/
               %script{:type => 'text/javascript'}
                 = "Announcement.refreshUrl = '#{url_for :controller => 'main', :action => 'announcements'}';"
                 Announcement.registerRefreshEventTimer();
+            +   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();

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

r382:c141e39c9118 - Thu, 29 Jan 2015 02:04:17 - 4 files changed: 57 inserted, 22 deleted

Sign in to your account

Commit r382:c141e39c9118 public

Author

r382:c141e39c9118 - Thu, 29 Jan 2015 02:04:17 - 4 files changed: 57 inserted, 22 deleted

Commit `r382:c141e39c9118` public