cafe-grader-web Commit - r606:7b10ea3e4720

cafe-grader-web

Commit `r606:7b10ea3e4720` public

parent | child

Description:

- clean up link to problem stat and user stat

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

r606:7b10ea3e4720 - Wed, 12 Oct 2016 08:39:58 - 6 files changed: 15 inserted, 13 deleted

app/controllers/users_controller.rb ¶ +1 -1

                                                                      :retrieve_password]
                 before_filter :authenticate, :profile_authorization, only: [:profile]
                 verify :method => :post, :only => [:chg_passwd],
                        :redirect_to => { :action => :index }
                 #in_place_edit_for :user, :alias_for_editing
                 #in_place_edit_for :user, :email_for_editing
                 def index
                   if !GraderConfiguration['system.user_setting_enabled']
                     redirect_to :controller => 'main', :action => 'list'
                   else
                     @user = User.find(session[:user_id])
                   end
                 end
                 def chg_passwd
                   user = User.find(session[:user_id])
                   user.password = params[:passwd]
                   user.password_confirmation = params[:passwd_verify]
                   if user.save
                     flash[:notice] = 'password changed'
                   else
                     flash[:notice] = 'Error: password changing failed'
                   end
                   redirect_to :action => 'index'
                 end
                 def new
                   @user = User.new
                   render :action => 'new', :layout => 'empty'
                 end
                 def register
                   if(params[:cancel])
                     redirect_to :controller => 'main', :action => 'login'
                     return
                   end
                   @user = User.new(params[:user])
                   @user.password_confirmation = @user.password = User.random_password
                   @user.activated = false
                   if (@user.valid?) and (@user.save)
                     if send_confirmation_email(@user)
                       render :action => 'new_splash', :layout => 'empty'
                     else
                       @admin_email = GraderConfiguration['system.admin_email']
                       render :action => 'email_error', :layout => 'empty'
                     end
                   else
                     @user.errors.add(:base,"Email cannot be blank") if @user.email==''
                     render :action => 'new', :layout => 'empty'
                   end
                 end
                 def confirm
                   login = params[:login]
                   key = params[:activation]
                   @user = User.find_by_login(login)
                   if (@user) and (@user.verify_activation_key(key))
                     if @user.valid?  # check uniquenss of email
                       @user.activated = true
                       @user.save
                       @result = :successful
                     else
                       @result = :email_used
                     end
                   else
                     @result = :failed
                   end
                   render :action => 'confirm', :layout => 'empty'
                 end
                 def forget
                   render :action => 'forget', :layout => 'empty'
                 end
                 def retrieve_password
                   email = params[:email]
                   user = User.find_by_email(email)
                   if user
                     last_updated_time = user.updated_at || user.created_at || (Time.now.gmtime - 1.hour)
                     if last_updated_time > Time.now.gmtime - 5.minutes
                       flash[:notice] = 'The account has recently created or new password has recently been requested.  Please wait for 5 minutes'
                     else
                       user.password = user.password_confirmation = User.random_password
                       user.save
                       send_new_password_email(user)
                       flash[:notice] = 'New password has been mailed to you.'
                     end
                   else
                     flash[:notice] = I18n.t 'registration.password_retrieval.no_email'
                   end
                   redirect_to :action => 'forget'
                 end
-            -   def profile
+            +   def stat
                   @user = User.find(params[:id])
                   @submission = Submission.includes(:problem).where(user_id: params[:id])
                   range = 120
                   @histogram = { data: Array.new(range,0), summary: {} }
                   @summary = {count: 0, solve: 0, attempt: 0}
                   problem = Hash.new(0)
                   @submission.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
                     next unless sub.problem
                     problem[sub.problem] = [problem[sub.problem], ( (sub.try(:points) || 0) >= sub.problem.full_score) ? 1 : 0].max
                   end
                   @histogram[:summary][:max] = [@histogram[:data].max,1].max
                   @summary[:attempt] = problem.count
                   problem.each_value { |v| @summary[:solve] += 1 if v == 1 }
                 end
                 def toggle_activate
                   @user = User.find(params[:id])
                   @user.update_attributes( activated:  !@user.activated? )
                   respond_to do |format|
                     format.js { render partial: 'toggle_button',
                                 locals: {button_id: "#toggle_activate_user_#{@user.id}",button_on: @user.activated? } }
                   end
                 end
                 def toggle_enable
                   @user = User.find(params[:id])
                   @user.update_attributes( enabled:  !@user.enabled? )
                   respond_to do |format|
                     format.js { render partial: 'toggle_button',
                                 locals: {button_id: "#toggle_enable_user_#{@user.id}",button_on: @user.enabled? } }
                   end
                 end
                 protected
                 def verify_online_registration
                   if !GraderConfiguration['system.online_registration']
                     redirect_to :controller => 'main', :action => 'login'
                   end
                 end
                 def send_confirmation_email(user)
                   contest_name = GraderConfiguration['contest.name']
                   activation_url = url_for(:action => 'confirm',
                                            :login => user.login,
                                            :activation => user.activation_key)
                   home_url = url_for(:controller => 'main', :action => 'index')
                   mail_subject = "[#{contest_name}] Confirmation"
                   mail_body = t('registration.email_body', {
                                   :full_name => user.full_name,
                                   :contest_name => contest_name,
                                   :login => user.login,
                                   :password => user.password,
                                   :activation_url => activation_url,
                                   :admin_email => GraderConfiguration['system.admin_email']
                                 })
                   logger.info mail_body
                   send_mail(user.email, mail_subject, mail_body)
                 end
                 def send_new_password_email(user)
                   contest_name = GraderConfiguration['contest.name']
                   mail_subject = "[#{contest_name}] Password recovery"
                   mail_body = t('registration.password_retrieval.email_body', {
                                   :full_name => user.full_name,
                                   :contest_name => contest_name,
                                   :login => user.login,
                                   :password => user.password,
                                   :admin_email => GraderConfiguration['system.admin_email']
                                 })
                   logger.info mail_body
                   send_mail(user.email, mail_subject, mail_body)
                 end
                 # allow viewing of regular user profile only when options allow so
                 # only admins can view admins profile
                 def profile_authorization
                   #if view admins' profile, allow only admin
                   return false unless(params[:id])
                   user = User.find(params[:id])
                   return false unless user
                   return admin_authorization if user.admin?
                   return true if GraderConfiguration["right.user_view_submission"]

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

               - content_for :head do
                 <meta http-equiv ="refresh" content="60"/>
               %h1 Grader information
               %p
                 = link_to 'Refresh', { :action => 'list' }, class: 'btn btn-info'
               .panel.panel-primary
                 .panel-heading
                   Grader control:
                 .panel-body
                   =link_to 'Start Graders in grading env', { action: 'start_grading'}, class: 'btn btn-default', method: 'post'
                   =link_to 'Start Graders in exam env', { action: 'start_exam'}, class: 'btn btn-default', method: 'post'
                   =link_to 'Stop all running Graders', { action: 'stop_all'}, class: 'btn btn-default', method: 'post'
                   =link_to 'Clear all data', { action: 'clear_all'}, class: 'btn btn-default', method: 'post'
               .row
                 .col-md-6
                   - 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
                   %p= link_to 'Clear data for terminated graders', { action: 'clear_terminated'}, class: 'btn btn-default', method: 'post'
                   = render :partial => 'grader_list', :locals => {:grader_list => @terminated_processes}
                 .col-md-6
                   %h2 Last 20 submissions
                   %table.table.table-striped.table-condensed
                     %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= link_to sub.id, submission_path(sub.id)
-            -             %td= sub.try(:user).try(:full_name)
+            +             %td= link_to sub.try(:user).try(:full_name), stat_user_path(sub.user.id)
-            -             %td= sub.try(:problem).try(:full_name)
+            +             %td= link_to sub.try(:problem).try(:full_name), stat_problem_path(sub.problem.id)
                           %td= "#{time_ago_in_words(sub.submitted_at)} ago"
                           %td= sub.graded_at ? "#{time_ago_in_words(sub.graded_at)} ago" : " "
                           %td= sub.grader_comment
                   %h2 Ungraded submission
                   %table.table.table-striped.table-condensed
                     %thead
                       %th ID
                       %th User
                       %th Problem
                       %th Submitted
                       %th Graded
                       %th Result
                     %tbody
                       - @backlog_submission.each do |sub|
                         %tr.inactive
-            -             %td= link_to sub.id, controller: 'graders' ,action: 'submission', id: sub.id
+            +             %td= link_to sub.id, submission_path(sub.id)
-            -             %td= sub.try(:user).try(:full_name)
+            +             %td= link_to sub.try(:user).try(:full_name), stat_user_path(sub.user.id)
-            -             %td= sub.try(:problem).try(:full_name)
+            +             %td= link_to sub.try(:problem).try(:full_name), stat_problem_path(sub.problem.id)
                           %td= "#{time_ago_in_words(sub.submitted_at)} ago"
                           %td= sub.graded_at ? "#{time_ago_in_words(sub.graded_at)} ago" : " "
                           %td= sub.grader_comment

app/views/problems/stat.html.haml ¶ +2 -2

               :css
                 .fix-width {
                   font-family: "Consolas, Monaco, Droid Sans Mono,Mono, Monospace,Courier"
                 }
               %h1 Problem stat: #{@problem.name}
               %h2 Overview
               %table.info
                 %thead
                   %tr.info-head
                     %th Stat
                     %th Value
                 %tbody
                   %tr{class: cycle('info-even','info-odd')}
                     %td Submissions
                     %td= @submissions.count
                   %tr{class: cycle('info-even','info-odd')}
                     %td Solved/Attempted User
                     %td #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
               %h2 Submissions Count
               = render partial: 'application/bar_graph', locals: { histogram: @histogram }
               %h2 Submissions
               - if @submissions and @submissions.count > 0
                 %table.info#main_table
                   %thead
                     %tr.info-head
                       %th ID
                       %th Login
                       %th Name
                       %th Submitted_at
                       %th Points
                       %th comment
                       %th IP
                   %tbody
                     - row_odd,curr = true,''
                     - @submissions.each do |sub|
                       - next unless sub.user
                       - row_odd,curr = !row_odd, sub.user if curr != sub.user
                       %tr{class: row_odd ? "info-odd" : "info-even"}
-            -           %td= link_to sub.id, controller: 'graders', action: 'submission', id: sub.id
+            +           %td= link_to sub.id, submission_path(sub)
-            -           %td= link_to sub.user.login, controller: :users, action: :profile, id: sub.user.id
+            +           %td= link_to sub.user.login, stat_user_path(sub.user)
                         %td= sub.user.full_name
                         %td= time_ago_in_words(sub.submitted_at) + " ago"
                         %td= sub.points
                         %td.fix-width= sub.grader_comment
                         %td= sub.ip_address
               - else
                 No submission

app/views/submissions/show.html.haml ¶ +2 -2

               %h1= "Submission: #{@submission.id}"
               %textarea#data{style: "display:none;"}
                 :preserve
                   #{@submission.source}
               //%div.highlight{:style => "border: 1px solid black;"}
               //=@formatted_code.html_safe
               .containter
                 .row
                   .col-md-7
                     %h2 Source Code
                   .col-md-5
                     %h2 Stat
                 .row
                   .col-md-7
                     %div#editor{ style: "font-size: 14px; height: 400px; border-radius:5px;" }
                     :javascript
                       e = ace.edit("editor")
                       e.setOptions({ maxLines: Infinity })
                       e.setValue($("#data").text())
                       e.gotoLine(1)
                       e.getSession().setMode("#{get_ace_mode(@submission.language)}")
                       e.setReadOnly(true)
                   .col-md-5
                     %table.table.table-striped
                       %tr
                         %td.text-right
                           %strong User
                         %td
                           - if @submission.user
-            -               = link_to "(#{@submission.user.login})", controller: "users", action: "profile", id: @submission.user
+            +               = link_to "#{@submission.user.login}", stat_user_path(@submission.user)
                             = @submission.user.full_name
                           - else
                             = "(n/a)"
                       %tr
                         %td.text-right
                           %strong Task
                         %td
                           - if @submission.problem!=nil
-            -               = link_to "(#{@submission.problem.name})", controller: "problems", action: "stat", id: @submission.problem
+            +               = link_to "[#{@submission.problem.name}]", stat_problem_path(@submission.problem)
                             = @submission.problem.full_name
                           - else
                             = "(n/a)"
                       %tr
                         %td.text-right
                           %strong Tries
                         %td= @submission.number
                       %tr
                         %td.text-right
                           %strong Language
                         %td= @submission.language.pretty_name
                       %tr
                         %td.text-right
                           %strong Submitted
                         %td #{time_ago_in_words(@submission.submitted_at)} ago (at #{@submission.submitted_at.to_formatted_s(:long)})
                       %tr
                         %td.text-right
                           %strong Graded
                         - if @submission.graded_at
                           %td #{time_ago_in_words(@submission.graded_at)} ago (at #{@submission.graded_at.to_formatted_s(:long)})
                         - else
                           %td -
                       %tr
                         %td.text-right
                           %strong Points
                         %td #{@submission.points}/#{@submission.problem.full_score}
                       %tr
                         %td.text-right
                           %strong Comment
                         %td #{@submission.grader_comment}
                       %tr
                         %td.text-right
                           %strong Runtime (s)
                         %td #{@submission.max_runtime}
                       %tr
                         %td.text-right
                           %strong Memory (kb)
                         %td #{@submission.peak_memory}
                       - if session[:admin]
                         %tr
                           %td.text-right
                             %strong IP
                           %td #{@submission.ip_address}

app/views/users/stat.html.haml ⬅ ~~app/views/users/profile.html.haml~~ renamed ¶ +2 -2

               - content_for :header do
                 = javascript_include_tag 'local_jquery'
               :javascript
                 $(function () {
                   $('#submission_table').tablesorter({widgets: ['zebra']});
                 });
               :css
                 .fix-width {
                   font-family: Droid Sans Mono,Consolas, monospace, mono, Courier New, Courier;
                 }
               %h1= @user.full_name
               <b>Login:</b> #{@user.login} <br/>
               <b>Full name:</b> #{@user.full_name} <br />
               %h2 Problem Stat
               %table.info
                 %thead
                   %tr.info-head
                     %th Stat
                     %th Value
                 %tbody
                   %tr{class: cycle('info-even','info-odd')}
                     %td.info_param Submissions
                     %td= @summary[:count]
                   %tr{class: cycle('info-even','info-odd')}
                     %td.info_param Solved/Attempted Problem
                     %td #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
               %h2 Submission History
               =render partial: 'application/bar_graph', locals: {histogram: @histogram, param: {bar_width: 7}}
               %table.tablesorter-cafe#submission_table
                 %thead
                   %tr
                     %th ID
                     %th Problem code
                     %th Problem full name
                     %th Language
                     %th Submitted at
                     %th Result
                     %th Score
                     - if session[:admin]
                       %th IP
                 %tbody
                   - @submission.each do |s|
                     - next unless s.problem
                     %tr
-            -         %td= link_to "#{s.id}", controller: "graders", action: "submission", id: s.id
+            +         %td= link_to s.id, submission_path(s)
-            -         %td= link_to s.problem.name, controller: "problems", action: "stat", id: s.problem
+            +         %td= link_to s.problem.name, stat_problem_path(s.problem)
                       %td= s.problem.full_name
                       %td= s.language.pretty_name
                       %td  #{s.submitted_at.strftime('%Y-%m-%d %H:%M')} (#{time_ago_in_words(s.submitted_at)} ago)
                       %td.fix-width= s.grader_comment
                       %td= ( s.try(:points) ? (s.points*100/s.problem.full_score)  : '' )
                       - if session[:admin]
                         %td= s.ip_address

config/routes.rb ¶ +2

               CafeGrader::Application.routes.draw do
                 get "sources/direct_edit"
                 root :to => 'main#login'
                 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'
+            +       get 'stat'
                   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'
+            +       get 'stat'
                   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

r606:7b10ea3e4720 - Wed, 12 Oct 2016 08:39:58 - 6 files changed: 15 inserted, 13 deleted

Sign in to your account

Commit r606:7b10ea3e4720 public

Author

r606:7b10ea3e4720 - Wed, 12 Oct 2016 08:39:58 - 6 files changed: 15 inserted, 13 deleted

Commit `r606:7b10ea3e4720` public