cafe-grader-web Commit - r518:4d5c727a0d13

cafe-grader-web

Commit `r518:4d5c727a0d13` public

parent | child

Description:

fix displaying bug

Commit status:

[Not Reviewed]

References:

java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r518:4d5c727a0d13 - Wed, 01 Oct 2014 15:46:51 - 2 files changed: 2 inserted, 1 deleted

app/controllers/report_controller.rb ¶ +1

                       flash[:notice] = 'Error: submissions for that problem are not viewable.'
                       return
                     end
                   end
                   return unless @problem
                   @by_lang = {} #aggregrate by language
                   range =65
                   @histogram = { data: Array.new(range,0), summary: {} }
                   @summary = {count: 0, solve: 0, attempt: 0}
                   user = Hash.new(0)
                   Submission.where(problem_id: @problem.id).find_each do |sub|
                     #histogram
                     d = (DateTime.now.in_time_zone - sub.submitted_at) / 24 / 60 / 60
                     @histogram[:data][d.to_i] += 1 if d < range
                     @summary[:count] += 1
                     user[sub.user_id] = [user[sub.user_id], (sub.points >= @problem.full_score) ? 1 : 0].max
                     lang = Language.find_by_id(sub.language_id)
                     next unless lang
                     next unless sub.points >= @problem.full_score
                     #initialize
                     unless @by_lang.has_key?(lang.pretty_name)
                       @by_lang[lang.pretty_name] = {
                         runtime: { avail: false, value: 2**30-1 },
                         memory: { avail: false, value: 2**30-1 },
                         length: { avail: false, value: 2**30-1 },
                         first: { avail: false, value: DateTime.new(3000,1,1) }
                       }
                     end
                     if sub.max_runtime and sub.max_runtime < @by_lang[lang.pretty_name][:runtime][:value]
                       @by_lang[lang.pretty_name][:runtime] = { avail: true, user_id: sub.user_id, value: sub.max_runtime, sub_id: sub.id }
                     end
                     if sub.peak_memory and sub.peak_memory < @by_lang[lang.pretty_name][:memory][:value]
                       @by_lang[lang.pretty_name][:memory] = { avail: true, user_id: sub.user_id, value: sub.peak_memory, sub_id: sub.id }
                     end
                     if sub.submitted_at and sub.submitted_at < @by_lang[lang.pretty_name][:first][:value] and
                         !sub.user.admin?
                       @by_lang[lang.pretty_name][:first] = { avail: true, user_id: sub.user_id, value: sub.submitted_at, sub_id: sub.id }
                     end
                     if @by_lang[lang.pretty_name][:length][:value] > sub.effective_code_length
                       @by_lang[lang.pretty_name][:length] = { avail: true, user_id: sub.user_id, value: sub.effective_code_length, sub_id: sub.id }
                     end
                   end
                   #process user_id
                   @by_lang.each do |lang,prop|
                     prop.each do |k,v|
                       v[:user] = User.exists?(v[:user_id]) ? User.find(v[:user_id]).full_name : "(NULL)"
                     end
                   end
                   #sum into best
                   if @by_lang and @by_lang.first
                     @best = @by_lang.first[1].clone
                     @by_lang.each do |lang,prop|
                       if @best[:runtime][:value] >= prop[:runtime][:value]
                         @best[:runtime] = prop[:runtime]
                         @best[:runtime][:lang] = lang
                       end
                       if @best[:memory][:value] >= prop[:memory][:value]
                         @best[:memory] = prop[:memory]
                         @best[:memory][:lang] = lang
                       end
                       if @best[:length][:value] >= prop[:length][:value]
                         @best[:length] = prop[:length]
                         @best[:length][:lang] = lang
                       end
                       if @best[:first][:value] >= prop[:first][:value]
                         @best[:first] = prop[:first]
                         @best[:first][:lang] = lang
                       end
                     end
                   end
                   @histogram[:summary][:max] = [@histogram[:data].max,1].max
                   @summary[:attempt] = user.count
                   user.each_value { |v| @summary[:solve] += 1 if v == 1 }
                 end
                 def stuck #report struggling user,problem
                   # init
                   user,problem = nil
                   solve = true
                   tries = 0
                   @struggle = Array.new
                   record = {}
                   Submission.includes(:problem,:user).order(:problem_id,:user_id).find_each do |sub|
+            +       next unless sub.user and sub.problem
                     if user != sub.user_id or problem != sub.problem_id
                       @struggle << { user: record[:user], problem: record[:problem], tries: tries } unless solve
                       record = {user: sub.user, problem: sub.problem}
                       user,problem = sub.user_id, sub.problem_id
                       solve = false
                       tries = 0
                     end
                     if sub.points >= sub.problem.full_score
                       solve = true
                     else
                       tries += 1
                     end
                   end
                   @struggle.sort!{|a,b| b[:tries] <=> a[:tries] }
                   @struggle = @struggle[0..50]
                 end
               end

app/views/graders/list.html.haml ¶ +1 -1

               - content_for :head do
                 = stylesheet_link_tag 'graders'
                 <meta http-equiv ="refresh" content="60"/>
               %h1 Grader information
               = link_to '[Refresh]', :action => 'list'
               %br/
               .submitbox
                 .item
                   Grader control:
                 .item
                   = form_for :clear, :url => {:action => 'start_grading'} do |f|
                     = submit_tag 'Start graders in grading env'
                 .item
                   = form_for :clear, :url => {:action => 'start_exam'} do |f|
                     = submit_tag 'Start graders in exam env'
                 .item
                   = form_for :clear, :url => {:action => 'stop_all'} do |f|
                     = submit_tag 'Stop all running graders'
                 .item
                   = form_for :clear, :url => {:action => 'clear_all'} do |f|
                     = submit_tag 'Clear all data'
                 %br{:style => 'clear:both'}/
               %div{style: 'width:500px; float: left;'}
                 - if @last_task
                   Last task:
                   = link_to "#{@last_task.id}", :action => 'view', :id => @last_task.id, :type => 'Task'
                   %br/
                 - if @last_test_request
                   Last test_request:
                   = link_to "#{@last_test_request.id}", :action => 'view', :id => @last_test_request.id, :type => 'TestRequest'
                 %h2 Current graders
                 = render :partial => 'grader_list', :locals => {:grader_list => @grader_processes}
                 %h2 Stalled graders
                 = render :partial => 'grader_list', :locals => {:grader_list => @stalled_processes}
                 %h2 Terminated graders
                 = form_for :clear, :url => {:action => 'clear_terminated'} do |f|
                   = submit_tag 'Clear data for terminated graders'
                 = render :partial => 'grader_list', :locals => {:grader_list => @terminated_processes}
               %div{}
                 %h2 Last 20 submissions
                 %table.graders
                   %thead
                     %th ID
                     %th User
                     %th Problem
                     %th Submitted
                     %th Graded
                     %th Result
                   %tbody
                     - @submission.each do |sub|
                       %tr.inactive
                         %td= link_to sub.id, controller: 'graders' ,action: 'submission', id: sub.id
                         %td= sub.try(:user).try(:full_name)
                         %td= sub.try(:problem).try(:full_name)
                         %td= "#{time_ago_in_words(sub.submitted_at)} ago"
-            -           %td= "#{time_ago_in_words(sub.graded_at)} ago"
+            +           %td= "#{sub.graded_at ? time_ago_in_words(sub.graded_at) : ''} ago"
                         %td= sub.grader_comment

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

r518:4d5c727a0d13 - Wed, 01 Oct 2014 15:46:51 - 2 files changed: 2 inserted, 1 deleted

Sign in to your account

Commit r518:4d5c727a0d13 public

Author

r518:4d5c727a0d13 - Wed, 01 Oct 2014 15:46:51 - 2 files changed: 2 inserted, 1 deleted

Commit `r518:4d5c727a0d13` public