Add job order details report. #379
This commit is contained in:
parent
e96fd6d7fb
commit
3caf23b57d
6 changed files with 421 additions and 0 deletions
|
|
@ -326,6 +326,10 @@ access_keys:
|
|||
label: Vehicle Battery Compatibility Report
|
||||
- id: report.warranty.details
|
||||
label: Warranty Details Report
|
||||
- id: report.jo.details
|
||||
label: Job Order Details Report
|
||||
- id: report.jo_events
|
||||
label: Job Order Events Report
|
||||
|
||||
- id: service
|
||||
label: Other Services
|
||||
|
|
|
|||
|
|
@ -77,3 +77,23 @@ rep_warranty_details_export_csv:
|
|||
path: /report/warranty_details_report
|
||||
controller: App\Controller\ReportController::warrantyDetailsExportCSV
|
||||
methods: [POST]
|
||||
|
||||
rep_jo_details_form:
|
||||
path: /report/jo_details_report
|
||||
controller: App\Controller\ReportController::jobOrderDetailsForm
|
||||
methods: [GET]
|
||||
|
||||
rep_jo_details_submit:
|
||||
path: /report/jo_details_report
|
||||
controller: App\Controller\ReportController::jobOrderDetailsSubmit
|
||||
methods: [POST]
|
||||
|
||||
rep_jo_events_form:
|
||||
path: /report/jo_events_report
|
||||
controller: App\Controller\ReportController::jobOrderEventsForm
|
||||
methods: [GET]
|
||||
|
||||
rep_jo_events_submit:
|
||||
path: /report/jo_events_report
|
||||
controller: App\Controller\ReportController::jobOrderEventsSubmit
|
||||
methods: [POST]
|
||||
|
|
|
|||
|
|
@ -6,10 +6,12 @@ use App\Ramcar\JORejectionReason;
|
|||
use App\Ramcar\ServiceType;
|
||||
use App\Ramcar\JOStatus;
|
||||
use App\Ramcar\InvalidPlateNumber;
|
||||
use App\Ramcar\JOEventType;
|
||||
|
||||
use App\Entity\JORejection;
|
||||
use App\Entity\Battery;
|
||||
use App\Entity\JobOrder;
|
||||
use App\Entity\JOEvent;
|
||||
use App\Entity\Warranty;
|
||||
use App\Entity\CustomerVehicle;
|
||||
use App\Entity\MobileSession;
|
||||
|
|
@ -725,6 +727,75 @@ class ReportController extends Controller
|
|||
|
||||
}
|
||||
|
||||
/**
|
||||
* @Menu(selected="outlet_list")
|
||||
*/
|
||||
public function jobOrderDetailsForm()
|
||||
{
|
||||
$this->denyAccessUnlessGranted('report.jo.details', null, 'No access.');
|
||||
|
||||
return $this->render('report/jo-details/form.html.twig');
|
||||
}
|
||||
|
||||
public function jobOrderDetailsSubmit(Request $req, EntityManagerInterface $em)
|
||||
{
|
||||
$data = $this->getJobOrderDetails($req, $em);
|
||||
|
||||
$resp = new StreamedResponse();
|
||||
$resp->setCallback(function() use ($data) {
|
||||
// csv output
|
||||
$csv_handle = fopen('php://output', 'w+');
|
||||
fputcsv($csv_handle, [
|
||||
'Job Order ID',
|
||||
'Dispatcher',
|
||||
'Coordinate Latitude',
|
||||
'Coordinate Longitude',
|
||||
'Date and Time Hub Assigned for JO',
|
||||
'Date Hub Assigned for JO',
|
||||
'Time Hub Assigned for JO',
|
||||
'Date and Time Rider Assigned for JO',
|
||||
'Date Rider Assigned for JO',
|
||||
'Time Rider Assigned for JO',
|
||||
'Date and Time Created for Invoice',
|
||||
'Date and Time Created for JO',
|
||||
'Date Created for JO',
|
||||
'Time Created for JO',
|
||||
'Outlet Name',
|
||||
'Rider Name',
|
||||
'Service Type',
|
||||
'Source',
|
||||
'Status',
|
||||
'SKU',
|
||||
|
||||
]);
|
||||
foreach ($data as $row)
|
||||
{
|
||||
fputcsv($csv_handle, $row);
|
||||
}
|
||||
|
||||
fclose($csv_handle);
|
||||
});
|
||||
|
||||
$filename = 'job_order_details_report' . '.csv';
|
||||
|
||||
$resp->setStatusCode(200);
|
||||
$resp->headers->set('Content-Type', 'text/csv; charset=utf-8');
|
||||
$resp->headers->set('Content-Disposition', 'attachment; filename="' . $filename . '"');
|
||||
|
||||
return $resp;
|
||||
}
|
||||
|
||||
/**
|
||||
* @Menu(selected="outlet_list")
|
||||
*/
|
||||
public function jobOrderEventsForm()
|
||||
{
|
||||
$this->denyAccessUnlessGranted('report.jo_events', null, 'No access.');
|
||||
|
||||
return $this->render('report/jo-events/form.html.twig');
|
||||
}
|
||||
|
||||
|
||||
protected function processPopappFile(UploadedFile $csv_file, EntityManagerInterface $em)
|
||||
{
|
||||
// attempt to open file
|
||||
|
|
@ -1162,4 +1233,146 @@ class ReportController extends Controller
|
|||
return $bsize_hash;
|
||||
}
|
||||
|
||||
protected function getJobOrderDetails(Request $req, EntityManagerInterface $em)
|
||||
{
|
||||
// get query builder
|
||||
$qb = $this->getDoctrine()
|
||||
->getRepository(JobOrder::class)
|
||||
->createQueryBuilder('r');
|
||||
|
||||
// get dates
|
||||
$raw_date_start = $req->request->get('date_start');
|
||||
$raw_date_end = $req->request->get('date_end');
|
||||
|
||||
$date_start = DateTime::createFromFormat('m/d/Y', $raw_date_start);
|
||||
$date_end = DateTime::createFromFormat('m/d/Y', $raw_date_end);
|
||||
|
||||
// build query
|
||||
$query = $qb->where('r.date_create >= :start')
|
||||
->andWhere('r.date_create <= :end')
|
||||
->setParameter('start', $date_start->format('Y-m-d') . ' 00:00:00')
|
||||
->setParameter('end', $date_end->format('Y-m-d') . ' 23:59:59')
|
||||
->getQuery();
|
||||
|
||||
|
||||
// run query
|
||||
$jos = $query->getResult();
|
||||
|
||||
$result = [];
|
||||
foreach($jos as $jo)
|
||||
{
|
||||
// get dispatcher if any
|
||||
$dispatcher_name = '';
|
||||
$dispatcher = $jo->getProcessedBy();
|
||||
if ($dispatcher != null)
|
||||
$dispatcher_name = $dispatcher->getFullName();
|
||||
|
||||
$coord_long = $jo->getCoordinates()->getLongitude();
|
||||
$coord_lat = $jo->getCoordinates()->getLatitude();
|
||||
|
||||
// find date and time when JO was assigned a hub
|
||||
$datetime_hub_assign_jo = '';
|
||||
$date_hub_assign_jo = '';
|
||||
$time_hub_assign_jo = '';
|
||||
$hub_assign_event_type = JOEventType::HUB_ASSIGN;
|
||||
$hub_assign_events = $em->getRepository(JOEvent::class)->findBy(['job_order' => $jo, 'type_id'=> $hub_assign_event_type], ['date_happen' => 'DESC']);
|
||||
if ($hub_assign_events != null)
|
||||
{
|
||||
// TODO: what happens if JO was reassigned a hub multiple times?
|
||||
// right now, this gets the last time hub was assigned.
|
||||
foreach ($hub_assign_events as $hub_assign_event)
|
||||
{
|
||||
$datetime_hub_assign_jo = $hub_assign_event->getDateHappen()->format('m-d-Y H:i');
|
||||
$date_hub_assign_jo = $hub_assign_event->getDateHappen()->format('m-d-Y');
|
||||
$time_hub_assign_jo = $hub_assign_event->getDateHappen()->format('H:i');
|
||||
}
|
||||
}
|
||||
|
||||
// find date and time when JO was assigned a rider
|
||||
$datetime_rider_assign_jo = '';
|
||||
$date_rider_assign_jo = '';
|
||||
$time_rider_assign_jo = '';
|
||||
$rider_assign_event_type = JOEventType::RIDER_ASSIGN;
|
||||
$rider_assign_events = $em->getRepository(JOEvent::class)->findBy(['job_order' => $jo, 'type_id'=> $rider_assign_event_type], ['date_happen' => 'DESC']);
|
||||
if ($rider_assign_events != null)
|
||||
{
|
||||
foreach ($rider_assign_events as $rider_assign_event)
|
||||
{
|
||||
// TODO: what happens if JO was reassigned a rider multiple times?
|
||||
// right now, this gets the last time rider was assigned.
|
||||
$datetime_rider_assign_jo = $rider_assign_event->getDateHappen()->format('m-d-Y H:i');
|
||||
$date_rider_assign_jo = $rider_assign_event->getDateHappen()->format('m-d-Y');
|
||||
$time_rider_assign_jo = $rider_assign_event->getDateHappen()->format('H:i');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// get invoice date create and item sku if any
|
||||
$datetime_create_invoice = '';
|
||||
$sku = '';
|
||||
$invoice = $jo->getInvoice();
|
||||
if ($invoice != null)
|
||||
{
|
||||
$invoice_create = $invoice->getDateCreate();
|
||||
$datetime_create_invoice = $invoice_create->format('m-d-Y H:i');
|
||||
|
||||
// get item sku
|
||||
$invoice_items = $invoice->getItems();
|
||||
foreach ($invoice_items as $item)
|
||||
{
|
||||
$battery = $item->getBattery();
|
||||
if ($battery != null)
|
||||
$sku = $battery->getModel()->getName() . ' ' . $battery->getSize()->getName();
|
||||
}
|
||||
}
|
||||
|
||||
// get jo date create
|
||||
$datetime_create_jo = '';
|
||||
$date_create_jo = '';
|
||||
$time_create_jo = '';
|
||||
$jo_create = $jo->getDateCreate();
|
||||
|
||||
$datetime_create_jo = $jo_create->format('m-d-Y H:i');
|
||||
$date_create_jo = $jo_create->format('m-d-Y');
|
||||
$time_create_jo = $jo_create->format('H:i');
|
||||
|
||||
// get hub if any
|
||||
$hub_name = '';
|
||||
$hub = $jo->getHub();
|
||||
if ($hub != null)
|
||||
$hub_name = $hub->getName();
|
||||
|
||||
// get rider if any
|
||||
$rider_name = '';
|
||||
$rider = $jo->getRider();
|
||||
if ($rider != null)
|
||||
$rider_name = $rider->getFullName();
|
||||
|
||||
$result[] = [
|
||||
$jo->getID(),
|
||||
$dispatcher_name,
|
||||
$coord_lat,
|
||||
$coord_long,
|
||||
$datetime_hub_assign_jo,
|
||||
$date_hub_assign_jo,
|
||||
$time_hub_assign_jo,
|
||||
$datetime_rider_assign_jo,
|
||||
$date_rider_assign_jo,
|
||||
$time_rider_assign_jo,
|
||||
$datetime_create_invoice,
|
||||
$datetime_create_jo,
|
||||
$date_create_jo,
|
||||
$time_create_jo,
|
||||
$hub_name,
|
||||
$rider_name,
|
||||
$jo->getServiceType(),
|
||||
$jo->getSource(),
|
||||
$jo->getStatus(),
|
||||
$sku,
|
||||
];
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -142,6 +142,26 @@
|
|||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<li class="m-menu__item " data-redirect="true" aria-haspopup="true">
|
||||
<a href= "{{ url('rep_jo_details_form') }}" class="m-menu__link">
|
||||
<i class="m-menu__link-bullet m-menu__link-bullet--dot">
|
||||
<span></span>
|
||||
</i>
|
||||
<span class="m-menu__link-text">
|
||||
Job Order Details Report
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<li class="m-menu__item " data-redirect="true" aria-haspopup="true">
|
||||
<a href= "{{ url('rep_jo_events_form') }}" class="m-menu__link">
|
||||
<i class="m-menu__link-bullet m-menu__link-bullet--dot">
|
||||
<span></span>
|
||||
</i>
|
||||
<span class="m-menu__link-text">
|
||||
Job Order Events Report
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li class="m-menu__item">
|
||||
|
|
|
|||
82
templates/report/jo-details/form.html.twig
Normal file
82
templates/report/jo-details/form.html.twig
Normal file
|
|
@ -0,0 +1,82 @@
|
|||
{% extends 'base.html.twig' %}
|
||||
|
||||
{% block body %}
|
||||
<!-- BEGIN: Subheader -->
|
||||
<div class="m-subheader">
|
||||
<div class="d-flex align-items-center">
|
||||
<div class="mr-auto">
|
||||
<h3 class="m-subheader__title">Job Order Details Report</h3>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- END: Subheader -->
|
||||
<div class="m-content">
|
||||
<!--Begin::Section-->
|
||||
<div class="row">
|
||||
<div class="col-xl-6">
|
||||
<div class="m-portlet m-portlet--mobile">
|
||||
<div class="m-portlet__head">
|
||||
<div class="m-portlet__head-caption">
|
||||
<div class="m-portlet__head-title">
|
||||
<span class="m-portlet__head-icon">
|
||||
<i class="fa fa-calendar"></i>
|
||||
</span>
|
||||
<h3 class="m-portlet__head-text">
|
||||
Select a date range
|
||||
</h3>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<form id="row-form" autocomplete="off" class="m-form m-form--fit m-form--label-align-right m-form--group-seperator-dashed" method="post" action="{{ url('rep_jo_details_submit') }}">
|
||||
<div class="m-portlet__body">
|
||||
<div class="form-group m-form__group row">
|
||||
<div class="input-daterange input-group" id="date-range">
|
||||
<input role="presentation" type="text" class="form-control m-input" name="date_start" placeholder="Start date" />
|
||||
<div class="input-group-append">
|
||||
<span class="input-group-text"><i class="la la-ellipsis-h"></i></span>
|
||||
</div>
|
||||
<input role="presentation" type="text" class="form-control" name="date_end" placeholder="End date" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="m-portlet__foot m-portlet__foot--fit">
|
||||
<div class="m-form__actions m-form__actions--solid m-form__actions--right">
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<button type="submit" class="btn btn-success">Submit</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block scripts %}
|
||||
<script>
|
||||
$(function() {
|
||||
$("#date-range").datepicker({
|
||||
orientation: "bottom"
|
||||
});
|
||||
|
||||
$("#row-form").submit(function(e) {
|
||||
var form = $(this);
|
||||
|
||||
if (!$("[name='date_start']").val() || !$("[name='date_end']").val()) {
|
||||
e.preventDefault();
|
||||
|
||||
swal({
|
||||
title: 'Whoops!',
|
||||
text: 'Please fill in both date fields.',
|
||||
type: 'warning'
|
||||
});
|
||||
|
||||
return false;
|
||||
}
|
||||
});
|
||||
});
|
||||
</script>
|
||||
{% endblock %}
|
||||
82
templates/report/jo-events/form.html.twig
Normal file
82
templates/report/jo-events/form.html.twig
Normal file
|
|
@ -0,0 +1,82 @@
|
|||
{% extends 'base.html.twig' %}
|
||||
|
||||
{% block body %}
|
||||
<!-- BEGIN: Subheader -->
|
||||
<div class="m-subheader">
|
||||
<div class="d-flex align-items-center">
|
||||
<div class="mr-auto">
|
||||
<h3 class="m-subheader__title">Job Order Events Report</h3>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- END: Subheader -->
|
||||
<div class="m-content">
|
||||
<!--Begin::Section-->
|
||||
<div class="row">
|
||||
<div class="col-xl-6">
|
||||
<div class="m-portlet m-portlet--mobile">
|
||||
<div class="m-portlet__head">
|
||||
<div class="m-portlet__head-caption">
|
||||
<div class="m-portlet__head-title">
|
||||
<span class="m-portlet__head-icon">
|
||||
<i class="fa fa-calendar"></i>
|
||||
</span>
|
||||
<h3 class="m-portlet__head-text">
|
||||
Select a date range
|
||||
</h3>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<form id="row-form" autocomplete="off" class="m-form m-form--fit m-form--label-align-right m-form--group-seperator-dashed" method="post" action="{{ url('rep_jo_events_submit') }}">
|
||||
<div class="m-portlet__body">
|
||||
<div class="form-group m-form__group row">
|
||||
<div class="input-daterange input-group" id="date-range">
|
||||
<input role="presentation" type="text" class="form-control m-input" name="date_start" placeholder="Start date" />
|
||||
<div class="input-group-append">
|
||||
<span class="input-group-text"><i class="la la-ellipsis-h"></i></span>
|
||||
</div>
|
||||
<input role="presentation" type="text" class="form-control" name="date_end" placeholder="End date" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="m-portlet__foot m-portlet__foot--fit">
|
||||
<div class="m-form__actions m-form__actions--solid m-form__actions--right">
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<button type="submit" class="btn btn-success">Submit</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block scripts %}
|
||||
<script>
|
||||
$(function() {
|
||||
$("#date-range").datepicker({
|
||||
orientation: "bottom"
|
||||
});
|
||||
|
||||
$("#row-form").submit(function(e) {
|
||||
var form = $(this);
|
||||
|
||||
if (!$("[name='date_start']").val() || !$("[name='date_end']").val()) {
|
||||
e.preventDefault();
|
||||
|
||||
swal({
|
||||
title: 'Whoops!',
|
||||
text: 'Please fill in both date fields.',
|
||||
type: 'warning'
|
||||
});
|
||||
|
||||
return false;
|
||||
}
|
||||
});
|
||||
});
|
||||
</script>
|
||||
{% endblock %}
|
||||
Loading…
Reference in a new issue