cafe-grader-web

Commit r483:7cf62e1e74ba public

parent | child
Description:
confusing merge
Commit status:
[Not Reviewed]
References:
merge 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

r483:7cf62e1e74ba - - 1 file changed: 0 inserted, 1 deleted

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