cafe-grader-web

Commit r138:0f4011aaed34 public

parent | child
Description:
enable user settings, remove APIO header git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@277 6386c4cd-e34a-4fa8-8920-d93eb39b512e
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r138:0f4011aaed34 - - 4 files changed: 7 inserted, 6 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -77,13 +77,13
77 ustat = Array.new
77 ustat = Array.new
78 ustat[0] = u.login
78 ustat[0] = u.login
79 ustat[1] = u.full_name
79 ustat[1] = u.full_name
80 @problems.each do |p|
80 @problems.each do |p|
81 sub = Submission.find_last_by_user_and_problem(u.id,p.id)
81 sub = Submission.find_last_by_user_and_problem(u.id,p.id)
82 if (sub!=nil) and (sub.points!=nil)
82 if (sub!=nil) and (sub.points!=nil)
83 - ustat << [sub.points, (sub.points>=p.full_score)]
83 + ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
84 else
84 else
85 ustat << [0,false]
85 ustat << [0,false]
86 end
86 end
87 end
87 end
88 @scorearray << ustat
88 @scorearray << ustat
89 end
89 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -6,15 +6,16
6 :redirect_to => { :action => :index }
6 :redirect_to => { :action => :index }
7
7
8 in_place_edit_for :user, :alias_for_editing
8 in_place_edit_for :user, :alias_for_editing
9 in_place_edit_for :user, :email_for_editing
9 in_place_edit_for :user, :email_for_editing
10
10
11 def index
11 def index
12 - # ... disable in this contest ...
12 + # uncomment below to disable settings
13 - # @user = User.find(session[:user_id])
13 + #redirect_to :controller => 'main', :action => 'list'
14 - redirect_to :controller => 'main', :action => 'list'
14 +
15 + @user = User.find(session[:user_id])
15 end
16 end
16
17
17 def chg_passwd
18 def chg_passwd
18 user = User.find(session[:user_id])
19 user = User.find(session[:user_id])
19 user.password = params[:passwd]
20 user.password = params[:passwd]
20 user.password_confirmation = params[:passwd_verify]
21 user.password_confirmation = params[:passwd_verify]
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -27,13 +27,13
27 if (user!=nil) and (Configuration.show_tasks_to?(user))
27 if (user!=nil) and (Configuration.show_tasks_to?(user))
28 append_to menu_items, '[Tasks]', 'tasks', 'list'
28 append_to menu_items, '[Tasks]', 'tasks', 'list'
29 append_to menu_items, '[Submissions]', 'main', 'submission'
29 append_to menu_items, '[Submissions]', 'main', 'submission'
30 append_to menu_items, '[Test]', 'test', 'index'
30 append_to menu_items, '[Test]', 'test', 'index'
31 end
31 end
32 append_to menu_items, '[Help]', 'main', 'help'
32 append_to menu_items, '[Help]', 'main', 'help'
33 - #append_to menu_items, '[Settings]', 'users', 'index'
33 + append_to menu_items, '[Settings]', 'users', 'index'
34 append_to menu_items, '[Log out]', 'main', 'login'
34 append_to menu_items, '[Log out]', 'main', 'login'
35
35
36 menu_items
36 menu_items
37 end
37 end
38
38
39 def append_to(option,label, controller, action)
39 def append_to(option,label, controller, action)
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,13 +1,13
1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
2 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
3
3
4 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
4 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
5 <head>
5 <head>
6 <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
6 <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
7 - <title>APIO'08</title>
7 + <title>Grader</title>
8 <%= stylesheet_link_tag 'application' %>
8 <%= stylesheet_link_tag 'application' %>
9 <%= yield :head %>
9 <%= yield :head %>
10 </head>
10 </head>
11 <body>
11 <body>
12
12
13 <div class="userbar">
13 <div class="userbar">
You need to be logged in to leave comments. Login now