cafe-grader-web

Commit r469:b28cd479ede6 public

parent | child
Description:
modify user list creation into user list update
Commit status:
[Not Reviewed]
References:
algo
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

r469:b28cd479ede6 - - 1 file changed: 11 inserted, 5 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,187 +1,193
1 1 require 'csv'
2 2
3 3 class UserAdminController < ApplicationController
4 4
5 5
6 6 include MailHelperMethods
7 7
8 8 before_filter :admin_authorization
9 9
10 10 # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
11 11 verify :method => :post, :only => [ :destroy,
12 12 :create, :create_from_list,
13 13 :update,
14 14 :manage_contest,
15 15 :bulk_mail
16 16 ],
17 17 :redirect_to => { :action => :list }
18 18
19 19 def index
20 20 list
21 21 render :action => 'list'
22 22 end
23 23
24 24 def list
25 25 @user_count = User.count
26 26 if params[:page] == 'all'
27 27 @users = User.all
28 28 @paginated = false
29 29 else
30 30 @users = User.paginate :page => params[:page]
31 31 @paginated = true
32 32 end
33 33 @hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at']
34 34 @contests = Contest.enabled
35 35 end
36 36
37 37 def active
38 38 sessions = ActiveRecord::SessionStore::Session.find(:all, :conditions => ["updated_at >= ?", 60.minutes.ago])
39 39 @users = []
40 40 sessions.each do |session|
41 41 if session.data[:user_id]
42 42 @users << User.find(session.data[:user_id])
43 43 end
44 44 end
45 45 end
46 46
47 47 def show
48 48 @user = User.find(params[:id])
49 49 end
50 50
51 51 def new
52 52 @user = User.new
53 53 end
54 54
55 55 def create
56 56 @user = User.new(params[:user])
57 57 @user.activated = true
58 58 if @user.save
59 59 flash[:notice] = 'User was successfully created.'
60 60 redirect_to :action => 'list'
61 61 else
62 62 render :action => 'new'
63 63 end
64 64 end
65 65
66 66 def create_from_list
67 67 lines = params[:user_list]
68 68
69 69 note = []
70 70
71 71 lines.split("\n").each do |line|
72 72 items = line.chomp.split(',')
73 73 if items.length>=2
74 74 login = items[0]
75 75 full_name = items[1]
76 76
77 77 added_random_password = false
78 78 if items.length>=3
79 79 password = items[2].chomp(" ")
80 80 user_alias = (items.length>=4) ? items[3] : login
81 81 else
82 82 password = random_password
83 83 user_alias = (items.length>=4) ? items[3] : login
84 84 added_random_password = true
85 85 end
86 86
87 - user = User.new({:login => login,
88 - :full_name => full_name,
89 - :password => password,
90 - :password_confirmation => password,
91 - :alias => user_alias})
87 + user = User.find_by_login(login)
88 + if (user)
89 + user.full_name = full_name
90 + user.password = password
91 + else
92 + user = User.new({:login => login,
93 + :full_name => full_name,
94 + :password => password,
95 + :password_confirmation => password,
96 + :alias => user_alias})
97 + end
92 98 user.activated = true
93 99 user.save
94 100
95 101 if added_random_password
96 102 note << "'#{login}' (+)"
97 103 else
98 104 note << login
99 105 end
100 106 end
101 107 end
102 108 flash[:notice] = 'User(s) ' + note.join(', ') +
103 109 ' were successfully created. ' +
104 110 '( (+) - created with random passwords.)'
105 111 redirect_to :action => 'list'
106 112 end
107 113
108 114 def edit
109 115 @user = User.find(params[:id])
110 116 end
111 117
112 118 def update
113 119 @user = User.find(params[:id])
114 120 if @user.update_attributes(params[:user])
115 121 flash[:notice] = 'User was successfully updated.'
116 122 redirect_to :action => 'show', :id => @user
117 123 else
118 124 render :action => 'edit'
119 125 end
120 126 end
121 127
122 128 def destroy
123 129 User.find(params[:id]).destroy
124 130 redirect_to :action => 'list'
125 131 end
126 132
127 133 def user_stat
128 134 if params[:commit] == 'download csv'
129 135 @problems = Problem.all
130 136 else
131 137 @problems = Problem.find_available_problems
132 138 end
133 139 @users = User.find(:all, :include => [:contests, :contest_stat])
134 140 @scorearray = Array.new
135 141 @users.each do |u|
136 142 ustat = Array.new
137 143 ustat[0] = u
138 144 @problems.each do |p|
139 145 sub = Submission.find_last_by_user_and_problem(u.id,p.id)
140 146 if (sub!=nil) and (sub.points!=nil)
141 147 ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
142 148 else
143 149 ustat << [0,false]
144 150 end
145 151 end
146 152 @scorearray << ustat
147 153 end
148 154
149 155 if params[:commit] == 'download csv' then
150 156 csv = gen_csv_from_scorearray(@scorearray,@problems)
151 157 send_data csv, filename: 'last_score.csv'
152 158 else
153 159 render template: 'user_admin/user_stat'
154 160 end
155 161 end
156 162
157 163 def user_stat_max
158 164 if params[:commit] == 'download csv'
159 165 @problems = Problem.all
160 166 else
161 167 @problems = Problem.find_available_problems
162 168 end
163 169 @users = User.find(:all, :include => [:contests, :contest_stat])
164 170 @scorearray = Array.new
165 171 #set up range from param
166 172 since_id = params.fetch(:since_id, 0).to_i
167 173 until_id = params.fetch(:until_id, 0).to_i
168 174 @users.each do |u|
169 175 ustat = Array.new
170 176 ustat[0] = u
171 177 @problems.each do |p|
172 178 max_points = 0
173 179 Submission.find_in_range_by_user_and_problem(u.id,p.id,since_id,until_id).each do |sub|
174 180 max_points = sub.points if sub and sub.points and (sub.points > max_points)
175 181 end
176 182 ustat << [(max_points.to_f*100/p.full_score).round, (max_points>=p.full_score)]
177 183 end
178 184 @scorearray << ustat
179 185 end
180 186
181 187 if params[:commit] == 'download csv' then
182 188 csv = gen_csv_from_scorearray(@scorearray,@problems)
183 189 send_data csv, filename: 'max_score.csv'
184 190 else
185 191 render template: 'user_admin/user_stat'
186 192 end
187 193 end
You need to be logged in to leave comments. Login now