From 9f31b259f9b222b1c871e88514927ef03177850b Mon Sep 17 00:00:00 2001
From: Alessandro Palmeira <alessandro.palmeira@gmail.com>
Date: Thu, 31 May 2012 18:02:03 -0300
Subject: [PATCH] [Mezuro] Refactoring metric configuration forms

---
 plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb          |  2 +-
 plugins/mezuro/views/mezuro_plugin_myprofile/new_compound_metric.html.erb | 45 ++++++++++++++++++++++-----------------------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb b/plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb
index e8fa986..7a1eb53 100644
--- a/plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb
+++ b/plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb
@@ -162,7 +162,7 @@ class MezuroPluginMyprofileController < ProfileController
     metric_configuration
   end
 
-  def assign_compound_metric_configuration_instance (metric_configuration)   
+  def assign_compound_metric_configuration_instance (metric_configuration)
     metric_configuration.metric.name = params[:metric_configuration][:metric][:name]
     metric_configuration.metric.description = params[:metric_configuration][:metric][:description]
     metric_configuration.metric.scope = params[:metric_configuration][:metric][:scope]
diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/new_compound_metric.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/new_compound_metric.html.erb
index 329a9c3..4748968 100644
--- a/plugins/mezuro/views/mezuro_plugin_myprofile/new_compound_metric.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_myprofile/new_compound_metric.html.erb
@@ -2,26 +2,31 @@
 
 <% form_for :metric_configuration, :url => {:action =>"create_compound_metric_configuration", 
 :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
-  <%= hidden_field_tag :configuration_name, @configuration_name %>  
-
-  <p>
-    <%= f.label :metric_name, "Metric Name:" %>
-    <%= f.text_field :metric_name %>
-  </p>
-  <p>
-    <%= f.label :description, "Description:" %>
-    <%= f.text_field :description %>
-  </p>
-  <p>
-    <%= f.label :scope, "Scope:" %>
-    <%= f.select :scope, [["Class", "CLASS"]] %>
-  </p>
+  <%= hidden_field_tag :configuration_name, @configuration_name %> 
+  <% f.fields_for :metric do |m| %>
+    <p>
+      <%= m.label :name, "Name:" %>
+      <%= m.text_field "name" %>
+    </p>
+    <p>
+      <%= m.label :description, "Description:" %>
+      <%= m.text_field "description" %>
+    </p>
+    <p>
+      <%= m.label :scope, "Scope:" %>
+      <%= m.select :scope, [["Class", "CLASS"]] %>
+    </p>
+    <p>
+      <%= m.label :script, "Script:" %>
+      <%= m.text_area "script" %>
+    </p>
+  <% end %>
   <p>
     <%= f.label :code, "Code:" %>
-    <%= f.text_field :code %>
+    <%= f.text_field "code" %>
   </p>
   <p>
-    <%= f.label :aggregation_form, "Aggregation:" %>
+    <%= f.label :aggregation_form, "Aggregation Form:" %>
     <%= f.select :aggregation_form, [["Average","AVERAGE"], ["Median", "MEDIAN"], ["Maximum", "MAXIMUM"], ["Minimum", "MINIMUM"], 
     ["Count", "COUNT"], ["Standard Deviation", "STANDARD_DEVIATION"]] %>
   </p>
@@ -30,14 +35,8 @@
     <%= f.text_field :weight %>
   </p>
   <p>
-    <%= f.label :script, "Script:" %>
-    <%= f.text_area :script %>
-  </p>
-
-  <p>
-    <%= f.submit "Add" %>
+    <%= f.submit "Save" %>
   </p>
-
 <% end %>
 
 <!-- make this prettier -->
--
libgit2 0.21.2