From 8be67413d4dc9681e69b92396c59712fff136edb Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Sun, 24 May 2020 16:09:17 +0800 Subject: [PATCH] Add map display to show overlaps #409 --- src/Controller/AnalyticsController.php | 17 +++++++++++--- templates/analytics/forecast_submit.html.twig | 23 +++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/src/Controller/AnalyticsController.php b/src/Controller/AnalyticsController.php index 601f157c..8dfbddde 100644 --- a/src/Controller/AnalyticsController.php +++ b/src/Controller/AnalyticsController.php @@ -61,27 +61,38 @@ class AnalyticsController extends Controller // $hub_list = [ 6, 4, 36, 7, 8, 126, 127, 18, 12, 9, 60, 10, 21, 135 ]; $hub_data = []; + $hub_coverage = []; foreach ($hub_list as $key => $hub_id) { + $hub = $em->getRepository(Hub::class)->find($hub_id); + $coords = $hub->getCoordinates(); + $dist = $distances[$key]; - $hub_data[$hub_id] = $this->generateHubData($em, $hub_id, $dist, $today); + $hub_data[$hub_id] = $this->generateHubData($em, $hub, $dist, $today); + + $hub_coverage[] = [ + 'longitude' => $coords->getLongitude(), + 'latitude' => $coords->getLatitude(), + 'distance' => $dist, + ]; } $params = [ 'date' => $today, 'hub_list' => $hub_data, + 'hub_coverage' => $hub_coverage, ]; return $this->render('analytics/forecast_submit.html.twig', $params); } - protected function generateHubData($em, $hub_id, $distance_limit, DateTime $today) + protected function generateHubData($em, $hub, $distance_limit, DateTime $today) { $date_start = DateTime::createFromFormat('Y-m-d H:i:s', '2018-01-01 00:00:00'); $date_end = new DateTime(); // get hub to analyze - $hub = $em->getRepository(Hub::class)->find($hub_id); + // $hub = $em->getRepository(Hub::class)->find($hub_id); $conn = $em->getConnection(); // get job order data diff --git a/templates/analytics/forecast_submit.html.twig b/templates/analytics/forecast_submit.html.twig index ad315ea6..3951a231 100644 --- a/templates/analytics/forecast_submit.html.twig +++ b/templates/analytics/forecast_submit.html.twig @@ -1,5 +1,9 @@ {% extends 'base.html.twig' %} +{% block stylesheets %} + +{% endblock %} + {% block body %}
@@ -12,6 +16,9 @@
+
+
+ {% for hub in hub_list %}
@@ -42,8 +49,24 @@ +