[Mezuro] Fixed range edition.

Diego Camarinha · Paulo Meireles
1 parent 8bf5768c
Showing 3 changed files with 24 additions and 13 deletions Show diff stats
plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb
plugins/mezuro/lib/kalibro/range.rb
plugins/mezuro/views/mezuro_plugin_myprofile/_range_form.html.erb
@@ -78,6 +78,7 @@ class MezuroPluginMyprofileController &lt; ProfileController
   def new_range
     @configuration_content = profile.articles.find(params[:id])
     @metric_name = params[:metric_name]
+    @range = Kalibro::Range.new
   end
   def edit_range
@@ -85,7 +86,7 @@ class MezuroPluginMyprofileController &lt; ProfileController
     @metric_name = params[:metric_name]
     @beginning_id = params[:beginning_id]
     metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, @metric_name)
-    @range = metric_configuration.ranges.find{|range| range.beginning == @beginning_id.to_f || ( @beginning_id =="-Infinity" && range.beginning == -1.0/0.0) }
+    @range = metric_configuration.ranges.find{|range| range.beginning == @beginning_id.to_f || @beginning_id =="-INF" }
   end
   def create_range
@@ -102,7 +103,7 @@ class MezuroPluginMyprofileController &lt; ProfileController
     metric_name = params[:metric_name]
     beginning_id = params[:beginning_id]
     metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(configuration_content.name, metric_name)
-    index = metric_configuration.ranges.index{ |range| range.beginning == beginning_id.to_f }
+    index = metric_configuration.ranges.index{ |range| range.beginning == beginning_id.to_f || beginning_id == "-INF" }
     metric_configuration.ranges[index] = Kalibro::Range.new params[:range]
     metric_configuration.save
   end
@@ -112,7 +113,7 @@ class MezuroPluginMyprofileController &lt; ProfileController
     metric_name = params[:metric_name]
     beginning_id = params[:beginning_id]
     metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(configuration_content.name, metric_name)
-    metric_configuration.ranges.delete_if { |range| range.beginning == beginning_id.to_f }
+    metric_configuration.ranges.delete_if { |range| range.beginning == beginning_id.to_f || beginning_id == "-INF" }
     metric_configuration.save
     formatted_metric_name = metric_name.gsub(/\s/, '+')
     if metric_configuration.metric.class == Kalibro::CompoundMetric
@@ -7,11 +7,29 @@ class Kalibro::Range &lt; Kalibro::Model
     @beginning = -1.0/0.0 if value == "-INF"
   end
+  def beginning
+    if !@beginning.nil?
+      case @beginning.to_s
+        when "-Infinity": "-INF"
+        else @beginning
+      end
+    end
+  end
+
   def end=(value)
     @end = value.to_f
     @end = 1.0/0.0 if value == "INF"
   end
+  def end
+    if !@end.nil?
+      case @end.to_s
+        when "Infinity": "INF"
+        else @end
+      end
+    end
+  end
+
   def grade=(value)
     @grade = value.to_f
   end
@@ -14,11 +14,7 @@
       <%= f.label :beginning, "(*) Beginning:" %>
     </td>
     <td>
-      <% if @range.beginning.to_s == "-Infinity" %>
-        <%= f.text_field :beginning, :value => "-INF" %>
-      <% else %>
-        <%= f.text_field :beginning %>
-      <% end %>
+      <%= f.text_field :beginning, :value => @range.beginning %>
     </td>
   </tr>
   <tr>
@@ -26,11 +22,7 @@
       <%= f.label :end, "(*) End:" %>
     </td>
     <td>
-      <% if @range.end.to_s == "Infinity" %>
-        <%= f.text_field :end, :value => "INF" %>
-      <% else %>
-        <%= f.text_field :end %>
-      <% end %>
+      <%= f.text_field :end, :value => @range.end %>
     </td>
   </tr>
   <tr>
	@@ -7,11 +7,29 @@ class Kalibro::Range < Kalibro::Model		@@ -7,11 +7,29 @@ class Kalibro::Range < Kalibro::Model
7	@beginning = -1.0/0.0 if value == "-INF"	7	@beginning = -1.0/0.0 if value == "-INF"
8	end	8	end
9		9
		10	+ def beginning
		11	+ if !@beginning.nil?
		12	+ case @beginning.to_s
		13	+ when "-Infinity": "-INF"
		14	+ else @beginning
		15	+ end
		16	+ end
		17	+ end
		18	+
10	def end=(value)	19	def end=(value)
11	@end = value.to_f	20	@end = value.to_f
12	@end = 1.0/0.0 if value == "INF"	21	@end = 1.0/0.0 if value == "INF"
13	end	22	end
14		23
		24	+ def end
		25	+ if !@end.nil?
		26	+ case @end.to_s
		27	+ when "Infinity": "INF"
		28	+ else @end
		29	+ end
		30	+ end
		31	+ end
		32	+
15	def grade=(value)	33	def grade=(value)
16	@grade = value.to_f	34	@grade = value.to_f
17	end	35	end