[Mezuro] Draft to rages tests.

João M. M. da Silva + Diego Araújo · Paulo Meireles
1 parent dbf169af
Showing 20 changed files with 129 additions and 138 deletions Show diff stats
plugins/mezuro/controllers/myprofile/mezuro_plugin_range_controller.rb
plugins/mezuro/lib/kalibro/metric_configuration.rb
plugins/mezuro/test/fixtures/range_fixtures.rb
plugins/mezuro/test/functional/myprofile/mezuro_plugin_range_controller_test.rb
plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_native.html.erb
plugins/mezuro/views/mezuro_plugin_range/_edit.html.erb
plugins/mezuro/views/mezuro_plugin_range/_edit_range.html.erb
plugins/mezuro/views/mezuro_plugin_range/_form.html.erb
plugins/mezuro/views/mezuro_plugin_range/_new.html.erb
plugins/mezuro/views/mezuro_plugin_range/_new_range.html.erb
plugins/mezuro/views/mezuro_plugin_range/_range.html.erb
plugins/mezuro/views/mezuro_plugin_range/_range_form.html.erb
plugins/mezuro/views/mezuro_plugin_range/create.rjs
plugins/mezuro/views/mezuro_plugin_range/create_range.rjs
plugins/mezuro/views/mezuro_plugin_range/edit.rjs
plugins/mezuro/views/mezuro_plugin_range/edit_range.rjs
plugins/mezuro/views/mezuro_plugin_range/new.rjs
plugins/mezuro/views/mezuro_plugin_range/new_range.rjs
plugins/mezuro/views/mezuro_plugin_range/update.rjs
plugins/mezuro/views/mezuro_plugin_range/update_range.rjs
@@ -2,43 +2,44 @@ class MezuroPluginRangeController &lt; MezuroPluginMyprofileController
   append_view_path File.join(File.dirname(__FILE__) + '/../../views')
-  def new_range
-    @content_id = params[:id]
-    @metric_configuration_id = params[:metric_configuration_id]
+  def new
+    @content_id = params[:id].to_i
+    @metric_configuration_id = params[:metric_configuration_id].to_i
     @reading_labels_and_ids = reading_labels_and_ids
   end
-  def edit_range
-    @content_id = params[:id]
-    @metric_configuration_id = params[:metric_configuration_id]
-    ranges = Kalibro::Range.ranges_of params[:metric_configuration_id]
+  def edit
+    @content_id = params[:id].to_i
+    @metric_configuration_id = params[:metric_configuration_id].to_i
+    ranges = Kalibro::Range.ranges_of params[:metric_configuration_id].to_i
     @range = (ranges.select { |range| range.id == params[:range_id].to_i }).first
     @reading_labels_and_ids = reading_labels_and_ids
+    @selected_reading_label = @range.label
   end
-  def create_range
+  def create
     metric_configuration_id = params[:metric_configuration_id].to_i
     @range = Kalibro::Range.new params[:range]
     @range.save metric_configuration_id
     if !@range.errors.empty?
-      @error = metric_configuration.errors[0].message
+      @error = @range.errors[0].message
     end
   end
-  def update_range
+  def update
     metric_configuration_id = params[:metric_configuration_id].to_i
     @range = Kalibro::Range.new params[:range]
     @range.save metric_configuration_id
     if !@range.errors.empty?
-      @error = metric_configuration.errors[0].message
+      @error = @range.errors[0].message
     end
   end
-  def remove_range
-    configuration_content_id = params[:id]
-    metric_configuration_id = params[:metric_configuration_id]
+  def remove
+    configuration_content_id = params[:id].to_i
+    metric_configuration_id = params[:metric_configuration_id].to_i
     compound = params[:compound]
-    Kalibro::Range.new({:id => params[:range_id]}).destroy
+    Kalibro::Range.new({:id => params[:range_id].to_i}).destroy
     if compound
       redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/metric_configuration/edit_compound?id=#{configuration_content_id}&metric_configuration_id=#{metric_configuration_id}"
     else
@@ -49,7 +50,7 @@ class MezuroPluginRangeController &lt; MezuroPluginMyprofileController
   private
   def reading_labels_and_ids
-    array = Kalibro::Reading.readings_of(params[:reading_group_id]).map { |reading| [reading.label, reading.id] }
+    array = Kalibro::Reading.readings_of(params[:reading_group_id].to_i).map { |reading| [reading.label, reading.id] }
     array.sort { |x,y| x.first.downcase <=> y.first.downcase }
   end
@@ -28,8 +28,10 @@ class Kalibro::MetricConfiguration &lt; Kalibro::Model
   end
   def self.metric_configurations_of(configuration_id)
-    hash = request(:metric_configurations_of, {:configuration_id => configuration_id})
-    hash[:metric_configuration].to_a.map { |metric_configuration| new metric_configuration }
+    response = request(:metric_configurations_of, {:configuration_id => configuration_id})[:metric_configuration]
+    response = [] if response.nil?
+    response = [response] if response.is_a?(Hash) 
+    response.map { |metric_configuration| new metric_configuration }
   end
   private
@@ -5,7 +5,11 @@ class RangeFixtures
   end
   def self.created_range
-    Kalibro::Range.new :beginning => "19.5", :end => "INF", :reading_id => "1", :comments => "Test range 1"
+    Kalibro::Range.new created_range_hash
+  end
+  
+  def self.created_range_hash
+    {:beginning => "19.5", :end => "INF", :reading_id => "1", :comments => "Test range 1"}
   end
   def self.range_hash
@@ -4,6 +4,7 @@ require &quot;#{RAILS_ROOT}/plugins/mezuro/test/fixtures/metric_fixtures&quot;
 require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/metric_configuration_fixtures"
 require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/configuration_fixtures"
 require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/range_fixtures"
+require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/reading_fixtures"
 class MezuroPluginRangeControllerTest < ActionController::TestCase
@@ -13,85 +14,68 @@ class MezuroPluginRangeControllerTest &lt; ActionController::TestCase
     @response = ActionController::TestResponse.new
     @profile = fast_create(Community)
-    @metric = MetricFixtures.amloc
     @metric_configuration = MetricConfigurationFixtures.amloc_metric_configuration
     @metric_configuration_hash = MetricConfigurationFixtures.amloc_metric_configuration_hash
     @configuration = ConfigurationFixtures.configuration
-    Kalibro::Configuration.expects(:all_names).returns([])
-    @content = MezuroPlugin::ConfigurationContent.new(:profile => @profile, :name => @configuration.name)
-    @content.expects(:send_kalibro_configuration_to_service).returns(nil)
+    @content = MezuroPlugin::ConfigurationContent.new(:profile => @profile, :name => @configuration.name, :configuration_id => 42)
+    @content.expects(:send_configuration_to_service).returns(nil)
+    @content.expects(:validate_configuration_name).returns(true)
     @content.stubs(:solr_save)
     @content.save
-    @range = RangeFixtures.range_excellent
-    @range_hash = RangeFixtures.range_excellent_hash
+    @created_range = RangeFixtures.created_range
+    @range = RangeFixtures.range
+    @created_range_hash = RangeFixtures.created_range_hash 
+    @range_hash = RangeFixtures.range_hash
+
+    @reading = ReadingFixtures.reading
   end
-  should 'test new range' do
-    get :new_range, :profile => @profile.identifier, :id => @content.id, :metric_name => @metric.name
-    assert_equal @content.id.to_s, assigns(:content_id)
-    assert_equal @metric.name, assigns(:metric_name)
+  should 'set correct attributes to create a new range' do
+    Kalibro::Reading.expects(:readings_of).with(@metric_configuration.reading_group_id).returns([@reading])
+    get :new, :profile => @profile.identifier, :id => @content.id, :metric_configuration_id => @metric_configuration.id, :reading_group_id => @metric_configuration.reading_group_id
+    assert_equal @content.id, assigns(:content_id)
+    assert_equal @metric_configuration.id, assigns(:metric_configuration_id)
+    assert_equal [[@reading.label,@reading.id]], assigns(:reading_labels_and_ids)
     assert_response 200
   end
-  should 'test edit range' do
-    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :get_metric_configuration, {
-      :configuration_name => @content.name,
-      :metric_name => @metric.name}).returns({:metric_configuration => @metric_configuration_hash})
-    get :edit_range, :profile => @profile.identifier, :id => @content.id, :metric_name => @metric.name, :beginning_id => @range.beginning
-    assert_equal @content.id.to_s, assigns(:content_id)
-    assert_equal @metric.name, assigns(:metric_name)
-    assert_equal @range.beginning, assigns(:beginning_id)
-    assert_equal @range.end, assigns(:range).end
+  should 'set correct attributes to edit a range' do
+    Kalibro::Reading.expects(:readings_of).with(@metric_configuration.reading_group_id).returns([@reading])
+    Kalibro::Range.expects(:ranges_of).with(@metric_configuration.id).returns([@range])
+    get :edit, :profile => @profile.identifier, :id => @content.id, :metric_configuration_id => @metric_configuration.id, :range_id => @range.id, :reading_group_id => @metric_configuration.reading_group_id
+    assert_equal @content.id, assigns(:content_id)
+    assert_equal @metric_configuration.id, assigns(:metric_configuration_id)
+    assert_equal [[@reading.label,@reading.id]], assigns(:reading_labels_and_ids)
+    assert_equal @range, assigns(:range)
     assert_response 200
   end
   should 'test create instance range' do
-    metric_configuration = @metric_configuration
-    metric_configuration.add_range(@range)
-    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :get_metric_configuration, {
-      :configuration_name => @content.name,
-      :metric_name => @metric.name}).returns({:metric_configuration => @metric_configuration_hash})
-    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :save_metric_configuration, {
-        :metric_configuration => metric_configuration.to_hash,
-        :configuration_name => metric_configuration.configuration_name})
-    get :create_range, :profile => @profile.identifier, :range => @range_hash, :id => @content.id, :metric_name => @metric.name
-    assert_equal @content, assigns(:configuration_content)
-    assert_equal @range.end, assigns(:range).end
+    Kalibro::Range.expects(:request).with(:save_range, {
+        :metric_configuration_id => @metric_configuration.id,
+        :range => @created_range.to_hash}).returns(:range_id => @range.id)
+    Kalibro::Reading.expects(:find).with(@created_range.reading_id).returns(@reading)
+    get :create, :range => @created_range_hash, :metric_configuration_id => @metric_configuration.id
+    assert_equal @range.id, assigns(:range).id
     assert_response 200
   end
   should 'test update range' do
-    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :get_metric_configuration, {
-      :configuration_name => @content.name,
-      :metric_name => @metric.name}).returns({:metric_configuration => @metric_configuration_hash})
-    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :save_metric_configuration, {
-        :metric_configuration => @metric_configuration.to_hash,
-        :configuration_name => @metric_configuration.configuration_name})
-    get :update_range,
-        :profile => @profile.identifier,
-        :range => @range_hash,
-        :id => @content.id,
-        :metric_name => @metric.name,
-        :beginning_id => @range.beginning
+    Kalibro::Range.expects(:request).with(:save_range, {
+        :metric_configuration_id => @metric_configuration.id,
+        :range => @range.to_hash}).returns(:range_id => @range.id)
+    Kalibro::Reading.expects(:find).with(@range.reading_id).returns(@reading)
+    get :update, :range => @range_hash, :metric_configuration_id => @metric_configuration.id
+    assert_equal @range.id, assigns(:range).id
     assert_response 200
   end
-  should 'test remove range' do
-    metric_configuration = @metric_configuration
-    metric_configuration.ranges.delete_if { |range| range.beginning == @range.beginning.to_f }
-    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :get_metric_configuration, {
-      :configuration_name => @content.name,
-      :metric_name => @metric.name}).returns({:metric_configuration => @metric_configuration_hash})
-    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :save_metric_configuration, {
-        :metric_configuration => metric_configuration.to_hash,
-        :configuration_name => metric_configuration.configuration_name})
-    get :remove_range,
-        :profile => @profile.identifier,
-        :id => @content.id,
-        :metric_name => @metric.name,
-        :beginning_id => @range.beginning
+  should 'test remove range in native metric configuration' do
+    Kalibro::Range.expects(:new).with({:id => @range.id}).returns(@range)
+    @range.expects(:destroy).with().returns()
+    get :remove, :id => @content.id, :metric_configuration_id => @metric_configuration.id, :range_id => @range.id, :compound => false
      assert_response 302
   end
 end
@@ -42,7 +42,7 @@
 <br/>
 <% if owner %>
-  <%= link_to_remote "New Range", :url => {:action =>"new_range", :controller => "mezuro_plugin_range", :id => @configuration_content.id, :metric_configuration_id => @metric_configuration.id, :reading_group_id => @metric_configuration.reading_group_id} %>
+  <%= link_to_remote "New Range", :url => {:action =>"new", :controller => "mezuro_plugin_range", :id => @configuration_content.id, :metric_configuration_id => @metric_configuration.id, :reading_group_id => @metric_configuration.reading_group_id} %>
 <% end %>
-<div id="range_form" style="display:none"></div>
+<div id="form" style="display:none"></div>
@@ -0,0 +1,4 @@
+<% remote_form_for :range, :url => {:action =>"update", :controller => "mezuro_plugin_range"}, :method => :get do |f| %>
+  <%= hidden_field_tag :beginning_id, @beginning_id %>
+  <%= render :partial => "form", :locals => {:f => f} %>
+<% end %>
@@ -1,4 +0,0 @@
-<% remote_form_for :range, :url => {:action =>"update_range", :controller => "mezuro_plugin_range"}, :method => :get do |f| %>
-  <%= hidden_field_tag :beginning_id, @beginning_id %>
-  <%= render :partial => "range_form", :locals => {:f => f} %>
-<% end %>
@@ -0,0 +1,35 @@
+<%= hidden_field_tag :id, @content_id %>
+<%= hidden_field_tag :metric_configuration_id, @metric_configuration_id %>
+
+<%= f.hidden_field :id %>
+
+  <%= required labelled_form_field _('Label'),
+  f.select(:reading_id, @reading_labels_and_ids, :selected => @selected_reading_label) %><br/>
+<table>
+  <tr>
+    <td>
+      <%= f.label :beginning, "(*) Beginning:" %>
+    </td>
+    <td>
+      <%= required f.text_field :beginning, :id => "range_beginning" %>&nbsp;<%= link_to('-&#8734', 'javascript:void(0)', :onClick => "jQuery( '#range_beginning' ).val('-INF');") %>
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <%= f.label :end, "(*) End:" %>
+    </td>
+    <td>
+      <%= required f.text_field(:end, :id => "range_end") %>&nbsp;<%= link_to('+&#8734', 'javascript:void(0)', :onClick => "jQuery( '#range_end' ).val('+INF');") %>
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <%= f.label :comments, "(*) Comments:" %>
+    </td>
+    <td>
+      <%= required f.text_area :comments, :rows => 3 %>
+    </td>
+  </tr>
+</table>
+<br/>
+<%= f.submit "Save Range" %>
@@ -0,0 +1,3 @@
+<% remote_form_for :range, :url => {:action =>"create", :controller => "mezuro_plugin_range"}, :method => :get do |f| %>
+  <%= render :partial => "form", :locals => {:f => f} %>
+<% end %>
@@ -1,3 +0,0 @@
-<% remote_form_for :range, :url => {:action =>"create_range", :controller => "mezuro_plugin_range"}, :method => :get do |f| %>
-  <%= render :partial => "range_form", :locals => {:f => f} %>
-<% end %>
@@ -13,9 +13,9 @@
   </td>
   <td bgcolor="#<%= range.color %>"></td>
   <% if (not user.nil?) && user.id == @profile.id %>
-  <td><%= link_to_remote "Edit", :url => {:action =>"edit_range", :controller => "mezuro_plugin_range", :id => params[:id], :metric_configuration_id => params[:metric_configuration_id], :range_id => range.id, :reading_group_id => reading_group_id} %>
+  <td><%= link_to_remote "Edit", :url => {:action =>"edit", :controller => "mezuro_plugin_range", :id => params[:id], :metric_configuration_id => params[:metric_configuration_id], :range_id => range.id, :reading_group_id => reading_group_id} %>
   </td>
-    <td><%= link_to "Remove", :action =>"remove_range", :controller => "mezuro_plugin_range", :id => params[:id], :metric_configuration_id => params[:metric_configuration_id], :range_id => range.id, :compound => compound %>
+    <td><%= link_to "Remove", :action =>"remove", :controller => "mezuro_plugin_range", :id => params[:id], :metric_configuration_id => params[:metric_configuration_id], :range_id => range.id, :compound => compound %>
     </td>
   <% else %>
     <td></td>
@@ -1,35 +0,0 @@
-<%= hidden_field_tag :id, @content_id %>
-<%= hidden_field_tag :metric_configuration_id, @metric_configuration_id %>
-
-<%= f.hidden_field :id %>
-
-  <%= required labelled_form_field _('Label'),
-  f.select(:reading_id, @reading_labels_and_ids) %><br/>
-<table>
-  <tr>
-    <td>
-      <%= f.label :beginning, "(*) Beginning:" %>
-    </td>
-    <td>
-      <%= required f.text_field :beginning, :id => "range_beginning" %>&nbsp;<%= link_to('-&#8734', 'javascript:void(0)', :onClick => "jQuery( '#range_beginning' ).val('-INF');") %>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <%= f.label :end, "(*) End:" %>
-    </td>
-    <td>
-      <%= required f.text_field(:end, :id => "range_end") %>&nbsp;<%= link_to('+&#8734', 'javascript:void(0)', :onClick => "jQuery( '#range_end' ).val('+INF');") %>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <%= f.label :comments, "(*) Comments:" %>
-    </td>
-    <td>
-      <%= required f.text_area :comments, :rows => 3 %>
-    </td>
-  </tr>
-</table>
-<br/>
-<%= f.submit "Save Range" %>
@@ -0,0 +1,6 @@
+if @error.nil?
+  page.visual_effect :toggle_slide, "form"
+  page.insert_html :bottom, "ranges", :partial => "range", :locals => {:range => @range}
+else
+  page.alert @error
+end
@@ -1,6 +0,0 @@
-if @error.nil?
-  page.visual_effect :toggle_slide, "range_form"
-  page.insert_html :bottom, "ranges", :partial => "range", :locals => {:range => @range}
-else
-  page.alert @error
-end
@@ -0,0 +1,3 @@
+page.replace_html 'form', :partial => "edit", :locals => {:range => @range}
+page.visual_effect :slide_down, "form"
+
@@ -1,3 +0,0 @@
-page.replace_html 'range_form', :partial => "edit_range", :locals => {:range => @range}
-page.visual_effect :slide_down, "range_form"
-
@@ -0,0 +1,3 @@
+page.replace_html 'form', :partial => "new"
+page.visual_effect :slide_down, "form"
+
@@ -1,3 +0,0 @@
-page.replace_html 'range_form', :partial => "new_range"
-page.visual_effect :slide_down, "range_form"
-
@@ -0,0 +1,5 @@
+if @error.nil?
+  page.reload()
+else
+  page.alert @error
+end
@@ -1,5 +0,0 @@
-if @error.nil?
-  page.reload()
-else
-  page.alert @error
-end
	@@ -42,7 +42,7 @@		@@ -42,7 +42,7 @@
42		42
43	<br/>	43	<br/>
44	<% if owner %>	44	<% if owner %>
45	- <%= link_to_remote "New Range", :url => {:action =>"new_range", :controller => "mezuro_plugin_range", :id => @configuration_content.id, :metric_configuration_id => @metric_configuration.id, :reading_group_id => @metric_configuration.reading_group_id} %>	45	+ <%= link_to_remote "New Range", :url => {:action =>"new", :controller => "mezuro_plugin_range", :id => @configuration_content.id, :metric_configuration_id => @metric_configuration.id, :reading_group_id => @metric_configuration.reading_group_id} %>
46	<% end %>	46	<% end %>
47	-<div id="range_form" style="display:none"></div>	47	+<div id="form" style="display:none"></div>
48		48
@@ -0,0 +1,4 @@		@@ -0,0 +1,4 @@
	1	+<% remote_form_for :range, :url => {:action =>"update", :controller => "mezuro_plugin_range"}, :method => :get do \|f\| %>
	2	+ <%= hidden_field_tag :beginning_id, @beginning_id %>
	3	+ <%= render :partial => "form", :locals => {:f => f} %>
	4	+<% end %>
	@@ -1,4 +0,0 @@	@@ -1,4 +0,0 @@
1	-<% remote_form_for :range, :url => {:action =>"update_range", :controller => "mezuro_plugin_range"}, :method => :get do \|f\| %>
2	- <%= hidden_field_tag :beginning_id, @beginning_id %>
3	- <%= render :partial => "range_form", :locals => {:f => f} %>
4	-<% end %>
@@ -0,0 +1,35 @@		@@ -0,0 +1,35 @@
	1	+<%= hidden_field_tag :id, @content_id %>
	2	+<%= hidden_field_tag :metric_configuration_id, @metric_configuration_id %>
	3	+
	4	+<%= f.hidden_field :id %>
	5	+
	6	+ <%= required labelled_form_field _('Label'),
	7	+ f.select(:reading_id, @reading_labels_and_ids, :selected => @selected_reading_label) %><br/>
	8	+<table>
	9	+ <tr>
	10	+ <td>
	11	+ <%= f.label :beginning, "(*) Beginning:" %>
	12	+ </td>
	13	+ <td>
	14	+ <%= required f.text_field :beginning, :id => "range_beginning" %> <%= link_to('-&#8734', 'javascript:void(0)', :onClick => "jQuery( '#range_beginning' ).val('-INF');") %>
	15	+ </td>
	16	+ </tr>
	17	+ <tr>
	18	+ <td>
	19	+ <%= f.label :end, "(*) End:" %>
	20	+ </td>
	21	+ <td>
	22	+ <%= required f.text_field(:end, :id => "range_end") %> <%= link_to('+&#8734', 'javascript:void(0)', :onClick => "jQuery( '#range_end' ).val('+INF');") %>
	23	+ </td>
	24	+ </tr>
	25	+ <tr>
	26	+ <td>
	27	+ <%= f.label :comments, "(*) Comments:" %>
	28	+ </td>
	29	+ <td>
	30	+ <%= required f.text_area :comments, :rows => 3 %>
	31	+ </td>
	32	+ </tr>
	33	+</table>
	34	+<br/>
	35	+<%= f.submit "Save Range" %>
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+<% remote_form_for :range, :url => {:action =>"create", :controller => "mezuro_plugin_range"}, :method => :get do \|f\| %>
	2	+ <%= render :partial => "form", :locals => {:f => f} %>
	3	+<% end %>
	@@ -1,3 +0,0 @@	@@ -1,3 +0,0 @@
1	-<% remote_form_for :range, :url => {:action =>"create_range", :controller => "mezuro_plugin_range"}, :method => :get do \|f\| %>
2	- <%= render :partial => "range_form", :locals => {:f => f} %>
3	-<% end %>
	@@ -13,9 +13,9 @@		@@ -13,9 +13,9 @@
13	</td>	13	</td>
14	<td bgcolor="#<%= range.color %>"></td>	14	<td bgcolor="#<%= range.color %>"></td>
15	<% if (not user.nil?) && user.id == @profile.id %>	15	<% if (not user.nil?) && user.id == @profile.id %>
16	- <td><%= link_to_remote "Edit", :url => {:action =>"edit_range", :controller => "mezuro_plugin_range", :id => params[:id], :metric_configuration_id => params[:metric_configuration_id], :range_id => range.id, :reading_group_id => reading_group_id} %>	16	+ <td><%= link_to_remote "Edit", :url => {:action =>"edit", :controller => "mezuro_plugin_range", :id => params[:id], :metric_configuration_id => params[:metric_configuration_id], :range_id => range.id, :reading_group_id => reading_group_id} %>
17	</td>	17	</td>
18	- <td><%= link_to "Remove", :action =>"remove_range", :controller => "mezuro_plugin_range", :id => params[:id], :metric_configuration_id => params[:metric_configuration_id], :range_id => range.id, :compound => compound %>	18	+ <td><%= link_to "Remove", :action =>"remove", :controller => "mezuro_plugin_range", :id => params[:id], :metric_configuration_id => params[:metric_configuration_id], :range_id => range.id, :compound => compound %>
19	</td>	19	</td>
20	<% else %>	20	<% else %>
21	<td></td>	21	<td></td>
	@@ -1,35 +0,0 @@	@@ -1,35 +0,0 @@
1	-<%= hidden_field_tag :id, @content_id %>
2	-<%= hidden_field_tag :metric_configuration_id, @metric_configuration_id %>
3	-
4	-<%= f.hidden_field :id %>
5	-
6	- <%= required labelled_form_field _('Label'),
7	- f.select(:reading_id, @reading_labels_and_ids) %><br/>
8	-<table>
9	- <tr>
10	- <td>
11	- <%= f.label :beginning, "(*) Beginning:" %>
12	- </td>
13	- <td>
14	- <%= required f.text_field :beginning, :id => "range_beginning" %> <%= link_to('-&#8734', 'javascript:void(0)', :onClick => "jQuery( '#range_beginning' ).val('-INF');") %>
15	- </td>
16	- </tr>
17	- <tr>
18	- <td>
19	- <%= f.label :end, "(*) End:" %>
20	- </td>
21	- <td>
22	- <%= required f.text_field(:end, :id => "range_end") %> <%= link_to('+&#8734', 'javascript:void(0)', :onClick => "jQuery( '#range_end' ).val('+INF');") %>
23	- </td>
24	- </tr>
25	- <tr>
26	- <td>
27	- <%= f.label :comments, "(*) Comments:" %>
28	- </td>
29	- <td>
30	- <%= required f.text_area :comments, :rows => 3 %>
31	- </td>
32	- </tr>
33	-</table>
34	-<br/>
35	-<%= f.submit "Save Range" %>
@@ -0,0 +1,6 @@		@@ -0,0 +1,6 @@
	1	+if @error.nil?
	2	+ page.visual_effect :toggle_slide, "form"
	3	+ page.insert_html :bottom, "ranges", :partial => "range", :locals => {:range => @range}
	4	+else
	5	+ page.alert @error
	6	+end
	@@ -1,6 +0,0 @@	@@ -1,6 +0,0 @@
1	-if @error.nil?
2	- page.visual_effect :toggle_slide, "range_form"
3	- page.insert_html :bottom, "ranges", :partial => "range", :locals => {:range => @range}
4	-else
5	- page.alert @error
6	-end