[Mezuro] Show ranges in metric configuration edition view.

João M. M. da Silva · Paulo Meireles
1 parent 34a1e40f
Showing 5 changed files with 47 additions and 71 deletions Show diff stats
plugins/mezuro/controllers/myprofile/mezuro_plugin_metric_configuration_controller.rb
plugins/mezuro/controllers/myprofile/mezuro_plugin_range_controller.rb
plugins/mezuro/lib/kalibro/range.rb
plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_native.html.erb
plugins/mezuro/views/mezuro_plugin_range/_range_form.html.erb
@@ -33,6 +33,7 @@ class MezuroPluginMetricConfigurationController &lt; MezuroPluginMyprofileControlle
     @metric_configuration = find_metric_configuration(metric_configurations, params[:metric_configuration_id].to_i)
     @metric = @metric_configuration.metric
     @reading_group_names_and_ids = reading_group_names_and_ids
+    @ranges = Kalibro::Range.ranges_of(@metric_configuration.id)
   end
 =begin
   def new_compound_metric_configuration
@@ -4,62 +4,41 @@ class MezuroPluginRangeController &lt; MezuroPluginMyprofileController
   def new_range
     @content_id = params[:id]
-    @metric_name = params[:metric_name]
-    @range = Kalibro::Range.new
-    @range_color = "#000000"
+    @metric_configuration_id = params[:metric_configuration_id]
   end
   def edit_range
-    @beginning_id = params[:beginning_id]
+    @range = Kalibro::Range.new(params[:range])
     @content_id = params[:id]
-    configuration_name = profile.articles.find(@content_id).name
-    @metric_name = params[:metric_name]
-    metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(configuration_name, @metric_name)
-    @range = metric_configuration.ranges.find{|range| range.beginning == @beginning_id.to_f || @beginning_id =="-INF" }
-    @range_color = "#" + @range.color.to_s.gsub(/^ff/, "")
+    @metric_configuration_id = params[:metric_configuration_id]
   end
   def create_range
-    @configuration_content = profile.articles.find(params[:id])
+    metric_configuration_id = params[:metric_configuration_id].to_i
     @range = Kalibro::Range.new params[:range]
-    metric_name = params[:metric_name]
-    metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, metric_name)
-    metric_configuration.add_range(@range)
-    metric_configuration.save
-    if metric_configuration_has_errors? metric_configuration
+    @range.save metric_configuration_id
+    if !@range.errors.empty?
       @error = metric_configuration.errors[0].message
     end
   end
   def update_range
-    configuration_content = profile.articles.find(params[:id])
-    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 || beginning_id == "-INF" }
-    metric_configuration.ranges[index] = Kalibro::Range.new params[:range]
-    metric_configuration.save
-    if metric_configuration_has_errors? metric_configuration
+    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
     end
   end
   def remove_range
-    configuration_content = profile.articles.find(params[:id])
-    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 || beginning_id == "-INF" }
-    metric_configuration.save
-    if metric_configuration_has_errors? metric_configuration
-      redirect_to_error_page metric_configuration.errors[0].message
+    configuration_content_id = params[:id]
+    metric_configuration_id = params[:metric_configuration_id]
+    Kalibro::Range.new(params[:range]).destroy
+    if metric_configuration.metric.compound
+      redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/metric_configuration/edit_compound_metric_configuration?id=#{configuration_content_id}&metric_configuration_id=#{metric_configuration_id}"
     else
-      formatted_metric_name = metric_name.gsub(/\s/, '+')
-      if metric_configuration.metric.class == Kalibro::CompoundMetric
-        redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/metric_configuration/edit_compound_metric_configuration?id=#{configuration_content.id}&metric_name=#{formatted_metric_name}"
-      else
-        redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/metric_configuration/edit_metric_configuration?id=#{configuration_content.id}&metric_name=#{formatted_metric_name}"
-      end
+      redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/metric_configuration/edit_native_metric_configuration?id=#{configuration_content_id}&metric_configuration_id=#{metric_configuration_id}"
     end
   end
@@ -30,16 +30,23 @@ class Kalibro::Range &lt; Kalibro::Model
     end
   end
-  def grade=(value)
-    @grade = value.to_f
+  def label
+    reading.label
+  end
+
+  def grade
+    reading.grade
+  end
+
+  def color
+    reading.color
   end
-	def mezuro_color
-		@color.nil? ? "e4ca2d" : @color.gsub(/^ff/, "")
-	end
-	
 	def self.ranges_of( metric_configuration_id )
-    request(:ranges_of, {:metric_configuration_id => metric_configuration_id} )[:range].to_a.map { |range| new range }
+    response = request(:ranges_of, {:metric_configuration_id => metric_configuration_id} )[:range]
+    response = [] if response.nil?
+    response = [response] if response.is_a?(Hash) 
+    response.map { |range| new range }
   end
   def save( metric_configuration_id )
@@ -52,4 +59,12 @@ class Kalibro::Range &lt; Kalibro::Model
 	  end
   end
+  private
+  
+  def reading
+    @reading ||= Kalibro::Reading.find(reading_id)
+    @reading
+  end
+
 end
+
@@ -34,20 +34,15 @@
     <td></td>    
     <td></td>
   </tr>
-  <%# if (@metric_configuration.ranges!=nil) 
-  #  @metric_configuration.ranges.each do |range| 
-  %>
-      <%= #render :partial => "mezuro_plugin_range/range", :locals => {:range => range, :id => @configuration_content.id, 
-         # :metric_name => @metric.name} 
-         %>
-    <% #end
- # end 
- %>
+  <% @ranges.each do |range| %>
+      <%= render :partial => "mezuro_plugin_range/range", :locals => {:range => range, :id => @configuration_content.id, 
+          :metric_configuration_id => @metric_configuration.id} %>
+  <% end %>
 </table>
 <br/>
 <% if owner %>
-  <%= link_to_remote "New Range", :url => {:action =>"new_range", :controller => "mezuro_plugin_range", :id => @configuration_content.id, :metric_name => @metric_configuration.id} %>
+  <%= link_to_remote "New Range", :url => {:action =>"new_range", :controller => "mezuro_plugin_range", :id => @configuration_content.id, :metric_configuration_id => @metric_configuration.id} %>
 <% end %>
 <div id="range_form" style="display:none"></div>
 <%= hidden_field_tag :id, @content_id %>
-<%= hidden_field_tag :metric_name, @metric_name %>
+<%= hidden_field_tag :metric_configuration_id, @metric_configuration_id %>
+
+<%= f.hidden_field :id %>
 <table>
   <tr>
     <td>
-      <%= f.label :label, "(*) Label:" %>
-    </td>
-    <td>
-      <%= f.text_field :label %>
-    </td>
-  </tr>
-  <tr>
-    <td>
       <%= f.label :beginning, "(*) Beginning:" %>
     </td>
     <td>
@@ -36,14 +30,6 @@
   </tr>
   <tr>
     <td>
-      <%= f.label :color, "(*) Color:" %>
-    </td>
-    <td>
-      <%= colorpicker_field(:range, :color, :value => @range.mezuro_color) %>Click in the field to change Color
-    </td>
-  </tr>
-  <tr>
-    <td>
       <%= f.label :comments, "Comments:" %>
     </td>
     <td>
	@@ -30,16 +30,23 @@ class Kalibro::Range < Kalibro::Model		@@ -30,16 +30,23 @@ class Kalibro::Range < Kalibro::Model
30	end	30	end
31	end	31	end
32		32
33	- def grade=(value)
34	- @grade = value.to_f	33	+ def label
		34	+ reading.label
		35	+ end
		36	+
		37	+ def grade
		38	+ reading.grade
		39	+ end
		40	+
		41	+ def color
		42	+ reading.color
35	end	43	end
36		44
37	- def mezuro_color
38	- @color.nil? ? "e4ca2d" : @color.gsub(/^ff/, "")
39	- end
40	-
41	def self.ranges_of( metric_configuration_id )	45	def self.ranges_of( metric_configuration_id )
42	- request(:ranges_of, {:metric_configuration_id => metric_configuration_id} )[:range].to_a.map { \|range\| new range }	46	+ response = request(:ranges_of, {:metric_configuration_id => metric_configuration_id} )[:range]
		47	+ response = [] if response.nil?
		48	+ response = [response] if response.is_a?(Hash)
		49	+ response.map { \|range\| new range }
43	end	50	end
44		51
45	def save( metric_configuration_id )	52	def save( metric_configuration_id )
	@@ -52,4 +59,12 @@ class Kalibro::Range < Kalibro::Model		@@ -52,4 +59,12 @@ class Kalibro::Range < Kalibro::Model
52	end	59	end
53	end	60	end
54		61
		62	+ private
		63	+
		64	+ def reading
		65	+ @reading \|\|= Kalibro::Reading.find(reading_id)
		66	+ @reading
		67	+ end
		68	+
55	end	69	end
		70	+