From 0c72e8b69acac3e0dd9bccb2d0e248055269770d Mon Sep 17 00:00:00 2001 From: Jordan Wright Date: Tue, 23 Feb 2016 18:50:07 -0600 Subject: [PATCH] Added updating of datamaps with new bubbles --- static/js/app/campaign_results.js | 52 +++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 10 deletions(-) diff --git a/static/js/app/campaign_results.js b/static/js/app/campaign_results.js index a99e19fc..73f794ed 100644 --- a/static/js/app/campaign_results.js +++ b/static/js/app/campaign_results.js @@ -63,6 +63,7 @@ var statuses = { } var campaign = {} +var bubbles = [] function dismiss() { $("#modal\\.flashes").empty() @@ -169,6 +170,15 @@ function renderTimeline(data) { return results } + +/* poll - Queries the API and updates the UI with the results + * + * Updates: + * * Timeline Chart + * * Email (Donut) Chart + * * Map Bubbles + * * Datatables + */ function poll() { api.campaignId.get(campaign.id) .success(function(c) { @@ -222,19 +232,42 @@ function poll() { /* Update the datatable */ resultsTable = $("#resultsTable").DataTable() resultsTable.rows().every(function(i, tableLoop, rowLoop) { - var rowData = this.row(i).data() - var rid = rowData[0] - $.each(campaign.results, function(j, result) { - if (result.id == rid) { - var label = statuses[result.status].label || "label-default"; - rowData[6] = "" + result.status + "" - resultsTable.row(i).data(rowData).draw() + var rowData = this.row(i).data() + var rid = rowData[0] + $.each(campaign.results, function(j, result) { + if (result.id == rid) { + var label = statuses[result.status].label || "label-default"; + rowData[6] = "" + result.status + "" + resultsTable.row(i).data(rowData).draw() + return false + } + }) + }) + /* Update the map information */ + $.each(campaign.results, function(i, result) { + // Check that it wasn't an internal IP + if (result.latitude == 0 && result.longitude == 0) { + return true; + } + newIP = true + $.each(bubbles, function(i, bubble) { + if (bubble.ip == result.ip) { + bubbles[i].radius += 1 + newIP = false return false } }) + if (newIP) { + bubbles.push({ + latitude: result.latitude, + longitude: result.longitude, + name: result.ip, + fillKey: "point", + radius: 2 + }) + } }) - - + map.bubbles(bubbles) }) } @@ -440,7 +473,6 @@ function load() { } }); } - bubbles = [] $.each(campaign.results, function(i, result) { // Check that it wasn't an internal IP if (result.latitude == 0 && result.longitude == 0) {