diff --git a/app/controllers/user_admin_controller.rb b/app/controllers/user_admin_controller.rb --- a/app/controllers/user_admin_controller.rb +++ b/app/controllers/user_admin_controller.rb @@ -80,7 +80,7 @@ @problems.each do |p| sub = Submission.find_last_by_user_and_problem(u.id,p.id) if (sub!=nil) and (sub.points!=nil) - ustat << [sub.points, (sub.points>=p.full_score)] + ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)] else ustat << [0,false] end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -9,9 +9,10 @@ in_place_edit_for :user, :email_for_editing def index - # ... disable in this contest ... - # @user = User.find(session[:user_id]) - redirect_to :controller => 'main', :action => 'list' + # uncomment below to disable settings + #redirect_to :controller => 'main', :action => 'list' + + @user = User.find(session[:user_id]) end def chg_passwd diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -30,7 +30,7 @@ append_to menu_items, '[Test]', 'test', 'index' end append_to menu_items, '[Help]', 'main', 'help' - #append_to menu_items, '[Settings]', 'users', 'index' + append_to menu_items, '[Settings]', 'users', 'index' append_to menu_items, '[Log out]', 'main', 'login' menu_items diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -4,7 +4,7 @@
-