From 9435dd4449939baa4499f8517c76ccf7ee10a7b5 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Fri, 16 May 2014 18:38:54 +0200 Subject: [PATCH] SONAR-5209 Coverage: i18n --- .../resources/org/sonar/l10n/core.properties | 6 + .../header/_coverage-header.hbs | 154 ++++++------------ .../component-viewer/header/_header-item.hbs | 4 + .../component-viewer/header/_header-link.hbs | 5 + .../main/js/common/handlebars-extensions.js | 32 +++- .../WEB-INF/app/views/issues/search.html.erb | 8 + 6 files changed, 100 insertions(+), 109 deletions(-) create mode 100644 sonar-server/src/main/hbs/component-viewer/header/_header-item.hbs create mode 100644 sonar-server/src/main/hbs/component-viewer/header/_header-link.hbs diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties index 1081d4f61e0..1320f51583f 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -2153,6 +2153,9 @@ metric.lines_to_cover.description=Lines to cover metric.new_lines_to_cover.name=Lines to cover on new code metric.new_lines_to_cover.description=Lines to cover on new code +metric.covered_lines.name=Covered lines +metric.covered_lines.description=Covered lines + metric.uncovered_lines.name=Uncovered lines metric.uncovered_lines.description=Uncovered lines @@ -2174,6 +2177,9 @@ metric.conditions_to_cover.description=Branches to cover metric.new_conditions_to_cover.name=Branches to cover on new code metric.new_conditions_to_cover.description=Branches to cover on new code +metric.covered_conditions.name=Covered branches +metric.covered_conditions.description=Covered branches + metric.uncovered_conditions.name=Uncovered branches metric.uncovered_conditions.description=Uncovered branches diff --git a/sonar-server/src/main/hbs/component-viewer/header/_coverage-header.hbs b/sonar-server/src/main/hbs/component-viewer/header/_coverage-header.hbs index ac32560b189..fa99fab4b7b 100644 --- a/sonar-server/src/main/hbs/component-viewer/header/_coverage-header.hbs +++ b/sonar-server/src/main/hbs/component-viewer/header/_coverage-header.hbs @@ -1,110 +1,52 @@ -
-
Unit Tests
- -
+{{#with component.msr}} +
+
Unit Tests
+ +
-
-
 
- -
+ {{#any branch_coverage conditions_to_cover covered_conditions uncovered_conditions}} +
+
 
+ +
+ {{/any}} -
-
Integration Tests
- -
+ {{#any it_coverage it_line_coverage it_lines_to_cover it_covered_lines it_uncovered_lines}} +
+
Integration Tests
+ +
+ {{/any}} -
-
 
- -
\ No newline at end of file + {{#any it_branch_coverage it_conditions_to_cover it_covered_conditions it_uncovered_conditions}} +
+
 
+ +
+ {{/any}} +{{/with}} \ No newline at end of file diff --git a/sonar-server/src/main/hbs/component-viewer/header/_header-item.hbs b/sonar-server/src/main/hbs/component-viewer/header/_header-item.hbs new file mode 100644 index 00000000000..c7c0a0ee736 --- /dev/null +++ b/sonar-server/src/main/hbs/component-viewer/header/_header-item.hbs @@ -0,0 +1,4 @@ +
  • + {{t 'metric' label 'name'}} + {{value}} +
    • \ No newline at end of file diff --git a/sonar-server/src/main/hbs/component-viewer/header/_header-link.hbs b/sonar-server/src/main/hbs/component-viewer/header/_header-link.hbs new file mode 100644 index 00000000000..d99ee4a161d --- /dev/null +++ b/sonar-server/src/main/hbs/component-viewer/header/_header-link.hbs @@ -0,0 +1,5 @@ +
  • + {{t 'metric' label 'name'}} + {{value}} + +
    • \ No newline at end of file diff --git a/sonar-server/src/main/js/common/handlebars-extensions.js b/sonar-server/src/main/js/common/handlebars-extensions.js index c0433bd337d..d4e2ffa911b 100644 --- a/sonar-server/src/main/js/common/handlebars-extensions.js +++ b/sonar-server/src/main/js/common/handlebars-extensions.js @@ -47,6 +47,10 @@ define(['handlebars'], function (Handlebars) { return v1 != v2 ? options.fn(this) : options.inverse(this); }); + Handlebars.registerHelper('notNull', function(value, options) { + return value != null ? options.fn(this) : options.inverse(this); + }); + Handlebars.registerHelper('all', function() { var args = Array.prototype.slice.call(arguments, 0, -1), options = arguments[arguments.length - 1], @@ -59,10 +63,10 @@ define(['handlebars'], function (Handlebars) { Handlebars.registerHelper('any', function() { var args = Array.prototype.slice.call(arguments, 0, -1), options = arguments[arguments.length - 1], - all = args.reduce(function(prev, current) { + any = args.reduce(function(prev, current) { return prev || current; - }, true); - return all ? options.fn(this) : options.inverse(this); + }, false); + return any ? options.fn(this) : options.inverse(this); }); Handlebars.registerHelper('inArray', function(array, element, options) { @@ -192,4 +196,26 @@ define(['handlebars'], function (Handlebars) { }, ''); }); + Handlebars.registerHelper('componentViewerHeaderLink', function(value, label, cl, hash) { + var name = '_header-link'; + if (value != null) { + var ps = Handlebars.partials; + if (typeof ps[name] !== 'function') { + ps[name] = Handlebars.compile(ps[name]); + } + return ps[name]({ value: value, label: label, cl: cl}, hash); + } + }); + + Handlebars.registerHelper('componentViewerHeaderItem', function(value, label, hash) { + var name = '_header-item'; + if (value != null) { + var ps = Handlebars.partials; + if (typeof ps[name] !== 'function') { + ps[name] = Handlebars.compile(ps[name]); + } + return ps[name]({ value: value, label: label}, hash); + } + }); + }); diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb index 1ed04d23299..074c5f2f8c6 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb @@ -236,9 +236,17 @@ 'metric.class_complexity_distribution.name': '<%= escape_javascript message('metric.class_complexity_distribution.name') -%>', 'metric.function_complexity_distribution.name': '<%= escape_javascript message('metric.function_complexity_distribution.name') -%>', 'metric.file_complexity_distribution.name': '<%= escape_javascript message('metric.file_complexity_distribution.name') -%>', + 'metric.coverage.name': '<%= escape_javascript message('metric.coverage.name') -%>', 'metric.line_coverage.name': '<%= escape_javascript message('metric.line_coverage.name') -%>', + 'metric.lines_to_cover.name': '<%= escape_javascript message('metric.lines_to_cover.name') -%>', + 'metric.covered_lines.name': '<%= escape_javascript message('metric.covered_lines.name') -%>', + 'metric.uncovered_lines.name': '<%= escape_javascript message('metric.uncovered_lines.name') -%>', 'metric.branch_coverage.name': '<%= escape_javascript message('metric.branch_coverage.name') -%>', + 'metric.conditions_to_cover.name': '<%= escape_javascript message('metric.conditions_to_cover.name') -%>', + 'metric.covered_conditions.name': '<%= escape_javascript message('metric.covered_conditions.name') -%>', + 'metric.uncovered_conditions.name': '<%= escape_javascript message('metric.uncovered_conditions.name') -%>', + 'metric.duplicated_blocks.name': '<%= escape_javascript message('metric.duplicated_blocks.name') -%>', 'metric.duplicated_files.name': '<%= escape_javascript message('metric.duplicated_files.name') -%>', 'metric.duplicated_lines.name': '<%= escape_javascript message('metric.duplicated_lines.name') -%>', -- 2.39.5