cafe-grader-web Commit - r512:4a0989b96ef2

cafe-grader-web

Commit `r512:4a0989b96ef2` public

parent | child

Description:

merge

Commit status:

[Not Reviewed]

References:

merge java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r512:4a0989b96ef2 - Mon, 22 Sep 2014 15:46:26 - 8 files changed: 35 inserted, 4 deleted

app/controllers/graders_controller.rb ¶ +1

                 end
                 def clear
                   grader_proc = GraderProcess.find(params[:id])
                   grader_proc.destroy if grader_proc!=nil
                   redirect_to :action => 'list'
                 end
                 def clear_terminated
                   GraderProcess.find_terminated_graders.each do |p|
                     p.destroy
                   end
                   redirect_to :action => 'list'
                 end
                 def clear_all
                   GraderProcess.find(:all).each do |p|
                     p.destroy
                   end
                   redirect_to :action => 'list'
                 end
                 def view
                   if params[:type]=='Task'
                     redirect_to :action => 'task', :id => params[:id]
                   else
                     redirect_to :action => 'test_request', :id => params[:id]
                   end
                 end
                 def test_request
                   @test_request = TestRequest.find(params[:id])
                 end
                 def task
                   @task = Task.find(params[:id])
                 end
                 def submission
                   @submission = Submission.find(params[:id])
                   formatter = Rouge::Formatters::HTML.new(css_class: 'highlight', line_numbers: true )
                   lexer = case @submission.language.name
                     when "c"      then Rouge::Lexers::C.new
                     when "cpp"    then Rouge::Lexers::Cpp.new
                     when "pas"    then Rouge::Lexers::Pas.new
                     when "ruby"   then Rouge::Lexers::Ruby.new
                     when "python" then Rouge::Lexers::Python.new
                     when "java"   then Rouge::Lexers::Java.new
+            +       when "php"    then Rouge::Lexers::PHP.new
                   end
                   @formatted_code = formatter.format(lexer.lex(@submission.source))
                   @css_style = Rouge::Themes::ThankfulEyes.render(scope: '.highlight')
                 end
                 # various grader controls
                 def stop
                   grader_proc = GraderProcess.find(params[:id])
                   GraderScript.stop_grader(grader_proc.pid)
                   flash[:notice] = 'Grader stopped.  It may not disappear now, but it should disappear shortly.'
                   redirect_to :action => 'list'
                 end
                 def stop_all
                   GraderScript.stop_graders(GraderProcess.find_running_graders +
                                             GraderProcess.find_stalled_process)
                   flash[:notice] = 'Graders stopped.  They may not disappear now, but they should disappear shortly.'
                   redirect_to :action => 'list'
                 end
                 def start_grading
                   GraderScript.start_grader('grading')
                   flash[:notice] = '2 graders in grading env started, one for grading queue tasks, another for grading test request'
                   redirect_to :action => 'list'
                 end
                 def start_exam
                   GraderScript.start_grader('exam')
                   flash[:notice] = '2 graders in grading env started, one for grading queue tasks, another for grading test request'
                   redirect_to :action => 'list'
                 end
               end

app/controllers/problems_controller.rb ¶ +22

                   end
                   @problem.description = @description
                   if @problem.save
                     flash[:notice] = 'Problem was successfully created.'
                     redirect_to :action => 'list'
                   else
                     render :action => 'new'
                   end
                 end
                 def quick_create
                   @problem = Problem.new(params[:problem])
                   @problem.full_name = @problem.name if @problem.full_name == ''
                   @problem.full_score = 100
                   @problem.available = false
                   @problem.test_allowed = true
                   @problem.output_only = false
                   @problem.date_added = Time.new
                   if @problem.save
                     flash[:notice] = 'Problem was successfully created.'
                     redirect_to :action => 'list'
                   else
                     flash[:notice] = 'Error saving problem'
                     redirect_to :action => 'list'
                   end
                 end
                 def edit
                   @problem = Problem.find(params[:id])
                   @description = @problem.description
                 end
                 def update
                   @problem = Problem.find(params[:id])
                   @description = @problem.description
                   if @description == nil and params[:description][:body]!=''
                     @description = Description.new(params[:description])
                     if !@description.save
                       flash[:notice] = 'Error saving description'
                       render :action => 'edit' and return
                     end
                     @problem.description = @description
                   elsif @description!=nil
                     if !@description.update_attributes(params[:description])
                       flash[:notice] = 'Error saving description'
                       render :action => 'edit' and return
                     end
                   end
+            +     if params[:file] and params[:file].content_type != 'application/pdf'
+            +         flash[:notice] = 'Error: Uploaded file is not PDF'
+            +         render :action => 'edit' and return
+            +     end
                   if @problem.update_attributes(params[:problem])
                     flash[:notice] = 'Problem was successfully updated.'
+            +       unless params[:file] == nil or params[:file] == ''
+            +         flash[:notice] = 'Problem was successfully updated and a new PDF file is uploaded.'
+            +         out_dirname = "#{Problem.download_file_basedir}/#{@problem.id}"
+            +         if not FileTest.exists? out_dirname
+            +           Dir.mkdir out_dirname
+            +         end
+            +
+            +         out_filename = "#{out_dirname}/#{@problem.name}.pdf"
+            +         if FileTest.exists? out_filename
+            +           File.delete out_filename
+            +         end
+            +
+            +         File.open(out_filename,"wb") do |file|
+            +           file.write(params[:file].read)
+            +         end
+            +         @problem.description_filename = "#{@problem.name}.pdf"
+            +         @problem.save
+            +       end
                     redirect_to :action => 'show', :id => @problem
                   else
                     render :action => 'edit'
                   end
                 end
                 def destroy
                   Problem.find(params[:id]).destroy
                   redirect_to :action => 'list'
                 end
                 def toggle
                   @problem = Problem.find(params[:id])
                   @problem.available = !(@problem.available)
                   @problem.save
                 end
                 def turn_all_off
                   Problem.find(:all,
                                :conditions => "available = 1").each do |problem|
                     problem.available = false
                     problem.save
                   end
                   redirect_to :action => 'list'
                 end
                 def turn_all_on
                   Problem.find(:all,
                                :conditions => "available = 0").each do |problem|
                     problem.available = true
                     problem.save
                   end
                   redirect_to :action => 'list'
                 end
                 def stat
                   @problem = Problem.find(params[:id])
                   if !@problem.available
                     redirect_to :controller => 'main', :action => 'list'
                   else
                     @submissions = Submission.includes(:user).where(problem_id: params[:id]).order(:user_id,:id)
                   end
                 end
                 def manage
                   @problems = Problem.find(:all, :order => 'date_added DESC')
                 end

app/views/main/_submission.html.haml ¶ +2

               %tr{:class => ((submission_counter%2==0) ? "info-even" : "info-odd")}
                 %td.info{:align => "center"}
                   = submission_counter+1
+            +   %td.info{:align => "center"}
+            +     = link_to "##{submission.id}", controller: :graders, action: :submission, id: submission.id
                 %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*100/submission.problem.full_score).to_i} " if GraderConfiguration['ui.show_score']
                     = " ["
                     %tt
                       = submission.grader_comment
                     = "]"
                 %td.info
                   = render :partial => 'compiler_message', :locals => {:compiler_message => submission.compiler_message }

app/views/main/submission.html.haml ¶ +1

               = user_title_bar(@user)
               .task-menu
                 Task List
                 %br/
                 - @problems.each do |problem|
                   = link_to problem.name, :action => 'submission', :id => problem.name
               - if @problem!=nil
                 %h2= "Task: #{@problem.full_name} (#{@problem.name})"
               - if @submissions!=nil
                 - if @submissions.length>0
                   %table.info
                     %tr.info-head
+            +         %th.info No.
                       %th.info #
                       %th.info At
                       %th.info Source
                       %th.info Result
                       %th.info{:width => "300px"}
                         Compiler message
                     = render :partial => 'submission', :collection => @submissions
                 - else
                   No submission

app/views/problems/_form.html.erb ¶ +2

               <!--[form:problem]-->
               <p><label for="problem_name">Name</label><br/>
               <%= text_field 'problem', 'name'  %></p>
               <p><label for="problem_full_name">Full name</label><br/>
               <%= text_field 'problem', 'full_name'  %></p>
               <p><label for="problem_full_score">Full score</label><br/>
               <%= text_field 'problem', 'full_score'  %></p>
               <p><label for="problem_date_added">Date added</label><br/>
               <%= date_select 'problem', 'date_added'  %></p>
               <%
               # TODO: these should be put in model Problem, but I can't think of
               #       nice default values for them.  These values look fine only
               #       in this case (of lazily adding new problems).
               @problem.available = true if @problem!=nil and @problem.available==nil
               @problem.test_allowed = true if @problem!=nil and @problem.test_allowed==nil
               @problem.output_only = false if @problem!=nil and @problem.output_only==nil
               %>
               <p>
               <label for="problem_available">Available?</label>
               <%= check_box :problem, :available %>
               <label for="problem_test_allowed">Test allowed?</label>
               <%= check_box :problem, :test_allowed %>
               <label for="problem_output_only">Output only?</label>
               <%= check_box :problem, :output_only %>
               </p>
               <%= error_messages_for 'description' %>
               <p><label for="description_body">Description</label><br/>
               <%= text_area :description, :body, :rows => 10, :cols => 80  %></p>
               <p><label for="description_markdowned">Markdowned?</label>
               <%= select "description",
                          "markdowned",
                          [['True',true],['False',false]],
                          {:selected => (@description) ? @description.markdowned : false }
               %></p>
               <p><label for="problem_url">URL</label><br/>
               <%= text_field 'problem', 'url'  %></p>
+            + <p>Task PDF <%= file_field_tag 'file' %></p>
+            +
               <!--[eoform:problem]-->

app/views/problems/edit.html.erb ¶ +1 -1

               <h1>Editing problem</h1>
-            - <%= form_tag :action => 'update', :id => @problem do %>
+            + <%= form_tag({action: 'update', id: @problem},multipart: true) do %>
                 <%= render :partial => 'form' %>
                 <%= submit_tag 'Edit' %>
               <% end %>
               <%= link_to 'Show', :action => 'show', :id => @problem %> |
               <%= link_to 'Back', :action => 'list' %>

app/views/user_admin/list.html.erb ¶ +2 -1

                 <% end %>
                 <br/>
                 <b>Import from site management</b>
                 <%= form_tag({:action => 'import'}, :multipart => true) do %>
                   File: <%= file_field_tag 'file' %> <%= submit_tag 'Import' %>
                 <% end %>
                 <br/>
                 <b>What else: </b>
                 <%= link_to '[New user]', :action => 'new' %>
                 <%= link_to '[New list of users]', :action => 'new_list' %>
                 <%= link_to '[View administrators]', :action => 'admin' %>
                 <%= link_to '[Random passwords]', :action => 'random_all_passwords' %>
                 <%= link_to '[View active users]', :action => 'active' %>
                 <%= link_to '[Mass mailing]', :action => 'mass_mailing' %>
                 <% if GraderConfiguration.multicontests? %>
                   <br/><b>Multi-contest:</b>
                   <%= link_to '[Manage bulk users in contests]', :action => 'contest_management' %>
                   View users in:
                   <% @contests.each do |contest| %>
                     <%= link_to "[#{contest.name}]", :action => 'contests', :id => contest.id %>
                   <% end %>
                   <%= link_to "[no contest]", :action => 'contests', :id => 'none' %>
                 <% end %>
               </div>
               Total <%= @user_count %> users |
               <% if !@paginated %>
                 Display all users.
                 <%= link_to '[show in pages]', :action => 'list', :page => '1' %>
               <% else %>
                 Display in pages.
                 <%= link_to '[display all]', :action => 'list', :page => 'all' %> |
                 <%= will_paginate @users, :container => false %>
               <% end %>
               <table class="info">
                 <tr class="info-head">
                   <% for column in User.content_columns %>
                     <% if !@hidden_columns.index(column.name) %>
                       <th><%= column.human_name %></th>
                     <% end %>
                   <% end %>
                   <th></th>
                   <th></th>
                   <th></th>
                 </tr>
               <% for user in @users %>
                 <tr class="info-<%= cycle("odd","even") %>">
+            +     <td><%= link_to user.login, controller: :users, :action => 'profile', :id => user %></td>
                   <% for column in User.content_columns %>
-            -       <% if !@hidden_columns.index(column.name) %>
+            +       <% if !@hidden_columns.index(column.name) and column.name != 'login' %>
                       <td><%=h user.send(column.name) %></td>
                     <% end %>
                   <% end %>
                   <td><%= link_to 'Show', :action => 'show', :id => user %></td>
                   <td><%= link_to 'Edit', :action => 'edit', :id => user %></td>
                   <td><%= link_to 'Destroy', { :action => 'destroy', :id => user }, :confirm => 'Are you sure?', :method => :post %></td>
                 </tr>
               <% end %>
               </table>
               <br />
               <%= link_to '[New user]', :action => 'new' %>
               <%= link_to '[New list of users]', :action => 'new_list' %>

app/views/users/profile.html.haml ¶ +4 -2

               - content_for :header do
                 = javascript_include_tag 'new'
               %script{:type=>"text/javascript"}
                 $(function () {
-            -   $('#submission_table').tablesorter({widgets: ['zebra','filter']});
+            +   $('#submission_table').tablesorter({widgets: ['zebra']});
                 });
               :css
                 .fix-width {
                   font-family: Droid Sans Mono,Consolas, monospace, mono, Courier New, Courier;
                 }
               %h1= @user.full_name + ' Profile'
               %h2 Basic info
               <b>Login:</b> #{@user.login} <br/>
               <b>Full name:</b> #{@user.full_name} <br />
               %h2 Problem Stat
               %h2 Submissions
               %table.tablesorter-cafe#submission_table
                 %thead
                   %tr
                     %th ID
                     %th Problem code
-            -       %th Problem name
+            +       %th Problem full name
                     %th Language
+            +       %th Submitted at
                     %th Result
                     %th Score
                     - if session[:admin]
                       %th IP
                 %tbody
                   - @submission.each do |s|
                     - next unless s.problem
                     %tr
                       %td= link_to "#{s.id}", controller: "graders", action: "submission", id: s.id
                       %td= s.problem.name
                       %td= s.problem.full_name
                       %td= s.language.pretty_name
+            +         %td  #{s.submitted_at.strftime('%Y-%m-%d %H:%M')} (#{time_ago_in_words(s.submitted_at)} ago)
                       %td.fix-width= s.grader_comment
                       %td= (s.points*100)/s.problem.full_score
                       - if session[:admin]
                         %td= s.ip_address

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

r512:4a0989b96ef2 - Mon, 22 Sep 2014 15:46:26 - 8 files changed: 35 inserted, 4 deleted

Sign in to your account

Commit r512:4a0989b96ef2 public

Author

r512:4a0989b96ef2 - Mon, 22 Sep 2014 15:46:26 - 8 files changed: 35 inserted, 4 deleted

Commit `r512:4a0989b96ef2` public