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

                   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)

app/controllers/users_controller.rb ¶ +20

                                                                      :register,
                                                                      :forget,
                                                                      :retrieve_password]
+            +   before_filter :authenticate, :profile_authorization, only: [:profile]
                 verify :method => :post, :only => [:chg_passwd],
                        :redirect_to => { :action => :index }
                   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
                   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

               - 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/
                       %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

                 %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') : ''

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

                       - 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'

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