From a72bf869bdae15720d7e71184a3d5308dda76065 Mon Sep 17 00:00:00 2001 From: Brian Flowers Date: Fri, 7 Feb 2025 00:18:42 -0500 Subject: [PATCH] Canvass monitor --- api.php | 8 +++++++- js/canvassing.js | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/api.php b/api.php index 4a6d423..056f8be 100644 --- a/api.php +++ b/api.php @@ -628,7 +628,13 @@ if( isset($_GET['get']) && // Add the volunteer level stats $query = "SELECT cr.userId, max(cr.timestamp), count(*) contacts, ". "(SELECT count(*) FROM canvassResults WHERE cr.priority > 0 AND userId = cr.userId) priority, ". - "(SELECT count(*) FROM canvassResults WHERE cr.noContact > 0 AND userId = cr.userId) noContact ". + "(SELECT count(*) FROM canvassResults WHERE cr.noContact > 0 AND userId = cr.userId) noContact, ". + "(SELECT va.latitude from voterAddresses va, voters v, canvassResults cri ". + "where va.id = v.addressId and v.id=cri.voterId AND cri.userId = cr.userId ". + "ORDER BY cri.timestamp DESC LIMIT 1) latitude, ". + "(SELECT va.longitude from voterAddresses va, voters v, canvassResults cri ". + "where va.id = v.addressId and v.id=cri.voterId AND cri.userId = cr.userId ". + "ORDER BY cri.timestamp DESC LIMIT 1) longitude ". "FROM canvassResults cr, canvasses c ". "WHERE c.turfId = CAST(? AS INTEGER) AND c.id = cr.canvassId ". "GROUP BY userId;"; diff --git a/js/canvassing.js b/js/canvassing.js index 5224668..f0f01ea 100644 --- a/js/canvassing.js +++ b/js/canvassing.js @@ -1014,13 +1014,13 @@ function monitorCanvass(canvass, turf) { lonTot += turfPoints[i][0]; } - map.setZoom(19); + map.setZoom(16); map.setView([latTot/i, lonTot/i]); enableCanvassControls(); currentCanvass = canvass; turfLayer = turf; setTimeout(toggleTurf.bind(null, turf, true), 1000); - viewCanvass(canvass); +// viewCanvass(canvass); /* var options = { method: "POST", -- 1.8.3.1