cafe-grader-web Commit - r125:89874907db3e

cafe-grader-web

Commit `r125:89874907db3e` public

parent | child

Description:

[web] normalize full_score to 100, more hints on how to submit questions, hint on the disabling to test interface during the last 30 minutes git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@253 6386c4cd-e34a-4fa8-8920-d93eb39b512e

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

r125:89874907db3e - Thu, 08 May 2008 16:38:00 - 5 files changed: 25 inserted, 4 deleted

app/models/grader_process.rb ¶ +5 -1

               class GraderProcess < ActiveRecord::Base
                 def self.find_by_host_and_pid(host,pid)
                   return GraderProcess.find(:first,
                                             :conditions => {
                                               :host => host,
                                               :pid => pid
                                             })
                 end
                 def self.register(host,pid,mode)
                   grader = GraderProcess.find_by_host_and_pid(host,pid)
                   if grader
                     grader.mode = mode
                     grader.active = nil
                     grader.task_id = nil
                     grader.task_type = nil
                     grader.save
                   else
                     grader = GraderProcess.create(:host => host,
                                                   :pid => pid,
                                                   :mode => mode)
                   end
                   grader
                 end
                 def self.find_stalled_process()
                   GraderProcess.find(:all,
                                      :conditions => ["active AND updated_at < ?",
                                                      Time.now.gmtime - GraderProcess.stalled_time])
                 end
                 def report_active(task=nil)
                   self.active = true
-            -     self.task_id = task.id
+            +     if task!=nil
+            +       self.task_id = task.id
+            +     else
+            +       self.task_id = nil
+            +     end
                   self.task_type = task.class.to_s
                   self.save
                 end
                 def report_inactive()
                   self.active = false
                   self.task_id = nil
                   self.task_type = nil
                   self.save
                 end
                 protected
                 def self.stalled_time()
                   return 1.minute
                 end
               end

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

               %tr{:class => ((submission_counter%2==0) ? "info-even" : "info-odd")}
                 %td.info{:align => "center"}
                   = submission_counter+1
                 %td.info= format_short_time(submission.submitted_at)
                 %td.info{:align => "center"}
                   = link_to('[load]',{:action => 'source', :id => submission.id})
                 %td.info
                   - if submission.graded_at!=nil
                     = "Graded at #{format_short_time(submission.graded_at)}."
                     %br/
-            -       = "Score: #{submission.points} " if Configuration['ui.show_score']
+            +       = "Score: #{(submission.points*100/submission.problem.full_score).to_i} " if Configuration['ui.show_score']
                     = " ["
                     %tt
                       = submission.grader_comment
                     = "]"
                 %td.info
                   = render :partial => 'compiler_message', :locals => {:compiler_message => submission.compiler_message }

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

               - if submission==nil
                 = "-"
               - else
                 - if submission.graded_at==nil
                   Submitted at
                   = format_short_time(submission.submitted_at)
                 - else
                   = "Graded at #{format_short_time(submission.graded_at)}, "
-            -     = "score: #{submission.points} " if Configuration['ui.show_score']
+            +     = "score: #{(submission.points*100/submission.problem.full_score).to_i} " if Configuration['ui.show_score']
                   = " ["
                   %tt
                     = submission.grader_comment
                   = "]"
                   = " | "
                   = link_to('[msg]', {:action => 'compiler_msg', :id => submission.id}, {:popup => true})
                 = " | "
                 = link_to('[source]',{:action => 'source', :id => submission.id})
                 = " | "
                 = link_to '[submissions]', :action => 'submission', :id => problem_name

app/views/messages/list.html.haml ¶ +13 -1

               = user_title_bar(@user)
-            - %h3 Your Messages
+            + .announcementbox
+            +   %span{:class => 'title'}
+            +     How to submit clarification requests
+            +   .announcement
+            +     %p
+            +       :markdown
+            +         The clarification requests should be phrased as yes/no questions.
+            +         The answers will be one of the following:
+            +         (1) **YES**,
+            +         (2) <b>NO</b>,
+            +         (3) **ANSWERED IN TASK DESCRIPTION (EXPLICITLY OR IMPLICITLY)**,
+            +         (4) **INVALID QUESTION**, and
+            +         (5) **NO COMMENT**.
               - form_for 'message', nil, :url => { :action => 'create'} do |f|
                 %p
                   %b New clarification request
                   = submit_tag "Post"
                   %br/
                   = f.text_area :body, :rows => 5, :cols => 100
               %hr/
               = render :partial => 'message', :collection => @messages, :locals => {:reply => false}

app/views/test/index.html.erb ¶ +5

               <%= user_title_bar(@user) %>
               <h2>Test Interface</h2>
+            + <p>
+            +   <b>Note:</b> Test interface will be disabled in the last 30 minutes
+            +    of the contest time on your site.
+            + </p>
+            +
               <% if @problems.length==0 %>
                 There is no submission
               <% else %>
               <script type="text/javascript">
               var submissionCount = new Array();
               <% @submissions.each do |submission| %>
               submissionCount[<%= submission.problem_id %>]=<%= submission.number %>;
               <% end %>
               function updateSubmissionList() {
                 currentProb = document.getElementById("test_request_problem_id").value;
                 count = submissionCount[currentProb];
                 submissionSelect = document.getElementById("test_request_submission_number");
                 old_len = submissionSelect.length;
                 // clear the box
                 for(i=0; i<old_len; i++)
                   submissionSelect.remove(0);
                 for(i=count; i>=1; i--) {
                   try {
                     submissionSelect.add(new Option(""+i,""+i,false,false),null);
                   } catch(ex) {
                     submissionSelect.add(new Option(""+i,""+i,false,false));
                   }
                 }
               }
               </script>
               <% if Configuration.show_submitbox_to?(@user) %>
                 <div class="submitbox">
                 <%= error_messages_for 'submitted_test_request' %>
                 <% form_for :test_request, nil,
                             :url => { :action => 'submit'},
                             :html => { :multipart => true } do |f| %>
                   <table>
                     <tr>
                       <td>Task:</td>
                       <td>
               	  <%= select(:test_request,
               	             :problem_id,
               	             @problems.collect {|p| [p.name, p.id]}, {},
               	             { :onclick => "updateSubmissionList();" }) %>
                       </td>
                     </tr>
                     <tr>
                       <td>Submission:</td>
                       <td>
               	  <%= select(:test_request,

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

r125:89874907db3e - Thu, 08 May 2008 16:38:00 - 5 files changed: 25 inserted, 4 deleted

Sign in to your account

Commit r125:89874907db3e public

Author

r125:89874907db3e - Thu, 08 May 2008 16:38:00 - 5 files changed: 25 inserted, 4 deleted

Commit `r125:89874907db3e` public