aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-server/src
diff options
context:
space:
mode:
authorsimonbrandhof <simon.brandhof@gmail.com>2010-12-03 12:59:56 +0000
committersimonbrandhof <simon.brandhof@gmail.com>2010-12-03 12:59:56 +0000
commit4797af9603b3866df947f5c503e23a9e8115aa63 (patch)
tree44dbaf2178ec1a9cb3b2367419a5f430894aface /sonar-server/src
parentba864aa618db80424f76908dc880d7af826dad94 (diff)
downloadsonarqube-4797af9603b3866df947f5c503e23a9e8115aa63.tar.gz
sonarqube-4797af9603b3866df947f5c503e23a9e8115aa63.zip
SONAR-249 improve some widgets + display variation of test execution time
Diffstat (limited to 'sonar-server/src')
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/models/project_measure.rb10
1 files changed, 5 insertions, 5 deletions
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 e249ed87b6c..8e08ab98147 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
@@ -101,7 +101,7 @@ class ProjectMeasure < ActiveRecord::Base
when Metric::VALUE_TYPE_PERCENT
number_to_percentage(val, {:precision => 1})
when Metric::VALUE_TYPE_MILLISEC
- millisecs_formatted_value( val )
+ millisecs_formatted_value(val)
else
val.to_s
end
@@ -122,18 +122,18 @@ class ProjectMeasure < ActiveRecord::Base
def millisecs_formatted_value( value )
# bugfix with jruby 1.0 release does not support % for BigDecimal
- value = value.to_i if value.kind_of? BigDecimal
- if value >= HOUR
+ value = value.to_i
+ if value.abs >= HOUR
hours = ( value / HOUR ).to_i
mins = ( value % HOUR / MIN ).to_i
secs = ( value % MIN / SEC ).to_i
return hours.to_s + ":" + leading_zero( mins ) + ":" + leading_zero( secs ) + " h"
- elsif value >= MIN
+ elsif value.abs >= MIN
mins = ( value / MIN ).to_i
secs = ( value % MIN / SEC ).to_i
millisecs = ( value % MIN % SEC ).to_i
return mins.to_s + ":" + leading_zero( secs ) + " min"
- elsif value >= SEC
+ elsif value.abs >= SEC
secs = ( value / SEC ).to_i
millisecs = ( value % SEC ).to_i
return secs.to_s + "." + millisecs.to_s[0, 1] + " sec" if millisecs != 0