Add assign advance order to acl, menu, and route. #509
This commit is contained in:
Korina Cordero
parent
55ac665938
commit
c4bf772f70
8 changed files with 1987 additions and 9 deletions
|
|
@ -276,10 +276,8 @@ access_keys:
|
|||
label: New Advance Order
|
||||
- id: jo_advance_order.edit
|
||||
label: New Advance Order Edit
|
||||
- id: jo_assign_advance_order.form
|
||||
- id: jo_assign_advance_order.list
|
||||
label: Assign Advance Order
|
||||
- id: jo_assign_advance_order.edit
|
||||
label: Assign Advance Order Edit
|
||||
|
||||
- id: support
|
||||
label: Customer Support Access
|
||||
|
|
|
|||
|
|
@ -110,8 +110,8 @@ main_menu:
|
|||
acl: jo_advance_order.form
|
||||
label: New Advance Order
|
||||
parent: joborder
|
||||
- id: jo_assign_advance_order_form
|
||||
acl: jo_assign_advance_order.form
|
||||
- id: jo_assign_advance_order
|
||||
acl: jo_assign_advance_order.list
|
||||
label: Assign Advance Order
|
||||
parent: joborder
|
||||
- id: jo_walkin_form
|
||||
|
|
|
|||
|
|
@ -285,13 +285,25 @@ jo_advance_order_edit_submit:
|
|||
controller: App\Controller\JobOrderController::advanceOrderEditSubmit
|
||||
methods: [POST]
|
||||
|
||||
jo_assign_advance_order_form:
|
||||
jo_assign_advance_order:
|
||||
path: /job-order/assign-advance-order
|
||||
controller: App\Controller\JobOrderController::listAssignAdvanceOrder
|
||||
methods: [GET]
|
||||
|
||||
jo_assign_advance_order_rows:
|
||||
path: /job-order/assign-advance-joborder-rows
|
||||
controller: App\Controller\JobOrderController::getRows
|
||||
methods: [POST]
|
||||
defaults:
|
||||
tier: "assign_advance_order"
|
||||
|
||||
jo_assign_advance_order_form:
|
||||
path: /job-order/assign-advance-order/{id}
|
||||
controller: App\Controller\JobOrderController::assignAdvanceOrderForm
|
||||
methods: [GET]
|
||||
|
||||
jo_assign_advance_order_submit:
|
||||
path: /job-order/assign-advance-order
|
||||
path: /job-order/assign-advance-order/{id}
|
||||
controller: App\Controller\JobOrderController::assignAdvanceOrderSubmit
|
||||
methods: [POST]
|
||||
|
||||
|
|
|
|||
|
|
@ -1164,7 +1164,51 @@ class JobOrderController extends Controller
|
|||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Menu(selected="jo_assign_advance_order_form")
|
||||
*/
|
||||
public function assignAdvanceOrderForm(EntityManagerInterface $em, JobOrderHandlerInterface $jo_handler,
|
||||
GISManagerInterface $gis)
|
||||
{
|
||||
$this->denyAccessUnlessGranted('jo_assign_advance_order.form', null, 'No access.');
|
||||
|
||||
$params = $jo_handler->initializeAssignAdvanceOrderForm();
|
||||
$params['submit_url'] = $this->generateUrl('jo_assign_advance_order_submit');
|
||||
$params['return_url'] = $this->generateUrl('jo_assign_advance_order_form');
|
||||
$params['map_js_file'] = $gis->getJSJOFile();
|
||||
$params['vmfgs'] = $em->getRepository(VehicleManufacturer::class)->findAll();
|
||||
$params['vmakes'] = $em->getRepository(Vehicle::class)->findAll();
|
||||
$params['hubs'] = $em->getRepository(Hub::class)->findAll();
|
||||
|
||||
$template = $params['template'];
|
||||
|
||||
// response
|
||||
return $this->render($template, $params);
|
||||
}
|
||||
|
||||
public function assignAdvanceOrderSubmit(Request $req, JobOrderHandlerInterface $jo_handler, MQTTClient $mclient)
|
||||
{
|
||||
$this->denyAccessUnlessGranted('jo_assign_advance_order.form', null, 'No access.');
|
||||
|
||||
// initialize error list
|
||||
$error_array = [];
|
||||
$id = -1;
|
||||
$error_array = $jo_handler->processAssignAdvanceOrderJobOrder($req, $id, $mclient);
|
||||
|
||||
// check if any errors were found
|
||||
if (!empty($error_array)) {
|
||||
// return validation failure response
|
||||
return $this->json([
|
||||
'success' => false,
|
||||
'errors' => $error_array
|
||||
], 422);
|
||||
}
|
||||
|
||||
// return successful response
|
||||
return $this->json([
|
||||
'success' => 'Changes have been saved!'
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Menu(selected="jo_hub_view")
|
||||
|
|
|
|||
|
|
@ -3259,6 +3259,10 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
|
|||
return $params;
|
||||
}
|
||||
|
||||
public function initializeAssignAdvanceOrderForm()
|
||||
{
|
||||
}
|
||||
|
||||
protected function fillDropdownParameters(&$params)
|
||||
{
|
||||
$em = $this->em;
|
||||
|
|
@ -3454,6 +3458,14 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
|
|||
$unlock_route = '';
|
||||
$jo_status = JOStatus::ASSIGNED;
|
||||
break;
|
||||
case 'assign_advance_order':
|
||||
$tier_key = 'jo_assign_advance_order';
|
||||
$tier_name = 'Assign Advance Order';
|
||||
$rows_route = 'jo_assign_advance_order_rows';
|
||||
$edit_route = '';
|
||||
$unlock_route = '';
|
||||
$jo_status = JOStatus::RIDER_ASSIGN;
|
||||
break;
|
||||
default:
|
||||
throw new AccessDeniedHttpException('No access.');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -402,7 +402,7 @@
|
|||
<div class="m-form__section">
|
||||
<div class="m-form__heading">
|
||||
<h3 class="m-form__heading-title">
|
||||
{% if mode in ['view-all', 'update-fulfillment'] %}
|
||||
{% if mode in ['view-all'] %}
|
||||
Assigned Hub
|
||||
{% else %}
|
||||
Nearest Hubs
|
||||
|
|
@ -718,7 +718,7 @@
|
|||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
{% if mode != 'view-all' %}
|
||||
<button type="submit" class="btn btn-success">{{ mode == 'update-fulfillment' ? 'Fulfill' : 'Submit' }}</button>
|
||||
<button type="submit" class="btn btn-success"> Submit </button>
|
||||
{% if ftags.set_map_coordinate and is_granted('joborder.cancel') and not obj.isCancelled %}
|
||||
<a href="{{ url('jo_cancel', {'id': obj.getID}) }}" class="btn btn-danger btn-cancel-job-order">Cancel Job Order</a>
|
||||
{% endif %}
|
||||
|
|
|
|||
1702
templates/job-order/cmb.form.assignadvanceorder.html.twig
Normal file
1702
templates/job-order/cmb.form.assignadvanceorder.html.twig
Normal file
File diff suppressed because it is too large
Load diff
210
templates/job-order/cmb.list.assignadvanceorder.html.twig
Normal file
210
templates/job-order/cmb.list.assignadvanceorder.html.twig
Normal file
|
|
@ -0,0 +1,210 @@
|
|||
{% 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">
|
||||
Advanced Order Job Orders
|
||||
</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>
|
||||
<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_assign_advance_order_rows') }}',
|
||||
method: 'POST'
|
||||
}
|
||||
},
|
||||
saveState: {
|
||||
cookie: false,
|
||||
webstorage: false
|
||||
},
|
||||
pageSize: 10,
|
||||
serverPaging: true,
|
||||
serverFiltering: true,
|
||||
serverSorting: true
|
||||
},
|
||||
rows: {
|
||||
beforeTemplate: function (row, data, index) {
|
||||
if (data.status == 'In Progress') {
|
||||
$(row).addClass('m-table__row--is_in_progress');
|
||||
}
|
||||
|
||||
if (data.status == 'Assigned') {
|
||||
$(row).addClass('m-table__row--is_assigned');
|
||||
}
|
||||
}
|
||||
},
|
||||
columns: [
|
||||
{
|
||||
field: 'id',
|
||||
title: 'JO #'
|
||||
},
|
||||
{
|
||||
field: 'Actions',
|
||||
width: 110,
|
||||
title: 'Actions',
|
||||
sortable: false,
|
||||
overflow: 'visible',
|
||||
template: function (row, index, datatable) {
|
||||
{% if is_granted('jo_onestep.edit') or is_granted('jo_advance_order.edit') or is_granted('jo_assign_advance_order.edit') %}
|
||||
var actions = '<a href="' + row.meta.edit_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-accent m-btn--icon m-btn--icon-only m-btn--pill btn-reassign-hub" title="Edit"><i class="la la-edit"></i></a>';
|
||||
{% endif %}
|
||||
|
||||
return actions;
|
||||
},
|
||||
},
|
||||
{
|
||||
field: 'type',
|
||||
title: 'Schedule'
|
||||
},
|
||||
{
|
||||
field: 'date_schedule',
|
||||
title: 'Scheduled Date'
|
||||
},
|
||||
{
|
||||
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'
|
||||
},
|
||||
{
|
||||
field: 'date_start',
|
||||
title: 'Start Date'
|
||||
},
|
||||
{
|
||||
field: 'rider_name',
|
||||
title: 'Rider'
|
||||
},
|
||||
{
|
||||
field: 'rider_plate_number',
|
||||
title: 'Rider Plate #'
|
||||
},
|
||||
{
|
||||
field: 'status',
|
||||
title: 'Status'
|
||||
},
|
||||
{
|
||||
field: 'creator',
|
||||
title: 'Agent'
|
||||
}
|
||||
],
|
||||
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 %}
|
||||
Loading…
Reference in a new issue