From db2c24f023c8ab6dfbd473269086c61847720dea Mon Sep 17 00:00:00 2001
From: simonbrandhof <simon.brandhof@gmail.com>
Date: Tue, 19 Oct 2010 15:31:17 +0000
Subject: SONAR-1830 new metric type 'rating'

---
 sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb | 2 +-
 sonar-server/src/main/webapp/WEB-INF/app/models/drilldown.rb           | 2 +-
 sonar-server/src/main/webapp/WEB-INF/app/models/metric.rb              | 3 ++-
 sonar-server/src/main/webapp/WEB-INF/app/models/project_measure.rb     | 2 ++
 4 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'sonar-server')

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
index d728ba39ec7..266997f087e 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
@@ -129,7 +129,7 @@ module ApplicationHelper
         end
         html="<a href='#{url}' style='#{alert_link ? "cursor : default" : ""}' class='#{link_class}' rel='#{link_rel}' title='#{link_rel}'>#{html}</a>"
       end
-      no_tendency_img=true if (measure.metric.val_type==Metric::VALUE_TYPE_LEVEL || measure.metric.val_type==Metric::VALUE_TYPE_BOOLEAN)
+      no_tendency_img=true if (measure.metric.val_type==Metric::VALUE_TYPE_LEVEL || measure.metric.val_type==Metric::VALUE_TYPE_BOOLEAN || measure.metric.val_type==Metric::VALUE_TYPE_RATING)
       html="#{html} #{tendency_icon(measure, small, no_tendency_img)} #{suffix}"
     end
     html
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/drilldown.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/drilldown.rb
index 59943c0a7cf..7b761c6ddd3 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/drilldown.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/drilldown.rb
@@ -91,7 +91,7 @@ class DrilldownColumn
     end
 
     @measures=ProjectMeasure.find(:all,
-      :select => 'project_measures.id,project_measures.metric_id,project_measures.value,project_measures.snapshot_id',
+      :select => 'project_measures.id,project_measures.metric_id,project_measures.value,project_measures.text_value,project_measures.snapshot_id',
       :joins => :snapshot,
       :conditions => [conditions,values],
       :order => order,
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/metric.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/metric.rb
index 9ccca7d3f1e..fe23e7eb177 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/metric.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/metric.rb
@@ -30,6 +30,7 @@ class Metric < ActiveRecord::Base
   VALUE_TYPE_MILLISEC = 'MILLISEC'
   VALUE_TYPE_LEVEL = 'LEVEL'
   VALUE_TYPE_DISTRIB = 'DISTRIB'
+  VALUE_TYPE_RATING = 'RATING'
 
   TYPE_LEVEL_OK = 'OK'
   TYPE_LEVEL_WARN = 'WARN'
@@ -78,7 +79,7 @@ class Metric < ActiveRecord::Base
   end
 
   def numeric?
-    val_type==VALUE_TYPE_INT || val_type==VALUE_TYPE_FLOAT || val_type==VALUE_TYPE_PERCENT || val_type==VALUE_TYPE_MILLISEC
+    val_type==VALUE_TYPE_INT || val_type==VALUE_TYPE_FLOAT || val_type==VALUE_TYPE_PERCENT || val_type==VALUE_TYPE_MILLISEC || val_type==VALUE_TYPE_RATING
   end
 
   def data?
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/project_measure.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/project_measure.rb
index 860a8258ce9..ffbea749e58 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/project_measure.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/project_measure.rb
@@ -94,6 +94,8 @@ class ProjectMeasure < ActiveRecord::Base
       text_value
     when Metric::VALUE_TYPE_STRING
       text_value
+    when Metric::VALUE_TYPE_RATING
+      text_value || value.to_i.to_s
     else
       value().to_s
     end
-- 
cgit v1.2.3