cafe-grader-web Commit - r431:7654a9f33bc8

cafe-grader-web

Commit `r431:7654a9f33bc8` public

parent | child

Description:

add user profile page listing all submission, permission is by 'right.user_view_submission' add link from users to their profile page

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

r431:7654a9f33bc8 - Sat, 13 Sep 2014 05:34:43 - 6 files changed: 92 inserted, 14 deleted

app/views/users/profile.html.haml created 644 ¶ +40

@@ -0,0 +1,40
	1	+ - content_for :header do
	2	+ = javascript_include_tag 'new'
	3	+
	4	+ %script{:type=>"text/javascript"}
	5	+ $(function () {
	6	+ $('#submission_table').tablesorter({widgets: ['zebra','filter']});
	7	+ });
	8	+
	9	+ %h1= @user.full_name + ' Profile'
	10	+
	11	+ %h2 Basic info
	12	+ <b>Login:</b> #{@user.login} <br/>
	13	+ <b>Full name:</b> #{@user.full_name} <br />
	14	+
	15	+
	16	+ %h2 Problem Stat
	17	+
	18	+ %h2 Submissions
	19	+
	20	+ %table.tablesorter-cafe#submission_table
	21	+ %thead
	22	+ %tr
	23	+ %th ID
	24	+ %th Problem code
	25	+ %th Problem name
	26	+ %th Language
	27	+ %th Result
	28	+ %th Score
	29	+ %tbody
	30	+ - @submission.each do \|s\|
	31	+ %tr
	32	+ %td= link_to "#{s.id}", controller: "graders", action: "submission", id: s.id
	33	+ %td= s.problem.name
	34	+ %td= s.problem.full_name
	35	+ %td= s.language.pretty_name
	36	+ %td{style: 'font-family: Droid Sans Mono,Consolas, monospace, mono'}= s.grader_comment
	37	+ %td= s.points/s.problem.full_score * 100
	38	+
	39	+
	40	+

app/controllers/report_controller.rb ¶ +2 -1

               class ReportController < ApplicationController
                 before_filter :admin_authorization, only: [:login_stat,:submission_stat]
                 before_filter(only: [:problem_hof]) { |c|
                   return false unless authenticate
                   if GraderConfiguration["right.user_view_submission"]
                     return true;
                   end
                   admin_authorization
                 }
                 def login_stat
                   @logins = Array.new
                   date_and_time = '%Y-%m-%d %H:%M'
                   begin
                     @since_time = DateTime.strptime(params[:since_datetime],date_and_time)
                   rescue
                     @since_time = DateTime.new(1000,1,1)
                   end
                   begin
                     @until_time = DateTime.strptime(params[:until_datetime],date_and_time)
                   rescue
                     @until_time = DateTime.new(3000,1,1)
                   end
                   User.all.each do |user|
-            -       @logins << { login: user.login,
+            +       @logins << { id: user.id,
+            +                    login: user.login,
                                  full_name: user.full_name,
                                  count: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?",
                                                     user.id,@since_time,@until_time)
                                         .count(:id),
                                  min: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?",
                                                     user.id,@since_time,@until_time)
                                         .minimum(:created_at),
                                  max: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?",
                                                     user.id,@since_time,@until_time)
                                         .maximum(:created_at)
                                }
                   end
                 end
                 def submission_stat
                   date_and_time = '%Y-%m-%d %H:%M'
                   begin
                     @since_time = DateTime.strptime(params[:since_datetime],date_and_time)
                   rescue
                     @since_time = DateTime.new(1000,1,1)
                   end
                   begin
                     @until_time = DateTime.strptime(params[:until_datetime],date_and_time)
                   rescue
                     @until_time = DateTime.new(3000,1,1)
                   end
                   @submissions = {}
                   User.find_each do |user|
                     @submissions[user.id] = { login: user.login, full_name: user.full_name, count: 0, sub: { } }
                   end
                   Submission.where("submitted_at >= ? AND submitted_at <= ?",@since_time,@until_time).find_each do |s|
                     if @submissions[s.user_id]
                       if not @submissions[s.user_id][:sub].has_key?(s.problem_id)
                         a = nil
                         begin
                           a = Problem.find(s.problem_id)
                         rescue
                           a = nil
                         end
                         @submissions[s.user_id][:sub][s.problem_id] =
                           { prob_name: (a ? a.full_name : '(NULL)'),
                             sub_ids: [s.id] }
                       else
                         @submissions[s.user_id][:sub][s.problem_id][:sub_ids] << s.id
                       end
                       @submissions[s.user_id][:count] += 1
                     end
                   end
                 end
                 def problem_hof
                   # gen problem list
                   @user = User.find(session[:user_id])
                   @problems = @user.available_problems
                   # get selected problems or the default
                   if params[:id]
                     begin
                       @problem = Problem.available.find(params[:id])
                     rescue
                       redirect_to action: :problem_hof
                       flash[:notice] = 'Error: submissions for that problem are not viewable.'
                       return
                     end
                   end
                   if @problem
                     #aggregrate by language
                     @by_lang = {}
                     Submission.where(problem_id: @problem.id).find_each do |sub|
                       lang = Language.find_by_id(sub.language_id)
                       next unless lang
                       next unless sub.points >= @problem.full_score
                       #initialize
                       unless @by_lang.has_key?(lang.pretty_name)
                         @by_lang[lang.pretty_name] = {
                           runtime: { avail: false, value: 2**30-1 },
                           memory: { avail: false, value: 2**30-1 },
                           length: { avail: false, value: 2**30-1 },
                           first: { avail: false, value: DateTime.new(3000,1,1) }
                         }
                       end
                       if sub.max_runtime and sub.max_runtime < @by_lang[lang.pretty_name][:runtime][:value]
                         @by_lang[lang.pretty_name][:runtime] = {
                           avail: true,
                           user_id: sub.user_id,
                           value: sub.max_runtime,
                           sub_id: sub.id
                         }
                       end
                       if sub.peak_memory and sub.peak_memory < @by_lang[lang.pretty_name][:memory][:value]
                         @by_lang[lang.pretty_name][:memory] = {
                           avail: true,
                           user_id: sub.user_id,
                           value: sub.peak_memory,
                           sub_id: sub.id
                         }
                       end
                       if sub.submitted_at and sub.submitted_at < @by_lang[lang.pretty_name][:first][:value] and
                          !sub.user.admin?
                         @by_lang[lang.pretty_name][:first] = {
                           avail: true,
                           user_id: sub.user_id,
                           value: sub.submitted_at,
                           sub_id: sub.id
                         }
                       end
                       if @by_lang[lang.pretty_name][:length][:value] > sub.effective_code_length
                         @by_lang[lang.pretty_name][:length] = {
                           avail: true,
                           user_id: sub.user_id,
                           value: sub.effective_code_length,
                           sub_id: sub.id
                         }
                       end
                     end
                     #process user_id
                     @by_lang.each do |lang,prop|
                       prop.each do |k,v|
                         v[:user] = User.exists?(v[:user_id]) ? User.find(v[:user_id]).full_name : "(NULL)"
                       end
                     end
                     #sum into best
                     if @by_lang and @by_lang.first
                       @best = @by_lang.first[1]
                       @by_lang.each do |lang,prop|
                         if @best[:runtime][:value] >= prop[:runtime][:value]
                           @best[:runtime] = prop[:runtime]
                           @best[:runtime][:lang] = lang
                         end
                         if @best[:memory][:value] >= prop[:memory][:value]
                           @best[:memory] = prop[:memory]
                           @best[:memory][:lang] = lang
                         end
                         if @best[:length][:value] >= prop[:length][:value]
                           @best[:length] = prop[:length]
                           @best[:length][:lang] = lang
                         end
                         if @best[:first][:value] >= prop[:first][:value]
                           @best[:first] = prop[:first]
                           @best[:first][:lang] = lang
                         end
                       end
                     end
                   end
                 end
               end

app/controllers/users_controller.rb ¶ +20

               require 'net/smtp'
               class UsersController < ApplicationController
                 include MailHelperMethods
                 before_filter :authenticate, :except => [:new,
                                                          :register,
                                                          :confirm,
                                                          :forget,
                                                          :retrieve_password]
                 before_filter :verify_online_registration, :only => [:new,
                                                                      :register,
                                                                      :forget,
                                                                      :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_to_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
+            +     @user = User.find(params[:id])
+            +     @submission = Submission.where(user_id: params[:id]).all
+            +   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 => 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 => 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"]
+            +
+            +     #finally, we allow only admin
+            +     admin_authorization
+            +   end
               end

app/views/report/_task_hof.html.haml ¶ +28 -11

               :css
                 .hof_user { color: orangered; font-style: italic; }
                 .hof_language { color: green; font-style: italic; }
                 .hof_value { color: deeppink;font-style: italic; }
               %h2 Overall
               - if @best
                 %b Best Runtime:
-            -   by <span class="hof_user">#{@best[:runtime][:user]}</span> using <span class="hof_language">#{@best[:runtime][:lang]}</span> with <span class="hof_value">#{@best[:runtime][:value] * 1000} milliseconds</span> at submission
+            +   by #{link_to @best[:runtime][:user], controller:'users', action:'profile', id:@best[:memory][:user_id]}
+            +   using <span class="hof_language">#{@best[:runtime][:lang]}</span>
+            +   with <span class="hof_value">#{@best[:runtime][:value] * 1000} milliseconds</span>
+            +   at submission
                 = link_to("#" + @best[:runtime][:sub_id].to_s, controller: 'graders', action: 'submission', id:@best[:runtime][:sub_id])
                 %br/
                 %b Best Memory Usage:
-            -   by <span class="hof_user">#{@best[:memory][:user]}</span> using <span class="hof_language">#{@best[:memory][:lang]}</span> with <span class="hof_value">#{@best[:memory][:value]} kbytes </span> at submission
+            +   by #{link_to @best[:memory][:user], controller:'users', action:'profile', id:@best[:memory][:user_id]}
+            +   using <span class="hof_language">#{@best[:memory][:lang]}</span>
+            +   with <span class="hof_value">#{@best[:memory][:value]} kbytes </span>
+            +   at submission
                 = link_to("#" + @best[:memory][:sub_id].to_s, controller: 'graders' , action: 'submission', id:@best[:memory][:sub_id])
                 %br/
-            -   %b Shortest Code:
+            +   %b Shortest Code:
-            -   by <span class="hof_user">#{@best[:length][:user]}</span> using <span class="hof_language">#{@best[:length][:lang]}</span> with  <span class="hof_value">#{@best[:length][:value]} bytes</span> at submission
+            +   by #{link_to @best[:length][:user], controller:'users', action:'profile', id:@best[:length][:user_id]}
+            +   using <span class="hof_language">#{@best[:length][:lang]}</span>
+            +   with  <span class="hof_value">#{@best[:length][:value]} bytes</span>
+            +   at submission
                 = link_to("#" + @best[:length][:sub_id].to_s, controller: 'graders' , action: 'submission', id: @best[:length][:sub_id])
                 %br/
-            -   %b First solver:
+            +   %b First solver:
-            -   <span class="hof_user">#{@best[:first][:user]}</span> is the first solver using <span class="hof_language">#{@best[:first][:lang]}</span> on <span class="hof_value">#{@best[:first][:value]}</span> at submission
+            +   #{link_to @best[:first][:user], controller:'users', action:'profile', id:@best[:first][:user_id]} is the first solver
+            +   using <span class="hof_language">#{@best[:first][:lang]}</span>
+            +   on <span class="hof_value">#{@best[:first][:value]}</span>
+            +   at submission
                 = link_to("#" + @best[:first][:sub_id].to_s, controller: 'graders' , action: 'submission', id: @best[:first][:sub_id])
                 %br/
                 %p
                   This counts only for submission with 100% score <br/>
                   Right now, java is excluded from memory usage competition. (Because it always uses 2GB memory...)
                 %h2 By language
                 %table.info
                   %thead
                     %tr.info-head
                       %th Language
                       %th Best runtime (ms)
                       %th Best memory (kbytes)
                       %th Shortest Code (bytes)
                       %th First solver
                   %tbody
                     - @by_lang.each do |lang,value|
                       %tr{class: cycle('info-even','info-odd')}
                         %td= lang
                         %td
-            -             = "#{value[:runtime][:user]} (#{(value[:runtime][:value] * 1000).to_i} @"
+            +             = link_to value[:runtime][:user], controller: 'users', action: 'profile', id: value[:runtime][:user_id]
+            +             = "(#{(value[:runtime][:value] * 1000).to_i} @"
                           = "#{link_to("#" + value[:runtime][:sub_id].to_s, controller: 'graders' , action: 'submission', id: value[:runtime][:sub_id])} )".html_safe
                         %td
-            -             = "#{value[:memory][:user]} (#{value[:memory][:value]} @"
+            +             = link_to value[:memory][:user], controller: 'users', action: 'profile', id: value[:memory][:user_id]
+            +             = "(#{value[:memory][:value]} @"
                           = "#{link_to("#" + value[:memory][:sub_id].to_s, controller: 'graders' , action: 'submission', id: value[:memory][:sub_id])} )".html_safe
                         %td
-            -             = "#{value[:length][:user]} (#{value[:length][:value]} @"
+            +             = link_to value[:length][:user], controller: 'users', action: 'profile', id: value[:length][:user_id]
+            +             = "(#{value[:length][:value]} @"
                           = "#{link_to("#" + value[:length][:sub_id].to_s, controller: 'graders' , action: 'submission', id: value[:length][:sub_id])} )".html_safe
                         %td
-            -             = "#{value[:first][:user]} (#{value[:first][:value]} @"
+            +             - if value[:first][:user] != '(NULL)' #TODO: i know... this is wrong...
-            -             = "#{link_to("#" + value[:first][:sub_id].to_s, controller: 'graders' , action: 'submission', id: value[:first][:sub_id])} )".html_safe
+            +               = link_to value[:first][:user], controller: 'users', action: 'profile', id: value[:first][:user_id]
+            +               = "(#{value[:first][:value]} @"
+            +               = "#{link_to("#" + value[:first][:sub_id].to_s, controller: 'graders' , action: 'submission', id: value[:first][:sub_id])} )".html_safe
               - else
                 %h3 No submissions

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

               - content_for :header do
                 = stylesheet_link_tag 'tablesorter-theme.cafe'
                 = javascript_include_tag 'new'
               %script{:type=>"text/javascript"}
                 $(function () {
                 $('#since_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
                 $('#until_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
                 $('#my_table').tablesorter({widthFixed: true, widgets: ['zebra']});
                 });
               %h1 Login status
               =render partial: 'report_menu'
               =render partial: 'date_range', locals: {param_text: 'Login date range:', title: 'Query login stat in the range'  }
               %table.tablesorter-cafe#my_table
                 %thead
                   %tr
                     %th login
                     %th full name
                     %th login count
                     %th earliest
                     %th latest
                 %tbody
                   - @logins.each do |l|
                     %tr{class: cycle('info-even','info-odd')}
-            -         %td= l[:login]
+            +         %td= link_to l[:login], controller: 'users', action: 'profile', id: l[:id]
                       %td= l[:full_name]
                       %td= l[:count]
                       %td= l[:min] ? l[:min].in_time_zone.strftime('%Y-%m-%d %H:%M') : ''
                       %td= l[:max] ? time_ago_in_words(l[:max].in_time_zone) + ' ago' : ''

app/views/user_admin/user_stat.html.haml ¶ +1 -1

               - content_for :header do
                 = javascript_include_tag 'new'
                 = stylesheet_link_tag 'tablesorter-theme.cafe'
               %script{:type=>"text/javascript"}
                 $(function () {
                 $('#since_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
                 $('#until_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
                 $('#my_table').tablesorter({widgets: ['zebra']});
                 });
               %h1 User grading results
               %h2= params[:action] == 'user_stat' ? "Show scores from latest submission" : "Show max scores in submission range"
               - if @problem and @problem.errors
                 =error_messages_for 'problem'
               = render partial: 'submission_range'
               - if params[:action] == 'user_stat'
                 = "latest score"
               - else
                 = link_to '[Show only latest submissions]', controller: :user_admin, action: :user_stat
               %table.tablesorter-cafe#my_table
                 %thead
                   %tr
                     %th User
                     %th Name
                     %th Activated?
                     %th Logged in
                     %th Contest(s)
                     - @problems.each do |p|
                       %th= p.name
                     %th Total
                     %th Passed
                 %tbody
                   - @scorearray.each do |sc|
                     %tr{class: cycle('info-even','info-odd')}
                       - total,num_passed = 0,0
                       - sc.each_index do |i|
                         - if i == 0
-            -             %td= sc[i].login
+            +             %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)!=nil ? 'yes' : 'no'
                           %td= sc[i].contests.collect {|c| c.name}.join(', ')
                         - else
                           %td= sc[i][0]
                           - total += sc[i][0]
                           - num_passed += 1 if sc[i][1]
                       %td= total
                       %td= num_passed

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

r431:7654a9f33bc8 - Sat, 13 Sep 2014 05:34:43 - 6 files changed: 92 inserted, 14 deleted

Sign in to your account

Commit r431:7654a9f33bc8 public

Author

r431:7654a9f33bc8 - Sat, 13 Sep 2014 05:34:43 - 6 files changed: 92 inserted, 14 deleted

Commit `r431:7654a9f33bc8` public