cafe-grader-web Commit - r92:84da10c15f8a

cafe-grader-web

Commit `r92:84da10c15f8a` public

parent | child

Description:

[web] refactor problem description, some styling git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@179 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

r92:84da10c15f8a - Thu, 17 Apr 2008 12:04:13 - 13 files changed: 167 inserted, 17 deleted

app/models/description.rb created 644 ¶ +2

@@ -0,0 +1,2
	1	+ class Description < ActiveRecord::Base
	2	+ end

db/migrate/027_create_descriptions.rb created 644 ¶ +13

@@ -0,0 +1,13
	1	+ class CreateDescriptions < ActiveRecord::Migration
	2	+ def self.up
	3	+ create_table :descriptions do \|t\|
	4	+ t.column :body, :text
	5	+ t.column :markdowned, :boolean
	6	+ t.timestamps
	7	+ end
	8	+ end
	9	+
	10	+ def self.down
	11	+ drop_table :descriptions
	12	+ end
	13	+ end

db/migrate/028_refactor_problem_body_to_description.rb created 644 ¶ +33

@@ -0,0 +1,33
	1	+ class RefactorProblemBodyToDescription < ActiveRecord::Migration
	2	+ def self.up
	3	+ add_column :problems, :description_id, :integer
	4	+ Problem.reset_column_information
	5	+
	6	+ Problem.find(:all).each do \|problem\|
	7	+ if problem.body!=nil
	8	+ description = Description.new
	9	+ description.body = problem.body
	10	+ description.markdowned = false
	11	+ description.save
	12	+ problem.description_id = description.id
	13	+ problem.save
	14	+ end
	15	+ end
	16	+
	17	+ remove_column :problems, :body
	18	+ end
	19	+
	20	+ def self.down
	21	+ add_column :problems, :body, :text
	22	+ Problem.reset_column_information
	23	+
	24	+ Problem.find(:all).each do \|problem\|
	25	+ if problem.description_id != nil
	26	+ problem.body = Description.find(problem.description_id).body
	27	+ problem.save
	28	+ end
	29	+ end
	30	+
	31	+ remove_column :problems, :description_id
	32	+ end
	33	+ end

test/fixtures/descriptions.yml created 644 ¶ +7

@@ -0,0 +1,7
	1	+ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
	2	+
	3	+ # one:
	4	+ # column: value
	5	+ #
	6	+ # two:
	7	+ # column: value

test/unit/description_test.rb created 644 ¶ +8

@@ -0,0 +1,8
	1	+ require File.dirname(__FILE__) + '/../test_helper'
	2	+
	3	+ class DescriptionTest < ActiveSupport::TestCase
	4	+ # Replace this with your real tests.
	5	+ def test_truth
	6	+ assert true
	7	+ end
	8	+ end

app/controllers/problems_controller.rb ¶ +25

                 def show
                   @problem = Problem.find(params[:id])
                 end
                 def new
                   @problem = Problem.new
+            +     @description = nil
                 end
                 def create
                   @problem = Problem.new(params[:problem])
+            +     @description = Description.new(params[:description])
+            +     if @description.body!=''
+            +       if !@description.save
+            +         render :action => new and return
+            +       end
+            +     else
+            +       @description = nil
+            +     end
+            +     @problem.description = @description
                   if @problem.save
                     flash[:notice] = 'Problem was successfully created.'
                     redirect_to :action => 'list'
                   else
                     render :action => 'new'
                   end
                 end
                 def edit
                   @problem = Problem.find(params[:id])
+            +     @description = @problem.description
                 end
                 def update
                   @problem = Problem.find(params[:id])
+            +     @description = @problem.description
+            +     if @description == nil and params[:description][:body]!=''
+            +       @description = Description.new(params[:description])
+            +       if !@description.save
+            +         flash[:notice] = 'Error saving description'
+            +         render :action => 'edit' and return
+            +       end
+            +       @problem.description = @description
+            +     elsif @description!=nil
+            +       if !@description.update_attributes(params[:description])
+            +         flash[:notice] = 'Error saving description'
+            +         render :action => 'edit' and return
+            +       end
+            +     end
                   if @problem.update_attributes(params[:problem])
                     flash[:notice] = 'Problem was successfully updated.'
                     redirect_to :action => 'show', :id => @problem
                   else
                     render :action => 'edit'
                   end

app/models/problem.rb ¶ +2

               class Problem < ActiveRecord::Base
+            +   belongs_to :description
+            +
                 def self.find_available_problems
                   find(:all, :conditions => {:available => true})
                 end
               end

app/views/problems/_form.rhtml ¶ +11 -3

               <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_body">Body</label><br/>
+            + <%= error_messages_for 'description' %>
-            - <%= text_area 'problem', 'body', :rows => 10, :cols => 80  %></p>
+            + <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/show.rhtml ¶ +7 -4

               <% for column in Problem.content_columns %>
               <p>
                 <b><%= column.human_name %>:</b>
-            -   <% if column.name != 'body' %>
                 <%=h @problem.send(column.name) %>
-            -   <% else %>
+            + </p>
+            + <% end %>
+            +
+            + <p>
+            + <b>Description:</b><br/>
+            + <% if @problem.description!=nil %>
               <pre>
-            -     <%= @problem.body %>
+            + <%= @problem.description.body %>
               </pre>
               <% end %>
               </p>
-            - <% end %>
               <%= link_to 'Edit', :action => 'edit', :id => @problem %> |
               <%= link_to 'Back', :action => 'list' %>

app/views/tasks/_problem.html.erb ¶ +17 -7

@@ -1,12 +1,22
		1	+ <tr class="name">
		2	+ <td>
1	<a name="<%= problem.name %>"></a>	3	<a name="<%= problem.name %>"></a>
2	- <% back_color = ((problem_counter % 2) == 0) ? "#fefedd" : "#feeefe" %>
3	- <div style="border: 1px solid grey; background: <%= back_color %>; padding-left: 20px; padding-bottom: 5px">
4	- <div style="border-bottom: 1px solid black; padding-top: 10px; padding-bottom: 5px; font-size: 18px; font-weight: bold">
5	<%= "#{problem.full_name} (#{problem.name})" %>	4	<%= "#{problem.full_name} (#{problem.name})" %>
6	- </div>	5	+ </td>
7	- <% if problem.body!=nil %>	6	+ </tr>
8	- <%= markdown(problem.body) %>	7	+ <tr>
		8	+ <% td_class = (problem_counter%2==0) ? "desc-even" : "desc-odd" %>
		9	+ <td class="<%= td_class %>">
		10	+ <% if problem.description!=nil %>
		11	+ <% if problem.description.markdowned %>
		12	+ <%= markdown(problem.description.body) %>
		13	+ <% else %>
		14	+ <pre>
		15	+ <%= problem.description.body %>
		16	+ </pre>
		17	+ <% end %>
9	<% else %>	18	<% else %>
10	(not available)	19	(not available)
11	<% end %>	20	<% end %>
12	- </div>	21	+ </td>
		22	+ </tr>

app/views/tasks/list.html.haml ¶ +2 -1

               = user_title_bar(@user)
               .task-menu
                 %b Task Listing:
                 - @problems.each do |problem|
-            -     - if problem.body!=nil
+            +     - if problem.description!=nil
                     %a{:href => "\##{problem.name}"}= "[#{problem.full_name}]"
                   - else
                     = "[#{problem.full_name}]"
+            + %table.taskdesc
                 = render :partial => 'problem', :collection => @problems

db/schema.rb ¶ +9 -2

               # 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 => 26) do
+            + ActiveRecord::Schema.define(:version => 28) 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.datetime "created_at"
+            +     t.datetime "updated_at"
+            +   end
+            +
                 create_table "grader_processes", :force => true do |t|
                   t.string   "host",       :limit => 20
                   t.integer  "pid"
                   t.string   "mode"
                   t.boolean  "active"
                   t.datetime "created_at"
                   t.string  "name",           :limit => 30
                   t.string  "full_name"
                   t.integer "full_score"
                   t.date    "date_added"
                   t.boolean "available"
                   t.string  "url"
-            -     t.text    "body"
+            +     t.integer "description_id"
                 end
                 create_table "rights", :force => true do |t|
                   t.string "name"
                   t.string "controller"
                   t.string "action"

public/stylesheets/application.css ¶ +31

@@ -118,6 +118,37
118	font-weight: bold;	118	font-weight: bold;
119	border-top: 1px solid black;	119	border-top: 1px solid black;
120	border-bottom: 1px solid black;	120	border-bottom: 1px solid black;
121	margin-top: 2px;	121	margin-top: 2px;
122	margin-bottom: 4px;	122	margin-bottom: 4px;
123	}	123	}
		124	+
		125	+ /*******************************
		126	+ [Submission]
		127	+ ********************************/
		128	+ table.taskdesc {
		129	+ border: 1px solid black;
		130	+ border-collapse: collapse;
		131	+ font-size: 12px;
		132	+ width: 100%;
		133	+ }
		134	+
		135	+ table.taskdesc tr.name {
		136	+ border: 1px solid black;
		137	+ background: #aaaaaa;
		138	+ color: white;
		139	+ font-weight: bold;
		140	+ font-size: 14px;
		141	+ text-align: center;
		142	+ }
		143	+
		144	+ table.taskdesc td.desc-odd {
		145	+ padding: 5px;
		146	+ padding-left: 10px;
		147	+ background: #fefeee;
		148	+ }
		149	+
		150	+ table.taskdesc td.desc-even {
		151	+ padding: 5px;
		152	+ padding-left: 10px;
		153	+ background: #feeefe;
		154	+ }

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

r92:84da10c15f8a - Thu, 17 Apr 2008 12:04:13 - 13 files changed: 167 inserted, 17 deleted

Sign in to your account

Commit r92:84da10c15f8a public

Author

r92:84da10c15f8a - Thu, 17 Apr 2008 12:04:13 - 13 files changed: 167 inserted, 17 deleted

Commit `r92:84da10c15f8a` public