add {p,q,r}_{min,max}

diff --git a/app/views/admin/problems/_quadratic_equation.html.erb b/app/views/admin/problems/_quadratic_equation.html.erb
index 58dbf65..eb8fbc2 100644 (file)
--- a/app/views/admin/problems/_quadratic_equation.html.erb
+++ b/app/views/admin/problems/_quadratic_equation.html.erb
@@ -1,3 +1,6 @@
 <table class="problem">
   <%= render :partial => "common" %>
+  <%= render :partial => "minus_min_max", :locals => { :prefix => "r_", :minus => false } %>
+  <%= render :partial => "minus_min_max", :locals => { :prefix => "p_", :minus => false } %>
+  <%= render :partial => "minus_min_max", :locals => { :prefix => "q_", :minus => false } %>
 </table>

diff --git a/app/views/admin/problems/_quadratic_equation_edit_form.html.erb b/app/views/admin/problems/_quadratic_equation_edit_form.html.erb
index 8eba925..2162d82 100644 (file)
--- a/app/views/admin/problems/_quadratic_equation_edit_form.html.erb
+++ b/app/views/admin/problems/_quadratic_equation_edit_form.html.erb
@@ -1,4 +1,6 @@
 <table class="problem">
   <%= render :partial => "common_edit_form", :locals => { :f => f } %>
-  <%# TODO 作る %>
+  <%= render :partial => "minus_min_max_edit_form", :locals => { :f => f, :prefix => "r_", :minus => false } %>
+  <%= render :partial => "minus_min_max_edit_form", :locals => { :f => f, :prefix => "p_", :minus => false } %>
+  <%= render :partial => "minus_min_max_edit_form", :locals => { :f => f, :prefix => "q_", :minus => false } %>
 </table>

diff --git a/db/seeds.rb b/db/seeds.rb
index 8d67541..230906a 100644 (file)
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -216,8 +216,11 @@ STR
                                :amount => 2,
                                :options =>  {
                                  :answer_type => :rational,
+                                 :r_min => 1,
                                  :r_max => 20,
+                                 :p_min => 0,
                                  :p_max => 12,
+                                 :q_min => 1,
                                  :q_max => 40,
                                }.to_json)
   problem_group.save!

diff --git a/spec/factories/problem.rb b/spec/factories/problem.rb
index 410ca50..354afff 100644 (file)
--- a/spec/factories/problem.rb
+++ b/spec/factories/problem.rb
@@ -109,8 +109,11 @@ Factory.define :quadratic_equation_level_1, :parent => :problem do |m|
   m.unit{|u| u.association :quadratic_equation }
   m.options({
               :answer_type => :rational,
+              :r_min => 1,
               :r_max => 20,
+              :p_min => 0,
               :p_max => 12,
+              :q_min => 0,
               :q_max => 40,
             }.to_json)
 end