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
@@ -1,158 +1,158
1 class UserAdminController < ApplicationController
1 class UserAdminController < ApplicationController
2
2
3 before_filter :admin_authorization
3 before_filter :admin_authorization
4
4
5 def index
5 def index
6 list
6 list
7 render :action => 'list'
7 render :action => 'list'
8 end
8 end
9
9
10 # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
10 # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
11 verify :method => :post, :only => [ :destroy, :create, :update ],
11 verify :method => :post, :only => [ :destroy, :create, :update ],
12 :redirect_to => { :action => :list }
12 :redirect_to => { :action => :list }
13
13
14 def list
14 def list
15 @users = User.find(:all)
15 @users = User.find(:all)
16 end
16 end
17
17
18 def show
18 def show
19 @user = User.find(params[:id])
19 @user = User.find(params[:id])
20 end
20 end
21
21
22 def new
22 def new
23 @user = User.new
23 @user = User.new
24 end
24 end
25
25
26 def create
26 def create
27 @user = User.new(params[:user])
27 @user = User.new(params[:user])
28 if @user.save
28 if @user.save
29 flash[:notice] = 'User was successfully created.'
29 flash[:notice] = 'User was successfully created.'
30 redirect_to :action => 'list'
30 redirect_to :action => 'list'
31 else
31 else
32 render :action => 'new'
32 render :action => 'new'
33 end
33 end
34 end
34 end
35
35
36 def create_from_list
36 def create_from_list
37 lines = params[:user_list]
37 lines = params[:user_list]
38 lines.split("\n").each do |line|
38 lines.split("\n").each do |line|
39 items = line.split(',')
39 items = line.split(',')
40 if items.length==4
40 if items.length==4
41 user = User.new
41 user = User.new
42 user.login = items[0]
42 user.login = items[0]
43 user.full_name = items[1]
43 user.full_name = items[1]
44 user.alias = items[2]
44 user.alias = items[2]
45 user.password = items[3]
45 user.password = items[3]
46 user.password_confirmation = items[3]
46 user.password_confirmation = items[3]
47 user.save
47 user.save
48 end
48 end
49 end
49 end
50 redirect_to :action => 'list'
50 redirect_to :action => 'list'
51 end
51 end
52
52
53 def edit
53 def edit
54 @user = User.find(params[:id])
54 @user = User.find(params[:id])
55 end
55 end
56
56
57 def update
57 def update
58 @user = User.find(params[:id])
58 @user = User.find(params[:id])
59 if @user.update_attributes(params[:user])
59 if @user.update_attributes(params[:user])
60 flash[:notice] = 'User was successfully updated.'
60 flash[:notice] = 'User was successfully updated.'
61 redirect_to :action => 'show', :id => @user
61 redirect_to :action => 'show', :id => @user
62 else
62 else
63 render :action => 'edit'
63 render :action => 'edit'
64 end
64 end
65 end
65 end
66
66
67 def destroy
67 def destroy
68 User.find(params[:id]).destroy
68 User.find(params[:id]).destroy
69 redirect_to :action => 'list'
69 redirect_to :action => 'list'
70 end
70 end
71
71
72 def user_stat
72 def user_stat
73 @problems = Problem.find_available_problems
73 @problems = Problem.find_available_problems
74 @users = User.find(:all)
74 @users = User.find(:all)
75 @scorearray = Array.new
75 @scorearray = Array.new
76 @users.each do |u|
76 @users.each do |u|
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
90 end
90 end
91
91
92 def import
92 def import
93 if params[:file]==''
93 if params[:file]==''
94 flash[:notice] = 'Error importing no file'
94 flash[:notice] = 'Error importing no file'
95 redirect_to :action => 'list' and return
95 redirect_to :action => 'list' and return
96 end
96 end
97 import_from_file(params[:file])
97 import_from_file(params[:file])
98 end
98 end
99
99
100 protected
100 protected
101
101
102 def import_from_file(f)
102 def import_from_file(f)
103 data_hash = YAML.load(f)
103 data_hash = YAML.load(f)
104 @import_log = ""
104 @import_log = ""
105
105
106 country_data = data_hash[:countries]
106 country_data = data_hash[:countries]
107 site_data = data_hash[:sites]
107 site_data = data_hash[:sites]
108 user_data = data_hash[:users]
108 user_data = data_hash[:users]
109
109
110 # import country
110 # import country
111 countries = {}
111 countries = {}
112 country_data.each_pair do |id,country|
112 country_data.each_pair do |id,country|
113 c = Country.find_by_name(country[:name])
113 c = Country.find_by_name(country[:name])
114 if c!=nil
114 if c!=nil
115 countries[id] = c
115 countries[id] = c
116 @import_log << "Found #{country[:name]}\n"
116 @import_log << "Found #{country[:name]}\n"
117 else
117 else
118 countries[id] = Country.new(:name => country[:name])
118 countries[id] = Country.new(:name => country[:name])
119 countries[id].save
119 countries[id].save
120 @import_log << "Created #{country[:name]}\n"
120 @import_log << "Created #{country[:name]}\n"
121 end
121 end
122 end
122 end
123
123
124 # import sites
124 # import sites
125 sites = {}
125 sites = {}
126 site_data.each_pair do |id,site|
126 site_data.each_pair do |id,site|
127 s = Site.find_by_name(site[:name])
127 s = Site.find_by_name(site[:name])
128 if s!=nil
128 if s!=nil
129 @import_log << "Found #{site[:name]}\n"
129 @import_log << "Found #{site[:name]}\n"
130 else
130 else
131 s = Site.new(:name => site[:name])
131 s = Site.new(:name => site[:name])
132 @import_log << "Created #{site[:name]}\n"
132 @import_log << "Created #{site[:name]}\n"
133 end
133 end
134 s.password = site[:password]
134 s.password = site[:password]
135 s.country = countries[site[:country_id]]
135 s.country = countries[site[:country_id]]
136 s.save
136 s.save
137 sites[id] = s
137 sites[id] = s
138 end
138 end
139
139
140 # import users
140 # import users
141 user_data.each_pair do |id,user|
141 user_data.each_pair do |id,user|
142 u = User.find_by_login(user[:login])
142 u = User.find_by_login(user[:login])
143 if u!=nil
143 if u!=nil
144 @import_log << "Found #{user[:login]}\n"
144 @import_log << "Found #{user[:login]}\n"
145 else
145 else
146 u = User.new(:login => user[:login])
146 u = User.new(:login => user[:login])
147 @import_log << "Created #{user[:login]}\n"
147 @import_log << "Created #{user[:login]}\n"
148 end
148 end
149 u.full_name = user[:name]
149 u.full_name = user[:name]
150 u.password = user[:password]
150 u.password = user[:password]
151 u.country = countries[user[:country_id]]
151 u.country = countries[user[:country_id]]
152 u.site = sites[user[:site_id]]
152 u.site = sites[user[:site_id]]
153 u.save
153 u.save
154 end
154 end
155
155
156 end
156 end
157
157
158 end
158 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,29 +1,30
1 class UsersController < ApplicationController
1 class UsersController < ApplicationController
2
2
3 before_filter :authenticate
3 before_filter :authenticate
4
4
5 verify :method => :post, :only => [:chg_passwd],
5 verify :method => :post, :only => [:chg_passwd],
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]
21 if user.save
22 if user.save
22 flash[:notice] = 'password changed'
23 flash[:notice] = 'password changed'
23 else
24 else
24 flash[:notice] = 'Error: password changing failed'
25 flash[:notice] = 'Error: password changing failed'
25 end
26 end
26 redirect_to :action => 'index'
27 redirect_to :action => 'index'
27 end
28 end
28
29
29 end
30 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,113 +1,113
1 # Methods added to this helper will be available to all templates in the application.
1 # Methods added to this helper will be available to all templates in the application.
2 module ApplicationHelper
2 module ApplicationHelper
3
3
4 SYSTEM_MODE_CONF_KEY = 'system.mode'
4 SYSTEM_MODE_CONF_KEY = 'system.mode'
5
5
6 def user_header
6 def user_header
7 menu_items = ''
7 menu_items = ''
8 user = User.find(session[:user_id])
8 user = User.find(session[:user_id])
9
9
10 if (user!=nil) and (session[:admin])
10 if (user!=nil) and (session[:admin])
11 # admin menu
11 # admin menu
12 menu_items << "<b>Administrative task:</b> "
12 menu_items << "<b>Administrative task:</b> "
13 append_to menu_items, '[Announcements]', 'announcements', 'index'
13 append_to menu_items, '[Announcements]', 'announcements', 'index'
14 append_to menu_items, '[Msg console]', 'messages', 'console'
14 append_to menu_items, '[Msg console]', 'messages', 'console'
15 append_to menu_items, '[Problem admin]', 'problems', 'index'
15 append_to menu_items, '[Problem admin]', 'problems', 'index'
16 append_to menu_items, '[User admin]', 'user_admin', 'index'
16 append_to menu_items, '[User admin]', 'user_admin', 'index'
17 append_to menu_items, '[User stat]', 'user_admin', 'user_stat'
17 append_to menu_items, '[User stat]', 'user_admin', 'user_stat'
18 append_to menu_items, '[Graders]', 'graders', 'list'
18 append_to menu_items, '[Graders]', 'graders', 'list'
19 append_to menu_items, '[Site config]', 'configurations', 'index'
19 append_to menu_items, '[Site config]', 'configurations', 'index'
20 menu_items << "<br/>"
20 menu_items << "<br/>"
21 end
21 end
22
22
23 # main page
23 # main page
24 append_to menu_items, '[Main]', 'main', 'list'
24 append_to menu_items, '[Main]', 'main', 'list'
25 append_to menu_items, '[Messages]', 'messages', 'list'
25 append_to menu_items, '[Messages]', 'messages', 'list'
26
26
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)
40 option << ' ' if option!=''
40 option << ' ' if option!=''
41 option << link_to_unless_current(label,
41 option << link_to_unless_current(label,
42 :controller => controller,
42 :controller => controller,
43 :action => action)
43 :action => action)
44 end
44 end
45
45
46 def format_short_time(time)
46 def format_short_time(time)
47 now = Time.now.gmtime
47 now = Time.now.gmtime
48 st = ''
48 st = ''
49 if (time.yday != now.yday) or
49 if (time.yday != now.yday) or
50 (time.year != now.year)
50 (time.year != now.year)
51 st = time.strftime("%x ")
51 st = time.strftime("%x ")
52 end
52 end
53 st + time.strftime("%X")
53 st + time.strftime("%X")
54 end
54 end
55
55
56 def read_textfile(fname,max_size=2048)
56 def read_textfile(fname,max_size=2048)
57 begin
57 begin
58 File.open(fname).read(max_size)
58 File.open(fname).read(max_size)
59 rescue
59 rescue
60 nil
60 nil
61 end
61 end
62 end
62 end
63
63
64 def user_title_bar(user)
64 def user_title_bar(user)
65 header = ''
65 header = ''
66 time_left = ''
66 time_left = ''
67
67
68 #
68 #
69 # if the contest is over
69 # if the contest is over
70 if Configuration[SYSTEM_MODE_CONF_KEY]=='contest'
70 if Configuration[SYSTEM_MODE_CONF_KEY]=='contest'
71 if user.site!=nil and user.site.finished?
71 if user.site!=nil and user.site.finished?
72 header = <<CONTEST_OVER
72 header = <<CONTEST_OVER
73 <tr><td colspan="2" align="center">
73 <tr><td colspan="2" align="center">
74 <span class="contest-over-msg">THE CONTEST IS OVER</span>
74 <span class="contest-over-msg">THE CONTEST IS OVER</span>
75 </td></tr>
75 </td></tr>
76 CONTEST_OVER
76 CONTEST_OVER
77 end
77 end
78 if user.site!=nil
78 if user.site!=nil
79 time_left = ". Time left: #{Time.at(user.site.time_left).gmtime.strftime("%X")}"
79 time_left = ". Time left: #{Time.at(user.site.time_left).gmtime.strftime("%X")}"
80 end
80 end
81 end
81 end
82
82
83 #
83 #
84 # if the contest is in the anaysis mode
84 # if the contest is in the anaysis mode
85 if Configuration[SYSTEM_MODE_CONF_KEY]=='analysis'
85 if Configuration[SYSTEM_MODE_CONF_KEY]=='analysis'
86 header = <<ANALYSISMODE
86 header = <<ANALYSISMODE
87 <tr><td colspan="2" align="center">
87 <tr><td colspan="2" align="center">
88 <span class="contest-over-msg">ANALYSIS MODE</span>
88 <span class="contest-over-msg">ANALYSIS MODE</span>
89 </td></tr>
89 </td></tr>
90 ANALYSISMODE
90 ANALYSISMODE
91 end
91 end
92
92
93 #
93 #
94 # build real title bar
94 # build real title bar
95 <<TITLEBAR
95 <<TITLEBAR
96 <div class="title">
96 <div class="title">
97 <table>
97 <table>
98 #{header}
98 #{header}
99 <tr>
99 <tr>
100 <td class="left-col">
100 <td class="left-col">
101 #{user.full_name}<br/>
101 #{user.full_name}<br/>
102 Current time is #{format_short_time(Time.new.gmtime)} UTC
102 Current time is #{format_short_time(Time.new.gmtime)} UTC
103 #{time_left}
103 #{time_left}
104 <br/>
104 <br/>
105 </td>
105 </td>
106 <td class="right-col">APIO'08</td>
106 <td class="right-col">APIO'08</td>
107 </tr>
107 </tr>
108 </table>
108 </table>
109 </div>
109 </div>
110 TITLEBAR
110 TITLEBAR
111 end
111 end
112
112
113 end
113 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,22 +1,22
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">
14 <%= user_header %>
14 <%= user_header %>
15 </div>
15 </div>
16
16
17 <%= content_tag(:p,flash[:notice],:style => "color:green") if flash[:notice]!=nil %>
17 <%= content_tag(:p,flash[:notice],:style => "color:green") if flash[:notice]!=nil %>
18
18
19 <%= yield %>
19 <%= yield %>
20
20
21 </body>
21 </body>
22 </html>
22 </html>
You need to be logged in to leave comments. Login now