[Mezuro] Fixed RangeSnapshot model and view

Rafael Manzo · Rafael Manzo
1 parent 9843d7f9
Showing 4 changed files with 36 additions and 7 deletions Show diff stats
plugins/mezuro/lib/kalibro/metric_configuration_snapshot.rb
plugins/mezuro/test/fixtures/metric_configuration_snapshot_fixtures.rb
plugins/mezuro/test/unit/kalibro/metric_configuration_snapshot_test.rb
plugins/mezuro/views/mezuro_plugin_module_result/_metric_results.rhtml
@@ -11,11 +11,24 @@ class Kalibro::MetricConfigurationSnapshot &lt; Kalibro::Model
   end
   def range=(value)
-    @range = Kalibro::RangeSnapshot.to_object value
+    value.to_a
+    @range = []
+
+    value.each do |range_snapshot|
+      @range << Kalibro::RangeSnapshot.to_object(range_snapshot)
+    end
+
   end
   def range_snapshot
     range
   end
+  def to_hash
+    hash = super
+    hash[:attributes!][:range] = {'xmlns:xsi'=> 'http://www.w3.org/2001/XMLSchema-instance',
+                    'xsi:type' => 'kalibro:rangeSnapshotXml'  }
+    hash
+  end
+
 end
@@ -14,7 +14,7 @@ class MetricConfigurationSnapshotFixtures
       :aggregation_form => 'AVERAGE',
       :metric => MetricFixtures.amloc_hash,
       :base_tool_name => "Analizo",
-      :range => RangeSnapshotFixtures.range_snapshot_hash,
+      :range => [RangeSnapshotFixtures.range_snapshot_hash],
       :attributes! => {
         :metric => {
           'xmlns:xsi'=> 'http://www.w3.org/2001/XMLSchema-instance',
@@ -26,6 +26,16 @@ class MetricConfigurationSnapshotFixtures
     }
   end
+  def self.metric_configuration_snapshot_with_2_elements
+    Kalibro::MetricConfigurationSnapshot.new  metric_configuration_snapshot_hash_with_2_elements
+  end
+
+  def self.metric_configuration_snapshot_hash_with_2_elements
+    hash = self.metric_configuration_snapshot_hash
+    hash[:range] << RangeSnapshotFixtures.range_snapshot_hash
+    hash
+  end
+
   def self.compound_metric_configuration_snapshot
     Kalibro::MetricConfigurationSnapshot.new compound_metric_configuration_snapshot_hash
   end
@@ -6,15 +6,19 @@ class MetricConfigurationSnapshotTest &lt; ActiveSupport::TestCase
   def setup
     @hash = MetricConfigurationSnapshotFixtures.metric_configuration_snapshot_hash
+    @hash2 = MetricConfigurationSnapshotFixtures.metric_configuration_snapshot_hash_with_2_elements
     @metric_configuration_snapshot = MetricConfigurationSnapshotFixtures.metric_configuration_snapshot
+    @metric_configuration_snapshot2 = MetricConfigurationSnapshotFixtures.metric_configuration_snapshot_with_2_elements
   end
-  should 'create metric configuration snapshot from hash' do
+  should 'create and convert metric configuration snapshot from hash' do
     assert_equal @hash[:code], Kalibro::MetricConfigurationSnapshot.new(@hash).code
+    assert_equal @hash, @metric_configuration_snapshot.to_hash
   end
-  should 'convert metric configuration snapshot to hash' do
-    assert_equal @hash, @metric_configuration_snapshot.to_hash
+  should 'create and convert metric configuration snapshot from hash with 2 elements' do
+    assert_equal @hash2[:code], Kalibro::MetricConfigurationSnapshot.new(@hash2).code
+    assert_equal @hash2, @metric_configuration_snapshot2.to_hash
   end
 end
@@ -9,13 +9,14 @@
 <tbody>
   <% @metric_results.each do |metric_result|  %>
     <% metric_configuration_snapshot = metric_result.metric_configuration_snapshot%>
-    <% range_snapshot = metric_configuration_snapshot.range_snapshot %>
+    <% range_snapshots = metric_configuration_snapshot.range_snapshot %>
     <% formatted_name = MezuroPlugin::Helpers::ContentViewerHelper.format_name(metric_configuration_snapshot) %>
-    <% if !range_snapshot.nil? %>
+    <% if !range_snapshots.nil? %>
       <tr>
         <td style="width: 74%"><a href="#" show-metric-history="<%= formatted_name %>" data-module-id="<%= @module_result.id %>"><%= metric_configuration_snapshot.metric.name %></a></td>
         <td><%= MezuroPlugin::Helpers::ContentViewerHelper.format_grade(metric_result.value) %></td>
         <td><%= metric_configuration_snapshot.weight %></td>
+      <% range_snapshots.each do |range_snapshot| %>
         <% if range_snapshot.beginning.to_f <= metric_result.value and range_snapshot.end.to_f > metric_result.value %>
         <td style="background-color: #<%= range_snapshot.color %>">
           <span title="<%= range_snapshot.comments %>" >
@@ -33,6 +34,7 @@
         </td>
       </tr>
       <% end %>
+      <% end %>
     <% end %>
   <% end %>
 </tbody>
	@@ -11,11 +11,24 @@ class Kalibro::MetricConfigurationSnapshot < Kalibro::Model		@@ -11,11 +11,24 @@ class Kalibro::MetricConfigurationSnapshot < Kalibro::Model
11	end	11	end
12		12
13	def range=(value)	13	def range=(value)
14	- @range = Kalibro::RangeSnapshot.to_object value	14	+ value.to_a
		15	+ @range = []
		16	+
		17	+ value.each do \|range_snapshot\|
		18	+ @range << Kalibro::RangeSnapshot.to_object(range_snapshot)
		19	+ end
		20	+
15	end	21	end
16		22
17	def range_snapshot	23	def range_snapshot
18	range	24	range
19	end	25	end
20		26
		27	+ def to_hash
		28	+ hash = super
		29	+ hash[:attributes!][:range] = {'xmlns:xsi'=> 'http://www.w3.org/2001/XMLSchema-instance',
		30	+ 'xsi:type' => 'kalibro:rangeSnapshotXml' }
		31	+ hash
		32	+ end
		33	+
21	end	34	end