cafe-grader-web Commit - r279:973f76ab730e

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

                 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
                   @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
                   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|

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

                 <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>

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

               <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>

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

                 <%= f.error_messages %>
                 <p>
+            +     <%= f.label :name %><br />
+            +     <%= f.text_field :name %>
+            +   </p>
+            +   <p>
                   <%= f.label :title %><br />
                   <%= f.text_field :title %>
                 </p>
                 </p>
               <% end %>
-            - <%= link_to 'Back', contests_path %>
  No newline at end of file
+            + <%= link_to 'Back', contests_path %>

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

                   <th>Date added</th>
                   <th>Avail?</th>
                   <th>Test?</th>
+            +     <% if Configuration.multicontests? %>
+            +       <th>Contests</th>
+            +     <% end %>
                 </tr>
               <% for problem in @problems %>
                   <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>

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

                       = 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= 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

               #
               # 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.boolean  "enabled"
                   t.datetime "created_at"
                   t.datetime "updated_at"
+            +     t.string   "name"
                 end
                 create_table "contests_problems", :id => false, :force => true do |t|

db/seeds.rb ¶ +6

                    :key => 'contest.test_request.early_timeout',
                    :value_type => 'boolean',
                    :default_value => 'false'
+            +    },
+            +
+            +    {
+            +      :key => 'system.multicontests',
+            +      :value_type => 'boolean',
+            +      :default_value => 'false'
                  }
                 ]

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

	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