Description:
[web] fix problem availability bug
git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@155 6386c4cd-e34a-4fa8-8920-d93eb39b512e
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
jittat
-
r75:8466e8e886f1 - - 1 file changed: 1 inserted, 1 deleted
| @@ -20,111 +20,111 | |||||
|
|
20 | return last_sub |
|
20 | return last_sub |
|
|
21 | end |
|
21 | end |
|
|
22 |
|
22 | ||
|
|
23 | def self.find_all_last_by_problem(problem_id) |
|
23 | def self.find_all_last_by_problem(problem_id) |
|
|
24 | # need to put in SQL command, maybe there's a better way |
|
24 | # need to put in SQL command, maybe there's a better way |
|
|
25 | Submission.find_by_sql("SELECT * FROM submissions " + |
|
25 | Submission.find_by_sql("SELECT * FROM submissions " + |
|
|
26 | "WHERE id = " + |
|
26 | "WHERE id = " + |
|
|
27 | "(SELECT MAX(id) FROM submissions AS subs " + |
|
27 | "(SELECT MAX(id) FROM submissions AS subs " + |
|
|
28 | "WHERE subs.user_id = submissions.user_id AND " + |
|
28 | "WHERE subs.user_id = submissions.user_id AND " + |
|
|
29 | "problem_id = " + problem_id.to_s + " " + |
|
29 | "problem_id = " + problem_id.to_s + " " + |
|
|
30 | "GROUP BY user_id)") |
|
30 | "GROUP BY user_id)") |
|
|
31 | end |
|
31 | end |
|
|
32 |
|
32 | ||
|
|
33 | def self.find_last_for_all_available_problems(user_id) |
|
33 | def self.find_last_for_all_available_problems(user_id) |
|
|
34 | submissions = Array.new |
|
34 | submissions = Array.new |
|
|
35 | problems = Problem.find_available_problems |
|
35 | problems = Problem.find_available_problems |
|
|
36 | problems.each do |problem| |
|
36 | problems.each do |problem| |
|
|
37 | sub = Submission.find_last_by_user_and_problem(user_id, problem.id) |
|
37 | sub = Submission.find_last_by_user_and_problem(user_id, problem.id) |
|
|
38 | submissions << sub if sub!=nil |
|
38 | submissions << sub if sub!=nil |
|
|
39 | end |
|
39 | end |
|
|
40 | submissions |
|
40 | submissions |
|
|
41 | end |
|
41 | end |
|
|
42 |
|
42 | ||
|
|
43 | def self.find_by_user_problem_number(user_id, problem_id, number) |
|
43 | def self.find_by_user_problem_number(user_id, problem_id, number) |
|
|
44 | Submission.find(:first, |
|
44 | Submission.find(:first, |
|
|
45 | :conditions => { |
|
45 | :conditions => { |
|
|
46 | :user_id => user_id, |
|
46 | :user_id => user_id, |
|
|
47 | :problem_id => problem_id, |
|
47 | :problem_id => problem_id, |
|
|
48 | :number => number |
|
48 | :number => number |
|
|
49 | }) |
|
49 | }) |
|
|
50 | end |
|
50 | end |
|
|
51 |
|
51 | ||
|
|
52 | def self.find_all_by_user_problem(user_id, problem_id) |
|
52 | def self.find_all_by_user_problem(user_id, problem_id) |
|
|
53 | Submission.find(:all, |
|
53 | Submission.find(:all, |
|
|
54 | :conditions => { |
|
54 | :conditions => { |
|
|
55 | :user_id => user_id, |
|
55 | :user_id => user_id, |
|
|
56 | :problem_id => problem_id, |
|
56 | :problem_id => problem_id, |
|
|
57 | }) |
|
57 | }) |
|
|
58 | end |
|
58 | end |
|
|
59 |
|
59 | ||
|
|
60 | protected |
|
60 | protected |
|
|
61 |
|
61 | ||
|
|
62 | def self.find_option_in_source(option, source) |
|
62 | def self.find_option_in_source(option, source) |
|
|
63 | if source==nil |
|
63 | if source==nil |
|
|
64 | return nil |
|
64 | return nil |
|
|
65 | end |
|
65 | end |
|
|
66 | i = 0 |
|
66 | i = 0 |
|
|
67 | source.each_line do |s| |
|
67 | source.each_line do |s| |
|
|
68 | if s =~ option |
|
68 | if s =~ option |
|
|
69 | words = s.split |
|
69 | words = s.split |
|
|
70 | return words[1] |
|
70 | return words[1] |
|
|
71 | end |
|
71 | end |
|
|
72 | i = i + 1 |
|
72 | i = i + 1 |
|
|
73 | if i==10 |
|
73 | if i==10 |
|
|
74 | return nil |
|
74 | return nil |
|
|
75 | end |
|
75 | end |
|
|
76 | end |
|
76 | end |
|
|
77 | return nil |
|
77 | return nil |
|
|
78 | end |
|
78 | end |
|
|
79 |
|
79 | ||
|
|
80 | def self.find_language_in_source(source) |
|
80 | def self.find_language_in_source(source) |
|
|
81 | langopt = find_option_in_source(/^LANG:/,source) |
|
81 | langopt = find_option_in_source(/^LANG:/,source) |
|
|
82 | if language = Language.find_by_name(langopt) |
|
82 | if language = Language.find_by_name(langopt) |
|
|
83 | return language |
|
83 | return language |
|
|
84 | elsif language = Language.find_by_pretty_name(langopt) |
|
84 | elsif language = Language.find_by_pretty_name(langopt) |
|
|
85 | return language |
|
85 | return language |
|
|
86 | else |
|
86 | else |
|
|
87 | return nil |
|
87 | return nil |
|
|
88 | end |
|
88 | end |
|
|
89 | end |
|
89 | end |
|
|
90 |
|
90 | ||
|
|
91 | def self.find_problem_in_source(source) |
|
91 | def self.find_problem_in_source(source) |
|
|
92 | prob_opt = find_option_in_source(/^TASK:/,source) |
|
92 | prob_opt = find_option_in_source(/^TASK:/,source) |
|
|
93 | if problem = Problem.find_by_name(prob_opt) |
|
93 | if problem = Problem.find_by_name(prob_opt) |
|
|
94 | return problem |
|
94 | return problem |
|
|
95 | else |
|
95 | else |
|
|
96 | return nil |
|
96 | return nil |
|
|
97 | end |
|
97 | end |
|
|
98 | end |
|
98 | end |
|
|
99 |
|
99 | ||
|
|
100 | # validation codes |
|
100 | # validation codes |
|
|
101 | def must_specify_language |
|
101 | def must_specify_language |
|
|
102 | return if self.source==nil |
|
102 | return if self.source==nil |
|
|
103 | self.language = Submission.find_language_in_source(self.source) |
|
103 | self.language = Submission.find_language_in_source(self.source) |
|
|
104 | errors.add_to_base("must specify programming language") unless self.language!=nil |
|
104 | errors.add_to_base("must specify programming language") unless self.language!=nil |
|
|
105 | end |
|
105 | end |
|
|
106 |
|
106 | ||
|
|
107 | def must_have_valid_problem |
|
107 | def must_have_valid_problem |
|
|
108 | return if self.source==nil |
|
108 | return if self.source==nil |
|
|
109 | if self.problem_id!=-1 |
|
109 | if self.problem_id!=-1 |
|
|
110 | problem = Problem.find(self.problem_id) |
|
110 | problem = Problem.find(self.problem_id) |
|
|
111 | else |
|
111 | else |
|
|
112 | problem = Submission.find_problem_in_source(self.source) |
|
112 | problem = Submission.find_problem_in_source(self.source) |
|
|
113 | end |
|
113 | end |
|
|
114 | if problem==nil |
|
114 | if problem==nil |
|
|
115 | errors.add_to_base("must specify problem") |
|
115 | errors.add_to_base("must specify problem") |
|
|
116 | - elsif !problem.available |
|
116 | + elsif (!problem.available) and (self.new_record?) |
|
|
117 | errors.add_to_base("must specify valid problem") |
|
117 | errors.add_to_base("must specify valid problem") |
|
|
118 | else |
|
118 | else |
|
|
119 | self.problem = problem |
|
119 | self.problem = problem |
|
|
120 | end |
|
120 | end |
|
|
121 | end |
|
121 | end |
|
|
122 |
|
122 | ||
|
|
123 | # callbacks |
|
123 | # callbacks |
|
|
124 | def assign_latest_number_if_new_recond |
|
124 | def assign_latest_number_if_new_recond |
|
|
125 | return if !self.new_record? |
|
125 | return if !self.new_record? |
|
|
126 | latest = Submission.find_last_by_user_and_problem(self.user_id, self.problem_id) |
|
126 | latest = Submission.find_last_by_user_and_problem(self.user_id, self.problem_id) |
|
|
127 | self.number = (latest==nil) ? 1 : latest.number + 1; |
|
127 | self.number = (latest==nil) ? 1 : latest.number + 1; |
|
|
128 | end |
|
128 | end |
|
|
129 |
|
129 | ||
|
|
130 | end |
|
130 | end |
You need to be logged in to leave comments.
Login now