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

Merge branch '498-cmb-rearrange-columns' into '488-cmb-live'

Browse source 
Rearranged the columns for the View pages. #498

See merge request jankstudio/resq!582
This commit is contained in:
Kendrick Chan 2020-09-17 07:38:51 +00:00
commit 094ccbe163
3 changed files with 65 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -108,6 +108,27 @@
field: 'id', field: 'id',
title: 'JO Number' title: 'JO Number'
}, },
{
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;
},
},
{
field: 'type',
title: 'Schedule'
},
{
field: 'date_schedule',
title: 'Scheduled Date'
},
{ {
field: 'plate_number', field: 'plate_number',
title: 'Plate #' title: 'Plate #'
@ -128,14 +149,6 @@
field: 'delivery_address', field: 'delivery_address',
title: 'Customer Area' title: 'Customer Area'
}, },
{
field: 'type',
title: 'Schedule'
},
{
field: 'date_schedule',
title: 'Scheduled Date'
},
{ {
field: 'date_start', field: 'date_start',
title: 'Start Date' title: 'Start Date'
@ -159,19 +172,6 @@
{ {
field: 'creator', field: 'creator',
title: 'Agent' title: 'Agent'
},
{
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: { search: {

44
templates/job-order/cmb.list.behindschedule.html.twig
View file

@ -96,6 +96,28 @@
field: 'id', field: 'id',
title: 'JO #' title: 'JO #'
}, },
{
field: 'Actions',
width: 110,
title: 'Actions',
sortable: false,
overflow: 'visible',
template: function (row, index, datatable) {
{% if is_granted('jo_onestep.edit') %}
var actions = '<a href="' + row.meta.onestep_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="fa fa-file"></i></a>';
{% endif %}
return actions;
},
},
{
field: 'type',
title: 'Schedule'
},
{
field: 'date_schedule',
title: 'Scheduled Date'
},
{ {
field: 'plate_number', field: 'plate_number',
title: 'Plate #' title: 'Plate #'
@ -116,18 +138,10 @@
field: 'delivery_address', field: 'delivery_address',
title: 'Area' title: 'Area'
}, },
{
field: 'type',
title: 'Schedule'
},
{ {
field: 'date_start', field: 'date_start',
title: 'Start Date' title: 'Start Date'
}, },
{
field: 'date_schedule',
title: 'Scheduled Date'
},
{ {
field: 'rider_name', field: 'rider_name',
title: 'Rider' title: 'Rider'
@ -143,20 +157,6 @@
{ {
field: 'processor', field: 'processor',
title: 'Dispatcher' title: 'Dispatcher'
},
{
field: 'Actions',
width: 110,
title: 'Actions',
sortable: false,
overflow: 'visible',
template: function (row, index, datatable) {
{% if is_granted('jo_onestep.edit') %}
var actions = '<a href="' + row.meta.onestep_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="fa fa-file"></i></a>';
{% endif %}
return actions;
},
} }
], ],
search: { search: {

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

@ -107,6 +107,28 @@
field: 'id', field: 'id',
title: 'JO #' title: 'JO #'
}, },
{
field: 'Actions',
width: 110,
title: 'Actions',
sortable: false,
overflow: 'visible',
template: function (row, index, datatable) {
{% if is_granted('jo_onestep.edit') %}
var actions = '<a href="' + row.meta.onestep_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="fa fa-file"></i></a>';
{% endif %}
return actions;
},
},
{
field: 'type',
title: 'Schedule'
},
{
field: 'date_schedule',
title: 'Scheduled Date'
},
{ {
field: 'plate_number', field: 'plate_number',
title: 'Plate #' title: 'Plate #'
@ -127,18 +149,10 @@
field: 'delivery_address', field: 'delivery_address',
title: 'Area' title: 'Area'
}, },
{
field: 'type',
title: 'Schedule'
},
{ {
field: 'date_start', field: 'date_start',
title: 'Start Date' title: 'Start Date'
}, },
{
field: 'date_schedule',
title: 'Scheduled Date'
},
{ {
field: 'rider_name', field: 'rider_name',
title: 'Rider' title: 'Rider'
@ -154,20 +168,6 @@
{ {
field: 'creator', field: 'creator',
title: 'Agent' title: 'Agent'
},
{
field: 'Actions',
width: 110,
title: 'Actions',
sortable: false,
overflow: 'visible',
template: function (row, index, datatable) {
{% if is_granted('jo_onestep.edit') %}
var actions = '<a href="' + row.meta.onestep_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="fa fa-file"></i></a>';
{% endif %}
return actions;
},
} }
], ],
search: { search: {