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

Remove service type display in jo process list #UAT

Browse source
This commit is contained in:
Kendrick Chan 2018-03-12 02:40:15 +08:00
parent 4566f468c6
commit ecd9ee0dcf
3 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/routes/job_order.yaml
View file

@ -10,10 +10,8 @@ jo_in_submit:
jo_proc:
path: /job-order/processing
controller: App\Controller\JobOrderController::listRows
controller: App\Controller\JobOrderController::listProcessing
methods: [GET]
defaults:
tier: "proc"
jo_proc_rows:
path: /job-order/processing-rows

11
src/Controller/JobOrderController.php
View file

@ -357,6 +357,17 @@ class JobOrderController extends BaseController
];
}
public function listProcessing()
{
$this->denyAccessUnlessGranted('jo_proc.list', null, 'No access.');
$params = $this->initParameters('jo_proc');
$params['table_refresh_rate'] = $this->container->getParameter('job_order_refresh_interval');
return $this->render('job-order/list.processing.html.twig', $params);
}
public function listAssigning()
{
$this->denyAccessUnlessGranted('jo_assign.list', null, 'No access.');

17
templates/job-order/list.processing.html.twig
View file

@ -6,7 +6,7 @@
<div class="d-flex align-items-center">
<div class="mr-auto">
<h3 class="m-subheader__title">
Job Orders ({{ tier_name|capitalize }})
Job Orders (Dispatch)
</h3>
</div>
</div>
@ -52,7 +52,7 @@
type: 'remote',
source: {
read: {
url: '{{ url(rows_route) }}',
url: '{{ url('jo_proc_rows') }}',
method: 'POST'
}
},
@ -81,10 +81,6 @@
field: 'delivery_address',
title: 'Customer Area'
},
{
field: 'service_type',
title: 'Type of Transaction'
},
{
field: 'date_schedule',
title: 'Scheduled Date'
@ -105,8 +101,13 @@
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 / Edit"><i class="la la-edit"></i></a>';
actions += '<a href="' + row.meta.unlock_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 / Edit"><i class="la la-edit"></i></a>';
{% if is_granted('jo_proc.unlock') %}
if (row.meta.unlock_url != '') {
actions += '<a href="' + row.meta.unlock_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="Unlock"><i class="fa fa-unlock"></i></a>';
}
{% endif %}
return actions;
},
}