cafe-grader-web Commit - r70:d6fd1806794c

cafe-grader-web

Commit `r70:d6fd1806794c` public

parent | child

Description:

[web] added compiler message and submission links to main/list git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@147 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

r70:d6fd1806794c - Sun, 23 Mar 2008 01:48:48 - 4 files changed: 25 inserted, 3 deleted

app/views/main/compiler_msg.html.haml created 644 ¶ +6

@@ -0,0 +1,6
	1	+ %h2= "Compiler message for submission \##{@submission.number}, task: #{@submission.problem.name}"
	2	+ %p
	3	+ - if @submission.compiler_message.chomp == ''
	4	+ no message
	5	+ - else
	6	+ = simple_format(@submission.compiler_message)

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

                 def list
                   prepare_list_information
                 end
                 def submit
                   @submission = Submission.new(params[:submission])
                   @submission.user_id = session[:user_id]
                   @submission.language_id = 0
                   @submission.source = params['file'].read if params['file']!=''
                   @submission.submitted_at = Time.new
                   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'
                     end
                   else
                     prepare_list_information
                     render :action => 'list' and return
                   end
                   redirect_to :action => 'list'
                 end
-            -   def get_source
+            +   def source
                   submission = Submission.find(params[:id])
                   if submission.user_id == session[:user_id]
                     fname = submission.problem.name + '.' + submission.language.ext
                     send_data(submission.source,
               		{:filename => fname,
                                 :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 = Problem.find_available_problems
                   if params[:id]==nil
                     @problem = nil
                     @submissions = nil
                   else
                     @problem = Problem.find_by_name(params[:id])
                     @submissions = Submission.find_all_by_user_problem(@user.id, @problem.id)
                   end
                 end
                 protected
                 def prepare_list_information
                   @problems = Problem.find_available_problems
                   @prob_submissions = Array.new
                   @user = User.find(session[:user_id])
                   @problems.each do |p|
                     sub = Submission.find_last_by_user_and_problem(@user.id,p.id)
                     if sub!=nil
                       @prob_submissions << { :count => sub.number, :submission => sub }
                     else
                       @prob_submissions << { :count => 0, :submission => nil }
                     end

app/views/main/_problem.html.erb ¶ +3 -1

               <tr class="info-<%= (problem_counter%2==0) ? "even" : "odd" %>">
                 <td>
                   <%= "#{problem_counter + 1}" %>
                 </td>
                 <td>
                   <%= "#{problem.full_name} (#{problem.name})" %>
                   <%= link_to '[desc]', problem.url, :popup => true if (problem.url!=nil) and (problem.url!='') %>
                 </td>
                 <td align="center">
                   <%= @prob_submissions[problem_counter][:count] %>
                 </td>
                 <td>
                   <%= render :partial => 'submission_short',
-            -                :locals => { :submission => @prob_submissions[problem_counter][:submission]} %>
+            +                :locals => {
+            +                  :submission => @prob_submissions[problem_counter][:submission],
+            +                  :problem_name => problem.name }%>
                 </td>
               </tr>

app/views/main/_submission_short.html.haml ¶ +5 -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} "
                   = " [" + submission.grader_comment + "]"
                   = " | "
-            -   = link_to('[source]',{:action => 'get_source', :id => submission.id})
+            +     = 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

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

r70:d6fd1806794c - Sun, 23 Mar 2008 01:48:48 - 4 files changed: 25 inserted, 3 deleted

Sign in to your account

Commit r70:d6fd1806794c public

Author

r70:d6fd1806794c - Sun, 23 Mar 2008 01:48:48 - 4 files changed: 25 inserted, 3 deleted

Commit `r70:d6fd1806794c` public