[Mezuro] fixed history view, finished module_result view and metric_results view

João M. M. da Silva + Alessandro Palmeira · João M. M. da Silva
1 parent b18ed7d2
Showing 10 changed files with 94 additions and 102 deletions Show diff stats
plugins/mezuro/controllers/profile/mezuro_plugin_module_result_controller.rb
plugins/mezuro/lib/kalibro/date_metric_result.rb
plugins/mezuro/lib/kalibro/date_module_result.rb
plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb
plugins/mezuro/test/fixtures/metric_configuration_snapshot_fixtures.rb
plugins/mezuro/test/functional/profile/mezuro_plugin_module_result_controller_test.rb
plugins/mezuro/views/mezuro_plugin_module_result/_metric_results.rhtml
plugins/mezuro/views/mezuro_plugin_module_result/_module_result.rhtml
plugins/mezuro/views/mezuro_plugin_module_result/_score_history.rhtml
plugins/mezuro/views/mezuro_plugin_module_result/_source_tree.rhtml
@@ -4,15 +4,10 @@ class MezuroPluginModuleResultController &lt; MezuroPluginProfileController
   def module_result
     @module_result = Kalibro::ModuleResult.find(params[:module_result_id].to_i)
+    @metric_results = Kalibro::MetricResult.metric_results_of(@module_result.id)
     render :partial => 'module_result'
   end
-  def metric_results
-    @module_result_id = params[:module_result_id].to_i
-    @metric_results = Kalibro::MetricResult.metric_results_of(@module_result_id)
-    render :partial => 'metric_results'
-  end
- 
   def metric_result_history
     @history = Kalibro::MetricResult.history_of(params[:metric_name], params[:module_result_id].to_i)
     render :partial => 'score_history'
@@ -9,5 +9,8 @@ class Kalibro::DateMetricResult &lt; Kalibro::Model
   def metric_result=(value)
     @metric_result = Kalibro::MetricResult.to_object value
   end
-  
+
+  def result
+    @metric_result.value
+  end
 end
@@ -10,4 +10,8 @@ class Kalibro::DateModuleResult &lt; Kalibro::Model
     @module_result = Kalibro::ModuleResult.to_object value
   end
+  def result
+    @module_result.grade
+  end
+  
 end
@@ -26,8 +26,8 @@ class MezuroPlugin::Helpers::ContentViewerHelper
     values = []
     labels = []
     score_history.each do |score_data|
-      values << score_data.first
-      labels << score_data.last
+      values << score_data.result
+      labels << score_data.date
     end
     labels = discretize_array labels
     Gchart.line(
@@ -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',
@@ -34,7 +34,7 @@ class MetricConfigurationSnapshotFixtures
       :aggregation_form => 'AVERAGE',
       :metric => MetricFixtures.compound_metric,
       :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',
@@ -22,18 +22,11 @@ class MezuroPluginModuleResultControllerTest &lt; ActionController::TestCase
   should 'find module result on kalibro' do
     Kalibro::ModuleResult.expects(:request).with(:get_module_result, { :module_result_id => @module_result_hash[:id] }).
         returns({:module_result => @module_result_hash})
-    get :module_result, :profile => @profile.identifier, :module_result_id => @module_result_hash[:id]
-    assert_equal @module_result_hash[:grade], assigns(:module_result).grade
-    assert_response 200
-    #TODO assert_select('h5', 'Metric results for: Qt-Calculator (APPLICATION)')
-  end
-
-  should 'get metric_results' do
     Kalibro::MetricResult.expects(:request).with(:metric_results_of, { :module_result_id => @module_result_hash[:id] }).
         returns({:metric_result => @metric_result_hash})
-    get :metric_results, :profile => @profile.identifier, :module_result_id => @module_result_hash[:id]
+    get :module_result, :profile => @profile.identifier, :module_result_id => @module_result_hash[:id]
+    assert_equal @module_result_hash[:grade], assigns(:module_result).grade
     assert_equal @metric_result_hash[:value], assigns(:metric_results).first.value
-    assert_equal @module_result_hash[:id], assigns(:module_result_id)
     assert_response 200
     #TODO assert_select('h5', 'Metric results for: Qt-Calculator (APPLICATION)')
   end
@@ -43,7 +36,7 @@ class MezuroPluginModuleResultControllerTest &lt; ActionController::TestCase
     Kalibro::MetricResult.expects(:request).with(:history_of, { :metric_name => metric_name, :module_result_id => @module_result_hash[:id] }).
         returns({:date_metric_result => @date_metric_result_hash})
     get :metric_result_history, :profile => @profile.identifier, :module_result_id => @module_result_hash[:id], :metric_name => metric_name
-    assert_equal @date_metric_result_hash[:date], assigns(:date_metric_results).first.date
+    assert_equal DateTime.parse(@date_metric_result_hash[:date]), assigns(:history).first.date
     assert_response 200
     #TODO assert_select
   end
@@ -52,7 +45,7 @@ class MezuroPluginModuleResultControllerTest &lt; ActionController::TestCase
     Kalibro::ModuleResult.expects(:request).with(:history_of_module, { :module_result_id => @module_result_hash[:id] }).
         returns({:date_module_result => @date_module_result_hash})
     get :module_result_history, :profile => @profile.identifier, :module_result_id => @module_result_hash[:id]
-    assert_equal @date_module_result_hash[:date], assigns(:date_module_results).first.date
+    assert_equal DateTime.parse(@date_module_result_hash[:date]), assigns(:history).first.date
     assert_response 200
     #TODO assert_select
   end
@@ -0,0 +1,36 @@
+<thead>
+  <tr>
+    <th style="width: 74%">Metric</th>
+    <th>Value</th>
+    <th>Weight</th>
+    <th>Threshold</th>
+  </tr>
+</thead>
+<tbody>
+  <% @metric_results.each do |metric_result|  %>
+    <% metric_configuration_snapshot = metric_result.metric_configuration_snapshot%>
+    <% range_snapshot = metric_configuration_snapshot.range_snapshot %>
+    <% formatted_name = MezuroPlugin::Helpers::ContentViewerHelper.format_name(metric_configuration_snapshot) %>
+    <% if !range_snapshot.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>
+        <td style="background-color: #<%= range_snapshot.color %>">
+          <span title="<%= range_snapshot.comments %>" >
+            <%= range_snapshot.label %>
+          </span>
+        </td>
+      </tr>	  
+      <tr class="<%= formatted_name %>" style="display: none;">
+        <td colspan="3">
+          <div id='historical-<%= formatted_name %>'>
+          </div>
+        </td>
+        <td align="right">
+          <%= range_snapshot.comments.nil? ? '' : range_snapshot.comments %>
+        </td> 
+      </tr>
+    <% end %>
+  <% end %>
+</tbody>
-<% module_name = @module_result.module.name
-<h5><%= _('Metric results for: #{module_name} (#{@module_result.module.granularity}) ') %> </h5>
+<% TODO source tree %>
+<h5><%= _('Metric results for: #{@module_result.module.name} (#{@module_result.module.granularity}) ') %> </h5>
 <hr/>
 <div class="zoomable-image">
 <table style="width: 100%">
-  <thead>
-    <tr>
-      <th style="width: 74%">Metric</th>
-      <th>Value</th>
-      <th>Weight</th>
-      <th>Threshold</th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @metric_results.each do |metric_result|  %>
-      <% metric_configuration_snapshot = metric_result.metric_configuration_snapshot%>
-      <% range_snapshot = metric_configuration_snapshot.range_snapshot %>
-      <% formatted_name = MezuroPlugin::Helpers::ContentViewerHelper.format_name(metric_configuration_snapshot) %>
-      <% if !range_snapshot.nil? %>
-        <tr>
-          <td style="width: 74%"><a href="#" show-metric-history="<%= formatted_name %>" data-module-name="<%= module_name %>"><%= metric_configuration_snapshot.metric.name %></a></td>
-          <td><%= MezuroPlugin::Helpers::ContentViewerHelper.format_grade(metric_result.value) %></td>
-          <td><%= metric_configuration_snapshot.weight %></td>
-          <td style="background-color: #<%= range_snapshot.color %>">
-            <span title="<%= range_snapshot.comments %>" >
-              <%= range_snapshot.label %>
-            </span>
-          </td>
-        </tr>	  
-        <tr class="<%= formatted_name %>" style="display: none;">
-          <td colspan="3">
-            <div id='historical-<%= formatted_name %>'>
-            </div>
-          </td>
-          <td align="right">
-            <%= range_snapshot.comments.nil? ? '' : range_snapshot.comments %>
-          </td> 
-        </tr>
-      <% end %>
-    <% end %>
-  </tbody>
+  <%= render :partial => "metric_results", :locals => {:metric_results => @metric_results, :module_result_id => @module_result.id} %>
   <tfoot>
     <tr>
       <td colspan = "3">
         <div id='historical-grade' style="display: none;"></div>
       </td>
       <td align = "right">
-        <a href="#" show-grade-history="<%= module_name %>" data-module-name="<%= module_name%>" >
+        <a href="#" show-grade-history="<%= @module_result.id %>" data-module-id="<%= module_result.id %>" >
           <strong>
             <%= _('Grade:') %>
             <%= "%.02f" % @module_result.grade %>
-<%= image_tag(MezuroPlugin::Helpers::ContentViewerHelper.generate_chart(@score_history)) %>
+<%= image_tag(MezuroPlugin::Helpers::ContentViewerHelper.generate_chart(@history)) %>
-<% unless @content.errors[:base].nil? %>
-  <%= @content.errors[:base] %>
-<% else %>
-  <h4><%= _('Source tree') %></h4>
-  <% module_name = @source_tree.module.name %>
-  <% module_label = "#{module_name} (#{@source_tree.module.granularity})" %>
+<h4><%= _('Source tree') %></h4>
+<% module_name = @source_tree.module.name %>
+<% module_label = "#{module_name} (#{@source_tree.module.granularity})" %>
-  <p><h2 class="path">
-    <% if module_name != @project_name %>
-      <a href="#" class="source-tree-link" data-module-name="<%= @project_name %>">
-        <%= @project_name %>
-      </a>
-    <% end %>
+<p><h2 class="path">
+  <% if module_name != @project_name %>
+    <a href="#" class="source-tree-link" data-module-name="<%= @project_name %>">
+      <%= @project_name %>
+    </a>
+  <% end %>
-    <% split_link = @source_tree.module.ancestor_names %>
-    <% split_link.each do |link| %>
-      /<a href="#" class="source-tree-link" data-module-name="<%= link %>">
-        <%= link.split(".").last %>
-      </a>
-    <% end %>
-  </h2></p>
-    
-  <% if @source_tree.children %>
-    <table border="0" class="source-tree">
-      <% @source_tree.children.each do |child| %>
-        <% if child.module.granularity=='PACKAGE' %>
-          <tr>
-	          <td class="icon"><%= image_tag('/plugins/mezuro/images/folder.png')%></td>
-	          <td class="source-tree-text"><a href='#' class="source-tree-link" data-module-name="<%= child.module.name %>"><%= child.module.name %></a></td>
-          </tr>
-        <% else %>
-          <tr>
-	          <td class="icon"><%= image_tag('/plugins/mezuro/images/file.png') %></td>
-	          <td class="source-tree-text">
-                    <a href='#' class="source-tree-link" data-module-name="<%= child.module.name %>">
-                      <%= child.module.name %>
-                    </a>
-                  </td>
-          </tr>
-        <% end %>
-      <% end %>  
-    </table>
+  <% split_link = @source_tree.module.ancestor_names %>
+  <% split_link.each do |link| %>
+    /<a href="#" class="source-tree-link" data-module-name="<%= link %>">
+      <%= link.split(".").last %>
+    </a>
   <% end %>
+</h2></p>
+  
+<% if @source_tree.children %>
+  <table border="0" class="source-tree">
+    <% @source_tree.children.each do |child| %>
+      <% if child.module.granularity=='PACKAGE' %>
+        <tr>
+          <td class="icon"><%= image_tag('/plugins/mezuro/images/folder.png')%></td>
+          <td class="source-tree-text"><a href='#' class="source-tree-link" data-module-name="<%= child.module.name %>"><%= child.module.name %></a></td>
+        </tr>
+      <% else %>
+        <tr>
+          <td class="icon"><%= image_tag('/plugins/mezuro/images/file.png') %></td>
+          <td class="source-tree-text">
+                  <a href='#' class="source-tree-link" data-module-name="<%= child.module.name %>">
+                    <%= child.module.name %>
+                  </a>
+                </td>
+        </tr>
+      <% end %>
+    <% end %>  
+  </table>
 <% end %>
	@@ -10,4 +10,8 @@ class Kalibro::DateModuleResult < Kalibro::Model		@@ -10,4 +10,8 @@ class Kalibro::DateModuleResult < Kalibro::Model
10	@module_result = Kalibro::ModuleResult.to_object value	10	@module_result = Kalibro::ModuleResult.to_object value
11	end	11	end
12		12
		13	+ def result
		14	+ @module_result.grade
		15	+ end
		16	+
13	end	17	end
	@@ -14,7 +14,7 @@ class MetricConfigurationSnapshotFixtures		@@ -14,7 +14,7 @@ class MetricConfigurationSnapshotFixtures
14	:aggregation_form => 'AVERAGE',	14	:aggregation_form => 'AVERAGE',
15	:metric => MetricFixtures.amloc_hash,	15	:metric => MetricFixtures.amloc_hash,
16	:base_tool_name => "Analizo",	16	:base_tool_name => "Analizo",
17	- :range => [RangeSnapshotFixtures.range_snapshot_hash],	17	+ :range => RangeSnapshotFixtures.range_snapshot_hash,
18	:attributes! => {	18	:attributes! => {
19	:metric => {	19	:metric => {
20	'xmlns:xsi'=> 'http://www.w3.org/2001/XMLSchema-instance',	20	'xmlns:xsi'=> 'http://www.w3.org/2001/XMLSchema-instance',
	@@ -34,7 +34,7 @@ class MetricConfigurationSnapshotFixtures		@@ -34,7 +34,7 @@ class MetricConfigurationSnapshotFixtures
34	:aggregation_form => 'AVERAGE',	34	:aggregation_form => 'AVERAGE',
35	:metric => MetricFixtures.compound_metric,	35	:metric => MetricFixtures.compound_metric,
36	:base_tool_name => "Analizo",	36	:base_tool_name => "Analizo",
37	- :range => [RangeSnapshotFixtures.range_snapshot_hash],	37	+ :range => RangeSnapshotFixtures.range_snapshot_hash,
38	:attributes! => {	38	:attributes! => {
39	:metric => {	39	:metric => {
40	'xmlns:xsi'=> 'http://www.w3.org/2001/XMLSchema-instance',	40	'xmlns:xsi'=> 'http://www.w3.org/2001/XMLSchema-instance',
@@ -0,0 +1,36 @@		@@ -0,0 +1,36 @@
	1	+<thead>
	2	+ <tr>
	3	+ <th style="width: 74%">Metric</th>
	4	+ <th>Value</th>
	5	+ <th>Weight</th>
	6	+ <th>Threshold</th>
	7	+ </tr>
	8	+</thead>
	9	+<tbody>
	10	+ <% @metric_results.each do \|metric_result\| %>
	11	+ <% metric_configuration_snapshot = metric_result.metric_configuration_snapshot%>
	12	+ <% range_snapshot = metric_configuration_snapshot.range_snapshot %>
	13	+ <% formatted_name = MezuroPlugin::Helpers::ContentViewerHelper.format_name(metric_configuration_snapshot) %>
	14	+ <% if !range_snapshot.nil? %>
	15	+ <tr>
	16	+ <td style="width: 74%"><a href="#" show-metric-history="<%= formatted_name %>" data-module-id="<%= @module_result_id %>"><%= metric_configuration_snapshot.metric.name %></a></td>
	17	+ <td><%= MezuroPlugin::Helpers::ContentViewerHelper.format_grade(metric_result.value) %></td>
	18	+ <td><%= metric_configuration_snapshot.weight %></td>
	19	+ <td style="background-color: #<%= range_snapshot.color %>">
	20	+ <span title="<%= range_snapshot.comments %>" >
	21	+ <%= range_snapshot.label %>
	22	+ </span>
	23	+ </td>
	24	+ </tr>
	25	+ <tr class="<%= formatted_name %>" style="display: none;">
	26	+ <td colspan="3">
	27	+ <div id='historical-<%= formatted_name %>'>
	28	+ </div>
	29	+ </td>
	30	+ <td align="right">
	31	+ <%= range_snapshot.comments.nil? ? '' : range_snapshot.comments %>
	32	+ </td>
	33	+ </tr>
	34	+ <% end %>
	35	+ <% end %>
	36	+</tbody>
1	-<% module_name = @module_result.module.name
2	-<h5><%= _('Metric results for: #{module_name} (#{@module_result.module.granularity}) ') %> </h5>	1	+<% TODO source tree %>
		2	+<h5><%= _('Metric results for: #{@module_result.module.name} (#{@module_result.module.granularity}) ') %> </h5>
3		3
4	<hr/>	4	<hr/>
5	<div class="zoomable-image">	5	<div class="zoomable-image">
6	<table style="width: 100%">	6	<table style="width: 100%">
7	- <thead>
8	- <tr>
9	- <th style="width: 74%">Metric</th>
10	- <th>Value</th>
11	- <th>Weight</th>
12	- <th>Threshold</th>
13	- </tr>
14	- </thead>
15	- <tbody>
16	- <% @metric_results.each do \|metric_result\| %>
17	- <% metric_configuration_snapshot = metric_result.metric_configuration_snapshot%>
18	- <% range_snapshot = metric_configuration_snapshot.range_snapshot %>
19	- <% formatted_name = MezuroPlugin::Helpers::ContentViewerHelper.format_name(metric_configuration_snapshot) %>
20	- <% if !range_snapshot.nil? %>
21	- <tr>
22	- <td style="width: 74%"><a href="#" show-metric-history="<%= formatted_name %>" data-module-name="<%= module_name %>"><%= metric_configuration_snapshot.metric.name %></a></td>
23	- <td><%= MezuroPlugin::Helpers::ContentViewerHelper.format_grade(metric_result.value) %></td>
24	- <td><%= metric_configuration_snapshot.weight %></td>
25	- <td style="background-color: #<%= range_snapshot.color %>">
26	- <span title="<%= range_snapshot.comments %>" >
27	- <%= range_snapshot.label %>
28	- </span>
29	- </td>
30	- </tr>
31	- <tr class="<%= formatted_name %>" style="display: none;">
32	- <td colspan="3">
33	- <div id='historical-<%= formatted_name %>'>
34	- </div>
35	- </td>
36	- <td align="right">
37	- <%= range_snapshot.comments.nil? ? '' : range_snapshot.comments %>
38	- </td>
39	- </tr>
40	- <% end %>
41	- <% end %>
42	- </tbody>	7	+ <%= render :partial => "metric_results", :locals => {:metric_results => @metric_results, :module_result_id => @module_result.id} %>
43	<tfoot>	8	<tfoot>
44	<tr>	9	<tr>
45	<td colspan = "3">	10	<td colspan = "3">
46	<div id='historical-grade' style="display: none;"></div>	11	<div id='historical-grade' style="display: none;"></div>
47	</td>	12	</td>
48	<td align = "right">	13	<td align = "right">
49	- <a href="#" show-grade-history="<%= module_name %>" data-module-name="<%= module_name%>" >	14	+ <a href="#" show-grade-history="<%= @module_result.id %>" data-module-id="<%= module_result.id %>" >
50	<strong>	15	<strong>
51	<%= _('Grade:') %>	16	<%= _('Grade:') %>
52	<%= "%.02f" % @module_result.grade %>	17	<%= "%.02f" % @module_result.grade %>