diff --git a/plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb b/plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb index 6480541..9ec018d 100644 --- a/plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb +++ b/plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb @@ -28,6 +28,13 @@ class MezuroPluginMyprofileController < ProfileController @metric_configuration = Kalibro::Client::MetricConfigurationClient.new.metric_configuration(@configuration_name, metric_name) @metric = @metric_configuration.metric end + + def edit_compound_metric_configuration + metric_name = params[:metric_name] + @configuration_name = params[:configuration_name] + @metric_configuration = Kalibro::Client::MetricConfigurationClient.new.metric_configuration(@configuration_name, metric_name) + @metric = @metric_configuration.metric + end def create_metric_configuration @configuration_name = params[:configuration_name] @@ -35,6 +42,18 @@ class MezuroPluginMyprofileController < ProfileController Kalibro::Client::MetricConfigurationClient.new.save(metric_configuration, @configuration_name) redirect_to "/#{profile.identifier}/#{@configuration_name.downcase.gsub(/\s/, '-')}" end + + def new_compound_metric + @configuration_name = params[:configuration_name] + @metric_configurations = Kalibro::Client::ConfigurationClient.new.configuration(@configuration_name).metric_configurations + end + + def create_compound_metric_configuration + @configuration_name = params[:configuration_name] + compound_metric_configuration = new_compound_metric_configuration_instance + Kalibro::Client::MetricConfigurationClient.new.save(compound_metric_configuration, @configuration_name) + redirect_to "/#{profile.identifier}/#{@configuration_name.downcase.gsub(/\s/, '-')}" + end def update_metric_configuration @configuration_name = params[:configuration_name] @@ -44,6 +63,15 @@ class MezuroPluginMyprofileController < ProfileController Kalibro::Client::MetricConfigurationClient.new.save(metric_configuration, @configuration_name) redirect_to "/#{profile.identifier}/#{@configuration_name.downcase.gsub(/\s/, '-')}" end + + def update_compound_metric_configuration + @configuration_name = params[:configuration_name] + metric_name = params[:metric][:name] + metric_configuration = Kalibro::Client::MetricConfigurationClient.new.metric_configuration(@configuration_name, metric_name) + assign_compound_metric_configuration_instance (metric_configuration) + Kalibro::Client::MetricConfigurationClient.new.save(metric_configuration, @configuration_name) + redirect_to "/#{profile.identifier}/#{@configuration_name.downcase.gsub(/\s/, '-')}" + end def new_range @metric_name = params[:metric_name] @@ -103,33 +131,6 @@ class MezuroPluginMyprofileController < ProfileController end - def new_compound_metric - @configuration_name = params[:configuration_name] - @metric_configurations = Kalibro::Client::ConfigurationClient.new.configuration(@configuration_name).metric_configurations - end - - def create_compound_metric_configuration - @configuration_name = params[:configuration_name] - compound_metric_configuration = new_compound_metric_configuration_instance - Kalibro::Client::MetricConfigurationClient.new.save(compound_metric_configuration, @configuration_name) - redirect_to "/#{profile.identifier}/#{@configuration_name.downcase.gsub(/\s/, '-')}" - end - - def edit_compound_metric_configuration - metric_name = params[:metric_name] - @configuration_name = params[:configuration_name] - @metric_configuration = Kalibro::Client::MetricConfigurationClient.new.metric_configuration(@configuration_name, metric_name) - @metric = @metric_configuration.metric - end - - def update_compound_metric_configuration - @configuration_name = params[:configuration_name] - metric_name = params[:metric][:name] - metric_configuration = Kalibro::Client::MetricConfigurationClient.new.metric_configuration(@configuration_name, metric_name) - assign_compound_metric_configuration_instance (metric_configuration) - Kalibro::Client::MetricConfigurationClient.new.save(metric_configuration, @configuration_name) - redirect_to "/#{profile.identifier}/#{@configuration_name.downcase.gsub(/\s/, '-')}" - end private diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/edit_compound_metric_configuration.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/edit_compound_metric_configuration.html.erb index 51d5369..a7186d5 100644 --- a/plugins/mezuro/views/mezuro_plugin_myprofile/edit_compound_metric_configuration.html.erb +++ b/plugins/mezuro/views/mezuro_plugin_myprofile/edit_compound_metric_configuration.html.erb @@ -2,7 +2,8 @@ <% form_for :metric_configuration, :url => {:action =>"update_compound_metric_configuration", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %> <%= hidden_field_tag :configuration_name, @configuration_name %> - + <%= hidden_field_tag :scope, @metric.scope %> +

<%= f.label :metric_name, "Metric Name:" %> <%= @metric.name %> @@ -10,17 +11,15 @@

<%= f.label :description, "Description:" %> - <%= @metric.description %> <%= text_field_tag "metric[description]", @metric.description %>

- <%= f.label :code, "Code:" %> - <%= f.text_field :code %> + <%= f.label :scope, "Scope:" %> + <%= f.select :scope, [["Class", "CLASS"]], :selected => @metric.scope %>

- <%= f.label :scope, "Scope:" %> - <%= @metric.scope %> - <%= text_field_tag "metric[scope]", @metric.scope %> + <%= f.label :code, "Code:" %> + <%= text_field_tag "metric[code]", @metric_configuration.code %>

<%= f.label :aggregation_form, "Aggregation Form:" %> @@ -31,10 +30,7 @@ <%= f.label :weight, "Weight:" %> <%= f.text_field :weight %>

-

- <%= f.label :script, "script:" %> - <%= f.text_area :script %> -

+

<%= f.submit "Save" %>

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 dab849a..329a9c3 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 @@ -13,7 +13,7 @@ <%= f.text_field :description %>

- <%= f.label :scope, "scope" %> + <%= f.label :scope, "Scope:" %> <%= f.select :scope, [["Class", "CLASS"]] %>

-- libgit2 0.21.2