[Mezuro] Finished configuration views refactoring

Diego Camarinha · Paulo Meireles
1 parent 2a69d623
Showing 3 changed files with 38 additions and 35 deletions Show diff stats
plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb
plugins/mezuro/test/functional/mezuro_plugin_myprofile_controller_test.rb
plugins/mezuro/views/mezuro_plugin_myprofile/edit_metric_configuration.html.erb
@@ -57,8 +57,8 @@ class MezuroPluginMyprofileController &lt; ProfileController
  
   def update_metric_configuration
     @configuration_name = params[:configuration_name]
+    metric_name = params[:metric_configuration][:metric][:name]
     metric_configuration_client = Kalibro::Client::MetricConfigurationClient.new
-    metric_name = params[:metric][:name]
     metric_configuration = metric_configuration_client.metric_configuration(@configuration_name, metric_name)  
     metric_configuration = assign_metric_configuration_instance(metric_configuration)
     metric_configuration_client.save(metric_configuration, @configuration_name)
@@ -152,19 +152,19 @@ class MezuroPluginMyprofileController &lt; ProfileController
     assign_compound_metric_configuration_instance (metric_configuration)
   end
  
-  def assign_metric_configuration_instance (metric_configuration)
-    metric_configuration.metric.name = params[:metric][:name]
-    metric_configuration.metric.description = params[:description]
-    metric_configuration.metric.origin = params[:metric][:origin]
-    metric_configuration.metric.scope = params[:scope]
-    metric_configuration.metric.language = params[:language]
+  def assign_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.origin = params[:metric_configuration][:metric][:origin]
+    metric_configuration.metric.scope = params[:metric_configuration][:metric][:scope]
+    metric_configuration.metric.language = params[:metric_configuration][:metric][:language]
     metric_configuration.code = params[:metric_configuration][:code]
     metric_configuration.weight = params[:metric_configuration][:weight]
     metric_configuration.aggregation_form = params[:metric_configuration][:aggregation_form]
     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]
@@ -76,9 +76,9 @@ class MezuroPluginMyprofileControllerTest &lt; ActionController::TestCase
   should 'test metric creation' do
     Kalibro::Client::MetricConfigurationClient.expects(:new).returns(@metric_configuration_client)
     @metric_configuration_client.expects(:save)
-    get :create_metric_configuration, :profile => @profile.identifier, :configuration_name => "test name", :description => @metric.description,
-    :scope => @metric.scope, :language => @metric.language, :metric => { :name => @metric.name, :origin => @metric.origin},
-    :metric_configuration => { :code => @metric_configuration.code, :weight => @metric_configuration.code, :aggregation => @metric_configuration.aggregation_form }
+    get :create_metric_configuration, :profile => @profile.identifier, :configuration_name => "test name", 
+    :metric_configuration => { :code => @metric_configuration.code, :weight => @metric_configuration.code, :aggregation => @metric_configuration.aggregation_form, 
+    :metric => { :name => @metric.name, :origin => @metric.origin, :description => @metric.description, :scope => @metric.scope, :language => @metric.language }}
     assert_equal assigns(:configuration_name), "test name"
     assert_response 302
   end
@@ -112,9 +112,9 @@ class MezuroPluginMyprofileControllerTest &lt; ActionController::TestCase
     Kalibro::Client::MetricConfigurationClient.expects(:new).returns(@metric_configuration_client)
     @metric_configuration_client.expects(:metric_configuration).with(@configuration.name, @metric_configuration.metric.name).returns(@metric_configuration)
     @metric_configuration_client.expects(:save)
-    get :update_metric_configuration, :profile => @profile.identifier, :configuration_name => @configuration.name, :description => @metric.description,
-    :scope => @metric.scope, :language => @metric.language, :metric => { :name => @metric.name, :origin => @metric.origin},
-    :metric_configuration => { :code => @metric_configuration.code, :weight => @metric_configuration.code, :aggregation => @metric_configuration.aggregation_form }
+    get :update_metric_configuration, :profile => @profile.identifier, :configuration_name => @configuration.name, 
+    :metric_configuration => { :code => @metric_configuration.code, :weight => @metric_configuration.weight, :aggregation => @metric_configuration.aggregation_form, 
+    :metric => { :name => @metric.name, :origin => @metric.origin, :description => @metric.description, :scope => @metric.scope, :language => @metric.language }}
     assert_response 302
   end
  
@@ -4,31 +4,34 @@
  
 <% form_for :metric_configuration, :url => {:action =>"update_metric_configuration", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
   <%= hidden_field_tag :configuration_name, @configuration_name %>
-  <%= hidden_field_tag :scope, @metric.scope %>
  
-  <% @metric.language.each do |language| %>
-    <%= hidden_field_tag "language[]", language %>
+  <% f.fields_for :metric do |m| %>
+  
+    <% @metric.language.each do |language| %>
+      <%= m.hidden_field :language, :multiple => true, :value => language %>
+    <% end %>
+    
+    <%= m.hidden_field "scope", :value => @metric.scope %>
+    <p>
+      <%= m.label :origin, "Collector Name:" %>
+      <%= @metric.origin %>
+      <%= m.hidden_field "origin", :value => @metric.origin %>
+    </p>
+    <p>
+      <%= m.label :metric_name, "Metric Name:" %>
+      <%= @metric.name %>
+      <%= m.hidden_field "name", :value => @metric.name %>
+    </p>
+    <p>    
+      <%= m.label :description, "Description:" %>
+      <%= @metric.description %>
+      <%= m.hidden_field "description", :value => @metric.description %>
+    </p>
   <% end %>
-
-  <p>
-    <%= f.label :origin, "Collector Name:" %>
-    <%= @metric.origin %>
-    <%= hidden_field_tag "metric[origin]", @metric.origin %>
-  </p>
-  <p>
-    <%= f.label :metric_name, "Metric Name:" %>
-    <%= @metric.name %>
-    <%= hidden_field_tag "metric[name]", @metric.name %>
-  </p>
-  <p>
-    <%= f.label :description, "Description:" %>
-    <%= @metric.description %>
-    <%= text_field_tag "metric[description]", @metric.description %>
-  </p>
   <p>
     <%= f.label :code, "Code:" %>
     <%= @metric_configuration.code %>
-    <%= f.hidden_field :code, :value => @metric_configuration.code %>
+    <%= f.hidden_field "code", :value => @metric_configuration.code %>
   </p>
   <p>
     <%= f.label :aggregation_form, "Aggregation Form:" %>
@@ -37,7 +40,7 @@
   </p>
   <p>
     <%= f.label :weight, "Weight:" %>
-    <%= f.text_field :weight %>
+    <%= f.text_field "weight", :value => @metric_configuration.weight %>
   </p>
  
   <p>
...	...	@@ -57,8 +57,8 @@ class MezuroPluginMyprofileController < ProfileController
57	57
58	58	def update_metric_configuration
59	59	@configuration_name = params[:configuration_name]
	60	+ metric_name = params[:metric_configuration][:metric][:name]
60	61	metric_configuration_client = Kalibro::Client::MetricConfigurationClient.new
61		- metric_name = params[:metric][:name]
62	62	metric_configuration = metric_configuration_client.metric_configuration(@configuration_name, metric_name)
63	63	metric_configuration = assign_metric_configuration_instance(metric_configuration)
64	64	metric_configuration_client.save(metric_configuration, @configuration_name)
...	...	@@ -152,19 +152,19 @@ class MezuroPluginMyprofileController < ProfileController
152	152	assign_compound_metric_configuration_instance (metric_configuration)
153	153	end
154	154
155		- def assign_metric_configuration_instance (metric_configuration)
156		- metric_configuration.metric.name = params[:metric][:name]
157		- metric_configuration.metric.description = params[:description]
158		- metric_configuration.metric.origin = params[:metric][:origin]
159		- metric_configuration.metric.scope = params[:scope]
160		- metric_configuration.metric.language = params[:language]
	155	+ def assign_metric_configuration_instance(metric_configuration)
	156	+ metric_configuration.metric.name = params[:metric_configuration][:metric][:name]
	157	+ metric_configuration.metric.description = params[:metric_configuration][:metric][:description]
	158	+ metric_configuration.metric.origin = params[:metric_configuration][:metric][:origin]
	159	+ metric_configuration.metric.scope = params[:metric_configuration][:metric][:scope]
	160	+ metric_configuration.metric.language = params[:metric_configuration][:metric][:language]
161	161	metric_configuration.code = params[:metric_configuration][:code]
162	162	metric_configuration.weight = params[:metric_configuration][:weight]
163	163	metric_configuration.aggregation_form = params[:metric_configuration][:aggregation_form]
164	164	metric_configuration
165	165	end
166	166
167		- def assign_compound_metric_configuration_instance (metric_configuration)
	167	+ def assign_compound_metric_configuration_instance(metric_configuration)
168	168	metric_configuration.metric.name = params[:metric_configuration][:metric][:name]
169	169	metric_configuration.metric.description = params[:metric_configuration][:metric][:description]
170	170	metric_configuration.metric.scope = params[:metric_configuration][:metric][:scope]
...	...
...	...	@@ -76,9 +76,9 @@ class MezuroPluginMyprofileControllerTest < ActionController::TestCase
76	76	should 'test metric creation' do
77	77	Kalibro::Client::MetricConfigurationClient.expects(:new).returns(@metric_configuration_client)
78	78	@metric_configuration_client.expects(:save)
79		- get :create_metric_configuration, :profile => @profile.identifier, :configuration_name => "test name", :description => @metric.description,
80		- :scope => @metric.scope, :language => @metric.language, :metric => { :name => @metric.name, :origin => @metric.origin},
81		- :metric_configuration => { :code => @metric_configuration.code, :weight => @metric_configuration.code, :aggregation => @metric_configuration.aggregation_form }
	79	+ get :create_metric_configuration, :profile => @profile.identifier, :configuration_name => "test name",
	80	+ :metric_configuration => { :code => @metric_configuration.code, :weight => @metric_configuration.code, :aggregation => @metric_configuration.aggregation_form,
	81	+ :metric => { :name => @metric.name, :origin => @metric.origin, :description => @metric.description, :scope => @metric.scope, :language => @metric.language }}
82	82	assert_equal assigns(:configuration_name), "test name"
83	83	assert_response 302
84	84	end
...	...	@@ -112,9 +112,9 @@ class MezuroPluginMyprofileControllerTest < ActionController::TestCase
112	112	Kalibro::Client::MetricConfigurationClient.expects(:new).returns(@metric_configuration_client)
113	113	@metric_configuration_client.expects(:metric_configuration).with(@configuration.name, @metric_configuration.metric.name).returns(@metric_configuration)
114	114	@metric_configuration_client.expects(:save)
115		- get :update_metric_configuration, :profile => @profile.identifier, :configuration_name => @configuration.name, :description => @metric.description,
116		- :scope => @metric.scope, :language => @metric.language, :metric => { :name => @metric.name, :origin => @metric.origin},
117		- :metric_configuration => { :code => @metric_configuration.code, :weight => @metric_configuration.code, :aggregation => @metric_configuration.aggregation_form }
	115	+ get :update_metric_configuration, :profile => @profile.identifier, :configuration_name => @configuration.name,
	116	+ :metric_configuration => { :code => @metric_configuration.code, :weight => @metric_configuration.weight, :aggregation => @metric_configuration.aggregation_form,
	117	+ :metric => { :name => @metric.name, :origin => @metric.origin, :description => @metric.description, :scope => @metric.scope, :language => @metric.language }}
118	118	assert_response 302
119	119	end
120	120
...	...
...	...	@@ -4,31 +4,34 @@
4	4
5	5	<% form_for :metric_configuration, :url => {:action =>"update_metric_configuration", :controller => "mezuro_plugin_myprofile"}, :method => :get do \|f\| %>
6	6	<%= hidden_field_tag :configuration_name, @configuration_name %>
7		- <%= hidden_field_tag :scope, @metric.scope %>
8	7
9		- <% @metric.language.each do \|language\| %>
10		- <%= hidden_field_tag "language[]", language %>
	8	+ <% f.fields_for :metric do \|m\| %>
	9	+
	10	+ <% @metric.language.each do \|language\| %>
	11	+ <%= m.hidden_field :language, :multiple => true, :value => language %>
	12	+ <% end %>
	13	+
	14	+ <%= m.hidden_field "scope", :value => @metric.scope %>
	15	+ <p>
	16	+ <%= m.label :origin, "Collector Name:" %>
	17	+ <%= @metric.origin %>
	18	+ <%= m.hidden_field "origin", :value => @metric.origin %>
	19	+ </p>
	20	+ <p>
	21	+ <%= m.label :metric_name, "Metric Name:" %>
	22	+ <%= @metric.name %>
	23	+ <%= m.hidden_field "name", :value => @metric.name %>
	24	+ </p>
	25	+ <p>
	26	+ <%= m.label :description, "Description:" %>
	27	+ <%= @metric.description %>
	28	+ <%= m.hidden_field "description", :value => @metric.description %>
	29	+ </p>
11	30	<% end %>
12		-
13		- <p>
14		- <%= f.label :origin, "Collector Name:" %>
15		- <%= @metric.origin %>
16		- <%= hidden_field_tag "metric[origin]", @metric.origin %>
17		- </p>
18		- <p>
19		- <%= f.label :metric_name, "Metric Name:" %>
20		- <%= @metric.name %>
21		- <%= hidden_field_tag "metric[name]", @metric.name %>
22		- </p>
23		- <p>
24		- <%= f.label :description, "Description:" %>
25		- <%= @metric.description %>
26		- <%= text_field_tag "metric[description]", @metric.description %>
27		- </p>
28	31	<p>
29	32	<%= f.label :code, "Code:" %>
30	33	<%= @metric_configuration.code %>
31		- <%= f.hidden_field :code, :value => @metric_configuration.code %>
	34	+ <%= f.hidden_field "code", :value => @metric_configuration.code %>
32	35	</p>
33	36	<p>
34	37	<%= f.label :aggregation_form, "Aggregation Form:" %>
...	...	@@ -37,7 +40,7 @@
37	40	</p>
38	41	<p>
39	42	<%= f.label :weight, "Weight:" %>
40		- <%= f.text_field :weight %>
	43	+ <%= f.text_field "weight", :value => @metric_configuration.weight %>
41	44	</p>
42	45
43	46	<p>
...	...