rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Merge branch '409-add-analytics-for-forecasting' into 'master'

Browse source 
Allow analytics to be filtered by date range #409

Closes #409

See merge request jankstudio/resq!497
This commit is contained in:
Kendrick Chan 2020-06-26 01:12:43 +00:00
commit 78d351b103
3 changed files with 104 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

146
src/Controller/AnalyticsController.php
View file

@ -102,10 +102,14 @@ class AnalyticsController extends Controller
*/ */
public function forecastSubmit(EntityManagerInterface $em, Request $req) public function forecastSubmit(EntityManagerInterface $em, Request $req)
{ {
$today = new DateTime();
$hub_list = $req->request->get('hub_ids', []); $hub_list = $req->request->get('hub_ids', []);
$distances = $req->request->get('distances', []); $distances = $req->request->get('distances', []);
$today = DateTime::createFromFormat('d M Y', $req->request->get('date'));
$month = $today->format('m'); $date_from = DateTime::createFromFormat('d M Y', $req->request->get('date_from'));
$date_to = DateTime::createFromFormat('d M Y', $req->request->get('date_to'));
// error_log(print_r($hub_list, true)); // error_log(print_r($hub_list, true));
// $hub_list = [ 6, 4, 36, 7, 8, 126, 127, 18, 12, 9, 60, 10, 21, 135 ]; // $hub_list = [ 6, 4, 36, 7, 8, 126, 127, 18, 12, 9, 60, 10, 21, 135 ];
@ -119,7 +123,7 @@ class AnalyticsController extends Controller
$hub = $em->getRepository(Hub::class)->find($hub_id); $hub = $em->getRepository(Hub::class)->find($hub_id);
$coords = $hub->getCoordinates(); $coords = $hub->getCoordinates();
$hub_data[$hub_id] = $this->generateHubData($em, $hub, $dist, $today, $overlaps); $hub_data[$hub_id] = $this->generateHubData($em, $hub, $dist, $date_from, $date_to, $overlaps);
$hub_coverage[] = [ $hub_coverage[] = [
'longitude' => $coords->getLongitude(), 'longitude' => $coords->getLongitude(),
@ -143,8 +147,9 @@ class AnalyticsController extends Controller
foreach ($hub_data as $hub_id => $one_hub) foreach ($hub_data as $hub_id => $one_hub)
{ {
$c_weekday = $one_hub['c_weekday']; $c_weekday = $one_hub['c_weekday'];
$chart_weekday = $this->generateWeekdayData($c_weekday, $today, $overlaps); $chart_weekday = $this->generateWeekdayData($c_weekday, $today, $overlaps);
$chart_all_weekdays = $this->generateAllWeekData($c_weekday, $today, $overlaps); $chart_all_weekdays = $this->generateAllWeekData($c_weekday, $overlaps);
// figure out the rider schedules based on the max hour values // figure out the rider schedules based on the max hour values
$scheduler_data = $chart_all_weekdays['scheduler_data']; $scheduler_data = $chart_all_weekdays['scheduler_data'];
@ -153,18 +158,16 @@ class AnalyticsController extends Controller
$total_jos = 0; $total_jos = 0;
// run scheduler // error_log(print_r($scheduler_data, true));
// check if 2018 data is available
if (isset($scheduler_data['2018'][$month]))
{
// send 2018 + month data
$sched_res = $this->runScheduler($scheduler_data['2018'][$month]);
// tally total JOs for the month // run scheduler
foreach ($scheduler_data['2018'][$month] as $sday_data) $sched_res = $this->runScheduler($scheduler_data);
foreach ($sday_data as $shour_data)
$total_jos += $shour_data; // tally total JOs for the month
} foreach ($scheduler_data as $sday_data)
foreach ($sday_data as $shour_data)
$total_jos += $shour_data;
/*
else else
{ {
$sched_res = [ $sched_res = [
@ -172,6 +175,10 @@ class AnalyticsController extends Controller
'total_riders' => 0, 'total_riders' => 0,
]; ];
} }
*/
// error_log(print_r($chart_all_weekdays, true));
// agggregate weekday data // agggregate weekday data
$i = 0; $i = 0;
@ -244,7 +251,7 @@ class AnalyticsController extends Controller
// error_log(print_r($args, true)); // error_log(print_r($args, true));
// error_log('running...' . $sched_script); error_log('running...' . $sched_script);
$proc = new Process($args); $proc = new Process($args);
$proc->run(); $proc->run();
@ -253,7 +260,7 @@ class AnalyticsController extends Controller
error_log('SCHEDULER DID NOT RUN PROPERLY'); error_log('SCHEDULER DID NOT RUN PROPERLY');
$res = $proc->getOutput(); $res = $proc->getOutput();
// error_log($res); error_log($res);
// segregate into weekdays // segregate into weekdays
@ -321,17 +328,14 @@ class AnalyticsController extends Controller
return $data; return $data;
} }
protected function generateHubData($em, $hub, $distance_limit, DateTime $today, &$overlaps) protected function generateHubData($em, $hub, $distance_limit, DateTime $date_start, DateTime $date_end, &$overlaps)
{ {
$date_start = DateTime::createFromFormat('Y-m-d H:i:s', '2018-01-01 00:00:00');
$date_end = new DateTime();
// get hub to analyze // get hub to analyze
// $hub = $em->getRepository(Hub::class)->find($hub_id); // $hub = $em->getRepository(Hub::class)->find($hub_id);
$conn = $em->getConnection(); $conn = $em->getConnection();
// get job order data (job orders within coverage area) // get job order data (job orders within coverage area)
$jos = $this->generateJobOrderData($conn, $hub, $distance_limit); $jos = $this->generateJobOrderData($conn, $hub, $distance_limit, $date_start, $date_end);
// initialize counters // initialize counters
$c_weekday = []; $c_weekday = [];
@ -360,21 +364,22 @@ class AnalyticsController extends Controller
$c_day[$year][$month][$day]++; $c_day[$year][$month][$day]++;
// weekday // weekday
if (!isset($c_weekday[$year][$month][$weekday][$hour])) if (!isset($c_weekday[$weekday][$hour]))
{ {
$c_weekday[$year][$month][$weekday][$hour]['total'] = 0; $c_weekday[$weekday][$hour]['total'] = 0;
$c_weekday[$year][$month][$weekday][$hour]['count'] = 0; $c_weekday[$weekday][$hour]['count'] = 0;
$c_weekday[$year][$month][$weekday][$hour]['jos'] = []; $c_weekday[$weekday][$hour]['jos'] = [];
} }
$c_weekday[$year][$month][$weekday][$hour]['total']++; $c_weekday[$weekday][$hour]['total']++;
$c_weekday[$year][$month][$weekday][$hour]['jos'][$jo_id] = $jo_id; $c_weekday[$weekday][$hour]['jos'][$jo_id] = $jo_id;
if (!isset($c_week_count[$year][$month][$week][$weekday][$hour])) // make a count of number of weeks, so we can take average
if (!isset($c_week_count[$week][$weekday][$hour]))
{ {
// error_log('week detected - ' . $week); // error_log('week detected - ' . $week);
$c_week_count[$year][$month][$week][$weekday][$hour] = 1; $c_week_count[$week][$weekday][$hour] = 1;
$c_weekday[$year][$month][$weekday][$hour]['count']++; $c_weekday[$weekday][$hour]['count']++;
} }
// track overlaps (jo that can be handled by more than one hub) // track overlaps (jo that can be handled by more than one hub)
@ -404,19 +409,19 @@ class AnalyticsController extends Controller
return $params; return $params;
} }
protected function generateJobOrderData($conn, $hub, $distance_limit) protected function generateJobOrderData($conn, $hub, $distance_limit, DateTime $date_start, DateTime $date_end)
{ {
$hub_coord = $hub->getCoordinates(); $hub_coord = $hub->getCoordinates();
// create query // create query
// formula to convert to km is 111195 * st_distance // formula to convert to km is 111195 * st_distance
$sql = "select id, round(st_distance(coordinates, Point(:lng, :lat)) * 111195) as dist, date_schedule from job_order where st_distance(coordinates, Point(:lng, :lat)) * 111195 <= :distance_limit and status <> 'cancelled' order by date_schedule asc"; $sql = "select id, round(st_distance(coordinates, Point(:lng, :lat)) * 111195) as dist, date_schedule from job_order where st_distance(coordinates, Point(:lng, :lat)) * 111195 <= :distance_limit and status <> 'cancelled' and date_schedule >= :date_start and date_schedule <= :date_end order by date_schedule asc";
$stmt = $conn->prepare($sql); $stmt = $conn->prepare($sql);
$stmt->bindValue('lng', $hub_coord->getLongitude()); $stmt->bindValue('lng', $hub_coord->getLongitude());
$stmt->bindValue('lat', $hub_coord->getLatitude()); $stmt->bindValue('lat', $hub_coord->getLatitude());
$stmt->bindValue('distance_limit', $distance_limit); $stmt->bindValue('distance_limit', $distance_limit);
// $stmt->bindValue('date_start', $date_start->format('Y-m-d H:i:s')); $stmt->bindValue('date_start', $date_start->format('Y-m-d H:i:s'));
// $stmt->bindValue('date_end', $date_end->format('Y-m-d H:i:s')); $stmt->bindValue('date_end', $date_end->format('Y-m-d H:i:s'));
$stmt->execute(); $stmt->execute();
$jos = $stmt->fetchAll(); $jos = $stmt->fetchAll();
@ -461,7 +466,7 @@ class AnalyticsController extends Controller
return $chart_year; return $chart_year;
} }
protected function generateAllWeekData($all_weekday_data, $today, $overlaps) protected function generateAllWeekData($all_weekday_data, $overlaps)
{ {
$data = []; $data = [];
@ -470,53 +475,56 @@ class AnalyticsController extends Controller
for ($i = 0; $i < 24; $i++) for ($i = 0; $i < 24; $i++)
$hours[] = sprintf('%02d', $i); $hours[] = sprintf('%02d', $i);
$month = $today->format('m'); // TODO: substitute this
$year_data = []; $year_data = $all_weekday_data;
$scheduler_data = []; $scheduler_data = [];
/*
error_log('----------------------------------------------------------------------');
error_log(print_r($all_weekday_data, true));
error_log('----------------------------------------------------------------------');
*/
// gather maximum for each hour // gather maximum for each hour
foreach ($this->weekdays as $weekday) foreach ($this->weekdays as $weekday)
{ {
foreach ($all_weekday_data as $year => $year_data) // go through the hours
foreach ($hours as $hour)
{ {
// go through the hours $id = $hour + 0;
foreach ($hours as $hour) if (!isset($data[$id]))
$data[$id] = [
'hour' => $hour,
];
// get hour data
$prefix = $weekday;
if (isset($year_data[$weekday][$hour]))
{ {
$id = $hour + 0; // calculate the rider value for each JO and use that score as basis
if (!isset($data[$id])) $total_rv = $this->calculateTotalRiderValue($year_data[$weekday][$hour]['jos'], $overlaps);
$data[$id] = [ $rv_average = ceil($total_rv / $year_data[$weekday][$hour]['count']);
'hour' => $hour,
];
// get hour data $data[$id][$prefix] = $year_data[$weekday][$hour]['total'];
$year_id = 'y' . $year; $data[$id][$prefix . '_count'] = $year_data[$weekday][$hour]['count'];
$prefix = $year_id . '_' . $weekday; $data[$id][$prefix . '_average'] = ceil($year_data[$weekday][$hour]['total'] / $year_data[$weekday][$hour]['count']);
if (isset($year_data[$month][$weekday][$hour])) $data[$id][$prefix . '_rv_average'] = $rv_average;
// assign scheduler data
$scheduler_data[$weekday][$hour] = $rv_average;
}
else
{
if (!isset($scheduler_data[$weekday][$hour]))
{ {
// calculate the rider value for each JO and use that score as basis $data[$id][$prefix . '_rv_average'] = 0;
$total_rv = $this->calculateTotalRiderValue($year_data[$month][$weekday][$hour]['jos'], $overlaps); $scheduler_data[$weekday][$hour] = 0;
$rv_average = ceil($total_rv / $year_data[$month][$weekday][$hour]['count']);
$data[$id][$prefix] = $year_data[$month][$weekday][$hour]['total'];
$data[$id][$prefix . '_count'] = $year_data[$month][$weekday][$hour]['count'];
$data[$id][$prefix . '_average'] = ceil($year_data[$month][$weekday][$hour]['total'] / $year_data[$month][$weekday][$hour]['count']);
$data[$id][$prefix . '_rv_average'] = $rv_average;
// assign scheduler data
$scheduler_data[$year][$month][$weekday][$hour] = $rv_average;
}
else
{
if (!isset($scheduler_data[$year][$month][$weekday][$hour]))
{
$data[$id][$prefix . '_rv_average'] = 0;
$scheduler_data[$year][$month][$weekday][$hour] = 0;
}
} }
} }
} }
} }
$data['scheduler_data'] = $scheduler_data; $data['scheduler_data'] = $scheduler_data;
// error_log(print_r($data, true)); // error_log(print_r($data, true));

30
templates/analytics/forecast_form.html.twig
View file

@ -31,16 +31,26 @@
<div class="m-portlet__body"> <div class="m-portlet__body">
<div class="form-group m-form__group row no-border"> <div class="form-group m-form__group row no-border">
<div class="col-lg-6"> <div class="col-lg-6">
<label data-field="date">Date</label> <label data-field="date_from">Date From</label>
<div class="input-group date dp"> <div class="input-group date dp">
<input type="text" name="date" id="date" class="form-control m-input" value="{{ "now"|date('d M Y') }}" readonly placeholder="Select a date" > <input type="text" name="date_from" id="date" class="form-control m-input" value="{{ "now"|date('d M Y') }}" readonly placeholder="Select a date" >
<span class="input-group-addon"> <span class="input-group-addon">
<i class="la la-calendar glyphicon-th"></i> <i class="la la-calendar glyphicon-th"></i>
</span> </span>
</div> </div>
<div class="form-control-feedback hide" data-field="date"></div> <div class="form-control-feedback hide" data-field="date_from"></div>
</div> </div>
<div class="col-lg-6">
<label data-field="date_to">Date To</label>
<div class="input-group date dp">
<input type="text" name="date_to" id="date" class="form-control m-input" value="{{ "now"|date('d M Y') }}" readonly placeholder="Select a date" >
<span class="input-group-addon">
<i class="la la-calendar glyphicon-th"></i>
</span>
</div>
<div class="form-control-feedback hide" data-field="date_to"></div>
</div>
</div> </div>
{% for hub_id in default_hubs %} {% for hub_id in default_hubs %}

14
templates/analytics/forecast_submit.html.twig
View file

@ -330,49 +330,49 @@ var lmon = chart2.series.push(new am4charts.LineSeries());
lmon.name = "Monday"; lmon.name = "Monday";
lmon.stroke = am4core.color("#003f5c"); lmon.stroke = am4core.color("#003f5c");
lmon.strokeWidth = 2; lmon.strokeWidth = 2;
lmon.dataFields.valueY = "y2018_Monday_rv_average"; lmon.dataFields.valueY = "Monday_rv_average";
lmon.dataFields.categoryX = "hour"; lmon.dataFields.categoryX = "hour";
var l = chart2.series.push(new am4charts.LineSeries()); var l = chart2.series.push(new am4charts.LineSeries());
l.name = "Tuesday"; l.name = "Tuesday";
l.stroke = am4core.color("#374c80"); l.stroke = am4core.color("#374c80");
l.strokeWidth = 2; l.strokeWidth = 2;
l.dataFields.valueY = "y2018_Tuesday_rv_average"; l.dataFields.valueY = "Tuesday_rv_average";
l.dataFields.categoryX = "hour"; l.dataFields.categoryX = "hour";
var l = chart2.series.push(new am4charts.LineSeries()); var l = chart2.series.push(new am4charts.LineSeries());
l.name = "Wednesday"; l.name = "Wednesday";
l.stroke = am4core.color("#7a5195"); l.stroke = am4core.color("#7a5195");
l.strokeWidth = 2; l.strokeWidth = 2;
l.dataFields.valueY = "y2018_Wednesday_rv_average"; l.dataFields.valueY = "Wednesday_rv_average";
l.dataFields.categoryX = "hour"; l.dataFields.categoryX = "hour";
var l = chart2.series.push(new am4charts.LineSeries()); var l = chart2.series.push(new am4charts.LineSeries());
l.name = "Thursday"; l.name = "Thursday";
l.stroke = am4core.color("#bc5090"); l.stroke = am4core.color("#bc5090");
l.strokeWidth = 2; l.strokeWidth = 2;
l.dataFields.valueY = "y2018_Thursday_rv_average"; l.dataFields.valueY = "Thursday_rv_average";
l.dataFields.categoryX = "hour"; l.dataFields.categoryX = "hour";
var l = chart2.series.push(new am4charts.LineSeries()); var l = chart2.series.push(new am4charts.LineSeries());
l.name = "Friday"; l.name = "Friday";
l.stroke = am4core.color("#ef5675"); l.stroke = am4core.color("#ef5675");
l.strokeWidth = 2; l.strokeWidth = 2;
l.dataFields.valueY = "y2018_Friday_rv_average"; l.dataFields.valueY = "Friday_rv_average";
l.dataFields.categoryX = "hour"; l.dataFields.categoryX = "hour";
var l = chart2.series.push(new am4charts.LineSeries()); var l = chart2.series.push(new am4charts.LineSeries());
l.name = "Saturday"; l.name = "Saturday";
l.stroke = am4core.color("#ff764a"); l.stroke = am4core.color("#ff764a");
l.strokeWidth = 2; l.strokeWidth = 2;
l.dataFields.valueY = "y2018_Saturday_rv_average"; l.dataFields.valueY = "Saturday_rv_average";
l.dataFields.categoryX = "hour"; l.dataFields.categoryX = "hour";
var l = chart2.series.push(new am4charts.LineSeries()); var l = chart2.series.push(new am4charts.LineSeries());
l.name = "Sunday"; l.name = "Sunday";
l.stroke = am4core.color("#ffa600"); l.stroke = am4core.color("#ffa600");
l.strokeWidth = 2; l.strokeWidth = 2;
l.dataFields.valueY = "y2018_Sunday_rv_average"; l.dataFields.valueY = "Sunday_rv_average";
l.dataFields.categoryX = "hour"; l.dataFields.categoryX = "hour";
{% endfor %} {% endfor %}