From 322d4cffcf67ef1ee10360eec89a24dea28ddf62 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Fri, 12 Sep 2014 17:26:19 +0300 Subject: [PATCH] fix graphs colors --- .../modules/crm/src/views/dashlets/abstract/chart.js | 4 +++- .../crm/src/views/dashlets/opportunities-by-stage.js | 8 ++++++-- .../modules/crm/src/views/dashlets/sales-by-month.js | 5 ++--- .../modules/crm/src/views/dashlets/sales-pipeline.js | 12 +++++++++--- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/frontend/client/modules/crm/src/views/dashlets/abstract/chart.js b/frontend/client/modules/crm/src/views/dashlets/abstract/chart.js index 0278161bc3..24349963aa 100644 --- a/frontend/client/modules/crm/src/views/dashlets/abstract/chart.js +++ b/frontend/client/modules/crm/src/views/dashlets/abstract/chart.js @@ -29,7 +29,9 @@ Espo.define('Crm:Views.Dashlets.Abstract.Chart', ['Views.Dashlets.Abstract.Base' thousandSeparator: ',', - colors: ['#6FA8D6', '#4E6CAD', '#EDC555', '#ED8F42', '#5ABD37', '#DE6666', '#7CC4A4', '#8A7CC2', '#D4729B'], + colors: ['#6FA8D6', '#4E6CAD', '#EDC555', '#ED8F42', '#DE6666', '#7CC4A4', '#8A7CC2', '#D4729B'], + + successColor: '#5ABD37', init: function () { Dep.prototype.init.call(this); diff --git a/frontend/client/modules/crm/src/views/dashlets/opportunities-by-stage.js b/frontend/client/modules/crm/src/views/dashlets/opportunities-by-stage.js index 990f5a18a0..ce9139c119 100644 --- a/frontend/client/modules/crm/src/views/dashlets/opportunities-by-stage.js +++ b/frontend/client/modules/crm/src/views/dashlets/opportunities-by-stage.js @@ -64,10 +64,14 @@ Espo.define('Crm:Views.Dashlets.OpportunitiesByStage', 'Crm:Views.Dashlets.Abstr var data = []; var i = 0; d.forEach(function (item) { - data.push({ + var o = { data: [[item.value, d.length - i]], label: this.getLanguage().translateOption(item.stage, 'stage', 'Opportunity'), - }); + } + if (item.stage == 'Closed Won') { + o.color = this.successColor; + } + data.push(o); this.stageList.push(this.getLanguage().translateOption(item.stage, 'stage', 'Opportunity')); i++; }, this); diff --git a/frontend/client/modules/crm/src/views/dashlets/sales-by-month.js b/frontend/client/modules/crm/src/views/dashlets/sales-by-month.js index 0eecb7685d..97d5d5a169 100644 --- a/frontend/client/modules/crm/src/views/dashlets/sales-by-month.js +++ b/frontend/client/modules/crm/src/views/dashlets/sales-by-month.js @@ -70,7 +70,7 @@ Espo.define('Crm:Views.Dashlets.SalesByMonth', 'Crm:Views.Dashlets.Abstract.Char values.forEach(function (value, i) { data.push({ data: [[i, value]], - color: (value >= mid) ? this.colorGood : this.colorBad + color: (value >= mid) ? this.successColor : this.colorBad }); }, this); @@ -81,8 +81,7 @@ Espo.define('Crm:Views.Dashlets.SalesByMonth', 'Crm:Views.Dashlets.Abstract.Char this.currency = this.getConfig().get('defaultCurrency'); this.currencySymbol = ''; - this.colorGood = '#5ABD37'; - this.colorBad = '#5ABD37'; + this.colorBad = this.successColor; }, drow: function () { diff --git a/frontend/client/modules/crm/src/views/dashlets/sales-pipeline.js b/frontend/client/modules/crm/src/views/dashlets/sales-pipeline.js index 5a679cbf2a..98cab4f100 100644 --- a/frontend/client/modules/crm/src/views/dashlets/sales-pipeline.js +++ b/frontend/client/modules/crm/src/views/dashlets/sales-pipeline.js @@ -125,10 +125,12 @@ Espo.define('Crm:Views.Dashlets.SalesPipeline', 'Crm:Views.Dashlets.Abstract.Cha var item = data[i]; var value = item.value; var nextValue = ((i + 1) < data.length) ? data[i + 1].value : value; - this.chartData.push({ + var o = { data: [[i, value], [i + 1, nextValue]], label: item.stage - }); + }; + + this.chartData.push(o); } this.maxY = 1000; @@ -139,8 +141,12 @@ Espo.define('Crm:Views.Dashlets.SalesPipeline', 'Crm:Views.Dashlets.Abstract.Cha drow: function () { var self = this; + + var colors = Espo.Utils.clone(this.colors); + colors[colors.length - 1] = this.successColor; + this.flotr.draw(this.$container.get(0), this.chartData, { - colors: this.colors, + colors: colors, shadowSize: false, lines: { show: true,