From 1e80f8b24612aed5172e9c69f115f3eb0687accb Mon Sep 17 00:00:00 2001 From: Alessandro Palmeira + João M. M. Silva Date: Fri, 20 Apr 2012 16:15:33 -0300 Subject: [PATCH] [Mezuro] Finished range and metric configuration. --- plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb | 16 +++++++++------- plugins/mezuro/views/mezuro_plugin_profile/_edit_range.html.erb | 1 + plugins/mezuro/views/mezuro_plugin_profile/_range_form.html.erb | 1 - plugins/mezuro/views/mezuro_plugin_profile/new_metric_configuration.html.erb | 4 ++-- plugins/mezuro/views/mezuro_plugin_profile/new_range.rjs | 2 +- plugins/mezuro/views/mezuro_plugin_profile/update_range.rjs | 3 +-- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb b/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb index 5ca8a15..fa31f87 100644 --- a/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb +++ b/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb @@ -72,7 +72,9 @@ class MezuroPluginProfileController < ProfileController def update_metric_configuration @configuration_name = params[:configuration_name] - metric_configuration = new_metric_configuration_instance + metric_name = params[:metric][:name] + metric_configuration = Kalibro::Client::MetricConfigurationClient.new.metric_configuration(@configuration_name, metric_name) + assign_metric_configuration_instance (metric_configuration) Kalibro::Client::MetricConfigurationClient.new.save(metric_configuration, @configuration_name) redirect_to "/#{profile.identifier}/#{@configuration_name.downcase.gsub(/\s/, '-')}" end @@ -112,9 +114,6 @@ class MezuroPluginProfileController < ProfileController index = metric_configuration.ranges.index{ |range| range.beginning == beginning_id.to_f } metric_configuration.ranges[index] = new_range_instance Kalibro::Client::MetricConfigurationClient.new.save(metric_configuration, configuration_name) - formatted_configuration_name = configuration_name.gsub(/\s/, '+') - formatted_metric_name = metric_name.gsub(/\s/, '+') - redirect_to "/profile/#{profile.identifier}/plugins/mezuro/edit_metric_configuration?configuration_name=#{formatted_configuration_name}&metric_name=#{formatted_metric_name}" end def remove_range @@ -127,8 +126,7 @@ class MezuroPluginProfileController < ProfileController Kalibro::Client::MetricConfigurationClient.new.save(metric_configuration, configuration_name) formatted_configuration_name = configuration_name.gsub(/\s/, '+') formatted_metric_name = metric_name.gsub(/\s/, '+') - #FIXME não está redirecionando - redirect "/profile/#{profile.identifier}/plugins/mezuro/edit_metric_configuration?configuration_name=#{formatted_configuration_name}&metric_name=#{formatted_metric_name}" + redirect_to "/profile/#{profile.identifier}/plugins/mezuro/edit_metric_configuration?configuration_name=#{formatted_configuration_name}&metric_name=#{formatted_metric_name}" end def remove_metric_configuration @@ -143,6 +141,10 @@ class MezuroPluginProfileController < ProfileController def new_metric_configuration_instance metric_configuration = Kalibro::Entities::MetricConfiguration.new metric_configuration.metric = Kalibro::Entities::NativeMetric.new + assign_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] @@ -150,7 +152,7 @@ class MezuroPluginProfileController < ProfileController metric_configuration.metric.language = params[:language] metric_configuration.code = params[:metric_configuration][:code] metric_configuration.weight = params[:metric_configuration][:weight] - metric_configuration.aggregation_form = params[:metric_configuration][:aggregation] + metric_configuration.aggregation_form = params[:metric_configuration][:aggregation_form] metric_configuration end diff --git a/plugins/mezuro/views/mezuro_plugin_profile/_edit_range.html.erb b/plugins/mezuro/views/mezuro_plugin_profile/_edit_range.html.erb index 4ae3a7b..bc99247 100644 --- a/plugins/mezuro/views/mezuro_plugin_profile/_edit_range.html.erb +++ b/plugins/mezuro/views/mezuro_plugin_profile/_edit_range.html.erb @@ -1,3 +1,4 @@ <% remote_form_for :range, :url => {:action =>"update_range", :controller => "mezuro_plugin_profile"}, :method => :get do |f| %> + <%= hidden_field_tag :beginning_id, beginning_id %> <%= render :partial => "range_form", :locals => {:f => f, :metric_name => metric_name, :configuration_name => configuration_name, :beginning_id => beginning_id, :range => range } %> <% end %> diff --git a/plugins/mezuro/views/mezuro_plugin_profile/_range_form.html.erb b/plugins/mezuro/views/mezuro_plugin_profile/_range_form.html.erb index aeb0bb9..b34a97c 100644 --- a/plugins/mezuro/views/mezuro_plugin_profile/_range_form.html.erb +++ b/plugins/mezuro/views/mezuro_plugin_profile/_range_form.html.erb @@ -1,6 +1,5 @@ <%= hidden_field_tag :configuration_name, configuration_name %> <%= hidden_field_tag :metric_name, metric_name %> -<%= hidden_field_tag :beginning_id, beginning_id %>
diff --git a/plugins/mezuro/views/mezuro_plugin_profile/new_metric_configuration.html.erb b/plugins/mezuro/views/mezuro_plugin_profile/new_metric_configuration.html.erb index 6efb14a..3626ff8 100644 --- a/plugins/mezuro/views/mezuro_plugin_profile/new_metric_configuration.html.erb +++ b/plugins/mezuro/views/mezuro_plugin_profile/new_metric_configuration.html.erb @@ -28,8 +28,8 @@ <%= f.text_field :code %>

- <%= f.label :aggregation, "Aggregation:" %> - <%= f.select :aggregation, [["Average","AVERAGE"], ["Median", "MEDIAN"], ["Maximum", "MAXIMUM"], ["Minimum", "MINIMUM"], + <%= f.label :aggregation_form, "Aggregation:" %> + <%= f.select :aggregation_form, [["Average","AVERAGE"], ["Median", "MEDIAN"], ["Maximum", "MAXIMUM"], ["Minimum", "MINIMUM"], ["Count", "COUNT"], ["Standard Deviation", "STANDARD_DEVIATION"]] %>

diff --git a/plugins/mezuro/views/mezuro_plugin_profile/new_range.rjs b/plugins/mezuro/views/mezuro_plugin_profile/new_range.rjs index cd28b9e..65c2f64 100644 --- a/plugins/mezuro/views/mezuro_plugin_profile/new_range.rjs +++ b/plugins/mezuro/views/mezuro_plugin_profile/new_range.rjs @@ -1,2 +1,2 @@ -page.replace_html 'range_form', :partial => "new_range", :locals => {:metric_name => @metric_name, :configuration_name => @configuration_name } +page.replace_html 'range_form', :partial => "new_range", :locals => {:metric_name => @metric_name, :configuration_name => @configuration_name, :beginning_id => "bolinha" } page.visual_effect :slide_down, "range_form" diff --git a/plugins/mezuro/views/mezuro_plugin_profile/update_range.rjs b/plugins/mezuro/views/mezuro_plugin_profile/update_range.rjs index f0cf9ee..5b95d3b 100644 --- a/plugins/mezuro/views/mezuro_plugin_profile/update_range.rjs +++ b/plugins/mezuro/views/mezuro_plugin_profile/update_range.rjs @@ -1,2 +1 @@ -page.visual_effect :toggle_slide, "range_form" -page.insert_html :bottom, "ranges", :partial => "range", :locals => {:range => @range} +page.reload() -- libgit2 0.21.2