Download as
Browse Code »

Commit 1e80f8b24612aed5172e9c69f115f3eb0687accb

Authored by Alessandro Palmeira + João M. M. Silva
Committed by Paulo Meireles
1 parent 728ee359
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

[Mezuro] Finished range and metric configuration.

Showing 6 changed files with 14 additions and 13 deletions   Show diff stats
plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
  Diff comments   View file @1e80f8b
@@ -72,7 +72,9 @@ class MezuroPluginProfileController < ProfileController @@ -72,7 +72,9 @@ class MezuroPluginProfileController < ProfileController
72 72
73 def update_metric_configuration 73 def update_metric_configuration
74 @configuration_name = params[:configuration_name] 74 @configuration_name = params[:configuration_name]
75 - metric_configuration = new_metric_configuration_instance 75 + metric_name = params[:metric][:name]
  76 + metric_configuration = Kalibro::Client::MetricConfigurationClient.new.metric_configuration(@configuration_name, metric_name)
  77 + assign_metric_configuration_instance (metric_configuration)
76 Kalibro::Client::MetricConfigurationClient.new.save(metric_configuration, @configuration_name) 78 Kalibro::Client::MetricConfigurationClient.new.save(metric_configuration, @configuration_name)
77 redirect_to "/#{profile.identifier}/#{@configuration_name.downcase.gsub(/\s/, '-')}" 79 redirect_to "/#{profile.identifier}/#{@configuration_name.downcase.gsub(/\s/, '-')}"
78 end 80 end
@@ -112,9 +114,6 @@ class MezuroPluginProfileController < ProfileController @@ -112,9 +114,6 @@ class MezuroPluginProfileController < ProfileController
112 index = metric_configuration.ranges.index{ |range| range.beginning == beginning_id.to_f } 114 index = metric_configuration.ranges.index{ |range| range.beginning == beginning_id.to_f }
113 metric_configuration.ranges[index] = new_range_instance 115 metric_configuration.ranges[index] = new_range_instance
114 Kalibro::Client::MetricConfigurationClient.new.save(metric_configuration, configuration_name) 116 Kalibro::Client::MetricConfigurationClient.new.save(metric_configuration, configuration_name)
115 - formatted_configuration_name = configuration_name.gsub(/\s/, '+')  
116 - formatted_metric_name = metric_name.gsub(/\s/, '+')  
117 - redirect_to "/profile/#{profile.identifier}/plugins/mezuro/edit_metric_configuration?configuration_name=#{formatted_configuration_name}&metric_name=#{formatted_metric_name}"  
118 end 117 end
119 118
120 def remove_range 119 def remove_range
@@ -127,8 +126,7 @@ class MezuroPluginProfileController < ProfileController @@ -127,8 +126,7 @@ class MezuroPluginProfileController < ProfileController
127 Kalibro::Client::MetricConfigurationClient.new.save(metric_configuration, configuration_name) 126 Kalibro::Client::MetricConfigurationClient.new.save(metric_configuration, configuration_name)
128 formatted_configuration_name = configuration_name.gsub(/\s/, '+') 127 formatted_configuration_name = configuration_name.gsub(/\s/, '+')
129 formatted_metric_name = metric_name.gsub(/\s/, '+') 128 formatted_metric_name = metric_name.gsub(/\s/, '+')
130 - #FIXME não está redirecionando  
131 - redirect "/profile/#{profile.identifier}/plugins/mezuro/edit_metric_configuration?configuration_name=#{formatted_configuration_name}&metric_name=#{formatted_metric_name}" 129 + redirect_to "/profile/#{profile.identifier}/plugins/mezuro/edit_metric_configuration?configuration_name=#{formatted_configuration_name}&metric_name=#{formatted_metric_name}"
132 end 130 end
133 131
134 def remove_metric_configuration 132 def remove_metric_configuration
@@ -143,6 +141,10 @@ class MezuroPluginProfileController < ProfileController @@ -143,6 +141,10 @@ class MezuroPluginProfileController < ProfileController
143 def new_metric_configuration_instance 141 def new_metric_configuration_instance
144 metric_configuration = Kalibro::Entities::MetricConfiguration.new 142 metric_configuration = Kalibro::Entities::MetricConfiguration.new
145 metric_configuration.metric = Kalibro::Entities::NativeMetric.new 143 metric_configuration.metric = Kalibro::Entities::NativeMetric.new
  144 + assign_metric_configuration_instance (metric_configuration)
  145 + end
  146 +
  147 + def assign_metric_configuration_instance (metric_configuration)
146 metric_configuration.metric.name = params[:metric][:name] 148 metric_configuration.metric.name = params[:metric][:name]
147 metric_configuration.metric.description = params[:description] 149 metric_configuration.metric.description = params[:description]
148 metric_configuration.metric.origin = params[:metric][:origin] 150 metric_configuration.metric.origin = params[:metric][:origin]
@@ -150,7 +152,7 @@ class MezuroPluginProfileController < ProfileController @@ -150,7 +152,7 @@ class MezuroPluginProfileController < ProfileController
150 metric_configuration.metric.language = params[:language] 152 metric_configuration.metric.language = params[:language]
151 metric_configuration.code = params[:metric_configuration][:code] 153 metric_configuration.code = params[:metric_configuration][:code]
152 metric_configuration.weight = params[:metric_configuration][:weight] 154 metric_configuration.weight = params[:metric_configuration][:weight]
153 - metric_configuration.aggregation_form = params[:metric_configuration][:aggregation] 155 + metric_configuration.aggregation_form = params[:metric_configuration][:aggregation_form]
154 metric_configuration 156 metric_configuration
155 end 157 end
156 158
plugins/mezuro/views/mezuro_plugin_profile/_edit_range.html.erb
  Diff comments   View file @1e80f8b
1 <% remote_form_for :range, :url => {:action =>"update_range", :controller => "mezuro_plugin_profile"}, :method => :get do |f| %> 1 <% remote_form_for :range, :url => {:action =>"update_range", :controller => "mezuro_plugin_profile"}, :method => :get do |f| %>
  2 + <%= hidden_field_tag :beginning_id, beginning_id %>
2 <%= render :partial => "range_form", :locals => {:f => f, :metric_name => metric_name, :configuration_name => configuration_name, :beginning_id => beginning_id, :range => range } %> 3 <%= render :partial => "range_form", :locals => {:f => f, :metric_name => metric_name, :configuration_name => configuration_name, :beginning_id => beginning_id, :range => range } %>
3 <% end %> 4 <% end %>
plugins/mezuro/views/mezuro_plugin_profile/_range_form.html.erb
  Diff comments   View file @1e80f8b
1 <%= hidden_field_tag :configuration_name, configuration_name %> 1 <%= hidden_field_tag :configuration_name, configuration_name %>
2 <%= hidden_field_tag :metric_name, metric_name %> 2 <%= hidden_field_tag :metric_name, metric_name %>
3 -<%= hidden_field_tag :beginning_id, beginning_id %>  
4 <table> 3 <table>
5 <tr> 4 <tr>
6 <td> 5 <td>
plugins/mezuro/views/mezuro_plugin_profile/new_metric_configuration.html.erb
  Diff comments   View file @1e80f8b
@@ -28,8 +28,8 @@ @@ -28,8 +28,8 @@
28 <%= f.text_field :code %> 28 <%= f.text_field :code %>
29 </p> 29 </p>
30 <p> 30 <p>
31 - <%= f.label :aggregation, "Aggregation:" %>  
32 - <%= f.select :aggregation, [["Average","AVERAGE"], ["Median", "MEDIAN"], ["Maximum", "MAXIMUM"], ["Minimum", "MINIMUM"], 31 + <%= f.label :aggregation_form, "Aggregation:" %>
  32 + <%= f.select :aggregation_form, [["Average","AVERAGE"], ["Median", "MEDIAN"], ["Maximum", "MAXIMUM"], ["Minimum", "MINIMUM"],
33 ["Count", "COUNT"], ["Standard Deviation", "STANDARD_DEVIATION"]] %> 33 ["Count", "COUNT"], ["Standard Deviation", "STANDARD_DEVIATION"]] %>
34 </p> 34 </p>
35 <p> 35 <p>
plugins/mezuro/views/mezuro_plugin_profile/new_range.rjs
  Diff comments   View file @1e80f8b
1 -page.replace_html 'range_form', :partial => "new_range", :locals => {:metric_name => @metric_name, :configuration_name => @configuration_name } 1 +page.replace_html 'range_form', :partial => "new_range", :locals => {:metric_name => @metric_name, :configuration_name => @configuration_name, :beginning_id => "bolinha" }
2 page.visual_effect :slide_down, "range_form" 2 page.visual_effect :slide_down, "range_form"
plugins/mezuro/views/mezuro_plugin_profile/update_range.rjs
  Diff comments   View file @1e80f8b
1 -page.visual_effect :toggle_slide, "range_form"  
2 -page.insert_html :bottom, "ranges", :partial => "range", :locals => {:range => @range} 1 +page.reload()