Disabled turboThreshold to allow campaign timeline renders for campaigns with > 1k events. Fixes #765

Moved datatables `draw()` functions to the end of a table render, rather than on every row
pull/843/merge
Jordan Wright 2017-09-26 21:29:15 -05:00
parent 0d03d01fa5
commit e785af5c0a
4 changed files with 15 additions and 12 deletions

View File

@ -279,7 +279,6 @@ func GetCampaignSummaries(uid int64) (CampaignSummaries, error) {
return overview, err return overview, err
} }
cs[i].Stats = s cs[i].Stats = s
Logger.Println(cs[i].CreatedDate.String())
} }
overview.Total = int64(len(cs)) overview.Total = int64(len(cs))
overview.Campaigns = cs overview.Campaigns = cs

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -387,7 +387,8 @@ var renderTimelineChart = function (chartopts) {
data: chartopts['data'], data: chartopts['data'],
dashStyle: "shortdash", dashStyle: "shortdash",
color: "#cccccc", color: "#cccccc",
lineWidth: 1 lineWidth: 1,
turboThreshold: 0
}] }]
}) })
} }
@ -565,7 +566,7 @@ function poll() {
if (result.id == rid) { if (result.id == rid) {
var label = statuses[result.status].label || "label-default"; var label = statuses[result.status].label || "label-default";
rowData[6] = "<span class=\"label " + label + "\">" + result.status + "</span>" rowData[6] = "<span class=\"label " + label + "\">" + result.status + "</span>"
resultsTable.row(i).data(rowData).draw(false) resultsTable.row(i).data(rowData)
if (row.child.isShown()) { if (row.child.isShown()) {
row.child(renderTimeline(row.data())) row.child(renderTimeline(row.data()))
} }
@ -573,6 +574,7 @@ function poll() {
} }
}) })
}) })
resultsTable.draw(false)
/* Update the map information */ /* Update the map information */
updateMap(campaign.results) updateMap(campaign.results)
$("#refresh_message").hide() $("#refresh_message").hide()
@ -646,7 +648,7 @@ function load() {
escapeHtml(result.email) || "", escapeHtml(result.email) || "",
escapeHtml(result.position) || "", escapeHtml(result.position) || "",
"<span class=\"label " + label + "\">" + result.status + "</span>" "<span class=\"label " + label + "\">" + result.status + "</span>"
]).draw() ])
email_series_data[result.status]++; email_series_data[result.status]++;
// Backfill status values // Backfill status values
var step = progressListing.indexOf(result.status) var step = progressListing.indexOf(result.status)
@ -654,6 +656,7 @@ function load() {
email_series_data[progressListing[i]]++ email_series_data[progressListing[i]]++
} }
}) })
resultsTable.draw();
// Setup the individual timelines // Setup the individual timelines
$('#resultsTable tbody').on('click', 'td.details-control', function () { $('#resultsTable tbody').on('click', 'td.details-control', function () {
var tr = $(this).closest('tr'); var tr = $(this).closest('tr');