diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-01-10 16:35:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-10 16:35:59 +0000 |
| commit | f6028db87672cd03fecfa1f720145852bead33c6 (patch) | |
| tree | 77dec4ec665055b84f52ef79bbde2fe478b44d3d /interface/js | |
| parent | 1f94c631a6f3717b7f175fa95a325502b81e0edc (diff) | |
| parent | 4879197f2459334fa6e39136776d8ab2a51f98c2 (diff) | |
| download | rspamd-f6028db87672cd03fecfa1f720145852bead33c6.tar.gz rspamd-f6028db87672cd03fecfa1f720145852bead33c6.zip | |
Merge pull request #1333 from AnnaStakhova/master
[WebUI] clusters for the chart
Diffstat (limited to 'interface/js')
| -rw-r--r-- | interface/js/rspamd.js | 38 |
1 files changed, 25 insertions, 13 deletions
diff --git a/interface/js/rspamd.js b/interface/js/rspamd.js index 9ce9c76cb..9f3703667 100644 --- a/interface/js/rspamd.js +++ b/interface/js/rspamd.js @@ -492,6 +492,7 @@ $(document).on('click', 'input:radio[name="clusterName"]', function (e) { checked_server = this.value; statWidgets(); + getChart(); }); // @opem modal with target form enabled @@ -516,21 +517,32 @@ $('#modalBody form').hide(); }); +// function getChart() { +// $.ajax({ +// dataType: 'json', +// type: 'GET', +// url: 'pie', +// jsonp: false, +// beforeSend: function (xhr) { +// xhr.setRequestHeader('Password', getPassword()); +// }, +// success: function (data) { +// console.log(data); +// pie = drawPie(pie, "chart", data); +// } +// }); +// } + function getChart() { - $.ajax({ - dataType: 'json', - type: 'GET', - url: 'pie', - jsonp: false, - beforeSend: function (xhr) { - xhr.setRequestHeader('Password', getPassword()); - }, - success: function (data) { - pie = drawPie(pie, "chart", data); - } - }); + var data = JSON.parse(sessionStorage.getItem('Credentials'))[checked_server].data; + var new_data = [{"color":"#66cc00","label":"Clean","data":data.clean,"value":data.clean}, + {"color":"#cc9966","label":"Temporary rejected","data":data.learned,"value":data.learned}, + {"color":"#FFD700","label":"Probable spam","data":data.probable,"value":data.probable}, + {"color":"#436EEE","label":"Greylisted","data":data.greylist,"value":data.greylist}, + {"color":"#FF0000","label":"Rejected","data":data.rejected,"value":data.rejected}]; + pie = drawPie(pie, "chart", new_data); } - + function drawPie(obj, id, data, conf) { if (obj) { obj.updateProp("data.content", |