cafe-grader-web Commit - r94:c175b74a31f0

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:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r94:c175b74a31f0 - Thu, 17 Apr 2008 15:50:27 - 4 files changed: 24 inserted, 10 deleted

app/controllers/test_controller.rb ¶ +7 -1

                   if @test_request==nil or @test_request.user_id != @user.id
                     flash[:notice] = 'Invalid request'
                     redirect_to :action => 'index'
                     return
                   end
                 end
                 protected
                 def prepare_index_information
                   @user = User.find(session[:user_id])
                   @submissions = Submission.find_last_for_all_available_problems(@user.id)
-            -     @problems = @submissions.collect { |submission| submission.problem }
+            +     all_problems = @submissions.collect { |submission| submission.problem }
+            +     @problems = []
+            +     all_problems.each do |problem|
+            +       if problem.test_allowed
+            +         @problems << problem
+            +       end
+            +     end
                   @test_requests = @user.test_requests
                 end
               end

app/views/problems/_form.rhtml ¶ +7 -2

               <p><label for="problem_name">Name</label><br/>
               <%= text_field 'problem', 'name'  %></p>
               <p><label for="problem_full_name">Full name</label><br/>
               <%= text_field 'problem', 'full_name'  %></p>
               <p><label for="problem_full_score">Full score</label><br/>
               <%= text_field 'problem', 'full_score'  %></p>
               <p><label for="problem_date_added">Date added</label><br/>
               <%= date_select 'problem', 'date_added'  %></p>
+            + <p><label for="problem_available">Available?</label>
+            + <%= select("problem","available",[['True',true],['False',false]]) %></p>
+            +
+            + <p><label for="problem_test_allowed">Test allowed?</label>
+            + <%= select("problem","test_allowed",[['True',true],['False',false]]) %></p>
+            +
               <%= error_messages_for 'description' %>
               <p><label for="description_body">Description</label><br/>
               <%= text_area :description, :body, :rows => 10, :cols => 80  %></p>
               <p><label for="description_markdowned">Markdowned?</label>
               <%= select "description",
                          "markdowned",
                          [['True',true],['False',false]],
                          {:selected => (@description) ? @description.markdowned : false }
               %></p>
               <p><label for="problem_url">URL</label><br/>
               <%= text_field 'problem', 'url'  %></p>
-            - <p><label for="problem_available">Available</label><br/>
-            - <%= select("problem","available",[['True',true],['False',false]]) %></p>
               <!--[eoform:problem]-->

app/views/problems/list.rhtml ¶ +8 -6

               <h1>Listing problems</h1>
               <%= link_to 'New problem', :action => 'new' %>
               <%= link_to 'Turn off all problems', :action => 'turn_all_off' %><br/>
               <table>
                 <tr>
                   <th>Name</th>
                   <th>Full name</th>
                   <th>Full score</th>
                   <th>Date added</th>
-            -     <th>Available</th>
+            +     <th>Avail?</th>
+            +     <th>Test?</th>
                 </tr>
               <% for problem in @problems %>
                 <tr class="<%= (problem.available) ? "available" : "not-available" %>">
                   <% @problem=problem %>
-            -     <td><%= in_place_editor_field :problem, :name, {}, :rows=>1 %>
+            +     <td><%= in_place_editor_field :problem, :name, {}, :rows=>1 %></td>
-            -     <td><%= in_place_editor_field :problem, :full_name, {}, :rows=>1 %>
+            +     <td><%= in_place_editor_field :problem, :full_name, {}, :rows=>1 %></td>
-            -     <td><%= in_place_editor_field :problem, :full_score, {}, :rows=>1 %>
+            +     <td><%= in_place_editor_field :problem, :full_score, {}, :rows=>1 %></td>
-            -     <td><%= problem.date_added %>
+            +     <td><%= problem.date_added %></td>
-            -     <td><%= problem.available %>
+            +     <td><%= problem.available %></td>
+            +     <td><%= problem.test_allowed %></td>
                   <td><%= link_to '[Toggle]', :action => 'toggle_avail', :id => problem.id %></td>
                   <td><%= link_to '[Stat]', :action => 'stat', :id => problem.id %></td>
                   <td><%= link_to '[Show]', :action => 'show', :id => problem %></td>
                   <td><%= link_to '[Edit]', :action => 'edit', :id => problem %></td>
                   <td><%= link_to '[Destroy]', { :action => 'destroy', :id => problem }, :confirm => 'Are you sure?', :method => :post %></td>
                 </tr>
               <% end %>
               </table>
               <br />

db/schema.rb ¶ +2 -1

               # This file is auto-generated from the current state of the database. Instead of editing this file,
               # please use the migrations feature of ActiveRecord to incrementally modify your database, and
               # then regenerate this schema definition.
               #
               # Note that this schema.rb definition is the authoritative source for your database schema. If you need
               # to create the application database on another system, you should be using db:schema:load, not running
               # all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
               # you'll amass, the slower it'll run and the greater likelihood for issues).
               #
               # It's strongly recommended to check this file into your version control system.
-            - ActiveRecord::Schema.define(:version => 28) do
+            + ActiveRecord::Schema.define(:version => 29) do
                 create_table "configurations", :force => true do |t|
                   t.string   "key"
                   t.string   "value_type"
                   t.string   "value"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
                 create_table "descriptions", :force => true do |t|
                   t.text     "body"
                   t.boolean  "markdowned"
                   t.string "pretty_name"
                   t.string "ext",         :limit => 10
                 end
                 create_table "problems", :force => true do |t|
                   t.string  "name",           :limit => 30
                   t.string  "full_name"
                   t.integer "full_score"
                   t.date    "date_added"
                   t.boolean "available"
                   t.string  "url"
                   t.integer "description_id"
+            +     t.boolean "test_allowed"
                 end
                 create_table "rights", :force => true do |t|
                   t.string "name"
                   t.string "controller"
                   t.string "action"
                 end
                 create_table "rights_roles", :id => false, :force => true do |t|
                   t.integer "right_id"
                   t.integer "role_id"
                 end

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r94:c175b74a31f0 - Thu, 17 Apr 2008 15:50:27 - 4 files changed: 24 inserted, 10 deleted

Sign in to your account

Commit r94:c175b74a31f0 public

Author

r94:c175b74a31f0 - Thu, 17 Apr 2008 15:50:27 - 4 files changed: 24 inserted, 10 deleted

Commit `r94:c175b74a31f0` public