From 8c755f23b5541dfb08a36c75839e441a598237a9 Mon Sep 17 00:00:00 2001 From: Ricardo Vega Date: Fri, 27 May 2016 17:30:35 -0500 Subject: [PATCH 1/2] Fixes NaN error when parsing missing data --- public/assets/js/build-plugins/warnings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/assets/js/build-plugins/warnings.js b/public/assets/js/build-plugins/warnings.js index 046fb9c6..89f57420 100644 --- a/public/assets/js/build-plugins/warnings.js +++ b/public/assets/js/build-plugins/warnings.js @@ -102,7 +102,7 @@ var warningsPlugin = ActiveBuild.UiPlugin.extend({ var i = 0; for (var key in self.keys) { - self.chartData.datasets[i].data.push(parseInt(self.data[build][key])); + self.chartData.datasets[i].data.push(~~(self.data[build][key])); i++; } } From 684e4639383ec3c9ae6174e99f5f43b49a69aeb5 Mon Sep 17 00:00:00 2001 From: Ricardo Vega Date: Fri, 27 May 2016 17:31:01 -0500 Subject: [PATCH 2/2] Restores PHPCS to quality trend chart --- PHPCI/Languages/lang.en.php | 2 ++ PHPCI/Languages/lang.es.php | 12 +++++++----- public/assets/js/build-plugins/warnings.js | 5 +++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/PHPCI/Languages/lang.en.php b/PHPCI/Languages/lang.en.php index 63df75d2..acdb20b0 100644 --- a/PHPCI/Languages/lang.en.php +++ b/PHPCI/Languages/lang.en.php @@ -181,6 +181,8 @@ PHPCI', 'phpcs_errors' => 'PHPCS Errors', 'phplint_errors' => 'Lint Errors', 'phpunit_errors' => 'PHPUnit Errors', + 'phptal_errors' => 'PHPTAL Errors', + 'phptal_warnings' => 'PHPTAL Warnings', 'phpdoccheck_warnings' => 'Missing Docblocks', 'issues' => 'Issues', diff --git a/PHPCI/Languages/lang.es.php b/PHPCI/Languages/lang.es.php index 1b7b33f7..56cf0552 100644 --- a/PHPCI/Languages/lang.es.php +++ b/PHPCI/Languages/lang.es.php @@ -171,11 +171,13 @@ PHPCI', 'build_log' => 'Log', 'quality_trend' => 'Tendencia de calidad', 'codeception_errors' => 'Errores de Codeception', - 'phpmd_warnings' => 'PHPMD Warnings', - 'phpcs_warnings' => 'PHPCS Warnings', - 'phpcs_errors' => 'PHPCS Errors', - 'phplint_errors' => 'Lint Errors', - 'phpunit_errors' => 'PHPUnit Errors', + 'phpmd_warnings' => 'Alertas de PHPMD', + 'phpcs_warnings' => 'Alertas de PHPCS', + 'phpcs_errors' => 'Errores de PHPCS', + 'phplint_errors' => 'Errores de Lint', + 'phpunit_errors' => 'Errores de PHPUnit', + 'phptal_errors' => 'Errores de PHPTAL', + 'phptal_warnings' => 'Alertas de PHPTAL', 'phpdoccheck_warnings' => 'Docblocks faltantes', 'issues' => 'Incidencias', diff --git a/public/assets/js/build-plugins/warnings.js b/public/assets/js/build-plugins/warnings.js index 89f57420..0d67201a 100644 --- a/public/assets/js/build-plugins/warnings.js +++ b/public/assets/js/build-plugins/warnings.js @@ -7,7 +7,8 @@ var warningsPlugin = ActiveBuild.UiPlugin.extend({ 'phplint-errors': Lang.get('phplint_errors'), 'phpunit-errors': Lang.get('phpunit_errors'), 'phptallint-errors': Lang.get('phptal_errors'), - 'phptallint-warnings': Lang.get('phptal_warnings') + 'phptallint-warnings': Lang.get('phptal_warnings'), + 'phpcs-errors': Lang.get('phpcs_errors'), }, data: {}, displayOnUpdate: false, @@ -22,7 +23,7 @@ var warningsPlugin = ActiveBuild.UiPlugin.extend({ queries.push(ActiveBuild.registerQuery(key, -1, {num_builds: 10, key: key})); } - $(window).on('codeception-errors phptallint-warnings phptallint-errors phplint-errors phpunit-errors', function(data) { + $(window).on('codeception-errors phptallint-warnings phptallint-errors phplint-errors phpunit-errors phpcs-errors', function(data) { self.onUpdate(data); });