rake annotate_models

diff --git a/app/models/decimal_arithmetic_edit_form.rb b/app/models/decimal_arithmetic_edit_form.rb
index 7a52c4b..e9e194a 100644 (file)
--- a/app/models/decimal_arithmetic_edit_form.rb
+++ b/app/models/decimal_arithmetic_edit_form.rb
@@ -1,10 +1,9 @@
 # == Schema Information
-# Schema version: 20100210063013
+# Schema version: 20100224042103
 #
 # Table name: active_forms
 #
-#  label           :
-#  unit            :
+#  unit_id         :
 #  level           :integer
 #  amount          :integer
 #  lock_version    :integer

diff --git a/app/models/expansion_edit_form.rb b/app/models/expansion_edit_form.rb
index cc8c6f9..11cbec1 100644 (file)
--- a/app/models/expansion_edit_form.rb
+++ b/app/models/expansion_edit_form.rb
@@ -1,10 +1,9 @@
 # == Schema Information
-# Schema version: 20100210063013
+# Schema version: 20100224042103
 #
 # Table name: active_forms
 #
-#  label        :
-#  unit         :
+#  unit_id      :
 #  level        :integer
 #  amount       :integer
 #  lock_version :integer

diff --git a/app/models/factorial_expression_edit_form.rb b/app/models/factorial_expression_edit_form.rb
index 7f085d8..922b12d 100644 (file)
--- a/app/models/factorial_expression_edit_form.rb
+++ b/app/models/factorial_expression_edit_form.rb
@@ -1,10 +1,9 @@
 # == Schema Information
-# Schema version: 20100210063013
+# Schema version: 20100224042103
 #
 # Table name: active_forms
 #
-#  label                       :
-#  unit                        :
+#  unit_id                     :
 #  level                       :integer
 #  amount                      :integer
 #  lock_version                :integer

diff --git a/app/models/factorization_edit_form.rb b/app/models/factorization_edit_form.rb
index cc2bd23..999c8ec 100644 (file)
--- a/app/models/factorization_edit_form.rb
+++ b/app/models/factorization_edit_form.rb
@@ -1,10 +1,9 @@
 # == Schema Information
-# Schema version: 20100210063013
+# Schema version: 20100224042103
 #
 # Table name: active_forms
 #
-#  label        :
-#  unit         :
+#  unit_id      :
 #  level        :integer
 #  amount       :integer
 #  lock_version :integer

diff --git a/app/models/fractional_arithmetic_edit_form.rb b/app/models/fractional_arithmetic_edit_form.rb
index 559f5d7..dcdfe97 100644 (file)
--- a/app/models/fractional_arithmetic_edit_form.rb
+++ b/app/models/fractional_arithmetic_edit_form.rb
@@ -1,10 +1,9 @@
 # == Schema Information
-# Schema version: 20100210063013
+# Schema version: 20100224042103
 #
 # Table name: active_forms
 #
-#  label           :
-#  unit            :
+#  unit_id         :
 #  level           :integer
 #  amount          :integer
 #  lock_version    :integer

diff --git a/app/models/learning_result.rb b/app/models/learning_result.rb
index 816b688..4ac93aa 100644 (file)
--- a/app/models/learning_result.rb
+++ b/app/models/learning_result.rb
@@ -1,5 +1,5 @@
 # == Schema Information
-# Schema version: 20100210063013
+# Schema version: 20100224042103
 #
 # Table name: learning_results
 #

diff --git a/app/models/ordinary_arithmetic_edit_form.rb b/app/models/ordinary_arithmetic_edit_form.rb
index 6ca5f17..f7438eb 100644 (file)
--- a/app/models/ordinary_arithmetic_edit_form.rb
+++ b/app/models/ordinary_arithmetic_edit_form.rb
@@ -1,10 +1,9 @@
 # == Schema Information
-# Schema version: 20100210063013
+# Schema version: 20100224042103
 #
 # Table name: active_forms
 #
-#  label           :
-#  unit            :
+#  unit_id         :
 #  level           :integer
 #  amount          :integer
 #  lock_version    :integer

diff --git a/app/models/partial_fraction_expansion_edit_form.rb b/app/models/partial_fraction_expansion_edit_form.rb
index 6dd1f99..f37954e 100644 (file)
--- a/app/models/partial_fraction_expansion_edit_form.rb
+++ b/app/models/partial_fraction_expansion_edit_form.rb
@@ -1,10 +1,9 @@
 # == Schema Information
-# Schema version: 20100210063013
+# Schema version: 20100224042103
 #
 # Table name: active_forms
 #
-#  label             :
-#  unit              :
+#  unit_id           :
 #  level             :integer
 #  amount            :integer
 #  lock_version      :integer

diff --git a/app/models/problem.rb b/app/models/problem.rb
index bcc45cf..5713da1 100644 (file)
--- a/app/models/problem.rb
+++ b/app/models/problem.rb
@@ -1,14 +1,13 @@
 # == Schema Information
-# Schema version: 20100210063013
+# Schema version: 20100224042103
 #
 # Table name: problems
 #
 #  id                       :integer       not null, primary key
+#  unit_id                  :integer       not null
 #  problem_group_problem_id :integer
-#  label                    :string(255)   not null
-#  unit                     :string(255)   not null, index_problems_on_unit_and_level(unique)
-#  level                    :integer       not null, index_problems_on_unit_and_level(unique)
-#  amount                   :integer       not null
+#  level                    :integer       default(0), not null
+#  amount                   :integer       default(1), not null
 #  options                  :text          not null
 #  lock_version             :integer       default(0), not null
 #  created_at               :datetime

diff --git a/app/models/problem_group.rb b/app/models/problem_group.rb
index 949df7d..37d3b24 100644 (file)
--- a/app/models/problem_group.rb
+++ b/app/models/problem_group.rb
@@ -1,5 +1,5 @@
 # == Schema Information
-# Schema version: 20100210063013
+# Schema version: 20100224042103
 #
 # Table name: problem_groups
 #
@@ -14,7 +14,7 @@
 
 class ProblemGroup < ActiveRecord::Base
   has_many :problem_groups_problems, :class_name => 'ProblemGroupsProblems', :dependent => :destroy
-  has_many :problems, :through => :problem_groups_problems
+  has_many :problems, :through => :problem_groups_problems, :order => 'unit_id, level ASC'
   has_many :learning_results
   has_many :reports
 

diff --git a/app/models/problem_groups_problems.rb b/app/models/problem_groups_problems.rb
index e5ad691..83cca44 100644 (file)
--- a/app/models/problem_groups_problems.rb
+++ b/app/models/problem_groups_problems.rb
@@ -1,5 +1,5 @@
 # == Schema Information
-# Schema version: 20100210063013
+# Schema version: 20100224042103
 #
 # Table name: problem_groups_problems
 #

diff --git a/app/models/report.rb b/app/models/report.rb
index 709c8eb..bae3db5 100644 (file)
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -1,5 +1,5 @@
 # == Schema Information
-# Schema version: 20100210063013
+# Schema version: 20100224042103
 #
 # Table name: reports
 #

diff --git a/app/models/role.rb b/app/models/role.rb
index ea6525c..9c21808 100644 (file)
--- a/app/models/role.rb
+++ b/app/models/role.rb
@@ -1,5 +1,5 @@
 # == Schema Information
-# Schema version: 20100210063013
+# Schema version: 20100224042103
 #
 # Table name: roles
 #

diff --git a/app/models/unit.rb b/app/models/unit.rb
index 94ff3c8..05e03a6 100644 (file)
--- a/app/models/unit.rb
+++ b/app/models/unit.rb
@@ -1,3 +1,16 @@
+# == Schema Information
+# Schema version: 20100224042103
+#
+# Table name: units
+#
+#  id              :integer       not null, primary key
+#  name            :string(40)    not null
+#  symbol          :string(40)    not null, index_units_on_symbol
+#  form_class_name :string(255)
+#  created_at      :datetime
+#  updated_at      :datetime
+#
+
 class Unit < ActiveRecord::Base
 
   has_many :problmes

diff --git a/app/models/user.rb b/app/models/user.rb
index bfbcd67..f56272d 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,5 +1,5 @@
 # == Schema Information
-# Schema version: 20100210063013
+# Schema version: 20100224042103
 #
 # Table name: users
 #

diff --git a/app/models/user_edit_form.rb b/app/models/user_edit_form.rb
index b757713..1e8e26d 100644 (file)
--- a/app/models/user_edit_form.rb
+++ b/app/models/user_edit_form.rb
@@ -1,5 +1,5 @@
 # == Schema Information
-# Schema version: 20100210063013
+# Schema version: 20100224042103
 #
 # Table name: active_forms
 #