cafe-grader-web Commit - r598:db36298d10ca

cafe-grader-web

Commit `r598:db36298d10ca` public

parent | child

Description:

- remove inplace editor from view - add link to edit announcement directly - modify submission_short display button

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

r598:db36298d10ca - Wed, 05 Oct 2016 08:26:00 - 4 files changed: 55 inserted, 22 deleted

app/controllers/report_controller.rb ¶ +46 -14

               class ReportController < ApplicationController
                 before_filter :admin_authorization, only: [:login_stat,:submission_stat, :stuck, :cheat_report, :cheat_scruntinize, :show_max_score]
                 before_filter(only: [:problem_hof]) { |c|
                   return false unless authenticate
                   if GraderConfiguration["right.user_view_submission"]
                     return true;
                   end
                   admin_authorization
                 }
                 def max_score
                 end
+            +   def current_score
+            +     @problems = Problem.find_available_problems
+            +     @users = User.includes(:contests).includes(:contest_stat).where(enabled: true)
+            +     @scorearray = calculate_max_score(problems, users,0,0,{max: true})
+            +
+            +     #rencer accordingly
+            +     if params[:commit] == 'download csv' then
+            +       csv = gen_csv_from_scorearray(@scorearray,@problems)
+            +       send_data csv, filename: 'max_score.csv'
+            +     else
+            +       #render template: 'user_admin/user_stat'
+            +       render 'current_score'
+            +     end
+            +   end
+            +
                 def show_max_score
                   #process parameters
                   #problems
                   @problems = []
                   params[:problem_id].each do |id|
                     next unless id.strip != ""
                     @problems << Problem.find(id.to_i)
                   end
                   #users
                   @users = if params[:user] == "all" then
                              User.find(:all, :include => [:contests, :contest_stat])
                            else
                              User.includes(:contests).includes(:contest_stat).where(enabled: true)
                            end
                   #set up range from param
                   since_id = params.fetch(:min_id, 0).to_i
                   until_id = params.fetch(:max_id, 0).to_i
-            -     #get data
+            +     #calculate the routine
-            -     @scorearray = Array.new
+            +     @scorearray = calculate_max_score(problems, users,since_id,until_id)
-            -     @users.each do |u|
-            -       ustat = Array.new
-            -       ustat[0] = u
-            -       @problems.each do |p|
-            -         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)]
-            -       end
-            -       @scorearray << ustat
-            -     end
+            +     #rencer accordingly
                   if params[:commit] == 'download csv' then
                     csv = gen_csv_from_scorearray(@scorearray,@problems)
                     send_data csv, filename: 'max_score.csv'
                   else
                     #render template: 'user_admin/user_stat'
                     render 'max_score'
                   end
                 end
                 def score
                   if params[:commit] == 'download csv'
                     @problems = Problem.all
                   else
                     @problems = Problem.find_available_problems
                   end
                   @users = User.includes(:contests, :contest_stat).where(enabled: true) #find(:all, :include => [:contests, :contest_stat]).where(enabled: true)
                   @scorearray = Array.new
                   @users.each do |u|
                     ustat = Array.new
                     ustat[0] = u
                     @problems.each do |p|
                       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
                   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)
+            +     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
+            +       scorearray << ustat
+            +     end
+            +     return scorearray
+            +   end
               end

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

               %li.list-group-item
                 %strong
                   = announcement.title
+            +   - if @current_user.admin?
+            +     = link_to 'Edit', edit_announcement_path(announcement), class: 'btn btn-xs btn-default'
                 %small= "(updated #{time_ago_in_words(announcement.updated_at)} ago on #{announcement.updated_at})"
                 %br
                   = markdown(announcement.body)
                 :javascript
                   Announcement.updateRecentId(#{announcement.id});
                 - if (defined? announcement_effect) and announcement_effect
                   :javascript
                     $("announcement-#{announcement.id}").blindDown({duration: 0.2});
                     $("announcement-#{announcement.id}").appear({duration: 0.5, queue: 'end'});

app/views/main/_submission_short.html.haml ¶ +4 -5

               - if submission.nil?
                 = "-"
               - else
                 - if submission.graded_at.nil?
                   = t 'main.submitted_at'
                   = format_short_time(submission.submitted_at.localtime)
                 - else
                   %strong= t 'main.graded_at'
                   = "#{format_short_time(submission.graded_at.localtime)} "
                   %br
                   - if GraderConfiguration['ui.show_score']
                     %strong= t 'main.score'
                     = "#{(submission.points*100/submission.problem.full_score).to_i} "
                   = " ["
                   %tt
                     = submission.grader_comment
                   = "]"
                   %br
                   %strong View:
                   - if GraderConfiguration.show_grading_result
                     = link_to '[detailed result]', :action => 'result', :id => submission.id
-            -     = link_to("[#{t 'main.cmp_msg'}]", {:action => 'compiler_msg', :id => submission.id}, {:popup => true})
+            +     = link_to "#{t 'main.cmp_msg'}", {:action => 'compiler_msg', :id => submission.id}, {popup: true,class: 'btn btn-xs btn-info'}
-            -   = " | "
+            +   = link_to "#{t 'main.src_link'}",{:action => 'source', :id => submission.id}, class: 'btn btn-xs btn-info'
-            -   = link_to("[#{t 'main.src_link'}]",{:action => 'source', :id => submission.id})
+            +   = link_to "#{t 'main.submissions_link'}", problem_submissions_path(problem_id), class: 'btn btn-xs btn-info'
-            -   = " | "
-            -   = link_to "[#{t 'main.submissions_link'}]", problem_submissions_path(problem_id)

app/views/problems/index.html.haml ¶ +3 -3

                   %b Quick New:
                   %label{:for => "problem_name"} Name
                   = text_field 'problem', 'name'
                   |
                   %label{:for => "problem_full_name"} Full name
                   = text_field 'problem', 'full_name'
                   = submit_tag "Create"
               %table.table.table-condense.table-hover
                 %thead
                   %th Name
                   %th Full name
                   %th.text-right Full score
                   %th Date added
                   %th.text-center
                     Avail?
                     %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Let user submits to this problem?' } [?]
                   %th.text-center
                     Test?
                     %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Let user uses test interface on this problem?' } [?]
                   - if GraderConfiguration.multicontests?
                     %th Contests
                 - for problem in @problems
                   %tr{:class => "#{(problem.available) ? "success" : "danger"}", :id => "prob-#{problem.id}", :name => "prob-#{problem.id}"}
                     - @problem=problem
-            -       %td= in_place_editor_field :problem, :name, {}, :rows=>1
+            +       %td= problem.name #in_place_editor_field :problem, :name, {}, :rows=>1
-            -       %td= in_place_editor_field :problem, :full_name, {}, :rows=>1
+            +       %td= problem.full_name #in_place_editor_field :problem, :full_name, {}, :rows=>1
-            -       %td.text-right= in_place_editor_field :problem, :full_score, {}, :rows=>1
+            +       %td.text-right= problem.full_score #in_place_editor_field :problem, :full_score, {}, :rows=>1
                     %td= problem.date_added
                     %td= toggle_button(@problem.available?, toggle_problem_url(@problem), "problem-avail-#{@problem.id}")
                     %td= toggle_button(@problem.test_allowed?, toggle_test_problem_url(@problem), "problem-test-#{@problem.id}")
                     - if GraderConfiguration.multicontests?
                       %td
                         = problem.contests.collect { |c| c.name }.join(', ')
                     %td= link_to 'Stat', {:action => 'stat', :id => problem.id}, class: 'btn btn-info btn-xs btn-block'
                     %td= link_to 'Show', {:action => 'show', :id => problem}, class: 'btn btn-info btn-xs btn-block'
                     %td= link_to 'Edit', {:action => 'edit', :id => problem}, class: 'btn btn-info btn-xs btn-block'
                     %td= link_to 'Destroy', { :action => 'destroy', :id => problem }, :confirm => 'Are you sure?', :method => :post, class: 'btn btn-danger btn-xs btn-block'
               %br/
               = link_to '[New problem]', :action => 'new'

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

r598:db36298d10ca - Wed, 05 Oct 2016 08:26:00 - 4 files changed: 55 inserted, 22 deleted

Sign in to your account

Commit r598:db36298d10ca public

Author

r598:db36298d10ca - Wed, 05 Oct 2016 08:26:00 - 4 files changed: 55 inserted, 22 deleted

Commit `r598:db36298d10ca` public