cafe-grader-web

Commit r688:b31aedc6a96e public

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

r688:b31aedc6a96e - - 1 file changed: 14 inserted, 9 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -308,35 +308,40
308 end
308 end
309 end
309 end
310 other_avaiable_problems = Problem.available.find_all {|p| pin[p.id]==nil and p.contests.length==0}
310 other_avaiable_problems = Problem.available.find_all {|p| pin[p.id]==nil and p.contests.length==0}
311 return contest_problems + other_avaiable_problems
311 return contest_problems + other_avaiable_problems
312 end
312 end
313 end
313 end
314
314
315 def available_problems_in_group
315 def available_problems_in_group
316 problem = []
316 problem = []
317 self.groups.each do |group|
317 self.groups.each do |group|
318 group.problems.where(available: true).each { |p| problem << p }
318 group.problems.where(available: true).each { |p| problem << p }
319 end
319 end
320 - problem.uniq!.sort! do |a,b|
320 + problem.uniq!
321 - case
321 + if problem
322 - when a.date_added < b.date_added
322 + problem.sort! do |a,b|
323 - 1
323 + case
324 - when a.date_added > b.date_added
324 + when a.date_added < b.date_added
325 - -1
325 + 1
326 - else
326 + when a.date_added > b.date_added
327 - a.name <=> b.name
327 + -1
328 + else
329 + a.name <=> b.name
330 + end
328 end
331 end
332 + return problem
333 + else
334 + return []
329 end
335 end
330 - return problem
331 end
336 end
332
337
333 def can_view_problem?(problem)
338 def can_view_problem?(problem)
334 if not GraderConfiguration.multicontests?
339 if not GraderConfiguration.multicontests?
335 return problem.available
340 return problem.available
336 else
341 else
337 return problem_in_user_contests? problem
342 return problem_in_user_contests? problem
338 end
343 end
339 end
344 end
340
345
341 def self.clear_last_login
346 def self.clear_last_login
342 User.update_all(:last_ip => nil)
347 User.update_all(:last_ip => nil)
You need to be logged in to leave comments. Login now