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

Resolve "Job order view all" #839

Merged
arcticzero merged 1 commit from 26-job-order-view-all into master 2018-02-27 15:32:38 +00:00
Conversation 3 Commits 1 Files changed 7 +332 -36
7 changed files with 332 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/acl.yaml
View file

@ -197,6 +197,8 @@ access_keys:
label: Fulfillment
- id: jo_open.list
label: Open
- id: jo_all.list
label: View All
- id: joborder.cancel
label: Cancel

4
config/menu.yaml
View file

@ -101,6 +101,10 @@ main_menu:
acl: jo_open.list
label: Open
parent: joborder
- id: jo_all
acl: jo_all.list
label: View All
parent: joborder
- id: support
acl: support.menu

17
config/routes/job_order.yaml
View file

@ -132,3 +132,20 @@ jo_assign_unlock:
path: /job-order/{id}/unlock/assignor
controller: App\Controller\JobOrderController::unlockAssignor
methods: [GET]
jo_all:
path: /job-order/all
controller: App\Controller\JobOrderController::listAll
methods: [GET]
jo_all_rows:
path: /job-order/all-rows
controller: App\Controller\JobOrderController::getRows
methods: [POST]
defaults:
tier: "all"
jo_all_form:
path: /job-order/all/{id}
controller: App\Controller\JobOrderController::allForm
methods: [GET]

19
public/assets/css/style.css
View file

@ -166,6 +166,25 @@ span.has-danger,
margin-left: 4px;
}
.m-timeline-2 .m-timeline-2__items .m-timeline-2__item .m-timeline-2__item-cricle {
left: 6.1rem;
top: 0.3rem;
}
.m-timeline-2 .m-timeline-2__items .m-timeline-2__item .m-timeline-2__item-text {
padding-left: 7rem;
}
.m-timeline-2:before {
left: 7.95rem;
}
.m-timeline-2 .m-timeline-2__items .m-timeline-2__item .m-timeline-2__item-time {
line-height: 1rem;
padding-top: 0;
top: -0.45rem;
}
@media (min-width: 995px) {
.modal-lg {
max-width: 1024px;

83
src/Controller/JobOrderController.php
View file

@ -304,7 +304,7 @@ class JobOrderController extends BaseController
$tier_key = 'jo_open';
$tier_name = 'Open';
$rows_route = 'jo_open_rows';
$edit_route = false;
$edit_route = '';
$unlock_route = '';
$jo_status = [
JOStatus::PENDING,
@ -313,6 +313,14 @@ class JobOrderController extends BaseController
JOStatus::IN_PROGRESS
];
break;
case 'all':
$tier_key = 'jo_open';
$tier_name = 'Open';
$rows_route = 'jo_open_rows';
$edit_route = 'jo_all_form';
$unlock_route = '';
$jo_status = '';
break;
default:
$exception = $this->createAccessDeniedException('No access.');
throw $exception;
@ -360,6 +368,15 @@ class JobOrderController extends BaseController
return $this->render('job-order/list.open.html.twig', $params);
}
public function listAll()
{
$params = $this->initParameters('jo_all');
$params['table_refresh_rate'] = $this->container->getParameter('job_order_refresh_interval');
return $this->render('job-order/list.all.html.twig', $params);
}
public function listRows($tier)
{
// check which job order tier is being called for and confirm access
@ -1212,6 +1229,68 @@ class JobOrderController extends BaseController
]);
}
public function allForm($id)
{
$this->denyAccessUnlessGranted('jo_all.list', null, 'No access.');
$em = $this->getDoctrine()->getManager();
$params = $this->initParameters('jo_all');
$params['mode'] = 'update-all';
// get row data
$obj = $em->getRepository(JobOrder::class)->find($id);
// make sure this row exists
if (empty($obj))
throw $this->createNotFoundException('The job order does not exist');
// get parent associations
$params['bmfgs'] = $em->getRepository(BatteryManufacturer::class)->findAll();
$params['customers'] = $em->getRepository(Customer::class)->findAll();
$params['service_types'] = ServiceType::getCollection();
$params['warranty_classes'] = WarrantyClass::getCollection();
$params['statuses'] = JOStatus::getCollection();
$params['promos'] = $em->getRepository(Promo::class)->findAll();
$params['discount_apply'] = DiscountApply::getCollection();
$params['trade_in_types'] = TradeInType::getCollection();
$params['obj'] = $obj;
$params['return_url'] = $this->generateUrl('jo_all');
$params['submit_url'] = '';
// timeline stuff (descending by time)
$params['timeline'] = [
[
'date' => date("M j"),
'time' => date("H:i A"),
'event' => "Event 4",
'color' => "#f4516c"
],
[
'date' => date("M j"),
'time' => date("H:i A"),
'event' => "Event 3",
'color' => "#34bfa3"
],
[
'date' => date("M j"),
'time' => date("H:i A"),
'event' => "Event 2",
'color' => "#716aca"
],
[
'date' => date("M j"),
'time' => date("H:i A"),
'event' => "Event 1",
'color' => "#ffb822"
],
];
// response
return $this->render('job-order/form.html.twig', $params);
}
public function cancelJobOrder(Request $req, $id)
{
$this->denyAccessUnlessGranted('joborder.cancel', null, 'No access.');
@ -1258,6 +1337,8 @@ class JobOrderController extends BaseController
$query->where('q.status IN (:statuses)')
->setParameter('statuses', $status, Connection::PARAM_STR_ARRAY);
break;
case 'all':
break;
default:
$query->where('q.status = :status')
->setParameter('status', $status);

111
templates/job-order/form.html.twig
View file

@ -34,6 +34,9 @@
{% elseif mode == 'update-reassign-rider' %}
Re-assign Rider
<small>{{ obj.getID() }}</small>
{% elseif mode == 'update-all' %}
Viewing
<small>{{ obj.getID() }}</small>
{% else %}
Incoming
{% endif %}
@ -454,7 +457,7 @@
</div>
{% endif %}
{% if mode in ['update-assigning', 'update-fulfillment', 'update-reassign-rider'] %}
{% 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">
@ -553,45 +556,81 @@
</div>
{% endif %}
{% if mode == 'update-fulfillment' %}
<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>
{% 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="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 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>
<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>
{% 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 item in timeline %}
<div class="m-timeline-2__item{{ loop.index > 1 ? ' m--margin-top-40' }}">
<span class="m-timeline-2__item-time">
<small>{{ item.date }}</small>
<div>{{ item.time }}</div>
</span>
<div class="m-timeline-2__item-cricle">
<i class="fa fa-genderless" style="color: {{ item.color }};"></i>
</div>
<div class="m-timeline-2__item-text m--padding-top-5">
{{ item.event }}
</div>
</div>
{% endfor %}
</div>
</div>
</div>
</div>
{% endif %}
</div>
{% endif %}
{% if mode != 'create' %}
@ -621,7 +660,9 @@
<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">{{ mode == 'update-fulfillment' ? 'Fulfill' : 'Submit' }}</button>
{% if mode != 'update-all' %}
<button type="submit" class="btn btn-success">{{ mode == 'update-fulfillment' ? 'Fulfill' : 'Submit' }}</button>
{% endif %}
{% if mode != 'create' and is_granted('joborder.cancel') %}
<a href="{{ url('jo_cancel', {'id': obj.getID}) }}" class="btn btn-danger btn-cancel-job-order">Cancel Job Order</button>
{% endif %}

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

@ -0,0 +1,132 @@
{% 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>
</div>
</div>
</div>
<!--begin: Datatable -->
<div id="data-rows"></div>
<!--end: Datatable -->
</div>
</div>
</div>
</div>
</div>
{% endblock %}
{% block scripts %}
<script>
$(function() {
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: 'delivery_address',
title: 'Customer Area'
},
{
field: 'service_type',
title: 'Type of Transaction'
},
{
field: 'date_schedule',
title: 'Scheduled Date'
},
{
field: 'status',
title: 'Status'
},
{
field: 'processor',
title: 'Processor'
},
{
field: 'assignor',
title: 'Assignor'
},
{
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>';
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 }});
});
</script>
{% endblock %}