cafe-grader-web Commit - r279:973f76ab730e

cafe-grader-web

Commit `r279:973f76ab730e` public

parent | child

Description:

manages problems in contests

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

r279:973f76ab730e - Wed, 03 Mar 2010 10:46:50 - 10 files changed: 74 inserted, 3 deleted

db/migrate/20100303095700_add_name_to_contests.rb created 644 ¶ +9

@@ -0,0 +1,9
	1	+ class AddNameToContests < ActiveRecord::Migration
	2	+ def self.up
	3	+ add_column :contests, :name, :string
	4	+ end
	5	+
	6	+ def self.down
	7	+ remove_column :contests, :name
	8	+ end
	9	+ end

app/controllers/problems_controller.rb ¶ +21

                   else
                     @submissions = Submission.find_all_last_by_problem(params[:id])
                   end
                 end
                 def manage
                   @problems = Problem.find(:all, :order => 'date_added DESC')
                 end
                 def do_manage
                   if params.has_key? 'change_date_added'
                     change_date_added
+            +     else params.has_key? 'add_to_contest'
+            +       add_to_contest
                   end
                   redirect_to :action => 'manage'
                 end
                 def import
                   @allow_test_pair_import = allow_test_pair_import?
                 end
                 def do_import
                   old_problem = Problem.find_by_name(params[:name])
                   if !allow_test_pair_import? and params.has_key? :import_to_db
                     params.delete :import_to_db
                                                                                 old_problem)
                   if @problem.errors.length != 0
                     render :action => 'import' and return
                   end
                   if old_problem!=nil
                     flash[:notice] = "The test data has been replaced for problem #{@problem.name}"
                   end
                   @log = import_log
                 end
+            +   def remove_contest
+            +     problem = Problem.find(params[:id])
+            +     contest = Contest.find(params[:contest_id])
+            +     if problem!=nil and contest!=nil
+            +       problem.contests.delete(contest)
+            +     end
+            +     redirect_to :action => 'manage'
+            +   end
+            +
                 ##################################
                 protected
                 def allow_test_pair_import?
                   if defined? ALLOW_TEST_PAIR_IMPORT
                     return ALLOW_TEST_PAIR_IMPORT
                   else
                     return false
                   end
                 end
                 def change_date_added
                   problems = get_problems_from_params
                   year = params[:date_added][:year].to_i
                   month = params[:date_added][:month].to_i
                   day = params[:date_added][:day].to_i
                   date = Date.new(year,month,day)
                   problems.each do |p|
                     p.date_added = date
                     p.save
                   end
                 end
+            +   def add_to_contest
+            +     problems = get_problems_from_params
+            +     contest = Contest.find(params[:contest][:id])
+            +     if contest!=nil and contest.enabled
+            +       problems.each do |p|
+            +         p.contests << contest
+            +       end
+            +     end
+            +   end
+            +
                 def get_problems_from_params
                   problems = []
                   params.keys.each do |k|
                     if k.index('prob-')==0
                       name, id = k.split('-')
                       problems << Problem.find(id)
                     end
                   end
                   problems
                 end
               end

app/views/contests/edit.html.erb ¶ +4

               <h1>Editing contest</h1>
               <% form_for(@contest) do |f| %>
                 <%= f.error_messages %>
                 <table>
                   <tr>
+            +       <td><%= f.label :name %></td>
+            +       <td><%= f.text_field :name %></td>
+            +     </tr>
+            +     <tr>
                     <td><%= f.label :title %></td>
                     <td><%= f.text_field :title %></td>
                   </tr>
                   <tr>
                     <td></td>
                     <td>
               	<%= f.check_box :enabled %>
               	<%= f.label :enabled %>
                     </td>
                   </tr>
                 </table>
                 <p>

app/views/contests/index.html.erb ¶ +2

               <% content_for :head do %>
               <%= javascript_include_tag :defaults %>
               <% end %>
               <h1>Listing contests</h1>
               <div class="infobox">
                 <b>Go back to:</b> [<%= link_to 'contest management', :controller => 'contest_management', :action => 'index' %>]
               </div>
               <table>
                 <tr>
+            +     <th>Name</th>
                   <th>Title</th>
                   <th>Enabled</th>
                 </tr>
               <% @contests.each do |contest| %>
                 <% @contest = contest %>
                 <tr>
+            +     <td><%= in_place_editor_field :contest, :name, {}, :rows => 1 %></td>
                   <td><%= in_place_editor_field :contest, :title, {}, :rows => 1 %></td>
                   <td><%= in_place_editor_field :contest, :enabled, {}, :rows => 1 %></td>
                   <td><%= link_to 'Show', contest %></td>
                   <td><%= link_to 'Edit', edit_contest_path(contest) %></td>
                   <td><%= link_to 'Destroy', contest, :confirm => 'Are you sure?', :method => :delete %></td>
                 </tr>
               <% end %>
               </table>
               <br />
               <%= link_to 'New contest', new_contest_path %>

app/views/contests/new.html.erb ¶ +5 -1

               <h1>New contest</h1>
               <% form_for(@contest) do |f| %>
                 <%= f.error_messages %>
                 <p>
+            +     <%= f.label :name %><br />
+            +     <%= f.text_field :name %>
+            +   </p>
+            +   <p>
                   <%= f.label :title %><br />
                   <%= f.text_field :title %>
                 </p>
                 <p>
                   <%= f.label :enabled %><br />
                   <%= f.check_box :enabled %>
                 </p>
                 <p>
                   <%= f.submit 'Create' %>
                 </p>
               <% end %>
-            - <%= link_to 'Back', contests_path %>
  No newline at end of file
+            + <%= link_to 'Back', contests_path %>

app/views/problems/list.rhtml ¶ +9

                   <%= submit_tag "Create" %>
                 <% end %>
               </div>
               <table>
                 <tr>
                   <th>Name</th>
                   <th>Full name</th>
                   <th>Full score</th>
                   <th>Date added</th>
                   <th>Avail?</th>
                   <th>Test?</th>
+            +     <% if Configuration.multicontests? %>
+            +       <th>Contests</th>
+            +     <% end %>
                 </tr>
               <% for problem in @problems %>
                 <tr id="prob-<%= problem.id %>" name="prob-<%= problem.id %>" class="<%= (problem.available) ? "available" : "not-available" %>">
                   <% @problem=problem %>
                   <td><%= in_place_editor_field :problem, :name, {}, :rows=>1 %></td>
                   <td><%= in_place_editor_field :problem, :full_name, {}, :rows=>1 %></td>
                   <td><%= in_place_editor_field :problem, :full_score, {}, :rows=>1 %></td>
                   <td><%= problem.date_added %></td>
                   <td id="prob-<%= problem.id %>-avail"><%= problem.available %></td>
                   <td><%= problem.test_allowed %></td>
+            +     <% if Configuration.multicontests? %>
+            +       <td>
+            +         <%= problem.contests.collect { |c| c.name }.join(', ') %>
+            +       </td>
+            +     <% end %>
+            +
                   <td><%= link_to_remote '[Toggle]', :url => {:action => 'toggle', :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 />
               <%= link_to '[New problem]', :action => 'new' %>

app/views/problems/manage.html.haml ¶ +13 -1

               %p= link_to '[Back to problem list]', :action => 'list'
               - form_tag :action=>'do_manage' do
                 .submitbox
                   What do you want to do?
                   %br/
                   %ul
                     %li
                       Change date added to
                       = select_date Date.current, :prefix => 'date_added'
                       &nbsp;&nbsp;&nbsp;
                       = submit_tag 'Change', :name => 'change_date_added'
+            +
+            +       - if Configuration.multicontests?
+            +         %li
+            +           Add to
+            +           = select("contest","id",Contest.all.collect {|c| [c.title, c.id]})
+            +           = submit_tag 'Add', :name => 'add_to_contest'
+            +
                 %table
                   %tr
                     %th/
                     %th Name
                     %th Full name
                     %th Date added
+            +       - if Configuration.multicontests?
+            +         %th Contests
                   - for problem in @problems
                     %tr{:id => "row-prob-#{problem.id}", :name=> "prob-#{problem.id}"}
                       %td= check_box_tag "prob-#{problem.id}"
                       %td= problem.name
                       %td= problem.full_name
                       %td= problem.date_added
+            +         - if Configuration.multicontests?
+            +           %td
+            +             - problem.contests.each do |contest|
+            +               = "(#{contest.name} [#{link_to 'x', :action => 'remove_contest', :id => problem.id, :contest_id => contest.id }])"

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 Active Record 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 => 20100219014840) do
+            + ActiveRecord::Schema.define(:version => 20100303095700) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
                   t.text     "body"
                   t.boolean  "published"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.boolean  "frontpage",    :default => false
                   t.boolean  "contest_only", :default => false
                   t.string   "title"
                 end
                   t.string   "value_type"
                   t.string   "value"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.text     "description"
                 end
                 create_table "contests", :force => true do |t|
                   t.string   "title"
                   t.boolean  "enabled"
                   t.datetime "created_at"
                   t.datetime "updated_at"
+            +     t.string   "name"
                 end
                 create_table "contests_problems", :id => false, :force => true do |t|
                   t.integer "contest_id"
                   t.integer "problem_id"
                 end
                 create_table "contests_users", :id => false, :force => true do |t|
                   t.integer "contest_id"
                   t.integer "user_id"
                 end

db/seeds.rb ¶ +6

                    :value_type => 'boolean',
                    :default_value => 'true',
                    :description => 'If this option is true, users can change their settings'
                  },
                  # If Configuration['contest.test_request.early_timeout'] is true
                  # the user will not be able to use test request at 30 minutes
                  # before the contest ends.
                  {
                    :key => 'contest.test_request.early_timeout',
                    :value_type => 'boolean',
                    :default_value => 'false'
+            +    },
+            +
+            +    {
+            +      :key => 'system.multicontests',
+            +      :value_type => 'boolean',
+            +      :default_value => 'false'
                  }
                 ]
               def create_configuration_key(key,
                                            value_type,
                                            default_value,
                                            description='')
                 conf = (Configuration.find_by_key(key) ||
                         Configuration.new(:key => key,
                                           :value_type => value_type,
                                           :value => default_value))

test/fixtures/contests.yml ¶ +3

               # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
               contest_a:
+            +   name: contest_a
                 title: Contest A
                 enabled: true
               contest_b:
+            +   name: contest_b
                 title: Contest B
                 enabled: true
               contest_c:
+            +   name: contest_c
                 title: Contest C
                 enabled: false

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

r279:973f76ab730e - Wed, 03 Mar 2010 10:46:50 - 10 files changed: 74 inserted, 3 deleted

Sign in to your account

Commit r279:973f76ab730e public

Author

r279:973f76ab730e - Wed, 03 Mar 2010 10:46:50 - 10 files changed: 74 inserted, 3 deleted

Commit `r279:973f76ab730e` public