[Mezuro] Fixed languages array problem and removed fakes

Alessandro Palmeira + João M. M. da Silva · Alessandro Palmeira
1 parent 26c86683
Showing 3 changed files with 18 additions and 33 deletions Show diff stats
plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
plugins/mezuro/views/content_viewer/show_configuration.rhtml
plugins/mezuro/views/mezuro_plugin_profile/new_metric_configuration.html.erb
@@ -58,22 +58,9 @@ class MezuroPluginProfileController &lt; ProfileController
   end
   def edit_metric_configuration
-    @metric_configuration_code = params[:metric_code]
     @configuration_name = params[:configuration_name]
-    @metric_configuration = Kalibro::Entities::MetricConfiguration.new
-    @metric_configuration.code = @metric_configuration_code
-    @metric_configuration.aggregation_form = "MEDIAN"
-    @metric_configuration.weight = "1"
-    @metric_configuration.metric = Kalibro::Entities::NativeMetric.new
-    @metric_configuration.metric.name = "Nome falso"
-    @metric_configuration.metric.origin = "Origem Falsa"
-    range = Kalibro::Entities::Range.new
-    range.beginning = "0"
-    range.end = "100"
-    range.label = "fake label"
-    range.grade = "100"
-    range.color = "FFFFFF"
-    @metric_configuration.range = [range]
+    metric_name = params[:metric_name]
+    @metric_configuration = Kalibro::Client::MetricConfigurationClient.new.metric_configuration(@configuration_name, metric_name)
   end
   def create_metric_configuration
@@ -96,6 +83,7 @@ class MezuroPluginProfileController &lt; ProfileController
   def update_metric_configuration
     @configuration_name = params[:configuration_name]
+   # raise @configuration_name.inspect
     redirect_to "/#{profile.identifier}/#{@configuration_name.downcase.gsub(/\s/, '-')}"
   end
 <% @configuration_content = @page
-@configuration = Kalibro::Entities::Configuration.new 
-@configuration.name = @configuration_content.name
-@configuration.description = @configuration_content.description 
-@fake_metric_configuration = Kalibro::Entities::MetricConfiguration.new
-@fake_metric_configuration.metric = {:name => "fake_name", :origin => "Analizo"}
-@fake_metric_configuration.code = "fake_code"
-@configuration.metric_configurations = [@fake_metric_configuration] %>
+@configuration = Kalibro::Client::ConfigurationClient.new.configuration(@configuration_content.name) %>
 <table id="project_info">
   <tr>
@@ -18,25 +12,24 @@
   </tr>
 </table>
-
 <br/>
-<%= link_to "#{image_tag ('/plugins/mezuro/images/plus.png')}Add Metric", :controller => "mezuro_plugin_profile", :action => "choose_base_tool", :params =>
-{:configuration_name => @configuration.name} %><br/>
+<%= link_to "#{image_tag ('/plugins/mezuro/images/plus.png')}Add Metric", :controller => "mezuro_plugin_profile", 
+:action => "choose_base_tool", :params => {:configuration_name => @configuration.name} %><br/>
 <table>
-<% @configuration.metric_configurations.each do |metric_configuration| %>
-    <tr class="titles">
-        <td><h5>Metric Name</h5></td>
-        <td><h5>Collector Name</h5></td>
-        <td><h5>Metric Code</h5></td>
-    </tr>
+  <tr class="titles">
+      <td><h5>Metric Name</h5></td>
+      <td><h5>Collector Name</h5></td>
+      <td><h5>Metric Code</h5></td>
+  </tr>
+  <% @configuration.metric_configurations.each do |metric_configuration| %>
     <tr class="metric">
       <td><%= metric_configuration.metric.name %></td>
       <td><%= metric_configuration.metric.origin %></td>
       <td><%= metric_configuration.code %></td>
       <td><%= link_to "Edit", :controller => "mezuro_plugin_profile", :action => "edit_metric_configuration", :params =>
-        {:configuration_name => @configuration.name, :metric_code => metric_configuration.code} %></td>
+        {:configuration_name => @configuration.name, :metric_name => metric_configuration.metric.name} %></td>
     </tr>
 <% end %>
 </table>
@@ -3,7 +3,11 @@
 <% form_for :metric_configuration, :url => {:action =>"create_metric_configuration", :controller => "mezuro_plugin_profile"}, :method => :get do |f| %>
   <%= hidden_field_tag :configuration_name, @configuration_name %>
   <%= hidden_field_tag :scope, @metric.scope %>
-  <%= hidden_field_tag :language, @metric.language %>
+  
+  <% @metric.language.each do |language| %>
+  <%= hidden_field_tag "language[]", language %>
+  <% end %>
+
   <p>
     <%= f.label :origin, "Collector Name:" %>