Description:
[web] added test_allowed flag to problems
git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@181 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
-
r94:c175b74a31f0 - - 4 files changed: 24 inserted, 10 deleted
| @@ -82,7 +82,13 | |||
|
|
82 | 82 | def prepare_index_information |
|
|
83 | 83 | @user = User.find(session[:user_id]) |
|
|
84 | 84 | @submissions = Submission.find_last_for_all_available_problems(@user.id) |
|
|
85 |
- |
|
|
|
85 | + all_problems = @submissions.collect { |submission| submission.problem } | |
|
|
86 | + @problems = [] | |
|
|
87 | + all_problems.each do |problem| | |
|
|
88 | + if problem.test_allowed | |
|
|
89 | + @problems << problem | |
|
|
90 | + end | |
|
|
91 | + end | |
|
|
86 | 92 | @test_requests = @user.test_requests |
|
|
87 | 93 | end |
|
|
88 | 94 | |
| @@ -13,6 +13,12 | |||
|
|
13 | 13 | <p><label for="problem_date_added">Date added</label><br/> |
|
|
14 | 14 | <%= date_select 'problem', 'date_added' %></p> |
|
|
15 | 15 | |
|
|
16 | + <p><label for="problem_available">Available?</label> | |
|
|
17 | + <%= select("problem","available",[['True',true],['False',false]]) %></p> | |
|
|
18 | + | |
|
|
19 | + <p><label for="problem_test_allowed">Test allowed?</label> | |
|
|
20 | + <%= select("problem","test_allowed",[['True',true],['False',false]]) %></p> | |
|
|
21 | + | |
|
|
16 | 22 | <%= error_messages_for 'description' %> |
|
|
17 | 23 | |
|
|
18 | 24 | <p><label for="description_body">Description</label><br/> |
| @@ -28,6 +34,5 | |||
|
|
28 | 34 | <p><label for="problem_url">URL</label><br/> |
|
|
29 | 35 | <%= text_field 'problem', 'url' %></p> |
|
|
30 | 36 | |
|
|
31 | - <p><label for="problem_available">Available</label><br/> | |
|
|
32 | - <%= select("problem","available",[['True',true],['False',false]]) %></p> | |
|
|
37 | + | |
|
|
33 | 38 | <!--[eoform:problem]--> |
| @@ -15,17 +15,19 | |||
|
|
15 | 15 | <th>Full name</th> |
|
|
16 | 16 | <th>Full score</th> |
|
|
17 | 17 | <th>Date added</th> |
|
|
18 |
- <th>Avail |
|
|
|
18 | + <th>Avail?</th> | |
|
|
19 | + <th>Test?</th> | |
|
|
19 | 20 | </tr> |
|
|
20 | 21 | |
|
|
21 | 22 | <% for problem in @problems %> |
|
|
22 | 23 | <tr class="<%= (problem.available) ? "available" : "not-available" %>"> |
|
|
23 | 24 | <% @problem=problem %> |
|
|
24 | - <td><%= in_place_editor_field :problem, :name, {}, :rows=>1 %> | |
|
|
25 | - <td><%= in_place_editor_field :problem, :full_name, {}, :rows=>1 %> | |
|
|
26 | - <td><%= in_place_editor_field :problem, :full_score, {}, :rows=>1 %> | |
|
|
27 | - <td><%= problem.date_added %> | |
|
|
28 | - <td><%= problem.available %> | |
|
|
25 | + <td><%= in_place_editor_field :problem, :name, {}, :rows=>1 %></td> | |
|
|
26 | + <td><%= in_place_editor_field :problem, :full_name, {}, :rows=>1 %></td> | |
|
|
27 | + <td><%= in_place_editor_field :problem, :full_score, {}, :rows=>1 %></td> | |
|
|
28 | + <td><%= problem.date_added %></td> | |
|
|
29 | + <td><%= problem.available %></td> | |
|
|
30 | + <td><%= problem.test_allowed %></td> | |
|
|
29 | 31 | |
|
|
30 | 32 | <td><%= link_to '[Toggle]', :action => 'toggle_avail', :id => problem.id %></td> |
|
|
31 | 33 | <td><%= link_to '[Stat]', :action => 'stat', :id => problem.id %></td> |
| @@ -9,7 +9,7 | |||
|
|
9 | 9 | # |
|
|
10 | 10 | # It's strongly recommended to check this file into your version control system. |
|
|
11 | 11 | |
|
|
12 |
- ActiveRecord::Schema.define(:version => 2 |
|
|
|
12 | + ActiveRecord::Schema.define(:version => 29) do | |
|
|
13 | 13 | |
|
|
14 | 14 | create_table "configurations", :force => true do |t| |
|
|
15 | 15 | t.string "key" |
| @@ -52,6 +52,7 | |||
|
|
52 | 52 | t.boolean "available" |
|
|
53 | 53 | t.string "url" |
|
|
54 | 54 | t.integer "description_id" |
|
|
55 | + t.boolean "test_allowed" | |
|
|
55 | 56 | end |
|
|
56 | 57 | |
|
|
57 | 58 | create_table "rights", :force => true do |t| |
You need to be logged in to leave comments.
Login now