From e61f62c60325469f589baccfa6e7e6b18ea569ce Mon Sep 17 00:00:00 2001 From: Alessandro Palmeira + João M. M. Silva Date: Thu, 26 Apr 2012 14:25:12 -0300 Subject: [PATCH] [Mezuro] Split controller in two -now working- --- plugins/mezuro/views/content_viewer/show_configuration.rhtml | 6 +++--- plugins/mezuro/views/mezuro_plugin_profile/_edit_range.html.erb | 4 ---- plugins/mezuro/views/mezuro_plugin_profile/_new_range.html.erb | 3 --- plugins/mezuro/views/mezuro_plugin_profile/_range.html.erb | 17 ----------------- plugins/mezuro/views/mezuro_plugin_profile/_range_form.html.erb | 53 ----------------------------------------------------- plugins/mezuro/views/mezuro_plugin_profile/choose_base_tool.html.erb | 13 ------------- plugins/mezuro/views/mezuro_plugin_profile/choose_metric.html.erb | 18 ------------------ plugins/mezuro/views/mezuro_plugin_profile/create_range.rjs | 2 -- plugins/mezuro/views/mezuro_plugin_profile/edit_metric_configuration.html.erb | 78 ------------------------------------------------------------------------------ plugins/mezuro/views/mezuro_plugin_profile/edit_range.rjs | 2 -- plugins/mezuro/views/mezuro_plugin_profile/new_metric_configuration.html.erb | 44 -------------------------------------------- plugins/mezuro/views/mezuro_plugin_profile/new_range.rjs | 2 -- plugins/mezuro/views/mezuro_plugin_profile/teste.html.erb | 1 - plugins/mezuro/views/mezuro_plugin_profile/update_range.rjs | 1 - 14 files changed, 3 insertions(+), 241 deletions(-) delete mode 100644 plugins/mezuro/views/mezuro_plugin_profile/_edit_range.html.erb delete mode 100644 plugins/mezuro/views/mezuro_plugin_profile/_new_range.html.erb delete mode 100644 plugins/mezuro/views/mezuro_plugin_profile/_range.html.erb delete mode 100644 plugins/mezuro/views/mezuro_plugin_profile/_range_form.html.erb delete mode 100644 plugins/mezuro/views/mezuro_plugin_profile/choose_base_tool.html.erb delete mode 100644 plugins/mezuro/views/mezuro_plugin_profile/choose_metric.html.erb delete mode 100644 plugins/mezuro/views/mezuro_plugin_profile/create_range.rjs delete mode 100644 plugins/mezuro/views/mezuro_plugin_profile/edit_metric_configuration.html.erb delete mode 100644 plugins/mezuro/views/mezuro_plugin_profile/edit_range.rjs delete mode 100644 plugins/mezuro/views/mezuro_plugin_profile/new_metric_configuration.html.erb delete mode 100644 plugins/mezuro/views/mezuro_plugin_profile/new_range.rjs delete mode 100644 plugins/mezuro/views/mezuro_plugin_profile/teste.html.erb delete mode 100644 plugins/mezuro/views/mezuro_plugin_profile/update_range.rjs diff --git a/plugins/mezuro/views/content_viewer/show_configuration.rhtml b/plugins/mezuro/views/content_viewer/show_configuration.rhtml index 1fef4a2..1002c41 100644 --- a/plugins/mezuro/views/content_viewer/show_configuration.rhtml +++ b/plugins/mezuro/views/content_viewer/show_configuration.rhtml @@ -14,7 +14,7 @@
-<%= link_to "#{image_tag ('/plugins/mezuro/images/plus.png')}Add Metric", :controller => "mezuro_plugin_profile", +<%= link_to "#{image_tag ('/plugins/mezuro/images/plus.png')}Add Metric", :controller => "mezuro_plugin_myprofile", :action => "choose_base_tool", :params => {:configuration_name => @configuration.name} %>
@@ -28,9 +28,9 @@ - - <% 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 deleted file mode 100644 index bc99247..0000000 --- a/plugins/mezuro/views/mezuro_plugin_profile/_edit_range.html.erb +++ /dev/null @@ -1,4 +0,0 @@ -<% 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/_new_range.html.erb b/plugins/mezuro/views/mezuro_plugin_profile/_new_range.html.erb deleted file mode 100644 index ec2cb9d..0000000 --- a/plugins/mezuro/views/mezuro_plugin_profile/_new_range.html.erb +++ /dev/null @@ -1,3 +0,0 @@ -<% remote_form_for :range, :url => {:action =>"create_range", :controller => "mezuro_plugin_profile"}, :method => :get do |f| %> - <%= render :partial => "range_form", :locals => {:f => f, :metric_name => metric_name, :configuration_name => configuration_name } %> -<% end %> diff --git a/plugins/mezuro/views/mezuro_plugin_profile/_range.html.erb b/plugins/mezuro/views/mezuro_plugin_profile/_range.html.erb deleted file mode 100644 index 6f7ba84..0000000 --- a/plugins/mezuro/views/mezuro_plugin_profile/_range.html.erb +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - diff --git a/plugins/mezuro/views/mezuro_plugin_profile/_range_form.html.erb b/plugins/mezuro/views/mezuro_plugin_profile/_range_form.html.erb deleted file mode 100644 index b34a97c..0000000 --- a/plugins/mezuro/views/mezuro_plugin_profile/_range_form.html.erb +++ /dev/null @@ -1,53 +0,0 @@ -<%= hidden_field_tag :configuration_name, configuration_name %> -<%= hidden_field_tag :metric_name, metric_name %> -
<%= metric_configuration.metric.name %> <%= metric_configuration.metric.origin %> <%= metric_configuration.code %><%= link_to "Edit", :controller => "mezuro_plugin_profile", :action => "edit_metric_configuration", :params => + <%= link_to "Edit", :controller => "mezuro_plugin_myprofile", :action => "edit_metric_configuration", :params => {:configuration_name => @configuration.name, :metric_name => metric_configuration.metric.name} %><%= link_to "Remove", :controller => "mezuro_plugin_profile", :action => "remove_metric_configuration", :params => + <%= link_to "Remove", :controller => "mezuro_plugin_myprofile", :action => "remove_metric_configuration", :params => {:configuration_name => @configuration.name, :metric_name => metric_configuration.metric.name} %>
- <%=range.label%> - - <%=range.beginning%> - - <%=range.end%> - - <%=range.grade%> - <%= link_to_remote "Edit", :url => {:action =>"edit_range", :controller => "mezuro_plugin_profile", :configuration_name => params[:configuration_name], :metric_name => params[:metric_name], :beginning_id => range.beginning} %><%= link_to "Remove", :action =>"remove_range", :controller => "mezuro_plugin_profile", :configuration_name => params[:configuration_name], :metric_name => params[:metric_name], :range_beginning => range.beginning %>
- - - - - - - - - - - - - - - - - - - - - - - - -
- <%= f.label :label, "Label:" %> - - <%= f.text_field :label %> -
- <%= f.label :beginning, "Beginning:" %> - - <%= f.text_field :beginning %> -
- <%= f.label :end, "End:" %> - - <%= f.text_field :end %> -
- <%= f.label :grade, "Grade:" %> - - <%= f.text_field :grade %> -
- <%= f.label :color, "Color:" %> - - <%= f.text_field :color %> -
- <%= f.label :comments, "Comments:" %> - - <%= f.text_field :comments %> -
-<%= f.submit "Save Range" %> diff --git a/plugins/mezuro/views/mezuro_plugin_profile/choose_base_tool.html.erb b/plugins/mezuro/views/mezuro_plugin_profile/choose_base_tool.html.erb deleted file mode 100644 index e50e01c..0000000 --- a/plugins/mezuro/views/mezuro_plugin_profile/choose_base_tool.html.erb +++ /dev/null @@ -1,13 +0,0 @@ -

<%= @configuration_name%> Configuration

- -
Base Tools:
- - <% @tool_names.base_tool_names.each do |collector_name| %> - - - - <% end %> -
- <%= link_to collector_name, :controller => "mezuro_plugin_profile", :action => "choose_metric", :params => - {:configuration_name => @configuration_name, :collector_name => collector_name} %> -
diff --git a/plugins/mezuro/views/mezuro_plugin_profile/choose_metric.html.erb b/plugins/mezuro/views/mezuro_plugin_profile/choose_metric.html.erb deleted file mode 100644 index bca3763..0000000 --- a/plugins/mezuro/views/mezuro_plugin_profile/choose_metric.html.erb +++ /dev/null @@ -1,18 +0,0 @@ -

<%= @configuration_name %> Configuration

- - - -
Metric Collector: <%= @collector_name %>
- - -
Choose a metric to add:
- - <% @collector.supported_metrics.each do |metric| %> - - - - <% end %> -
- <%= link_to metric.name, :controller => "mezuro_plugin_profile", :action => "new_metric_configuration", :params => {:metric_name => metric.name, - :collector_name => @collector_name, :configuration_name => @configuration_name} %> -
diff --git a/plugins/mezuro/views/mezuro_plugin_profile/create_range.rjs b/plugins/mezuro/views/mezuro_plugin_profile/create_range.rjs deleted file mode 100644 index f0cf9ee..0000000 --- a/plugins/mezuro/views/mezuro_plugin_profile/create_range.rjs +++ /dev/null @@ -1,2 +0,0 @@ -page.visual_effect :toggle_slide, "range_form" -page.insert_html :bottom, "ranges", :partial => "range", :locals => {:range => @range} diff --git a/plugins/mezuro/views/mezuro_plugin_profile/edit_metric_configuration.html.erb b/plugins/mezuro/views/mezuro_plugin_profile/edit_metric_configuration.html.erb deleted file mode 100644 index 2159e7a..0000000 --- a/plugins/mezuro/views/mezuro_plugin_profile/edit_metric_configuration.html.erb +++ /dev/null @@ -1,78 +0,0 @@ -

<%= @configuration_name %> Configuration

- -<% form_for :metric_configuration, :url => {:action =>"update_metric_configuration", :controller => "mezuro_plugin_profile"}, :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 %> - <% end %> - -

- <%= f.label :origin, "Collector Name:" %> - <%= @metric.origin %> - <%= hidden_field_tag "metric[origin]", @metric.origin %> -

-

- <%= f.label :metric_name, "Metric Name:" %> - <%= @metric.name %> - <%= hidden_field_tag "metric[name]", @metric.name %> -

-

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

-

- <%= f.label :code, "Code:" %> - <%= @metric_configuration.code %> - <%= f.hidden_field :code, :value => @metric_configuration.code %> -

-

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

-

- <%= f.label :weight, "Weight:" %> - <%= f.text_field :weight %> -

- -

- <%= f.submit "Save" %> -

-<% end %> - - -
Ranges

- - - - - - - - - - <% if (@metric_configuration.ranges!=nil) - @metric_configuration.ranges.each do |range| %> - <%= render :partial => "range", :locals => {:range => range, :configuration_name => @configuration_name, - :metric_name => @metric_configuration.metric.name} %> - <% end - end %> -
- Label - - Beginning - - End - - Grade - - Color -
- -
-<%= link_to_remote "New Range", :url => {:action =>"new_range", :controller => "mezuro_plugin_profile", :configuration_name => @configuration_name, :metric_name => @metric.name} %> - - diff --git a/plugins/mezuro/views/mezuro_plugin_profile/edit_range.rjs b/plugins/mezuro/views/mezuro_plugin_profile/edit_range.rjs deleted file mode 100644 index 144b018..0000000 --- a/plugins/mezuro/views/mezuro_plugin_profile/edit_range.rjs +++ /dev/null @@ -1,2 +0,0 @@ -page.replace_html 'range_form', :partial => "edit_range", :locals => {:metric_name => @metric_name, :configuration_name => @configuration_name, :beginning_id => @beginning_id, :range => @range } -page.visual_effect :slide_down, "range_form" 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 deleted file mode 100644 index 3626ff8..0000000 --- a/plugins/mezuro/views/mezuro_plugin_profile/new_metric_configuration.html.erb +++ /dev/null @@ -1,44 +0,0 @@ -

<%= @configuration_name %> Configuration

- -<% form_for :metric_configuration, :url => {:action =>"create_metric_configuration", :controller => "mezuro_plugin_profile"}, :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 %> - <% end %> - -

- <%= f.label :origin, "Collector Name:" %> - <%= @metric.origin %> - <%= hidden_field_tag "metric[origin]", @metric.origin %> -

-

- <%= f.label :metric_name, "Metric Name:" %> - <%= @metric.name %> - <%= hidden_field_tag "metric[name]", @metric.name %> -

-

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

-

- <%= f.label :code, "Code:" %> - <%= f.text_field :code %> -

-

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

-

- <%= f.label :weight, "Weight:" %> - <%= f.text_field :weight %> -

- -

- <%= f.submit "Add" %> -

- -<% end %> diff --git a/plugins/mezuro/views/mezuro_plugin_profile/new_range.rjs b/plugins/mezuro/views/mezuro_plugin_profile/new_range.rjs deleted file mode 100644 index 65c2f64..0000000 --- a/plugins/mezuro/views/mezuro_plugin_profile/new_range.rjs +++ /dev/null @@ -1,2 +0,0 @@ -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/teste.html.erb b/plugins/mezuro/views/mezuro_plugin_profile/teste.html.erb deleted file mode 100644 index de40087..0000000 --- a/plugins/mezuro/views/mezuro_plugin_profile/teste.html.erb +++ /dev/null @@ -1 +0,0 @@ -

<%= @configuration_name %>

diff --git a/plugins/mezuro/views/mezuro_plugin_profile/update_range.rjs b/plugins/mezuro/views/mezuro_plugin_profile/update_range.rjs deleted file mode 100644 index 5b95d3b..0000000 --- a/plugins/mezuro/views/mezuro_plugin_profile/update_range.rjs +++ /dev/null @@ -1 +0,0 @@ -page.reload() -- libgit2 0.21.2