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

                     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

app/controllers/problems_controller.rb ¶ +22

@@ -86,14 +86,36
86	elsif @description!=nil	86	elsif @description!=nil
87	if !@description.update_attributes(params[:description])	87	if !@description.update_attributes(params[:description])
88	flash[:notice] = 'Error saving description'	88	flash[:notice] = 'Error saving description'
89	render :action => 'edit' and return	89	render :action => 'edit' and return
90	end	90	end
91	end	91	end
		92	+ if params[:file] and params[:file].content_type != 'application/pdf'
		93	+ flash[:notice] = 'Error: Uploaded file is not PDF'
		94	+ render :action => 'edit' and return
		95	+ end
92	if @problem.update_attributes(params[:problem])	96	if @problem.update_attributes(params[:problem])
93	flash[:notice] = 'Problem was successfully updated.'	97	flash[:notice] = 'Problem was successfully updated.'
		98	+ unless params[:file] == nil or params[:file] == ''
		99	+ flash[:notice] = 'Problem was successfully updated and a new PDF file is uploaded.'
		100	+ out_dirname = "#{Problem.download_file_basedir}/#{@problem.id}"
		101	+ if not FileTest.exists? out_dirname
		102	+ Dir.mkdir out_dirname
		103	+ end
		104	+
		105	+ out_filename = "#{out_dirname}/#{@problem.name}.pdf"
		106	+ if FileTest.exists? out_filename
		107	+ File.delete out_filename
		108	+ end
		109	+
		110	+ File.open(out_filename,"wb") do \|file\|
		111	+ file.write(params[:file].read)
		112	+ end
		113	+ @problem.description_filename = "#{@problem.name}.pdf"
		114	+ @problem.save
		115	+ end
94	redirect_to :action => 'show', :id => @problem	116	redirect_to :action => 'show', :id => @problem
95	else	117	else
96	render :action => 'edit'	118	render :action => 'edit'
97	end	119	end
98	end	120	end
99		121

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)}."

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

                 %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

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

                          {: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

                   <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>

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;
                 }
               %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