cafe-grader-web Commit - r601:ff006e008326

cafe-grader-web

Commit `r601:ff006e008326` public

parent | child

Description:

- DRY score table - add report to check maximum score of selected problem

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

r601:ff006e008326 - Wed, 05 Oct 2016 09:20:43 - 6 files changed: 46 inserted, 41 deleted

app/views/report/_score_table.html.haml created 644 ¶ +34

@@ -0,0 +1,34
	1	+ %table.table.sortable.table-striped.table-bordered.table-condensed
	2	+ %thead
	3	+ %tr
	4	+ %th Login
	5	+ %th Name
	6	+ %th Activated?
	7	+ %th Logged_in
	8	+ %th Contest(s)
	9	+ %th Remark
	10	+ - @problems.each do \|p\|
	11	+ %th.text-right= p.name
	12	+ %th.text-right Total
	13	+ %th.text-right Passed
	14	+ %tbody
	15	+ - @scorearray.each do \|sc\|
	16	+ %tr
	17	+ - total,num_passed = 0,0
	18	+ - sc.each_index do \|i\|
	19	+ - if i == 0
	20	+ %td= link_to sc[i].login, controller: 'users', action: 'profile', id: sc[i]
	21	+ %td= sc[i].full_name
	22	+ %td= sc[i].activated
	23	+ %td= sc[i].try(:contest_stat).try(:started_at) ? 'yes' : 'no'
	24	+ %td= sc[i].contests.collect {\|c\| c.name}.join(', ')
	25	+ %td= sc[i].remark
	26	+ - else
	27	+ %td.text-right= sc[i][0]
	28	+ - total += sc[i][0]
	29	+ - num_passed += 1 if sc[i][1]
	30	+ %td.text-right= total
	31	+ %td.text-right= num_passed
	32	+
	33	+ :javascript
	34	+ $.bootstrapSortable(true,'reversed')

app/views/report/current_score.html.haml created 644 ¶ +3

@@ -0,0 +1,3
	1	+ %h1 Current Score
	2	+
	3	+ = render "score_table"

app/controllers/report_controller.rb ¶ +6 -3

               class ReportController < ApplicationController
+            +   before_filter :authenticate
+            +
                 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})
+            +     @scorearray = calculate_max_score(@problems, @users,0,0,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)
+            +       pid = Problem.find_by_id(id.to_i)
+            +       @problems << pid if pid
                   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
                   #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[: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
                         ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
                       else
                         ustat << [0,false]
                       end
                     end
                     @scorearray << ustat
                   end
                   if params[:commit] == 'download csv' then
                     csv = gen_csv_from_scorearray(@scorearray,@problems)
                     send_data csv, filename: 'last_score.csv'
                   else
                     render template: 'user_admin/user_stat'
                   end
                 end
                 def login_stat
                   @logins = Array.new
                   date_and_time = '%Y-%m-%d %H:%M'
                   begin
                     md = params[:since_datetime].match(/(\d+)-(\d+)-(\d+) (\d+):(\d+)/)

app/views/layouts/_header.html.haml ¶ +1 -1

                         MAIN
                     .collapse.navbar-collapse
                       %ul.nav.navbar-nav
                         - if (@current_user!=nil) and (GraderConfiguration.show_tasks_to?(@current_user))
                           //= add_menu("#{I18n.t 'menu.tasks'}", 'tasks', 'list')
                           %li.dropdown
                             %a.dropdown-toggle{href: '#', data: {toggle:'dropdown'},  aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               = "#{I18n.t 'menu.submissions'}"
                               %span.caret
                             %ul.dropdown-menu
                               = add_menu("View", 'main', 'submission')
                               = add_menu("Self Test", 'test', 'index')
                         - if GraderConfiguration['right.user_hall_of_fame']
                           = add_menu("#{I18n.t 'menu.hall_of_fame'}", 'report', 'problem_hof')
                         / display MODE button (with countdown in contest mode)
                         - if GraderConfiguration.analysis_mode?
                           %div.navbar-btn.btn.btn-success#countdown= "ANALYSIS MODE"
                         - elsif GraderConfiguration.time_limit_mode?
                           - if @current_user.contest_finished?
                             %div.navbar-btn.btn.btn-danger#countdown= "Contest is over"
                           - elsif !@current_user.contest_started?
                             %div.navbar-btn.btn.btn-primary#countdown= (t 'title_bar.contest_not_started')
                           - else
                             %div.navbar-btn.btn.btn-primary#countdown asdf
                             :javascript
                               $("#countdown").countdown({until: "+#{@current_user.contest_time_left.to_i}s", layout: 'Time left: {hnn}:{mnn}:{snn}'});
                         / admin section
                         - if (@current_user!=nil) and (session[:admin])
                           %li.dropdown
                             %a.dropdown-toggle{href: '#', data: {toggle:'dropdown'},  aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               Manage
                               %span.caret
                             %ul.dropdown-menu
                               = add_menu( 'Announcements', 'announcements', 'index')
                               = add_menu( 'Problems', 'problems', 'index')
                               = add_menu( 'Users', 'user_admin', 'index')
                               = add_menu( 'Graders', 'graders', 'list')
                               = add_menu( 'Message ', 'messages', 'console')
                               %li.divider{role: 'separator'}
                               = add_menu( 'System config', 'configurations', 'index')
                               %li.divider{role: 'separator'}
                               = add_menu( 'Sites', 'sites', 'index')
                               = add_menu( 'Contests', 'contest_management', 'index')
                           %li.dropdown
                             %a.dropdown-toggle{href: '#', data: {toggle:'dropdown'},  aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               Report
                               %span.caret
                             %ul.dropdown-menu
-            -                 = add_menu( 'Results', 'user_admin', 'user_stat')
+            +                 = add_menu( 'Results', 'report', 'current_score')
                               = add_menu( 'Report', 'report', 'multiple_login')
                           - if (ungraded = Submission.where('graded_at is null').where('submitted_at < ?', 1.minutes.ago).count) > 0
                             =link_to "#{ungraded} backlogs!",
                               grader_list_path,
                               class: 'navbar-btn btn btn-default btn-warning', data: {toggle: 'tooltip'},title: 'Number of ungraded submission'
                       %ul.nav.navbar-nav.navbar-right
                         = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-question-sign')}".html_safe, 'main', 'help')
                         = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-comment')}".html_safe, 'messages', 'list', {title: I18n.t('menu.messages'), data: {toggle: 'tooltip'}})
                         - if GraderConfiguration['system.user_setting_enabled']
                           = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-cog')}".html_safe, 'users', 'index', {title: I18n.t('menu.settings'), data: {toggle: 'tooltip'}})
                         = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-log-out')} #{@current_user.full_name}".html_safe, 'main', 'login', {title: I18n.t('menu.log_out'), data: {toggle: 'tooltip'}})
               /
                 - if (@current_user!=nil) and (session[:admin])
                   %nav.navbar.navbar-fixed-top.navbar-inverse.secondnavbar
                     .container-fluid
                       .collapse.navbar-collapse
                         %ul.nav.navbar-nav
                           = add_menu( '[Announcements]', 'announcements', 'index')
                           = add_menu( '[Msg console]', 'messages', 'console')
                           = add_menu( '[Problems]', 'problems', 'index')
                           = add_menu( '[Users]', 'user_admin', 'index')
                           = add_menu( '[Results]', 'user_admin', 'user_stat')
                           = add_menu( '[Report]', 'report', 'multiple_login')
                           = add_menu( '[Graders]', 'graders', 'list')
                           = add_menu( '[Contests]', 'contest_management', 'index')
                           = add_menu( '[Sites]', 'sites', 'index')
                           = add_menu( '[System config]', 'configurations', 'index')

app/views/report/max_score.html.haml ¶ +1 -37

               %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]}),
                           { 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"
                       .form-group
                         = label_tag :from, "Max"
                         = text_field_tag 'to_id', nil, 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"
                   = button_tag 'Download CSV', class: "btn btn-primary btn-large"
               - if @scorearray
                 %h2 Result
-            -   %table.table.sortable.table-striped.table-bordered.table-condensed
+            +   =render "score_table"
-            -     %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
-            -         %th.text-right Total
-            -         %th.text-right Passed
-            -     %tbody
-            -       - @scorearray.each do |sc|
-            -         %tr
-            -           - total,num_passed = 0,0
-            -           - sc.each_index do |i|
-            -             - if i == 0
-            -               %td= link_to sc[i].login, controller: 'users', action: 'profile', id: 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]
-            -           %td.text-right= total
-            -           %td.text-right= num_passed
-            -   :javascript
-            -     $.bootstrapSortable(true,'reversed')
-            -   /.col-md-4.col-md-offset-1
-            -   /  = button_tag 'Show', class: "btn btn-primary btn-block"
-            -   /.col-md-4.col-md-offset-2
-            -   /  = button_tag 'Download CSV', class: "btn btn-primary btn-block"

config/routes.rb ¶ +1

                 resources :contests
                 resources :sites
                 resources :announcements do
                   member do
                     get 'toggle','toggle_front'
                   end
                 end
                 resources :problems do
                   member do
                     get 'toggle'
                     get 'toggle_test'
                   end
                   collection do
                     get 'turn_all_off'
                     get 'turn_all_on'
                     get 'import'
                     get 'manage'
                   end
                 end
                 resources :grader_configuration, controller: 'configurations'
                 resources :users do
                   member do
                     get 'toggle_activate', 'toggle_enable'
                   end
                 end
                 resources :submissions do
                   collection do
                     get 'prob/:problem_id', to: 'submissions#index', as: 'problem'
                     get 'direct_edit_problem/:problem_id', to: 'submissions#direct_edit_problem', as: 'direct_edit_problem'
                     get 'get_latest_submission_status/:uid/:pid', to: 'submissions#get_latest_submission_status', as: 'get_latest_submission_status'
                   end
                 end
                 match 'tasks/view/:file.:ext' => 'tasks#view'
                 match 'tasks/download/:id/:file.:ext' => 'tasks#download'
                 match 'heartbeat/:id/edit' => 'heartbeat#edit'
                 #main
                 get "main/list"
                 get 'main/submission(/:id)', to: 'main#submission', as: 'main_submission'
                 #report
+            +   get 'report/current_score', to: 'report#current_score', as: 'report_current_score'
                 get 'report/problem_hof(/:id)', to: 'report#problem_hof', as: 'report_problem_hof'
                 get "report/login"
                 get 'report/max_score', to: 'report#max_score', as: 'report_max_score'
                 post 'report/show_max_score', to: 'report#show_max_score', as: 'report_show_max_score'
                 #grader
                 get 'graders/list', to: 'graders#list', as: 'grader_list'
                 match 'heartbeat/:id/edit' => 'heartbeat#edit'
                 # See how all your routes lay out with "rake routes"
                 # This is a legacy wild controller route that's not recommended for RESTful applications.
                 # Note: This route will make all actions in every controller accessible via GET requests.
                 match ':controller(/:action(/:id))(.:format)'
               end

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

r601:ff006e008326 - Wed, 05 Oct 2016 09:20:43 - 6 files changed: 46 inserted, 41 deleted

Sign in to your account

Commit r601:ff006e008326 public

Author

r601:ff006e008326 - Wed, 05 Oct 2016 09:20:43 - 6 files changed: 46 inserted, 41 deleted

Commit `r601:ff006e008326` public