cafe-grader-web Commit - r64:f6cdb5f921b2

cafe-grader-web

Commit `r64:f6cdb5f921b2` public

parent | child

Description:

[web] improving readability of test_interface, re: ticket #10 git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@141 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

r64:f6cdb5f921b2 - Fri, 21 Mar 2008 16:54:59 - 5 files changed: 6 inserted, 5 deleted

app/controllers/test_controller.rb ¶ +1

               class TestController < ApplicationController
                 before_filter :authenticate
                 verify :method => :post, :only => [:test_submit],
                        :redirect_to => { :action => :index }
                 def index
                   @user = User.find(session[:user_id])
                   prepare_index_information
+            +     @test_requests = @user.test_requests
                 end
                 def 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 => 'index'
                   else
                     flash[:notice] = 'Error saving your test submission'
                     redirect_to :action => 'index'
                   end
                 end
                 def read
                   user = User.find(session[:user_id])
                   test_request = TestRequest.find(params[:id])
                   if test_request.user_id != user.id
                     flash[:notice] = 'Invalid output'
                     redirect_to :action => 'index'
                     return
                   end
                   if test_request.output_file_name!=nil
                     data = File.open(test_request.output_file_name).read(2048)
                     if data==nil
                       data=""
                     end
                     send_data(data,
                               {:filename => 'output.txt',
                                 :type => 'text/plain'})
                     return
                   end
                   redirect_to :action => 'index'
                 end
                 protected
                 def prepare_index_information
                   @submissions = Submission.find_last_for_all_available_problems(@user.id)
                   @problems = @submissions.collect { |submission| submission.problem }
                 end
               end

app/models/user.rb ¶ +1 -1

               require 'digest/sha1'
               class User < ActiveRecord::Base
                 has_and_belongs_to_many :roles
-            -   has_many :test_requests, :order => "problem_id"
+            +   has_many :test_requests, :order => "submitted_at DESC"
                 validates_presence_of :login
                 validates_presence_of :full_name
                 validates_length_of :full_name, :minimum => 1
                 validates_presence_of :password, :if => :password_required?
                 validates_length_of :password, :within => 4..20, :if => :password_required?
                 validates_confirmation_of :password, :if => :password_required?
                 attr_accessor :password
                 before_save :encrypt_new_password
                 def self.authenticate(login, password)
                   user = find_by_login(login)
                   return user if user && user.authenticated?(password)
                 end
                 def authenticated?(password)
                   hashed_password == User.encrypt(password,self.salt)
                 end
                 def admin?
                   self.roles.detect {|r| r.name == 'admin' }
                 end
                 def email_for_editing
                   if self.email==nil
                     "(unknown)"
                   elsif self.email==''
                     "(blank)"
                   else
                     self.email
                   end
                 end
                 def email_for_editing=(e)
                   self.email=e
                 end
                 def alias_for_editing
                   if self.alias==nil
                     "(unknown)"
                   elsif self.alias==''
                     "(blank)"
                   else
                     self.alias
                   end

app/views/test/_test_request.html.haml ¶ +2 -2

               %tr{:class => (test_request_counter%2==0) ? "info-even" : "info-odd"}
                 %td= test_request_counter +1
                 %td= test_request.problem.full_name
                 %td= test_request.submission.number
                 %td= test_request.status_str
-            -   %td= test_request.running_stat or ''
+            +   %td= simple_format((test_request.running_stat or ''))
                 %td
                   - if test_request.output_file_name!=nil
                     = link_to '[output]', :action => 'read', :id => test_request.id
                 %td= test_request.grader_comment or ''
-            -   %td= test_request.compiler_message or ''
+            +   %td= simple_format((test_request.compiler_message or ''))

app/views/test/index.html.erb ¶ +1 -1

               }
               </script>
               <% 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,
               	           :submission_number,
               	           ((1..@submissions[0].number).collect {|n| [n,n]}).reverse) %>
                     </td>
                   </tr>
                   <tr>
                     <td>Input data:</td>
                     <td><%= f.file_field :input_file %></td>
                   <tr>
                     <td colspan="2">
                       <%= submit_tag 'submit' %>
                     </td>
                   </tr>
                 </table>
               <% end %>
               <h3>Previous requests</h3>
               <table class="info">
                 <tr class="info-head">
                   <th></td>
                   <th>problem</th>
                   <th>#</th>
                   <th>status</th>
                   <th>running stat</th>
                   <th>output (first 2kb)</th>
                   <th>grading comment</th>
                   <th>compiler message</th>
                 </tr>
-            -   <%= render :partial => 'test_request', :collection => @user.test_requests %>
+            +   <%= render :partial => 'test_request', :collection => @test_requests %>
               </table>
               <% end %>

spec/models/submission_spec.rb ¶ +1 -1

               require File.dirname(__FILE__) + '/../spec_helper'
-            - describe Submission do
+            + describe Submission, "when verifying user submission" do
                 before(:each) do
                   @submission = Submission.new
                   @submission.source = <<SOURCE
               /*
               LANG: C++
               TASK: testproblem
               */
               SOURCE
                 end
                 it "should find language in source" do
                   langcpp = stub(Language, :name => 'cpp', :ext => 'cpp')
                   Language.should_receive(:find_by_name).with('C++').and_return(langcpp)
                   Submission.find_language_in_source(@submission.source).should == langcpp
                 end
                 it "should find problem in source, when there is any" do
                   problem = stub(Problem, :name => 'testproblem')
                   Problem.should_receive(:find_by_name).with('testproblem').and_return(problem)
                   Submission.find_problem_in_source(@submission.source).should == problem
                 end
                 it "should return nil when it cannot find problem in source" do
                   Submission.find_problem_in_source(<<SOURCE
               /*
               LANG: C
               */
               SOURCE
               ).should == nil
                 end
               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

r64:f6cdb5f921b2 - Fri, 21 Mar 2008 16:54:59 - 5 files changed: 6 inserted, 5 deleted

Sign in to your account

Commit r64:f6cdb5f921b2 public

Author

r64:f6cdb5f921b2 - Fri, 21 Mar 2008 16:54:59 - 5 files changed: 6 inserted, 5 deleted

Commit `r64:f6cdb5f921b2` public