diff --git a/plugins/mezuro/lib/kalibro/client/configuration_client.rb b/plugins/mezuro/lib/kalibro/client/configuration_client.rb index 59cd11e..1bd56cc 100644 --- a/plugins/mezuro/lib/kalibro/client/configuration_client.rb +++ b/plugins/mezuro/lib/kalibro/client/configuration_client.rb @@ -4,7 +4,6 @@ class Kalibro::Client::ConfigurationClient configuration = Kalibro::Entities::Configuration.new configuration.name = configuration_content.name configuration.description = configuration_content.description - configuration.create_metric_configurations(configuration_content.metrics) new.save(configuration) end diff --git a/plugins/mezuro/lib/kalibro/entities/configuration.rb b/plugins/mezuro/lib/kalibro/entities/configuration.rb index 097c051..38e3d0a 100644 --- a/plugins/mezuro/lib/kalibro/entities/configuration.rb +++ b/plugins/mezuro/lib/kalibro/entities/configuration.rb @@ -2,8 +2,6 @@ class Kalibro::Entities::Configuration < Kalibro::Entities::Entity attr_accessor :name, :description, :metric_configuration - #FIXME Fix metric_configuration / metric_configurationS names - def metric_configuration=(value) @metric_configuration = to_entity_array(value, Kalibro::Entities::MetricConfiguration) end @@ -23,14 +21,4 @@ class Kalibro::Entities::Configuration < Kalibro::Entities::Entity end end - def create_metric_configuration(metric) - splitted_metric = metric.split(/:/) - origin = splitted_metric[0] - name = splitted_metric[1] - metric = Kalibro::Entities::NativeMetric.new_with_origin_and_name(origin, name) - metric.scope = 'CLASS' - metric.languages = ['JAVA'] - Kalibro::Entities::MetricConfiguration.new_with_metric_and_code(metric, name) - end - end diff --git a/plugins/mezuro/lib/kalibro/entities/metric_configuration.rb b/plugins/mezuro/lib/kalibro/entities/metric_configuration.rb index 6dd31f9..c532542 100644 --- a/plugins/mezuro/lib/kalibro/entities/metric_configuration.rb +++ b/plugins/mezuro/lib/kalibro/entities/metric_configuration.rb @@ -2,23 +2,6 @@ class Kalibro::Entities::MetricConfiguration < Kalibro::Entities::Entity attr_accessor :metric, :code, :weight, :aggregation_form, :range - - def self.new_with_metric_and_code(metric, code) - configuration = new - configuration.metric = metric - configuration.code = code - configuration.ranges = [new_range] - configuration - end - - def self.new_range - created_range = Kalibro::Entities::Range.new - created_range.beginning = 0 - created_range.end = 10 - created_range.label = "" - created_range - end - def metric=(value) if value.kind_of?(Hash) @metric = to_entity(value, Kalibro::Entities::CompoundMetric) if value.has_key?(:script) diff --git a/plugins/mezuro/lib/kalibro/entities/native_metric.rb b/plugins/mezuro/lib/kalibro/entities/native_metric.rb index 3f41dc7..5b72682 100644 --- a/plugins/mezuro/lib/kalibro/entities/native_metric.rb +++ b/plugins/mezuro/lib/kalibro/entities/native_metric.rb @@ -10,11 +10,4 @@ class Kalibro::Entities::NativeMetric < Kalibro::Entities::Metric @language = languages end - def self.new_with_origin_and_name(origin, name) - metric = new - metric.name = name - metric.origin = origin - metric - end - end diff --git a/plugins/mezuro/views/cms/mezuro_plugin/_configuration_content.html.erb b/plugins/mezuro/views/cms/mezuro_plugin/_configuration_content.html.erb index 1e44fbe..847042d 100644 --- a/plugins/mezuro/views/cms/mezuro_plugin/_configuration_content.html.erb +++ b/plugins/mezuro/views/cms/mezuro_plugin/_configuration_content.html.erb @@ -18,25 +18,3 @@ end <%= required f.text_field(:name) %> <%= f.text_field :description %>
- -

Metrics

-<% @tool_names = Kalibro::Client::BaseToolClient.new -@tool_names.base_tool_names.each do |collector_name| %> -

<%=collector_name%>

- - <% - @collector = @tool_names.base_tool(collector_name) - @collector.supported_metrics.each do |metric| - - metric_id = collector_name + ":" + metric.name %> - - - - - <% end %> -
- <% #FIXME Tratar caso com 0 métricas selecionadas %> - <%= check_box_tag "article[metrics][]", metric_id, false, {:id => metric_id.gsub(/[\/ ]/, '_')} %> - <%= label_tag metric_id, metric.name %> -
-<% end %> diff --git a/plugins/mezuro/views/content_viewer/show_configuration.rhtml b/plugins/mezuro/views/content_viewer/show_configuration.rhtml index ecbea56..755de83 100644 --- a/plugins/mezuro/views/content_viewer/show_configuration.rhtml +++ b/plugins/mezuro/views/content_viewer/show_configuration.rhtml @@ -14,23 +14,3 @@ <%= link_to "Teste", "/profile/#{profile.identifier}/plugins/mezuro/teste" %> <%= link_to "Teste", :controller => "mezuro_plugin_profile", :action => "teste", :params => {:configuration_name => @configuration_content.name}%> - -

Metrics

-<% @tool_names = Kalibro::Client::BaseToolClient.new -@tool_names.base_tool_names.each do |collector_name| %> -

<%=collector_name%>

- - <% @configuration_content.metrics.each do |metric| - splitted_metric = metric.split(/:/) - metric_origin = splitted_metric[0] - metric_name = splitted_metric[1] - if( metric_origin == collector_name )%> - - - - <%end - end %> -
- <%=metric_name%> -
-<% end %> -- libgit2 0.21.2