From 88bbff0210da75e55da43c47eda5561e64037426 Mon Sep 17 00:00:00 2001
From: Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
Date: Wed, 12 Dec 2012 17:29:24 -0200
Subject: [PATCH] [Mezuro] Finished source tree view.

---
 plugins/mezuro/lib/kalibro/module_result.rb                                           |  2 +-
 plugins/mezuro/test/functional/profile/mezuro_plugin_module_result_controller_test.rb |  5 +++++
 plugins/mezuro/views/mezuro_plugin_module_result/_module_result.rhtml                 |  2 +-
 plugins/mezuro/views/mezuro_plugin_module_result/_source_tree.rhtml                   |  9 ++++-----
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/plugins/mezuro/lib/kalibro/module_result.rb b/plugins/mezuro/lib/kalibro/module_result.rb
index 0124f74..d90d6af 100644
--- a/plugins/mezuro/lib/kalibro/module_result.rb
+++ b/plugins/mezuro/lib/kalibro/module_result.rb
@@ -7,7 +7,7 @@ class Kalibro::ModuleResult < Kalibro::Model
   end
 
   def children
-    response = self.class.request(:children_of, {:module_result_id => self.id})[:module_result]
+    response = self.class.request(:children_of, {:module_result_id => id})[:module_result]
     response = [] if response.nil?
     response = [response] if response.is_a?(Hash) 
     response.map {|module_result| Kalibro::ModuleResult.new module_result}
diff --git a/plugins/mezuro/test/functional/profile/mezuro_plugin_module_result_controller_test.rb b/plugins/mezuro/test/functional/profile/mezuro_plugin_module_result_controller_test.rb
index cec91e7..3061465 100644
--- a/plugins/mezuro/test/functional/profile/mezuro_plugin_module_result_controller_test.rb
+++ b/plugins/mezuro/test/functional/profile/mezuro_plugin_module_result_controller_test.rb
@@ -20,10 +20,15 @@ class MezuroPluginModuleResultControllerTest < ActionController::TestCase
   end
 
   should 'find module result on kalibro' do
+    parent_module_result = ModuleResultFixtures.parent_module_result_hash
     Kalibro::ModuleResult.expects(:request).with(:get_module_result, { :module_result_id => @module_result_hash[:id] }).
         returns({:module_result => @module_result_hash})
     Kalibro::MetricResult.expects(:request).with(:metric_results_of, { :module_result_id => @module_result_hash[:id] }).
         returns({:metric_result => @metric_result_hash})
+    Kalibro::ModuleResult.expects(:request).with(:get_module_result, { :module_result_id => @module_result_hash[:parent_id] }).
+        returns({:module_result => parent_module_result})
+    Kalibro::ModuleResult.expects(:request).with(:children_of, {:module_result_id => @module_result_hash[:id]}).
+        returns({:module_result => nil})
     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
diff --git a/plugins/mezuro/views/mezuro_plugin_module_result/_module_result.rhtml b/plugins/mezuro/views/mezuro_plugin_module_result/_module_result.rhtml
index e45dbeb..b3d21aa 100644
--- a/plugins/mezuro/views/mezuro_plugin_module_result/_module_result.rhtml
+++ b/plugins/mezuro/views/mezuro_plugin_module_result/_module_result.rhtml
@@ -11,7 +11,7 @@
         <div id='historical-grade' style="display: none;"></div>
       </td>
       <td align = "right">
-        <a href="#" show-grade-history="<%= @module_result.id %>" data-module-id="<%= module_result.id %>" >
+        <a href="#" show-grade-history="<%= @module_result.id %>" data-module-id="<%= @module_result.id %>" >
           <strong>
             <%= _('Grade:') %>
             <%= "%.02f" % @module_result.grade %>
diff --git a/plugins/mezuro/views/mezuro_plugin_module_result/_source_tree.rhtml b/plugins/mezuro/views/mezuro_plugin_module_result/_source_tree.rhtml
index 7409a88..5e918e2 100644
--- a/plugins/mezuro/views/mezuro_plugin_module_result/_source_tree.rhtml
+++ b/plugins/mezuro/views/mezuro_plugin_module_result/_source_tree.rhtml
@@ -1,11 +1,10 @@
 <h4><%= _('Source tree') %></h4>
-<% module_name = @module_result.module.name %>
-<% module_label = "#{module_name} (#{@module_result.module.granularity})" %>
+<% module_name = module_result.module.name %>
+<% module_label = "#{module_name} (#{module_result.module.granularity})" %>
 
 <p>
   <h2 class="path">
-    <% parents = @module_result.parents %>
-    <% parents.each do |parent| %>
+    <% module_result.parents.each do |parent| %>
       /<a href="#" class="source-tree-link" data-module-id="<%= parent.id %>">
         <%= parent.module.name %>
       </a>
@@ -14,7 +13,7 @@
 </p>
   
 <table border="0" class="source-tree">
-  <% @module_result.children.each do |child| %>
+  <% module_result.children.each do |child| %>
     <% if child.module.granularity=='PACKAGE' %>
       <tr>
         <td class="icon"><%= image_tag('/plugins/mezuro/images/folder.png')%></td>
--
libgit2 0.21.2