cafe-grader-web Commit - r782:97cd56a5f1d8

cafe-grader-web

Commit `r782:97cd56a5f1d8` public

parent | child

Description:

fix display bugs in corrent score

Commit status:

[Not Reviewed]

References:

algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r782:97cd56a5f1d8 - Mon, 04 Nov 2019 02:03:25 - 3 files changed: 5 inserted, 4 deleted

app/controllers/report_controller.rb ¶ +1

                   #convert date & time
                   date_and_time = '%Y-%m-%d %H:%M'
                   begin
                     md = params[:since_datetime].match(/(\d+)-(\d+)-(\d+) (\d+):(\d+)/)
                     @since_time = Time.zone.local(md[1].to_i,md[2].to_i,md[3].to_i,md[4].to_i,md[5].to_i)
                   rescue
                     @since_time = Time.zone.now.ago( 90.minutes)
                   end
                   begin
                     md = params[:until_datetime].match(/(\d+)-(\d+)-(\d+) (\d+):(\d+)/)
                     @until_time = Time.zone.local(md[1].to_i,md[2].to_i,md[3].to_i,md[4].to_i,md[5].to_i)
                   rescue
                     @until_time = Time.zone.now
                   end
                   #convert sid
                   @sid = params[:SID].split(/[,\s]/) if params[:SID]
                   unless @sid and @sid.size > 0
                     return
                     redirect_to actoin: :cheat_scruntinize
                     flash[:notice] = 'Please enter at least 1 student id'
                   end
                   mark = Array.new(@sid.size,'?')
                   condition = "(u.login = " + mark.join(' OR u.login = ') + ')'
                   @st = <<-SQL
                 SELECT l.created_at as submitted_at ,-1 as id,u.login,u.full_name,l.ip_address,"" as problem_id,"" as points,l.user_id
                 FROM logins l INNER JOIN users u on l.user_id  = u.id
                 WHERE l.created_at >= ? AND l.created_at <= ? AND #{condition}
               UNION
                 SELECT s.submitted_at,s.id,u.login,u.full_name,s.ip_address,s.problem_id,s.points,s.user_id
                 FROM submissions s INNER JOIN users u ON s.user_id = u.id
                 WHERE s.submitted_at >= ? AND s.submitted_at <= ? AND #{condition}
               ORDER BY submitted_at
                 SQL
                   p = [@st,@since_time,@until_time] + @sid + [@since_time,@until_time] + @sid
                   @logs = Submission.joins(:problem).find_by_sql(p)
                 end
                 protected
                 def calculate_max_score(problems, users,since_id,until_id, get_last_score = false)
+            +     #score[i] = user #i's user stat where i is the index (not id)
                   scorearray = Array.new
                   users.each do |u|
                     ustat = Array.new
                     ustat[0] = u
                     problems.each do |p|
                       unless get_last_score
                         #get max score
                         max_points = 0
                         Submission.find_in_range_by_user_and_problem(u.id,p.id,since_id,until_id).each do |sub|
                           max_points = sub.points if sub and sub.points and (sub.points > max_points)
                         end
                         ustat << [(max_points.to_f*100/p.full_score).round, (max_points>=p.full_score)]
                       else
                         #get latest score
                         sub = Submission.find_last_by_user_and_problem(u.id,p.id)
                         if (sub!=nil) and (sub.points!=nil) and p and p.full_score
                           ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
                         else
                           ustat << [0,false]
                         end
                       end
                     end
                     scorearray << ustat
                   end
                   return scorearray
                 end
                 def gen_csv_from_scorearray(scorearray,problem)
                   CSV.generate do |csv|
                     #add header
                     header = ['User','Name', 'Activated?', 'Logged in', 'Contest']
                     problem.each { |p| header << p.name }
                     header += ['Total','Passed']
                     csv << header
                     #add data
                     scorearray.each do |sc|
                       total = num_passed = 0
                       row = Array.new
                       sc.each_index do |i|
                         if i == 0
                           row << sc[i].login
                           row << sc[i].full_name
                           row << sc[i].activated
                           row << (sc[i].try(:contest_stat).try(:started_at)!=nil ? 'yes' : 'no')
                           row << sc[i].contests.collect {|c| c.name}.join(', ')
                         else
                           row << sc[i][0]
                           total += sc[i][0]

app/views/report/_score_table.html.haml ¶ +3 -3

               %table.table.sortable.table-striped.table-bordered.table-condensed
                 %thead
                   %tr
                     %th Login
                     %th Name
                     / %th Activated?
                     / %th Logged_in
                     / %th Contest(s)
                     %th Remark
                     - @problems.each do |p|
                       %th.text-right= p.name.gsub('_',' ')
                     %th.text-right Total
                     %th.text-right Passed
                 %tbody
-            -     - sum = Array.new(@scorearray[0].count,0)
+            +     - sum = Array.new(@problems.count,0)
-            -     - nonzero = Array.new(@scorearray[0].count,0)
+            +     - nonzero = Array.new(@problems.count,0)
-            -     - full = Array.new(@scorearray[0].count,0)
+            +     - full = Array.new(@problems.count,0)
                   - @scorearray.each do |sc|
                     %tr
                       - total,num_passed = 0,0
                       - sc.each_index do |i|
                         - if i == 0
                           %td= link_to sc[i].login, stat_user_path(sc[i])
                           %td= sc[i].full_name
                           / %td= sc[i].activated
                           / %td= sc[i].try(:contest_stat).try(:started_at) ? 'yes' : 'no'
                           / %td= sc[i].contests.collect {|c| c.name}.join(', ')
                           %td= sc[i].remark
                         - else
                           %td.text-right= sc[i][0]
                           - total += sc[i][0]
                           - num_passed += 1 if sc[i][1]
                           - sum[i] += sc[i][0]
                           - nonzero[i] += 1 if sc[i][0] > 0
                           - full[i] += 1 if sc[i][1]
                       %td.text-right= total
                       %td.text-right= num_passed
                   %tfoot
                     %tr
                       %td Summation
                       %td
                       %td
                       - sum.each.with_index do |s,i|
                         - next if i == 0
                         %td.text-right= number_with_delimiter(s)
                       %td
                       %td
                     %tr
                       %td partial solver
                       %td
                       %td
                       - nonzero.each.with_index do |s,i|
                         - next if i == 0
                         %td.text-right= number_with_delimiter(s)
                       %td
                       %td
                     %tr
                       %td Full solver
                       %td
                       %td
                       - full.each.with_index do |s,i|
                         - next if i == 0
                         %td.text-right= number_with_delimiter(s)
                       %td
                       %td

app/views/report/current_score.html.haml ¶ +1 -1

               .container-fluid
                 %h1 Current Score
                 = form_tag current_score_report_path, method: 'get' do
                   Show only users from this group
-            -     = select_tag "group_id", options_from_collection_for_select( Group.all, 'id','name',params[:group_name]), id: 'group_name',class: 'select2'
+            +     = select_tag "group_id", options_from_collection_for_select( Group.all, 'id','name',params[:group_id]), id: 'group_name',class: 'select2', style: 'width: 20em';
                   = submit_tag 'Apply',class: 'btn btn-default'
                 %br
                 = render "score_table"

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

r782:97cd56a5f1d8 - Mon, 04 Nov 2019 02:03:25 - 3 files changed: 5 inserted, 4 deleted

Sign in to your account

Commit r782:97cd56a5f1d8 public

Author

r782:97cd56a5f1d8 - Mon, 04 Nov 2019 02:03:25 - 3 files changed: 5 inserted, 4 deleted

Commit `r782:97cd56a5f1d8` public