cafe-grader-web

Commit r527:662f5e0a87b8 public

parent | child
Description:
add check for nil problem
Commit status:
[Not Reviewed]
References:
algo
Diff options:
Raw Diff | Patch Diff | Download Diff | Show 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

r527:662f5e0a87b8 - - 1 file changed: 1 inserted, 1 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -97,97 +97,97
97 97 user.activated = true
98 98 user.save
99 99
100 100 if added_random_password
101 101 note << "'#{login}' (+)"
102 102 else
103 103 note << login
104 104 end
105 105 end
106 106 end
107 107 flash[:notice] = 'User(s) ' + note.join(', ') +
108 108 ' were successfully created. ' +
109 109 '( (+) - created with random passwords.)'
110 110 redirect_to :action => 'list'
111 111 end
112 112
113 113 def edit
114 114 @user = User.find(params[:id])
115 115 end
116 116
117 117 def update
118 118 @user = User.find(params[:id])
119 119 if @user.update_attributes(params[:user])
120 120 flash[:notice] = 'User was successfully updated.'
121 121 redirect_to :action => 'show', :id => @user
122 122 else
123 123 render :action => 'edit'
124 124 end
125 125 end
126 126
127 127 def destroy
128 128 User.find(params[:id]).destroy
129 129 redirect_to :action => 'list'
130 130 end
131 131
132 132 def user_stat
133 133 if params[:commit] == 'download csv'
134 134 @problems = Problem.all
135 135 else
136 136 @problems = Problem.find_available_problems
137 137 end
138 138 @users = User.find(:all, :include => [:contests, :contest_stat])
139 139 @scorearray = Array.new
140 140 @users.each do |u|
141 141 ustat = Array.new
142 142 ustat[0] = u
143 143 @problems.each do |p|
144 144 sub = Submission.find_last_by_user_and_problem(u.id,p.id)
145 - if (sub!=nil) and (sub.points!=nil)
145 + if (sub!=nil) and (sub.points!=nil) and p and p.full_score
146 146 ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
147 147 else
148 148 ustat << [0,false]
149 149 end
150 150 end
151 151 @scorearray << ustat
152 152 end
153 153 if params[:commit] == 'download csv' then
154 154 csv = gen_csv_from_scorearray(@scorearray,@problems)
155 155 send_data csv, filename: 'last_score.csv'
156 156 else
157 157 render template: 'user_admin/user_stat'
158 158 end
159 159 end
160 160
161 161 def user_stat_max
162 162 if params[:commit] == 'download csv'
163 163 @problems = Problem.all
164 164 else
165 165 @problems = Problem.find_available_problems
166 166 end
167 167 @users = User.find(:all, :include => [:contests, :contest_stat])
168 168 @scorearray = Array.new
169 169 #set up range from param
170 170 since_id = params.fetch(:since_id, 0).to_i
171 171 until_id = params.fetch(:until_id, 0).to_i
172 172 @users.each do |u|
173 173 ustat = Array.new
174 174 ustat[0] = u
175 175 @problems.each do |p|
176 176 max_points = 0
177 177 Submission.find_in_range_by_user_and_problem(u.id,p.id,since_id,until_id).each do |sub|
178 178 max_points = sub.points if sub and sub.points and (sub.points > max_points)
179 179 end
180 180 ustat << [(max_points.to_f*100/p.full_score).round, (max_points>=p.full_score)]
181 181 end
182 182 @scorearray << ustat
183 183 end
184 184
185 185 if params[:commit] == 'download csv' then
186 186 csv = gen_csv_from_scorearray(@scorearray,@problems)
187 187 send_data csv, filename: 'max_score.csv'
188 188 else
189 189 render template: 'user_admin/user_stat'
190 190 end
191 191 end
192 192
193 193 def import
You need to be logged in to leave comments. Login now