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

Add saving of updated form for one step job order. #270

Browse source
This commit is contained in:
Korina Cordero 2020-01-14 08:26:39 +00:00
parent 3a167f0b38
commit 8da95f2ed0
3 changed files with 526 additions and 686 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/Controller/JobOrderController.php
View file

@ -870,11 +870,12 @@ class JobOrderController extends Controller
/** /**
* @Menu(selected="jo_onestep_edit_form") * @Menu(selected="jo_onestep_edit_form")
*/ */
public function oneStepEditForm($id, JobOrderHandlerInterface $jo_handler, GISManagerInterface $gis) public function oneStepEditForm($id, JobOrderHandlerInterface $jo_handler,
GISManagerInterface $gis, MapTools $map_tools)
{ {
$this->denyAccessUnlessGranted('jo_onestep.edit', null, 'No access.'); $this->denyAccessUnlessGranted('jo_onestep.edit', null, 'No access.');
$params = $jo_handler->initializeOneStepEditForm($id); $params = $jo_handler->initializeOneStepEditForm($id, $map_tools);
$params['submit_url'] = $this->generateUrl('jo_onestep_edit_submit', ['id' => $id]); $params['submit_url'] = $this->generateUrl('jo_onestep_edit_submit', ['id' => $id]);
$params['return_url'] = $this->generateUrl('jo_open'); $params['return_url'] = $this->generateUrl('jo_open');
$params['map_js_file'] = $gis->getJSJOFile(); $params['map_js_file'] = $gis->getJSJOFile();
@ -885,7 +886,26 @@ class JobOrderController extends Controller
return $this->render($template, $params); return $this->render($template, $params);
} }
public function oneStepEditSubmit(Request $req, JobOrderHandlerInterface $jo_handler) public function oneStepEditSubmit(Request $req, JobOrderHandlerInterface $jo_handler, $id)
{ {
$this->denyAccessUnlessGranted('jo_onestep.edit', null, 'No access.');
$error_array = [];
$error_array = $jo_handler->generateOneStepJobOrder($req, $id);
// 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!'
]);
} }
} }

53
src/Service/JobOrderHandler/ResqJobOrderHandler.php
View file

@ -1267,19 +1267,60 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
return $params; return $params;
} }
public function initializeOneStepEditForm($id) public function initializeOneStepEditForm($id, $map_tools)
{ {
$em = $this->em; $em = $this->em;
$jo = $em->getRepository(JobOrder::class)->find($id); $obj = $em->getRepository(JobOrder::class)->find($id);
$params['obj'] = $jo; $params['obj'] = $obj;
$params['mode'] = 'onestep_edit'; $params['mode'] = 'onestep-edit';
$params['cvid'] = $jo->getCustomerVehicle()->getID(); $params['cvid'] = $obj->getCustomerVehicle()->getID();
$params['vid'] = $jo->getCustomerVehicle()->getVehicle()->getID(); $params['vid'] = $obj->getCustomerVehicle()->getVehicle()->getID();
$this->fillDropdownParameters($params); $this->fillDropdownParameters($params);
$this->fillFormTags($params); $this->fillFormTags($params);
// get the hubs
// TODO: move this snippet to a function
$hubs = $map_tools->getClosestHubs($obj->getCoordinates(), 50, date("H:i:s"));
$params['hubs'] = [];
// format duration and distance into friendly time
foreach ($hubs as $hub) {
// duration
$seconds = $hub['duration'];
if (!empty($seconds) && $seconds > 0) {
$hours = floor($seconds / 3600);
$minutes = ceil(($seconds / 60) % 60);
$hub['duration'] = ($hours > 0 ? number_format($hours) . " hr" . ($hours > 1 ? "s" : '') . ($minutes > 0 ? ", " : '') : '') . ($minutes > 0 ? number_format($minutes) . " min" . ($minutes > 1 ? "s" : '') : '');
} else {
$hub['duration'] = false;
}
// distance
$meters = $hub['distance'];
if (!empty($meters) && $meters > 0) {
$hub['distance'] = round($meters / 1000) . " km";
} else {
$hub['distance'] = false;
}
// counters
$hub['rider_count'] = count($hub['hub']->getAvailableRiders());
$hub['jo_count'] = count($hub['hub']->getForAssignmentJobOrders());
// check for rejection
$hub['flag_rejected'] = false;
$hub_id = $hub['hub']->getID();
$params['hubs'][] = $hub;
}
// get template to display // get template to display
$params['template'] = $this->getTwigTemplate('jo_onestep_edit_form'); $params['template'] = $this->getTwigTemplate('jo_onestep_edit_form');

291
templates/job-order/form.onestep.html.twig
View file

@ -32,6 +32,7 @@
<form id="row-form" class="m-form m-form--fit m-form--label-align-right" method="post" action="{{ submit_url }}"> <form id="row-form" class="m-form m-form--fit m-form--label-align-right" method="post" action="{{ submit_url }}">
<input type="hidden" id="invoice-change" name="invoice_change" value="0"> <input type="hidden" id="invoice-change" name="invoice_change" value="0">
<div class="m-portlet__body"> <div class="m-portlet__body">
{%if ftags.vehicle_dropdown %}
<div class="m-form__section m-form__section--first"> <div class="m-form__section m-form__section--first">
<div class="form-group m-form__group row"> <div class="form-group m-form__group row">
<div class="col-lg-6"> <div class="col-lg-6">
@ -47,6 +48,18 @@
</div> </div>
</div> </div>
</div> </div>
<div class="m-form__section">
<div class="form-group m-form__group row">
<div class="col-lg-6">
<label data-field="ref_jo">Reference Job Order:</label>
<select class="form-control m-select2" id="ref-jo" name="ref_jo"></select>
<div class="form-control-feedback hide" data-field="ref_jo"></div>
</div>
</div>
</div>
{% else %}
<input type="hidden" id="customer-vehicle" name="customer_vehicle" value="{{ obj.getCustomerVehicle.getID|default('0') }}">
{% endif %}
{% if obj.getReferenceJO %} {% if obj.getReferenceJO %}
<div class="m-form__section m-form__section--first"> <div class="m-form__section m-form__section--first">
<div class="form-group m-form__group row"> <div class="form-group m-form__group row">
@ -303,19 +316,6 @@
</div> </div>
</div> </div>
</div> </div>
<!--
<div class="form-group m-form__group row">
<div class="col-lg-6">
<label data-field="status">Status</label>
<select class="form-control m-input" name="status">
{% for key, status in statuses %}
<option value="{{ key }}"{{ obj.getStatus == key ? ' selected' }}>{{ status }}</option>
{% endfor %}
</select>
<div class="form-control-feedback hide" data-field="status"></div>
</div>
</div>
-->
</div> </div>
<div class="m-form__seperator m-form__seperator--dashed"></div> <div class="m-form__seperator m-form__seperator--dashed"></div>
<div class="m-form__section"> <div class="m-form__section">
@ -485,7 +485,6 @@
<th class="text-right">Quantity</th> <th class="text-right">Quantity</th>
<th class="text-right">Unit Price</th> <th class="text-right">Unit Price</th>
<th class="text-right">Amount</th> <th class="text-right">Amount</th>
<!--<th style="width: 50px;"></th>-->
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -549,185 +548,6 @@
</div> </div>
{% endif %} {% endif %}
</div> </div>
{% if mode in ['update-assigning', 'update-fulfillment', 'update-reassign-rider', 'update-all'] %}
<div class="m-form__seperator m-form__seperator--dashed"></div>
{% if obj.getHub %}
<div class="m-form__section">
<div class="m-form__heading">
<h3 class="m-form__heading-title">
Hub Details
</h3>
</div>
<div class="form-group m-form__group row">
<div class="col-lg-6">
<label data-field="hub_name">Name</label>
<input type="text" name="hub_name" id="hub-name" class="form-control m-input" value="{{ obj.getHub.getName }}" disabled>
<div class="form-control-feedback hide" data-field="hub_name"></div>
</div>
<div class="col-lg-3">
<label data-field="hub_time_open">Time Open</label>
<input type="text" name="hub_time_open" id="hub-time-open" class="form-control m-input" value="{{obj.getHub.getTimeOpen|date("g:i A") }}" disabled>
<div class="form-control-feedback hide" data-field="hub_time_open"></div>
</div>
<div class="col-lg-3">
<label data-field="hub_time_close">Time Close</label>
<input type="text" name="hub_time_close" id="hub-time-close" class="form-control m-input" value="{{ obj.getHub.getTimeClose|date("g:i A") }}" disabled>
<div class="form-control-feedback hide" data-field="hub_time_close"></div>
</div>
</div>
<div class="form-group m-form__group row">
<div class="col-lg-6">
<label data-field="hub_address">
Address
</label>
<textarea class="form-control m-input" id="hub-address" rows="4" name="hub_address" disabled>{{ obj.getHub.getAddress }}</textarea>
<div class="form-control-feedback hide" data-field="hub_address"></div>
</div>
<div class="col-lg-6">
<label data-field="contact_nums">
Contact Numbers
</label>
<textarea class="form-control m-input" id="hub-contact-nums" rows="4" name="hub_contact_nums" disabled>{{ obj.getHub.getContactNumbers }}</textarea>
<div class="form-control-feedback hide" data-field="hub_contact_nums"></div>
</div>
</div>
</div>
{% endif %}
<div class="m-form__seperator m-form__seperator--dashed"></div>
{% if mode in ['update-assigning', 'update-reassign-rider'] %}
<div class="m-form__section">
<div class="m-form__heading">
<h3 class="m-form__heading-title">
Rider Assignment
</h3>
</div>
<div class="form-group m-form__group row">
<div class="col-lg-12">
<label>Click on a row to select a rider</label>
<div class="form-control-feedback hide" data-field="rider"></div>
<div class="table-frame" data-name="rider">
<table id="riders-table" class="table table-compact table-hover table-clickable table-vcenter m-table">
<thead>
<tr>
<th></th>
<th>First Name</th>
<th>Last Name</th>
<th>Contact No.</th>
<th>Plate Number</th>
<th>Status</th>
</tr>
</thead>
<tbody>
{% set avail_riders = obj.getHub.getAvailableRiders|default([]) %}
<tr class="placeholder-row{{ obj.getHub and avail_riders|length > 0 ? ' hide' }}">
<td colspan="6">
No riders available.
</td>
</tr>
{% if obj.getHub %}
{% for rider in avail_riders %}
<tr data-id="{{ rider.getID }}"{{ obj.getRider and obj.getRider.getID == rider.getID ? ' class="m-table__row--primary"' }}>
<td>
<div class="user-portrait-sm" style="background-image: url('{{ rider.getImageFile ? "/uploads/" ~ rider.getImageFile : "/assets/images/user.gif" }}');"></div>
</td>
<td>{{ rider.getFirstName }}</td>
<td>{{ rider.getLastName }}</td>
<td>{{ rider.getContactNumber }}</td>
<td>{{ rider.getPlateNumber }}</td>
<td></td>
</tr>
{% endfor %}
{% endif %}
</tbody>
</table>
</div>
</div>
</div>
</div>
{% endif %}
{% if mode in ['update-fulfillment', 'update-all'] %}
{% if obj.getRider %}
<div class="m-form__section">
<div class="m-form__heading">
<h3 class="m-form__heading-title">
Rider Details
</h3>
</div>
<div class="form-group m-form__group row">
<div class="col-lg-6">
<label data-field="rider_first_name">First Name</label>
<input type="text" name="rider_first_name" id="rider-first-name" class="form-control m-input" value="{{ obj.getRider.getFirstName }}" disabled>
<div class="form-control-feedback hide" data-field="rider_first_name"></div>
</div>
<div class="col-lg-6">
<label data-field="rider_last_name">Last Name</label>
<input type="text" name="rider_last_name" id="rider-last-name" class="form-control m-input" value="{{obj.getRider.getLastName }}" disabled>
<div class="form-control-feedback hide" data-field="rider_last_name"></div>
</div>
</div>
<div class="form-group m-form__group row">
<div class="col-lg-6">
<label data-field="rider_contact_no">Contact Number</label>
<input type="text" name="rider_contact_no" id="rider-contact-no" class="form-control m-input" value="{{ obj.getRider.getContactNumber }}" disabled>
<div class="form-control-feedback hide" data-field="rider_contact_no"></div>
</div>
<div class="col-lg-6">
<label data-field="rider_plate_number">Plate Number</label>
<input type="text" name="rider_plate_number" id="rider-plate-number" class="form-control m-input" value="{{obj.getRider.getPlateNumber }}" disabled>
<div class="form-control-feedback hide" data-field="rider_plate_number"></div>
</div>
</div>
<div class="form-group m-form__group row">
<div class="col-lg-12">
<label data-field="rider_picture">Picture</label>
<div class="portrait-box" style="background-image: url('{{ obj.getRider.getImageFile ? '/uploads/' ~ obj.getRider.getImageFile : '/assets/images/user.gif' }}');"></div>
</div>
</div>
</div>
{% endif %}
{% endif %}
{% endif %}
{% if mode == 'update-all' %}
<div class="m-form__seperator m-form__seperator--dashed"></div>
<div class="m-form__section">
<div class="m-form__heading">
<h3 class="m-form__heading-title">
Timeline
</h3>
</div>
<div class="form-group m-form__group row">
<div class="col-lg-12">
<div class="m-timeline-2">
<div class="m-timeline-2__items m--padding-top-25 m--padding-bottom-25">
{% for event in obj.getEvents %}
<div class="m-timeline-2__item{{ loop.index > 1 ? ' m--margin-top-40' }}">
<span class="m-timeline-2__item-time">
<small>{{ event.getDateHappen|date("M j, Y") }}</small>
<div>{{ event.getDateHappen|date("h:i:s a") }}</div>
</span>
<div class="m-timeline-2__item-cricle">
<i class="fa fa-genderless" style="color: #f4516c;"></i>
</div>
<div class="m-timeline-2__item-text m--padding-top-5">
{{ event.getTypeName }} by {{ event.getUser.getFullName|default('Application') }} {% if event.getRider %} - Rider - {{ event.getRider.getFullName }}{% endif %}
</div>
</div>
{% endfor %}
</div>
</div>
</div>
</div>
</div>
{% endif %}
</div>
<div class="m-portlet__foot m-portlet__foot--fit"> <div class="m-portlet__foot m-portlet__foot--fit">
<div class="m-form__actions m-form__actions--solid m-form__actions--right"> <div class="m-form__actions m-form__actions--solid m-form__actions--right">
<div class="row"> <div class="row">
@ -743,68 +563,6 @@
</div> </div>
</div> </div>
</div> </div>
{% if mode in ['update-processing', 'update-reassign-hub'] %}
<!-- rejection modal -->
<div id="modal-rejection" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="modal-rejection-label" aria-hidden="true">
<div class="modal-dialog modal-lg" role="document">
<form id="hub-reject-form" class="m-form" method="post" action="{{ url('jo_reject_hub', {'id': obj.getID} ) }}">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="modal-rejection-label">Reject Hub</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<div class="m-form__section m-form__section--first m-form__section--last">
<div class="form-group m-form__group row">
<div class="col-md-6">
<label for="hub-reject-name" data-field="hub_name">Hub</label>
<input type="text" name="hub_name" id="hub-reject-name" class="form-control m-input" readonly>
<div class="form-control-feedback hide" data-field="hub_name"></div>
</div>
<div class="col-md-6">
<label for="hub-reject-branch" data-field="hub_branch">Branch</label>
<input type="text" name="hub_branch" id="hub-reject-branch" class="form-control m-input" readonly>
<div class="form-control-feedback hide" data-field="hub_branch"></div>
</div>
</div>
<div class="form-group m-form__group row">
<div class="col-md-6">
<label for="hub-reject-reason" data-field="reason">Reason</label>
<select id="hub-reject-reason" class="form-control m-input" name="reason">
{% for key, reason in rejection_reasons %}
<option value="{{ key }}">{{ reason }}</option>
{% endfor %}
</select>
<div class="form-control-feedback hide" data-field="reason"></div>
</div>
<div class="col-md-6">
<label for="hub-reject-contact-person" data-field="contact_person">Contact Person</label>
<input type="text" name="contact_person" id="hub-reject-contact-person" class="form-control m-input">
<div class="form-control-feedback hide" data-field="contact_person"></div>
</div>
</div>
<div class="form-group m-form__group row">
<div class="col-12">
<label for="hub-reject-remarks" data-field="remarks">Remarks</label>
<textarea name="remarks" id="hub-reject-remarks" class="form-control m-input" rows="8"></textarea>
<div class="form-control-feedback hide" data-field="remarks"></div>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<input type="hidden" id="hub-reject-id" name="hub">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
<button type="submit" class="btn btn-primary">Reject</button>
</div>
</div>
</form>
</div>
</div>
{% endif %}
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
@ -933,10 +691,12 @@ $(function() {
}); });
$(function() { $(function() {
var selected_hub = ''; var selected_hub = '{{ obj.getHub ? obj.getHub.getID : "" }}';
$('#hubs-table').on('click', 'tr', function() { $('#hubs-table').on('click', 'tr', function() {
var id = $(this).data('id'); var id = $(this).data('id');
if (id != selected_hub) {
// highlight this row // highlight this row
$('#hubs-table').find('.m-table__row--primary').removeClass('m-table__row--primary'); $('#hubs-table').find('.m-table__row--primary').removeClass('m-table__row--primary');
@ -966,6 +726,13 @@ $(function() {
$('#riders').html(rider_table); $('#riders').html(rider_table);
}); });
} else {
// unhighlight this row
$(this).removeClass('m-table__row--primary');
// remove id value
selected_hub = '';
}
}); });
}); });
@ -985,6 +752,15 @@ $(function() {
}); });
}); });
{% if mode in ['onestep-edit'] %}
var lat = {{ obj.getCoordinates.getLatitude }};
var lng = {{ obj.getCoordinates.getLongitude }};
selectPoint(lat, lng);
// TODO: find a way to highlight the set hub
{% endif %}
{% if mode in ['update-processing', 'update-reassign-hub'] %} {% if mode in ['update-processing', 'update-reassign-hub'] %}
// display hub map // display hub map
// OSM code // OSM code
@ -1113,6 +889,8 @@ $(function() {
// store selected vehicle data // store selected vehicle data
var vdata = false; var vdata = false;
// vehicle selector
{% if ftags.vehicle_dropdown %}
// vehicle selector // vehicle selector
$('#customer-vehicle').select2({ $('#customer-vehicle').select2({
ajax: { ajax: {
@ -1173,6 +951,7 @@ $(function() {
} }
}) })
}).focus(); }).focus();
{% endif %}
{% if ftags.vehicle_dropdown %} {% if ftags.vehicle_dropdown %}
// reference job order selector // reference job order selector