cafe-grader-web Commit - r44:826893c27cee

r44:826893c27cee - Sat, 08 Mar 2008 22:11:55 - 11 files changed: 148 inserted, 101 deleted

app/controllers/test_controller.rb created 644 ¶ +49

@@ -0,0 +1,49
	1	+ class TestController < ApplicationController
	2	+
	3	+ before_filter :authenticate
	4	+
	5	+ verify :method => :post, :only => [:test_submit],
	6	+ :redirect_to => { :action => :index }
	7	+
	8	+ def index
	9	+ @user = User.find(session[:user_id])
	10	+ prepare_index_information
	11	+ end
	12	+
	13	+ def submit
	14	+ @user = User.find(session[:user_id])
	15	+ test_request = TestRequest.new_from_form_params(@user,params[:test_request])
	16	+ if test_request.save
	17	+ redirect_to :action => 'index'
	18	+ else
	19	+ flash[:notice] = 'Error saving your test submission'
	20	+ redirect_to :action => 'index'
	21	+ end
	22	+ end
	23	+
	24	+ def read
	25	+ user = User.find(session[:user_id])
	26	+ test_request = TestRequest.find(params[:id])
	27	+ if test_request.user_id != user.id
	28	+ flash[:notice] = 'Invalid output'
	29	+ redirect_to :action => 'index'
	30	+ return
	31	+ end
	32	+ if test_request.output_file_name!=nil
	33	+ data = File.open(test_request.output_file_name).read(2048)
	34	+ send_data(data,
	35	+ {:filename => 'output.txt',
	36	+ :type => 'text/plain'})
	37	+ return
	38	+ end
	39	+ redirect_to :action => 'index'
	40	+ end
	41	+
	42	+ protected
	43	+
	44	+ def prepare_index_information
	45	+ @submissions = Submission.find_last_for_all_available_problems(@user.id)
	46	+ @problems = @submissions.collect { \|submission\| submission.problem }
	47	+ end
	48	+
	49	+ end

app/helpers/test_helper.rb created 644 ¶ +2

@@ -0,0 +1,2
	1	+ module TestHelper
	2	+ end

app/views/test/_test_request.html.haml created 644 ¶ +11

@@ -0,0 +1,11
	1	+ %tr.test-request
	2	+ %td= test_request_counter +1
	3	+ %td= test_request.problem.full_name
	4	+ %td= test_request.submission_id
	5	+ %td= test_request.status_str
	6	+ %td= test_request.grader_comment or ''
	7	+ %td= test_request.compiler_message or ''
	8	+ %td= test_request.running_stat or ''
	9	+ %td
	10	+ - if test_request.output_file_name!=nil
	11	+ = link_to '[output]', :action => 'read', :id => test_request.id

app/views/test/index.html.erb created 644 ¶ +69

@@ -0,0 +1,69
	1	+ <h2>Test Interface</h2>
	2	+
	3	+ <% if @problems.length==0 %>
	4	+ There is no submission
	5	+ <% else %>
	6	+
	7	+ <script type="text/javascript">
	8	+ var submissionCount = {
	9	+ <% @submissions.each do \|submission\| %>
	10	+ <%= submission.problem_id %> : <%= submission.number %>,
	11	+ <% end %>
	12	+ };
	13	+ function updateSubmissionList() {
	14	+ currentProb = document.getElementById("test_request_problem_id").value;
	15	+ count = submissionCount[currentProb];
	16	+ submissionSelect = document.getElementById("test_request_submission_number");
	17	+ submissionSelect.options.length = 0;
	18	+ for(i=0; i<count; i++) {
	19	+ submissionSelect.options[i] = new Option(""+(i+1),""+(i+1),false,false);
	20	+ }
	21	+ }
	22	+ </script>
	23	+
	24	+ <% form_for :test_request, nil,
	25	+ :url => { :action => 'submit'},
	26	+ :html => { :multipart => true } do \|f\| %>
	27	+ <table>
	28	+ <tr>
	29	+ <td>Task:</td>
	30	+ <td>
	31	+ <%= select(:test_request,
	32	+ :problem_id,
	33	+ @problems.collect {\|p\| [p.name, p.id]}, {},
	34	+ { :onclick => "updateSubmissionList();" }) %>
	35	+ </td>
	36	+ </tr>
	37	+ <tr>
	38	+ <td>Submission:</td>
	39	+ <td>
	40	+ <%= select(:test_request,
	41	+ :submission_number,
	42	+ (1..@submissions[0].number).collect {\|n\| [n,n]}) %>
	43	+ </td>
	44	+ </tr>
	45	+ <tr>
	46	+ <td>Input data:</td>
	47	+ <td><%= f.file_field :input_file %></td>
	48	+ <tr>
	49	+ <td colspan="2">
	50	+ <%= submit_tag 'submit' %>
	51	+ </td>
	52	+ </tr>
	53	+ </table>
	54	+ <% end %>
	55	+
	56	+ <h3>Previous requests</h3>
	57	+
	58	+ <table border="1">
	59	+ <tr>
	60	+ <th></td>
	61	+ <th>problem</th>
	62	+ <th>#</th>
	63	+ <th>status</th>
	64	+ </tr>
	65	+ <%= render :partial => 'test_request', :collection => @user.test_requests %>
	66	+ </table>
	67	+
	68	+ <% end %>
	69	+

test/functional/test_controller_test.rb created 644 ¶ +8

@@ -0,0 +1,8
	1	+ require File.dirname(__FILE__) + '/../test_helper'
	2	+
	3	+ class TestControllerTest < ActionController::TestCase
	4	+ # Replace this with your real tests.
	5	+ def test_truth
	6	+ assert true
	7	+ end
	8	+ end

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

                     fname = submission.problem.name + '.' + submission.language.ext
                     send_data(submission.source,
               		{:filename => fname,
                                 :type => 'text/plain'})
                   else
                     flash[:notice] = 'Error viewing source'
-            -     end
+            +       redirect_to :action => 'list'
-            -   end
-            -   def test
-            -     @user = User.find(session[:user_id])
-            -     @submissions = Submission.find_last_for_all_available_problems(@user.id)
-            -     @problems = @submissions.collect { |submission| submission.problem }
-            -   end
-            -   def test_submit
-            -     @user = User.find(session[:user_id])
-            -     test_request = TestRequest.new_from_form_params(@user,params[:test_request])
-            -     if test_request.save
-            -       redirect_to :action => 'test'
-            -     else
-            -       flash[:notice] = 'Error saving your test submission'
-            -       render :action => 'test'
                   end
                 end
                 protected
                 def prepare_list_information
                   @problems = Problem.find_available_problems

app/helpers/application_helper.rb ¶ +1 -1

                 def user_header
                   menu_items = ''
                   user = User.find(session[:user_id])
                   # main page
                   append_to menu_items, '[Main]', 'main', 'list'
-            -     append_to menu_items, '[Test]', 'main', 'test'
+            +     append_to menu_items, '[Test]', 'test', 'index'
                   # admin menu
                   if (user!=nil) and (user.admin?)
                     append_to menu_items, '[Problem admin]', 'problems', 'index'
                     append_to menu_items, '[User admin]', 'user_admin', 'index'
                     append_to menu_items, '[User stat]', 'user_admin', 'user_stat'

app/models/test_request.rb ¶ +7 -7

                 end
                 def self.get_inqueue_and_change_status(status)
                   # since there will be only one grader grading TestRequest
                   # we do not need locking (hopefully)
-            -     task = Task.find(:first,
+            +     test_request = TestRequest.find(:first,
-            -                      :order => "created_at",
+            +                                     :order => "created_at",
-            -                      :conditions => {:status=> Task::STATUS_INQUEUE})
+            +                                     :conditions => {:status=> Task::STATUS_INQUEUE})
-            -     if task!=nil
+            +     if test_request!=nil
-            -       task.status = status
+            +       test_request.status = status
-            -       task.save!
+            +       test_request.save!
                   end
-            -     task
+            +     test_request
                 end
                 # interfacing with form
                 def self.new_from_form_params(user,params)
                   test_request = TestRequest.new
                   test_request.user = user

app/views/main/list.rhtml ¶ -2

                 <%= error_messages_for 'submission' %>
                 <%= render :partial => 'submission_box' %>
               </div>
               <hr/>
-            - <p style="color: red"><%= flash[:notice] %></p>
               <div class="problist">
                 <%= render :partial => 'problem', :collection => @problems %>
               </div>
               <hr />

app/views/main/_test_request.html.haml removed ¶ -5

deleted file

app/views/main/test.html.erb removed ¶ -69

deleted file

	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

r44:826893c27cee - Sat, 08 Mar 2008 22:11:55 - 11 files changed: 148 inserted, 101 deleted

Sign in to your account

Commit r44:826893c27cee public

Author

r44:826893c27cee - Sat, 08 Mar 2008 22:11:55 - 11 files changed: 148 inserted, 101 deleted

Commit `r44:826893c27cee` public