From 6dd3068e70b5ae8511cc64c2b818dde6eb8d4f36 Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Thu, 17 Sep 2020 07:37:22 +0000
Subject: [PATCH] Rearranged the columns for the View pages. #498

---
 templates/job-order/cmb.list.all.html.twig    | 42 +++++++++---------
 .../cmb.list.behindschedule.html.twig         | 44 +++++++++----------
 templates/job-order/cmb.list.open.html.twig   | 44 +++++++++----------
 3 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/templates/job-order/cmb.list.all.html.twig b/templates/job-order/cmb.list.all.html.twig
index d4210903..17c7be16 100644
--- a/templates/job-order/cmb.list.all.html.twig
+++ b/templates/job-order/cmb.list.all.html.twig
@@ -108,6 +108,27 @@
                     field: 'id',
                     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',
                     title: 'Plate #'
@@ -128,14 +149,6 @@
                     field: 'delivery_address',
                     title: 'Customer Area'
                 },
-                {
-                    field: 'type',
-                    title: 'Schedule'
-                },
-                {
-                    field: 'date_schedule',
-                    title: 'Scheduled Date'
-                },
                 {
                     field: 'date_start',
                     title: 'Start Date'
@@ -159,19 +172,6 @@
                 {
                     field: 'creator',
                     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: {
diff --git a/templates/job-order/cmb.list.behindschedule.html.twig b/templates/job-order/cmb.list.behindschedule.html.twig
index d2e1199a..faa7d6e7 100644
--- a/templates/job-order/cmb.list.behindschedule.html.twig
+++ b/templates/job-order/cmb.list.behindschedule.html.twig
@@ -96,6 +96,28 @@
                     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') %}
+                            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',
                     title: 'Plate #'
@@ -116,18 +138,10 @@
                     field: 'delivery_address',
                     title: 'Area'
                 },
-                {
-                    field: 'type',
-                    title: 'Schedule'
-                },
                 {
                     field: 'date_start',
                     title: 'Start Date'
                 },
-                {
-                    field: 'date_schedule',
-                    title: 'Scheduled Date'
-                },
                 {
                     field: 'rider_name',
                     title: 'Rider'
@@ -143,20 +157,6 @@
                 {
                     field: 'processor',
                     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: {
diff --git a/templates/job-order/cmb.list.open.html.twig b/templates/job-order/cmb.list.open.html.twig
index 99197412..92f195ac 100644
--- a/templates/job-order/cmb.list.open.html.twig
+++ b/templates/job-order/cmb.list.open.html.twig
@@ -107,6 +107,28 @@
                     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') %}
+                            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',
                     title: 'Plate #'
@@ -127,18 +149,10 @@
                     field: 'delivery_address',
                     title: 'Area'
                 },
-                {
-                    field: 'type',
-                    title: 'Schedule'
-                },
                 {
                     field: 'date_start',
                     title: 'Start Date'
                 },
-                {
-                    field: 'date_schedule',
-                    title: 'Scheduled Date'
-                },
                 {
                     field: 'rider_name',
                     title: 'Rider'
@@ -154,20 +168,6 @@
                 {
                     field: 'creator',
                     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: {