cristiancmoises
/
gophish
mirror of https://github.com/gophish/gophish
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make Campaign Results Pie Chart Consistent with Dashboard (#1272)

pull/1323/head
Jordan Wright 2018-11-11 15:37:49 -06:00 committed by GitHub
parent 7fd0657a91
commit 3b248d25c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
static/js/dist/app/campaign_results.min.js vendored
View File

File diff suppressed because one or more lines are too long

16
static/js/src/app/campaign_results.js
View File

@ -518,7 +518,7 @@ var renderPieChart = function (chartopts) {
pie = chart.series[0], pie = chart.series[0],
left = chart.plotLeft + pie.center[0], left = chart.plotLeft + pie.center[0],
top = chart.plotTop + pie.center[1]; top = chart.plotTop + pie.center[1];
this.innerText = rend.text(chartopts['data'][0].y, left, top). this.innerText = rend.text(chartopts['data'][0].count, left, top).
attr({ attr({
'text-anchor': 'middle', 'text-anchor': 'middle',
'font-size': '24px', 'font-size': '24px',
@ -529,7 +529,7 @@ var renderPieChart = function (chartopts) {
}, },
render: function () { render: function () {
this.innerText.attr({ this.innerText.attr({
text: chartopts['data'][0].y text: chartopts['data'][0].count
}) })
} }
} }
@ -553,7 +553,7 @@ var renderPieChart = function (chartopts) {
if (this.key == undefined) { if (this.key == undefined) {
return false return false
} }
return '<span style="color:' + this.color + '">\u25CF</span>' + this.point.name + ': <b>' + this.y + '</b><br/>' return '<span style="color:' + this.color + '">\u25CF</span>' + this.point.name + ': <b>' + this.y + '%</b><br/>'
} }
}, },
series: [{ series: [{
@ -677,11 +677,12 @@ function poll() {
} }
email_data.push({ email_data.push({
name: status, name: status,
y: count y: Math.floor((count / campaign.results.length) * 100),
count: count
}) })
email_data.push({ email_data.push({
name: '', name: '',
y: campaign.results.length - count y: 100 - Math.floor((count / campaign.results.length) * 100)
}) })
var chart = $("#" + statusMapping[status] + "_chart").highcharts() var chart = $("#" + statusMapping[status] + "_chart").highcharts()
chart.series[0].update({ chart.series[0].update({
@ -862,11 +863,12 @@ function load() {
} }
email_data.push({ email_data.push({
name: status, name: status,
y: count y: Math.floor((count / campaign.results.length) * 100),
count: count
}) })
email_data.push({ email_data.push({
name: '', name: '',
y: campaign.results.length - count y: 100 - Math.floor((count / campaign.results.length) * 100)
}) })
var chart = renderPieChart({ var chart = renderPieChart({
elemId: statusMapping[status] + '_chart', elemId: statusMapping[status] + '_chart',