From 4d0a480bf153f2f86c46a4dfa7dab5d260431d40 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Fri, 21 Feb 2014 15:38:40 +0100 Subject: [PATCH] SONAR-4996 Display debt variation --- .../main/java/org/sonar/api/measures/Metric.java | 3 ++- .../webapp/WEB-INF/app/models/project_measure.rb | 13 ++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metric.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metric.java index 051556e0aee..4104dd60cb3 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metric.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metric.java @@ -503,7 +503,8 @@ public class Metric implements ServerExtension, BatchExtension { || ValueType.PERCENT.equals(type) || ValueType.BOOL.equals(type) || ValueType.MILLISEC.equals(type) - || ValueType.RATING.equals(type); + || ValueType.RATING.equals(type) + || ValueType.WORK_DUR.equals(type); } /** 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 cc5c7adf07f..f00e6089c2b 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 @@ -86,7 +86,7 @@ class ProjectMeasure < ActiveRecord::Base when Metric::VALUE_TYPE_MILLISEC millisecs_formatted_value( value() ) when Metric::VALUE_TYPE_WORK_DUR - Internal.work_duration_formatter.abbreviation(value()) + work_duration_formatted_value(value()) when Metric::VALUE_TYPE_BOOLEAN value() == 1 ? 'Yes' : 'No' when Metric::VALUE_TYPE_LEVEL @@ -118,6 +118,8 @@ class ProjectMeasure < ActiveRecord::Base end when Metric::VALUE_TYPE_MILLISEC millisecs_formatted_value(val) + when Metric::VALUE_TYPE_WORK_DUR + work_duration_formatted_value(val) else val.to_s end @@ -161,6 +163,15 @@ class ProjectMeasure < ActiveRecord::Base end end + def work_duration_formatted_value(value) + if value == 0 + '0' + else + duration = Internal.work_duration_formatter.abbreviation(value.abs).to_s + value > 0 ? duration : '-' + duration + end + end + def color @color ||= begin -- 2.39.5