cafe-grader-web Commit - r647:bb242b3ef68d

cafe-grader-web

Commit `r647:bb242b3ef68d` public

parent | child

Description:

make report max_score remember user options

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

r647:bb242b3ef68d - Fri, 10 Mar 2017 12:35:55 - 3 files changed: 12 inserted, 10 deleted

app/controllers/report_controller.rb ¶ +9 -7

                 }
                 def max_score
                 end
                 def current_score
                   @problems = Problem.available_problems
                   @users = User.includes(:contests).includes(:contest_stat).where(enabled: true)
                   @scorearray = calculate_max_score(@problems, @users,0,0,true)
                   #rencer accordingly
                   if params[:button] == 'download' 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|
+            +     if params[:problem_id]
-            -       next unless id.strip != ""
+            +       params[:problem_id].each do |id|
-            -       pid = Problem.find_by_id(id.to_i)
+            +         next unless id.strip != ""
-            -       @problems << pid if pid
+            +         pid = Problem.find_by_id(id.to_i)
+            +         @problems << pid if pid
+            +       end
                   end
                   #users
                   @users = if params[:user] == "all" then
                              User.includes(:contests).includes(:contest_stat)
                            else
                              User.includes(:contests).includes(:contest_stat).where(enabled: true)
                            end
                   #set up range from param
-            -     since_id = params.fetch(:from_id, 0).to_i
+            +     @since_id = params.fetch(:from_id, 0).to_i
-            -     until_id = params.fetch(:to_id, 0).to_i
+            +     @until_id = params.fetch(:to_id, 0).to_i
                   #calculate the routine
-            -     @scorearray = calculate_max_score(@problems, @users,since_id,until_id)
+            +     @scorearray = calculate_max_score(@problems, @users, @since_id, @until_id)
                   #rencer accordingly
                   if params[:button] == 'download' 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.available_problems
                   end
                   @users = User.includes(:contests, :contest_stat).where(enabled: true)
                   @scorearray = Array.new
                   @users.each do |u|
                     ustat = Array.new
                     ustat[0] = u
                     @problems.each do |p|

app/views/report/max_score.html.haml ¶ +2 -2

               %h1 Maximum score
               = form_tag report_show_max_score_path
               .row
                 .col-md-4
                   .panel.panel-primary
                     .panel-heading
                       Problems
                     .panel-body
                       %p
                         Select problem(s) that we wish to know the score.
                       = label_tag :problem_id, "Problems"
                       = select_tag 'problem_id[]',
                           options_for_select(Problem.all.collect {|p| ["[#{p.name}] #{p.full_name}", p.id]},params[:problem_id]),
                           { class: 'select2 form-control', multiple: "true" }
                 .col-md-4
                   .panel.panel-primary
                     .panel-heading
                       Submission range
                     .panel-body
                       %p
                         Input minimum and maximum range of submission ID that should be included. A blank value for min and max means -1 and infinity, respectively.
                       .form-group
                         = label_tag :from, "Min"
-            -           = text_field_tag 'from_id', nil, class: "form-control"
+            +           = text_field_tag 'from_id', @since_id, class: "form-control"
                       .form-group
                         = label_tag :from, "Max"
-            -           = text_field_tag 'to_id', nil, class: "form-control"
+            +           = text_field_tag 'to_id', @until_id, class: "form-control"
                 .col-md-4
                   .panel.panel-primary
                     .panel-heading
                       Users
                     .panel-body
                       .radio
                         %label
                           = radio_button_tag 'users', 'all', true
                           All users
                       .radio
                         %label
                           = radio_button_tag 'users', 'enabled'
                           Only enabled users
               .row
                 .col-md-12
                   = button_tag 'Show', class: "btn btn-primary btn-large", value: "show"
                   = button_tag 'Download CSV', class: "btn btn-primary btn-large", value: "download"
               - if @scorearray
                 %h2 Result
                 =render "score_table"

app/views/submissions/rejudge.js.haml ¶ +1 -1

@@ -1,2 +1,2
1	:plain	1	:plain
2	- $("body").prepend("<div class=\"alert alert-info\"> Submission #{@submission.id}'s task status has been chaned to \"#{@task.status_str}\" </div>")	2	+ $("body").prepend("<div class=\"alert alert-info\"> Submission #{@submission.id}'s task status has been changed to \"#{@task.status_str}\". It will be re-judged soon. </div>")

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

r647:bb242b3ef68d - Fri, 10 Mar 2017 12:35:55 - 3 files changed: 12 inserted, 10 deleted

Sign in to your account

Commit r647:bb242b3ef68d public

Author

r647:bb242b3ef68d - Fri, 10 Mar 2017 12:35:55 - 3 files changed: 12 inserted, 10 deleted

Commit `r647:bb242b3ef68d` public