cafe-grader-web Commit - r255:b7ca2d765156

cafe-grader-web

Commit `r255:b7ca2d765156` public

parent | child

Description:

added level to problems, randoms problem from each level

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

r255:b7ca2d765156 - Tue, 09 Feb 2010 15:46:54 - 9 files changed: 87 inserted, 7 deleted

db/migrate/20100209145331_add_level_to_problems.rb created 644 ¶ +9

			@@ -0,0 +1,9
		1	+ class AddLevelToProblems < ActiveRecord::Migration
		2	+ def self.up
		3	+ add_column :problems, :level, :integer, :default => 0
		4	+ end
		5	+
		6	+ def self.down
		7	+ remove_column :problems, :level, :integer
		8	+ end
		9	+ end

app/controllers/codejom_controller.rb ¶ +26 -2

               class CodejomController < ApplicationController
                 before_filter :admin_authorization
-            -   before_filter :authenticate
                 def index
                   @user = User.find(session[:user_id])
                   @problems = Problem.find(:all)
-            -     @available_problems = @problems.find_all {|p| not p.available }
+            +     @levels = @problems.collect {|p| p.level}.uniq.sort
+            +     @available_problems = {}
+            +     @levels.each do |level|
+            +       @available_problems[level] = []
+            +     end
+            +     @problems.find_all {|p| not p.available }.each do |problem|
+            +       @available_problems[problem.level] << problem
+            +     end
                   @activated_problems = @problems.find_all {|p| p.available }
                 end
+            +   def random_problem
+            +     level = params[:id].to_i
+            +
+            +     problems = Problem.unavailable.level(level).all
+            +     puts problems
+            +     if problems.length!=0
+            +       if problems.length != 1
+            +         problem = problems[rand(problems.length)]
+            +       else
+            +         problem = problems[0]
+            +       end
+            +       problem.available = true
+            +       problem.save
+            +     end
+            +
+            +     redirect_to :action => 'index'
+            +   end
+            +
               end

app/controllers/problems_controller.rb ¶ +3

                 before_filter :authenticate, :authorization
                 in_place_edit_for :problem, :name
                 in_place_edit_for :problem, :full_name
                 in_place_edit_for :problem, :full_score
+            +   # for codejom
+            +   in_place_edit_for :problem, :level
+            +
                 def index
                   list
                   render :action => 'list'
                 end
                 # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)

app/models/problem.rb ¶ +7

               class Problem < ActiveRecord::Base
                 belongs_to :description
                 has_many :test_pairs, :dependent => :delete_all
+            +   named_scope :level, lambda { |level|
+            +     { :conditions => { :level => level }}
+            +   }
+            +
+            +   named_scope :unavailable, { :conditions => { :available => false }}
+            +
+            +
                 validates_presence_of :name
                 validates_format_of :name, :with => /^\w+$/
                 validates_presence_of :full_name
                 DEFAULT_TIME_LIMIT = 1
                 DEFAULT_MEMORY_LIMIT = 32

app/views/codejom/index.html.haml ¶ +16 -4

               %h1 Code Jom Control Panel
-            - %h2= "Available problems (#{@available_problems.length})"
-            - %ul
-            -   - @available_problems.each do |problem|
-            -     %li= problem.name
+            + %h2 Available problems
+            + %table{:class => "codejom-problems"}
+            +   %tr
+            +     - @levels.each do |level|
+            +       %th= "Level #{level} (#{@available_problems[level].length})"
+            +   %tr
+            +     - @levels.each do |level|
+            +       %td
+            +         - @available_problems[level].each do |problem|
+            +           = problem.name
+            +           %br/
+            +   %tr
+            +     - @levels.each do |level|
+            +       %td{:class => 'random-button'}
+            +         - form_tag :action => 'random_problem', :id => level do
+            +           = submit_tag 'Random'
               %h2= "Activated problems (#{@activated_problems.length})"
               - @activated_problems.each do |problem|
                 = problem.name

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

               </div>
               <table>
                 <tr>
                   <th>Name</th>
                   <th>Full name</th>
+            +     <th>Level</th>
                   <th>Full score</th>
                   <th>Date added</th>
                   <th>Avail?</th>
                   <th>Test?</th>
                 </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, :level, {}, :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>
                   <td><%= link_to_remote '[Toggle]', :url => {:action => 'toggle', :id => problem.id } %></td>

db/schema.rb ¶ +2 -1

               # 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 => 20100129041917) do
+            + ActiveRecord::Schema.define(:version => 20100209145331) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
                   t.text     "body"
                   t.boolean  "published"
                   t.datetime "created_at"
                   t.date    "date_added"
                   t.boolean "available"
                   t.string  "url"
                   t.integer "description_id"
                   t.boolean "test_allowed"
                   t.boolean "output_only"
+            +     t.integer "level",                        :default => 0
                 end
                 create_table "rights", :force => true do |t|
                   t.string "name"
                   t.string "controller"
                   t.string "action"

public/stylesheets/application.css ¶ +10

                   font-weight: bold;
                   background: #000070;
                   padding: 3px 20px 3px 20px;
                   -moz-border-radius: 2px;
                   -webkit-border-radius: 5px;
                   border-radius: 5px; }
+            +
+            + table.codejom-problems th {
+            +   background: #000070;
+            +   color: white; }
+            + table.codejom-problems td {
+            +   width: 200px;
+            +   vertical-align: top;
+            +   text-align: center; }
+            +   table.codejom-problems td.random-button {
+            +     background: lightgrey; }

public/stylesheets/sass/application.sass ¶ +12

                   font-weight: bold
                   background: #000070
                   padding: 3px 20px 3px 20px
                   -moz-border-radius: 2px
                   -webkit-border-radius: 5px
                   border-radius: 5px
+            +
+            + table.codejom-problems
+            +   th
+            +     background: #000070
+            +     color: white
+            +   td
+            +     width: 200px
+            +     vertical-align: top
+            +     text-align: center
+            +
+            +     &.random-button
+            +       background: lightgrey
  No newline at end of file

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

r255:b7ca2d765156 - Tue, 09 Feb 2010 15:46:54 - 9 files changed: 87 inserted, 7 deleted

Sign in to your account

Commit r255:b7ca2d765156 public

Author

r255:b7ca2d765156 - Tue, 09 Feb 2010 15:46:54 - 9 files changed: 87 inserted, 7 deleted

Commit `r255:b7ca2d765156` public