Separate hotspot from tree metric on configurations show

Signed off by: Eduardo Silva Araújo <duduktamg@hotmail.com> Signed off by: Diego Araújo <diegoamc90@gmail.com>

Separate hotspot from tree metric on configurations show
Signed off by: Eduardo Silva Araújo <duduktamg@hotmail.com> Signed off by: Diego Araújo <diegoamc90@gmail.com>
Heitor
1 parent c7828da0
Showing 6 changed files with 50 additions and 11 deletions Show diff stats
app/controllers/kalibro_configurations_controller.rb
app/controllers/metric_configurations_controller.rb
app/views/kalibro_configurations/_metric_configurations.html.erb
app/views/kalibro_configurations/show.html.erb
config/locales/views/en.yml
config/locales/views/pt.yml
@@ -28,8 +28,11 @@ class KalibroConfigurationsController &lt; ApplicationController
   # GET /kalibro_configurations/1
   # GET /kalibro_configurations/1.json
   def show
-    Rails.cache.fetch("#{@kalibro_configuration.id}_metric_configurations") do
-       @kalibro_configuration.metric_configurations
+    Rails.cache.fetch("#{@kalibro_configuration.id}_tree_metric_configurations") do
+      @kalibro_configuration.tree_metric_configurations
+    end
+    Rails.cache.fetch("#{@kalibro_configuration.id}_hotspot_metric_configurations") do
+      @kalibro_configuration.hotspot_metric_configurations
     end
   end
@@ -20,7 +20,7 @@ class MetricConfigurationsController &lt; BaseMetricConfigurationsController
     respond_to do |format|
       create_and_redir(format)
     end
-    Rails.cache.delete("#{params[:kalibro_configuration_id]}_metric_configurations")
+    update_caches
   end
   def edit
@@ -38,7 +38,7 @@ class MetricConfigurationsController &lt; BaseMetricConfigurationsController
       if @metric_configuration.update(metric_configuration_params)
         format.html { redirect_to(kalibro_configuration_path(@metric_configuration.kalibro_configuration_id), notice: t('successfully_updated', :record => t(metric_configuration.class))) }
         format.json { head :no_content }
-        Rails.cache.delete("#{@metric_configuration.kalibro_configuration_id}_metric_configurations")
+        update_caches
       else
         failed_action(format, 'edit')
       end
@@ -51,7 +51,7 @@ class MetricConfigurationsController &lt; BaseMetricConfigurationsController
       format.html { redirect_to kalibro_configuration_path(params[:kalibro_configuration_id]) }
       format.json { head :no_content }
     end
-    Rails.cache.delete("#{params[:kalibro_configuration_id]}_metric_configurations")
+    update_caches
   end
   protected
@@ -67,6 +67,11 @@ class MetricConfigurationsController &lt; BaseMetricConfigurationsController
   private
+  def update_caches
+    Rails.cache.delete("#{params[:kalibro_configuration_id]}_tree_metric_configurations")
+    Rails.cache.delete("#{params[:kalibro_configuration_id]}_hotspot_metric_configurations")
+  end
+
   # Duplicated code on create and update actions extracted here
   def failed_action(format, destiny_action)
     @kalibro_configuration_id = params[:kalibro_configuration_id]
 <tr>
   <td><%= metric_configuration.metric.name %></td>
-  <td><%= metric_configuration.metric.code %></td>
-  <td><%= metric_configuration.weight %></td>
+  <% unless metric_configuration.metric.is_a? KalibroClient::Entities::Miscellaneous::HotspotMetric %>
+    <td><%= metric_configuration.metric.code %></td>
+    <td><%= metric_configuration.weight %></td>
+  <% end %>
   <td>
     <%= link_to_show_page(metric_configuration, @kalibro_configuration.id) %>
   </td>
@@ -8,11 +8,11 @@
 </p>
 <hr>
-<div id="metrics">
-<h2><%= t('metric').pluralize %></h2>
 <% if kalibro_configuration_owner? @kalibro_configuration.id %>
   <%= link_to t_action(:add, MetricConfiguration), kalibro_configuration_choose_metric_path(@kalibro_configuration.id), class: 'btn btn-info' %>
 <% end %>
+<div id="tree_metrics">
+<h2><%= t('tree_metric').pluralize %></h2>
 <table class="table table-hover">
   <thead>
@@ -24,10 +24,10 @@
     </tr>
   </thead>
   <tbody>
-    <% if Rails.cache.read("#{@kalibro_configuration.id}_metric_configurations").empty? %>
+    <% if Rails.cache.read("#{@kalibro_configuration.id}_tree_metric_configurations").empty? %>
       <%= render partial: 'no_metric_configurations' %>
     <% else %>
-      <%= render partial: 'metric_configurations', collection: Rails.cache.read("#{@kalibro_configuration.id}_metric_configurations"), as: :metric_configuration %>
+      <%= render partial: 'metric_configurations', collection: Rails.cache.read("#{@kalibro_configuration.id}_tree_metric_configurations"), as: :metric_configuration %>
     <% end %>
   </tbody>
 </table>
@@ -35,6 +35,27 @@
 <hr>
+<div id="hotspot_metrics">
+<h2><%= t('hotspot_metric').pluralize %></h2>
+
+<table class="table table-hover">
+  <thead>
+    <tr>
+      <th><%= t('metric') %></th>
+      <th colspan="1"></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% if Rails.cache.read("#{@kalibro_configuration.id}_hotspot_metric_configurations").empty? %>
+      <%= render partial: 'no_metric_configurations' %>
+    <% else %>
+      <%= render partial: 'metric_configurations', collection: Rails.cache.read("#{@kalibro_configuration.id}_hotspot_metric_configurations"), as: :metric_configuration %>
+    <% end %>
+  </tbody>
+</table>
+</div>
+
+<hr>
 <p>
  <%= link_to t('back'), kalibro_configurations_path, class: 'btn btn-default' %>
  <% if kalibro_configuration_owner? @kalibro_configuration.id %>
@@ -47,6 +47,10 @@ en:
   no_description: "There is no description available"
   welcome: "Welcome"
   metrics: "Metrics"
+  tree_metrics: "Tree Metrics"
+  tree_metric: "Tree Metric"
+  hotspot_metrics: "Hotspot Metrics"
+  hotspot_metric: "Hotspot Metric"
   value: "Value"
   threshold: "Threshold"
   granularity: "Granularity"
@@ -50,6 +50,10 @@ pt:
   no_description: "Não há descrição disponível."
   welcome: "Bem-Vindo"
   metrics: "Métricas"
+  tree_metrics: "Métricas escalares"
+  tree_metric: "Métrica escalar"
+  hotspot_metrics: "Métricas de Hotspot"
+  hotspot_metric: "Métrica de Hotspot"
   value: "Valor"
   threshold: "limite"
   granularity: "Granularidade"
	@@ -47,6 +47,10 @@ en:		@@ -47,6 +47,10 @@ en:
47	no_description: "There is no description available"	47	no_description: "There is no description available"
48	welcome: "Welcome"	48	welcome: "Welcome"
49	metrics: "Metrics"	49	metrics: "Metrics"
		50	+ tree_metrics: "Tree Metrics"
		51	+ tree_metric: "Tree Metric"
		52	+ hotspot_metrics: "Hotspot Metrics"
		53	+ hotspot_metric: "Hotspot Metric"
50	value: "Value"	54	value: "Value"
51	threshold: "Threshold"	55	threshold: "Threshold"
52	granularity: "Granularity"	56	granularity: "Granularity"
	@@ -50,6 +50,10 @@ pt:		@@ -50,6 +50,10 @@ pt:
50	no_description: "Não há descrição disponível."	50	no_description: "Não há descrição disponível."
51	welcome: "Bem-Vindo"	51	welcome: "Bem-Vindo"
52	metrics: "Métricas"	52	metrics: "Métricas"
		53	+ tree_metrics: "Métricas escalares"
		54	+ tree_metric: "Métrica escalar"
		55	+ hotspot_metrics: "Métricas de Hotspot"
		56	+ hotspot_metric: "Métrica de Hotspot"
53	value: "Valor"	57	value: "Valor"
54	threshold: "limite"	58	threshold: "limite"
55	granularity: "Granularidade"	59	granularity: "Granularidade"