cafe-grader-web

Commit r94:c175b74a31f0 public

parent | child
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:
default
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

r94:c175b74a31f0 - - 4 files changed: 24 inserted, 10 deleted

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