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

Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 330-entity-logging-service-bundle

Browse source
This commit is contained in:
Korina Cordero 2020-03-06 03:29:51 +00:00
commit 3e8a6a642a
11 changed files with 362 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
public/assets/js/dashboard_map.js
View file

@ -51,6 +51,32 @@ class DashboardMap {
return this.map;
}
switchRiderStatus(rider_id, rider_status) {
console.log('switching rider ' + rider_id + ' to ' + rider_status);
// find the marker
console.log(this.rider_markers);
if (this.rider_markers.hasOwnProperty(rider_id)) {
var marker = this.rider_markers[rider_id];
} else {
// TODO: call ajax to get location and create marker
console.log('marker not found for rider');
return true;
}
// add it to proper layer group
console.log(rider_status);
if (rider_status == 'available') {
this.layer_groups.rider_active_jo.removeLayer(marker);
this.layer_groups.rider_available.addLayer(marker);
marker.setIcon(this.options.icons.rider_available);
} else if (rider_status == 'jo') {
this.layer_groups.rider_available.removeLayer(marker);
this.layer_groups.rider_active_jo.addLayer(marker);
marker.setIcon(this.options.icons.rider_active_jo);
}
}
putMarker(id, lat, lng, markers, icon, layer_group, popup_url) {
var my = this;
// existing marker
@ -131,6 +157,19 @@ class DashboardMap {
);
}
removeRiderMarker(id) {
console.log('removing rider marker for ' + id);
var markers = this.rider_markers;
if (!markers.hasOwnProperty(id)) {
console.log('no such marker to remove');
return;
}
this.layer_groups.rider_active_jo.removeLayer(markers[id]);
this.layer_groups.rider_available.removeLayer(markers[id]);
}
loadLocations(location_url) {
console.log(this.rider_markers);
var my = this;

29
public/assets/js/map_mqtt.js
View file

@ -27,18 +27,26 @@ class MapEventHandler {
console.log('mqtt connected!');
var my = icontext.invocationContext;
// subscribe to rider locations
if (my.options.track_rider) {
// subscribe to rider locations
console.log('subscribing to ' + my.options.channels.rider_location);
my.mqtt.subscribe(my.options.channels.rider_location);
// subscribe to rider status
console.log('subscribing to ' + my.options.channels.rider_status);
my.mqtt.subscribe(my.options.channels.rider_status);
}
// subscribe to jo locations
if (my.options.track_jo) {
// subscribe to jo locations
console.log('subscribing to ' + my.options.channels.jo_location);
my.mqtt.subscribe(my.options.channels.jo_location);
// subscribe to jo status
console.log('subscribing to ' + my.options.channels.jo_status);
my.mqtt.subscribe(my.options.channels.jo_status);
}
}
onMessage(msg) {
@ -75,8 +83,24 @@ class MapEventHandler {
var lat = parseFloat(pl_split[0]);
var lng = parseFloat(pl_split[1]);
// TODO: check if available or not
this.dashmap.putRiderAvailableMarker(chan_split[1], lat, lng);
break;
case "status":
console.log("got status for rider " + chan_split[1] + " - " + payload);
switch (payload) {
case 'available':
this.dashmap.switchRiderStatus(chan_split[1], 'available');
break;
case 'jo':
console.log('jo status');
this.dashmap.switchRiderStatus(chan_split[1], 'jo');
break;
case 'logout':
this.dashmap.removeRiderMarker(chan_split[1]);
break;
}
break;
}
}
@ -102,6 +126,7 @@ class MapEventHandler {
this.dashmap.putCustomerMarker(id, lat, lng);
break;
case "status":
console.log("got status for jo " + payload);
switch (payload) {
case 'cancel':
case 'fulfill':

2
src/Controller/RoleController.php
View file

@ -248,7 +248,7 @@ class RoleController extends Controller
if (!$row->isSuperAdmin())
{
// clear first
$row->clearACLAttributes();
$row->clearACLAccess();
// then add
$acl_attribs = $req->request->get('acl');

13
src/Entity/Rider.php
View file

@ -320,7 +320,18 @@ class Rider
{
// check if we have set a custom active
if ($this->active_job_order != null)
return $this->active_job_order;
{
switch ($this->active_job_order->getStatus())
{
// if jo is open, return it
case JOStatus::ASSIGNED:
case JOStatus::IN_TRANSIT:
case JOStatus::IN_PROGRESS:
return $this->active_job_order;
}
// if active jo is not open, get the next open one
}
// no custom active job order
$active_status = [

2
src/Entity/Warranty.php
View file

@ -149,7 +149,7 @@ class Warranty
return $this->id;
}
public function setSerial($serial)
public function setSerial($serial = null)
{
$this->serial = $serial;
return $this;

36
src/EventListener/JobOrderActiveCacheListener.php
View file

@ -35,6 +35,7 @@ class JobOrderActiveCacheListener
$this->processActiveJO($jo);
break;
// inactive
// NOTE: should never really get here since it's creation
case JOStatus::CANCELLED:
$this->processInactiveJO($jo, 'cancel');
break;
@ -84,22 +85,55 @@ class JobOrderActiveCacheListener
$coords = $jo->getCoordinates();
// TODO: do we put the key in config?
// send jo location
$this->mqtt->publish(
'jo/' . $jo->getID() . '/location',
$coords->getLatitude() . ':' . $coords->getLongitude()
);
// TODO: do we still need to send jo status?
// send rider status
$rider = $jo->getRider();
if ($rider != null)
{
$this->mqtt->publish(
'rider/' . $rider->getID() . '/status',
'jo'
);
}
}
protected function processInactiveJO($jo, $status = 'cancel')
{
error_log('got inactive jo, sending mqtt message for ' . $jo->getID());
// remove from redis cache
$this->jo_cache->removeActiveJobOrder($jo);
// TODO: publich to mqtt
// publish to mqtt
// send jo status
$this->mqtt->publish(
'jo/' . $jo->getID() . '/status',
$status
);
// send rider status
$rider = $jo->getRider();
if ($rider != null)
{
// check if rider has any queued jobs
$open_jos = $rider->getOpenJobOrders();
if (count($open_jos) > 0)
$rider_status = 'jo';
else
$rider_status = 'available';
// send status
$this->mqtt->publish(
'rider/' . $rider->getID() . '/status',
$rider_status
);
}
}
}

24
src/Service/JobOrderHandler/CMBJobOrderHandler.php
View file

@ -160,6 +160,25 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
// process rows
$rows = [];
foreach ($obj_rows as $orow) {
// get car model
$cv = $orow->getCustomerVehicle();
$cv_manufacturer = $cv->getVehicle()->getManufacturer()->getName();
$cv_make = $cv->getVehicle()->getMake();
$year = $cv->getModelYear();
$car_model = $cv_manufacturer . ' ' . $cv_make . ' ' . $year;
// get rider information
$rider_name = '';
$rider_plate_number = '';
$rider = $orow->getRider();
if (!empty($rider))
{
$rider_name = $rider->getFullName();
$rider_plate_number = $rider->getPlateNumber();
}
// add row data
$row['id'] = $orow->getID();
$row['customer_name'] = $orow->getCustomer()->getFirstName() . ' ' . $orow->getCustomer()->getLastName();
@ -171,6 +190,9 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
$row['flag_advance'] = $orow->isAdvanceOrder();
$row['plate_number'] = $orow->getCustomerVehicle()->getPlateNumber();
$row['is_mobile'] = $orow->getSource() == TransactionOrigin::MOBILE_APP;
$row['car_model'] = $car_model;
$row['rider_name'] = $rider_name;
$row['rider_plate_number'] = $rider_plate_number;
$processor = $orow->getProcessedBy();
if ($processor == null)
@ -2803,7 +2825,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
$this->template_hash['jo_all_form'] = 'job-order/cmb.form.onestep.html.twig';
$this->template_hash['jo_list_fulfillment'] = 'job-order/cmb.list.fulfillment.html.twig';
$this->template_hash['jo_list_open'] = 'job-order/cmb.list.open.html.twig';
$this->template_hash['jo_list_all'] = 'job-order/list.all.html.twig';
$this->template_hash['jo_list_all'] = 'job-order/cmb.list.all.html.twig';
$this->template_hash['jo_onestep_form'] = 'job-order/cmb.form.onestep.html.twig';
$this->template_hash['jo_onestep_edit_form'] = 'job-order/cmb.form.onestep.html.twig';
$this->template_hash['jo_walkin_form'] = 'job-order/cmb.form.walkin.html.twig';

7
src/Service/WarrantyHandler.php
View file

@ -73,8 +73,11 @@ class WarrantyHandler
}
// set and save values
$warranty->setSerial($serial)
->setPlateNumber($plate_number)
if (trim($serial) == '')
$warranty->setSerial(null);
else
$warranty->setSerial($serial);
$warranty->setPlateNumber($plate_number)
->setFirstName($first_name)
->setLastName($last_name)
->setMobileNumber($mobile_number)

1
templates/home.html.twig
View file

@ -51,6 +51,7 @@ function initEventHandler(dashmap) {
'track_rider': true,
'channels': {
'rider_location': 'rider/+/location',
'rider_status': 'rider/+/status',
'jo_location': 'jo/+/location',
'jo_status': 'jo/+/status'
},

202
templates/job-order/cmb.list.all.html.twig Normal file
View file

@ -0,0 +1,202 @@
{% 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 Orders (All)
</h3>
</div>
</div>
</div>
<!-- END: Subheader -->
<div class="m-content">
<!--Begin::Section-->
<div class="row">
<div class="col-xl-12">
<div class="m-portlet m-portlet--mobile">
<div class="m-portlet__body">
<div class="m-form m-form--label-align-right m--margin-top-20 m--margin-bottom-30">
<div class="row align-items-center">
<div class="col-xl-12">
<div class="form-group m-form__group row align-items-center">
<div class="col-md-4">
<div class="m-input-icon m-input-icon--left">
<input type="text" class="form-control m-input m-input--solid" placeholder="Search..." id="data-rows-search">
<span class="m-input-icon__icon m-input-icon__icon--left">
<span><i class="la la-search"></i></span>
</span>
</div>
</div>
<div class="col-md-4">
<div class="m-input-icon m-input-icon--left">
<div class="input-group">
<select class="form-control m-input" id="rider_list" name="rider_list">
<option value="">All Riders</option>
{% for rider in riders %}
<option value="{{ rider.getID }}">{{ rider.getFirstName ~ ' ' ~ rider.getLastName }} </option>
{% endfor %}
</select>
</div>
</div>
</div>
<div class="col-md-4">
<div class="m-input-icon m-input-icon--left">
<div class="input-daterange input-group" id="date-range">
<input role="presentation" type="text" class="form-control m-input" id="date_start" 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" id="date_end" name="date_end" placeholder="End date" />
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!--begin: Datatable -->
<div id="data-rows"></div>
<!--end: Datatable -->
</div>
</div>
</div>
</div>
</div>
{% endblock %}
{% block scripts %}
<script>
$(function() {
$("#date-range").datepicker({
orientation: "bottom"
});
var options = {
data: {
type: 'remote',
source: {
read: {
url: '{{ url('jo_all_rows') }}',
method: 'POST'
}
},
saveState: {
cookie: false,
webstorage: false
},
pageSize: 10,
serverPaging: true,
serverFiltering: true,
serverSorting: true
},
rows: {
beforeTemplate: function (row, data, index) {
if (data.flag_advance) {
$(row).addClass('m-table__row--danger');
}
}
},
columns: [
{
field: 'id',
title: 'JO Number'
},
{
field: 'plate_number',
title: 'Plate #'
},
{
field: 'car_model',
title: 'Car Model'
},
{
field: 'customer_name',
title: 'Customer'
},
{
field: 'service_type',
title: 'Service Type',
},
{
field: 'delivery_address',
title: 'Customer Area'
},
{
field: 'type',
title: 'Schedule'
},
{
field: 'date_schedule',
title: 'Scheduled Date'
},
{
field: 'rider_name',
title: 'Rider'
},
{
field: 'rider_plate_number',
title: 'Rider Plate #'
},
{
field: 'status',
title: 'Status'
},
{
field: 'processor',
title: 'Dispatcher'
},
{
field: 'Actions',
width: 110,
title: 'Actions',
sortable: false,
overflow: 'visible',
template: function (row, index, datatable) {
var actions = '<a href="' + row.meta.update_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-accent m-btn--icon m-btn--icon-only m-btn--pill btn-edit" title="View"><i class="la la-edit"></i></a>';
actions += '<a href="' + row.meta.pdf_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-accent m-btn--icon m-btn--icon-only m-btn--pill btn-edit" title="PDF" target="_blank"><i class="la la-file-o"></i></a>';
return actions;
},
}
],
search: {
onEnter: false,
input: $('#data-rows-search'),
delay: 400
}
};
var table = $("#data-rows").mDatatable(options);
// auto refresh table
setInterval(function() {
table.reload();
}, {{ table_refresh_rate }});
$("#rider_list").on("change", function() {
table.search($(this).val(), "rider");
});
$("#date_start").on("change", function() {
var date_start = $(this).val();
var date_end = $("[name='date_end']").val();
var date_array = [date_start, date_end];
table.search(date_array, "schedule_date");
});
$("#date_end").on("change", function() {
console.log($(this).val());
var date_end = $(this).val();
var date_start = $("[name='date_start']").val();
var date_array = [date_start, date_end];
table.search(date_array, "schedule_date");
});
});
</script>
{% endblock %}

16
templates/job-order/cmb.list.open.html.twig
View file

@ -111,10 +111,18 @@
field: 'plate_number',
title: 'Plate #'
},
{
field: 'car_model',
title: 'Car Model'
},
{
field: 'customer_name',
title: 'Customer'
},
{
field: 'service_type',
title: 'Service Type',
},
{
field: 'delivery_address',
title: 'Area'
@ -127,6 +135,14 @@
field: 'date_schedule',
title: 'Scheduled Date'
},
{
field: 'rider_name',
title: 'Rider'
},
{
field: 'rider_plate_number',
title: 'Rider Plate #'
},
{
field: 'status',
title: 'Status'