Description:
controllers get available problems from current user
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
Jittat Fakcharoenphol
-
r288:74436ad04ad0 - - 3 files changed: 42 inserted, 45 deleted
| @@ -86,49 +86,49 | |||
|
|
86 | 86 | def source |
|
|
87 | 87 | submission = Submission.find(params[:id]) |
|
|
88 | 88 | if submission.user_id == session[:user_id] |
|
|
89 | 89 | send_data(submission.source, |
|
|
90 | 90 | {:filename => submission.download_filename, |
|
|
91 | 91 | :type => 'text/plain'}) |
|
|
92 | 92 | else |
|
|
93 | 93 | flash[:notice] = 'Error viewing source' |
|
|
94 | 94 | redirect_to :action => 'list' |
|
|
95 | 95 | end |
|
|
96 | 96 | end |
|
|
97 | 97 | |
|
|
98 | 98 | def compiler_msg |
|
|
99 | 99 | @submission = Submission.find(params[:id]) |
|
|
100 | 100 | if @submission.user_id == session[:user_id] |
|
|
101 | 101 | render :action => 'compiler_msg', :layout => 'empty' |
|
|
102 | 102 | else |
|
|
103 | 103 | flash[:notice] = 'Error viewing source' |
|
|
104 | 104 | redirect_to :action => 'list' |
|
|
105 | 105 | end |
|
|
106 | 106 | end |
|
|
107 | 107 | |
|
|
108 | 108 | def submission |
|
|
109 | 109 | @user = User.find(session[:user_id]) |
|
|
110 |
- @problems = |
|
|
|
110 | + @problems = @user.available_problems | |
|
|
111 | 111 | if params[:id]==nil |
|
|
112 | 112 | @problem = nil |
|
|
113 | 113 | @submissions = nil |
|
|
114 | 114 | else |
|
|
115 | 115 | @problem = Problem.find_by_name(params[:id]) |
|
|
116 | 116 | if not @problem.available |
|
|
117 | 117 | redirect_to :action => 'list' |
|
|
118 | 118 | flash[:notice] = 'Error: submissions for that problem are not viewable.' |
|
|
119 | 119 | return |
|
|
120 | 120 | end |
|
|
121 | 121 | @submissions = Submission.find_all_by_user_problem(@user.id, @problem.id) |
|
|
122 | 122 | end |
|
|
123 | 123 | end |
|
|
124 | 124 | |
|
|
125 | 125 | def result |
|
|
126 | 126 | if !Configuration.show_grading_result |
|
|
127 | 127 | redirect_to :action => 'list' and return |
|
|
128 | 128 | end |
|
|
129 | 129 | @user = User.find(session[:user_id]) |
|
|
130 | 130 | @submission = Submission.find(params[:id]) |
|
|
131 | 131 | if @submission.user!=@user |
|
|
132 | 132 | flash[:notice] = 'You are not allowed to view result of other users.' |
|
|
133 | 133 | redirect_to :action => 'list' and return |
|
|
134 | 134 | end |
| @@ -172,96 +172,55 | |||
|
|
172 | 172 | if params.has_key? 'recent' |
|
|
173 | 173 | prepare_announcements(params[:recent]) |
|
|
174 | 174 | else |
|
|
175 | 175 | prepare_announcements |
|
|
176 | 176 | end |
|
|
177 | 177 | render(:partial => 'announcement', |
|
|
178 | 178 | :collection => @announcements, |
|
|
179 | 179 | :locals => {:announcement_effect => true}) |
|
|
180 | 180 | end |
|
|
181 | 181 | |
|
|
182 | 182 | protected |
|
|
183 | 183 | |
|
|
184 | 184 | def prepare_announcements(recent=nil) |
|
|
185 | 185 | if Configuration.show_tasks_to?(@user) |
|
|
186 | 186 | @announcements = Announcement.find_published(true) |
|
|
187 | 187 | else |
|
|
188 | 188 | @announcements = Announcement.find_published |
|
|
189 | 189 | end |
|
|
190 | 190 | if recent!=nil |
|
|
191 | 191 | recent_id = recent.to_i |
|
|
192 | 192 | @announcements = @announcements.find_all { |a| a.id > recent_id } |
|
|
193 | 193 | end |
|
|
194 | 194 | end |
|
|
195 | 195 | |
|
|
196 | - def problem_list_by_user_contests(user) | |
|
|
197 | - contest_problems = [] | |
|
|
198 | - pin = {} | |
|
|
199 | - user.contests.enabled.each do |contest| | |
|
|
200 | - available_problems = contest.problems.available | |
|
|
201 | - contest_problems << { | |
|
|
202 | - :contest => contest, | |
|
|
203 | - :problems => available_problems | |
|
|
204 | - } | |
|
|
205 | - available_problems.each {|p| pin[p.id] = true} | |
|
|
206 | - end | |
|
|
207 | - other_avaiable_problems = Problem.available.find_all {|p| pin[p.id]==nil and p.contests.length==0} | |
|
|
208 | - contest_problems << { | |
|
|
209 | - :contest => nil, | |
|
|
210 | - :problems => other_avaiable_problems | |
|
|
211 | - } | |
|
|
212 | - return contest_problems | |
|
|
213 | - end | |
|
|
214 | - | |
|
|
215 | - def problem_list_for_user(user, contest_problems=nil) | |
|
|
216 | - if not Configuration.multicontests? | |
|
|
217 | - return Problem.find_available_problems | |
|
|
218 | - else | |
|
|
219 | - if contest_problems==nil | |
|
|
220 | - contest_problems = problem_list_by_user_contests(user) | |
|
|
221 | - end | |
|
|
222 | - | |
|
|
223 | - problems = [] | |
|
|
224 | - collected = {} | |
|
|
225 | - contest_problems.each do |cp| | |
|
|
226 | - cp[:problems].each do |problem| | |
|
|
227 | - if not collected[problem.id] | |
|
|
228 | - problems << problem | |
|
|
229 | - collected[problem.id] = true | |
|
|
230 | - end | |
|
|
231 | - end | |
|
|
232 | - end | |
|
|
233 | - return problems | |
|
|
234 | - end | |
|
|
235 | - end | |
|
|
236 | - | |
|
|
237 | 196 | def prepare_list_information |
|
|
238 | 197 | @user = User.find(session[:user_id]) |
|
|
239 | 198 | if not Configuration.multicontests? |
|
|
240 | 199 | @problems = problem_list_for_user(@user) |
|
|
241 | 200 | else |
|
|
242 |
- @contest_problems = |
|
|
|
243 |
- @problems = |
|
|
|
201 | + @contest_problems = @user.available_problems_group_by_contests | |
|
|
202 | + @problems = @user.available_problems | |
|
|
244 | 203 | end |
|
|
245 | 204 | @prob_submissions = {} |
|
|
246 | 205 | @problems.each do |p| |
|
|
247 | 206 | sub = Submission.find_last_by_user_and_problem(@user.id,p.id) |
|
|
248 | 207 | if sub!=nil |
|
|
249 | 208 | @prob_submissions[p.id] = { :count => sub.number, :submission => sub } |
|
|
250 | 209 | else |
|
|
251 | 210 | @prob_submissions[p.id] = { :count => 0, :submission => nil } |
|
|
252 | 211 | end |
|
|
253 | 212 | end |
|
|
254 | 213 | prepare_announcements |
|
|
255 | 214 | end |
|
|
256 | 215 | |
|
|
257 | 216 | def check_viewability |
|
|
258 | 217 | @user = User.find(session[:user_id]) |
|
|
259 | 218 | if (!Configuration.show_tasks_to?(@user)) and |
|
|
260 | 219 | ((action_name=='submission') or (action_name=='submit')) |
|
|
261 | 220 | redirect_to :action => 'list' and return |
|
|
262 | 221 | end |
|
|
263 | 222 | end |
|
|
264 | 223 | |
|
|
265 | 224 | def prepare_grading_result(submission) |
|
|
266 | 225 | if Configuration.task_grading_info.has_key? submission.problem.name |
|
|
267 | 226 | grading_info = Configuration.task_grading_info[submission.problem.name] |
| @@ -1,34 +1,34 | |||
|
|
1 | 1 | class TasksController < ApplicationController |
|
|
2 | 2 | |
|
|
3 | 3 | before_filter :authenticate, :check_viewability |
|
|
4 | 4 | |
|
|
5 | 5 | def index |
|
|
6 | 6 | redirect_to :action => 'list' |
|
|
7 | 7 | end |
|
|
8 | 8 | |
|
|
9 | 9 | def list |
|
|
10 |
- @problems = |
|
|
|
10 | + @problems = @user.available_problems | |
|
|
11 | 11 | end |
|
|
12 | 12 | |
|
|
13 | 13 | # this has contest-wide access control |
|
|
14 | 14 | def view |
|
|
15 | 15 | base_name = params[:file] |
|
|
16 | 16 | base_filename = File.basename("#{base_name}.#{params[:ext]}") |
|
|
17 | 17 | filename = "#{Problem.download_file_basedir}/#{base_filename}" |
|
|
18 | 18 | |
|
|
19 | 19 | if !FileTest.exists?(filename) |
|
|
20 | 20 | redirect_to :action => 'index' and return |
|
|
21 | 21 | end |
|
|
22 | 22 | |
|
|
23 | 23 | send_file_to_user(filename, base_filename) |
|
|
24 | 24 | end |
|
|
25 | 25 | |
|
|
26 | 26 | # this has problem-level access control |
|
|
27 | 27 | def download |
|
|
28 | 28 | problem = Problem.find(params[:id]) |
|
|
29 | 29 | if !problem or !problem.available or !@user.can_view_problem? problem |
|
|
30 | 30 | redirect_to :action => 'index' and return |
|
|
31 | 31 | end |
|
|
32 | 32 | |
|
|
33 | 33 | base_name = params[:file] |
|
|
34 | 34 | base_filename = File.basename("#{base_name}.#{params[:ext]}") |
| @@ -176,48 +176,86 | |||
|
|
176 | 176 | def update_start_time |
|
|
177 | 177 | stat = self.contest_stat |
|
|
178 | 178 | if stat == nil |
|
|
179 | 179 | stat = UserContestStat.new(:user => self, |
|
|
180 | 180 | :started_at => Time.now.gmtime) |
|
|
181 | 181 | stat.save |
|
|
182 | 182 | end |
|
|
183 | 183 | end |
|
|
184 | 184 | |
|
|
185 | 185 | def problem_in_user_contests?(problem) |
|
|
186 | 186 | problem_contests = problem.contests.all |
|
|
187 | 187 | |
|
|
188 | 188 | if problem_contests.length == 0 # this is public contest |
|
|
189 | 189 | return true |
|
|
190 | 190 | end |
|
|
191 | 191 | |
|
|
192 | 192 | contests.each do |contest| |
|
|
193 | 193 | if problem_contests.find {|c| c.id == contest.id } |
|
|
194 | 194 | return true |
|
|
195 | 195 | end |
|
|
196 | 196 | end |
|
|
197 | 197 | return false |
|
|
198 | 198 | end |
|
|
199 | 199 | |
|
|
200 | + def available_problems_group_by_contests | |
|
|
201 | + contest_problems = [] | |
|
|
202 | + pin = {} | |
|
|
203 | + contests.enabled.each do |contest| | |
|
|
204 | + available_problems = contest.problems.available | |
|
|
205 | + contest_problems << { | |
|
|
206 | + :contest => contest, | |
|
|
207 | + :problems => available_problems | |
|
|
208 | + } | |
|
|
209 | + available_problems.each {|p| pin[p.id] = true} | |
|
|
210 | + end | |
|
|
211 | + other_avaiable_problems = Problem.available.find_all {|p| pin[p.id]==nil and p.contests.length==0} | |
|
|
212 | + contest_problems << { | |
|
|
213 | + :contest => nil, | |
|
|
214 | + :problems => other_avaiable_problems | |
|
|
215 | + } | |
|
|
216 | + return contest_problems | |
|
|
217 | + end | |
|
|
218 | + | |
|
|
219 | + def available_problems | |
|
|
220 | + if not Configuration.multicontests? | |
|
|
221 | + return Problem.find_available_problems | |
|
|
222 | + else | |
|
|
223 | + contest_problems = [] | |
|
|
224 | + pin = {} | |
|
|
225 | + contests.enabled.each do |contest| | |
|
|
226 | + contest.problems.available.each do |problem| | |
|
|
227 | + if not pin.has_key? problem.id | |
|
|
228 | + contest_problems << problem | |
|
|
229 | + end | |
|
|
230 | + pin[problem.id] = true | |
|
|
231 | + end | |
|
|
232 | + end | |
|
|
233 | + other_avaiable_problems = Problem.available.find_all {|p| pin[p.id]==nil and p.contests.length==0} | |
|
|
234 | + return contest_problems + other_avaiable_problems | |
|
|
235 | + end | |
|
|
236 | + end | |
|
|
237 | + | |
|
|
200 | 238 | def can_view_problem?(problem) |
|
|
201 | 239 | if not Configuration.multicontests? |
|
|
202 | 240 | return problem.available |
|
|
203 | 241 | else |
|
|
204 | 242 | return problem_in_user_contests? problem |
|
|
205 | 243 | end |
|
|
206 | 244 | end |
|
|
207 | 245 | |
|
|
208 | 246 | protected |
|
|
209 | 247 | def encrypt_new_password |
|
|
210 | 248 | return if password.blank? |
|
|
211 | 249 | self.salt = (10+rand(90)).to_s |
|
|
212 | 250 | self.hashed_password = User.encrypt(self.password,self.salt) |
|
|
213 | 251 | end |
|
|
214 | 252 | |
|
|
215 | 253 | def assign_default_site |
|
|
216 | 254 | # have to catch error when migrating (because self.site is not available). |
|
|
217 | 255 | begin |
|
|
218 | 256 | if self.site==nil |
|
|
219 | 257 | self.site = Site.find_by_name('default') |
|
|
220 | 258 | if self.site==nil |
|
|
221 | 259 | self.site = Site.find(1) # when 'default has be renamed' |
|
|
222 | 260 | end |
|
|
223 | 261 | end |
You need to be logged in to leave comments.
Login now