Add the new columns to the Resq View All page. #770

src/Controller/ResqJobOrderController.php

@@ -14,6 +14,7 @@ use Doctrine\ORM\EntityManagerInterface;
 use Catalyst\MenuBundle\Annotation\Menu;
 
 use App\Entity\JobOrder;
+use App\Entity\Rider;
 
 use App\Service\JobOrderHandlerInterface;
 
@@ -23,6 +24,8 @@ use App\Ramcar\ServiceType;
 use App\Ramcar\WillingToWaitContent;
 use App\Ramcar\CustomerClassification;
 
+use DateTime;
+
 class ResqJobOrderController extends Controller
 {
      /**
@@ -39,7 +42,7 @@ class ResqJobOrderController extends Controller
     /**
      * @IsGranted("jo_resq_proc.list")
      */
-    public function datatableRows(Request $req, $tier, JobOrderHandlerInterface $jo_handler)
+    public function datatableRows(EntityManagerInterface $em, Request $req, $tier, JobOrderHandlerInterface $jo_handler)
     {
         // get query builder
         $qb = $this->getDoctrine()
@@ -54,11 +57,11 @@ class ResqJobOrderController extends Controller
 
         // right now, tier is either proc or all
         if ($tier == 'proc')
-            $this->setQueryFilters($datatable, $tquery, $qb, JOStatus::PENDING, TransactionOrigin::MOBILE_APP);
+            $this->setQueryFilters($datatable, $tquery, $qb, $tier);
         else
         {
             // default to all
-            $this->setQueryFilters($datatable, $tquery, $qb, null, TransactionOrigin::MOBILE_APP);
+            $this->setQueryFilters($datatable, $tquery, $qb, $tier);
         }
 
         $total = $tquery->getQuery()
@@ -81,14 +84,16 @@ class ResqJobOrderController extends Controller
         ];
 
         // build query
+        $qb = $em->getRepository(JobOrder::class)
+            ->createQueryBuilder('q');
         $query = $qb->select('q');
 
         if ($tier == 'proc')
-            $this->setQueryFilters($datatable, $tquery, $qb, JOStatus::PENDING, TransactionOrigin::MOBILE_APP);
+            $this->setQueryFilters($datatable, $query, $qb, $tier);
         else
         {
             // default to all
-            $this->setQueryFilters($datatable, $tquery, $qb, null, TransactionOrigin::MOBILE_APP);
+            $this->setQueryFilters($datatable, $query, $qb, $tier);
         }
 
         // check if sorting is present, otherwise use default
@@ -123,7 +128,13 @@ class ResqJobOrderController extends Controller
             // check if customer is not willing to wait
             $will_not_wait = $orow->getWillWait();
             if ($will_not_wait == WillingToWaitContent::NOT_WILLING_TO_WAIT)
-                $is_emergency = true;
+            {
+                // check if reason is emergency or rush
+                $reason = $orow->getReasonNotWait();
+                if (($reason == CustomerNotWaitReason::EMERGENCY) ||
+                    ($reason == CustomerNotWaitReason::RUSH_REQUEST))
+                    $is_emergency = true;
+            }
 
             // add row data
             $row['id'] = $orow->getID();
@@ -138,6 +149,9 @@ class ResqJobOrderController extends Controller
             $row['is_mobile'] = $orow->getSource() == TransactionOrigin::MOBILE_APP;
             $row['is_vip'] = $is_vip;
             $row['is_emergency'] = $is_emergency;
+            $row['flag_cust_new'] = $orow->isCustNew();
+            $row['date_assign'] = !empty($orow->getDateAssign()) ? $orow->getDateAssign()->format("c") : null;
+            $row['date_fulfill'] = !empty($orow->getDateFulfill()) ? $orow->getDateFulfill()->format("c") : null;
 
             $processor = $orow->getProcessedBy();
             if ($processor == null)
@@ -145,6 +159,13 @@ class ResqJobOrderController extends Controller
             else
                 $row['processor'] = $orow->getProcessedBy()->getFullName();
 
+            // get the assigned hub, if any
+            $assigned_hub = $orow->getHub();
+            if ($assigned_hub ==  null)
+                $row['assigned_hub'] = '';
+            else
+                $row['assigned_hub'] = $orow->getHub()->getName();
+
             // add the items for Actions
             $jo_id = $orow->getID();
 
@@ -175,27 +196,75 @@ class ResqJobOrderController extends Controller
      * @Menu(selected="jo_resq_all")
      * @IsGranted("jo_resq_all.list")
      */
-    public function listAll()
+    public function listAll(EntityManagerInterface $em)
     {
         $params['table_refresh_rate'] = $this->container->getParameter('job_order_refresh_interval');
 
+        // get riders for dropdown
+        $params['riders'] = $em->getRepository(Rider::class)->findAll();
+
         return $this->render('resq-job-order/list.all.html.twig', $params);
     }
 
-    protected function setQueryFilters($datatable, &$query, $qb, $status, $source)
+    protected function setQueryFilters($datatable, &$query, $qb, $tier)
     {
-        if ($status != null)
+        switch ($tier)
         {
-            $query->where('q.status = :status')
+            case 'proc':
-                ->andWhere('q.source = :source')
+                $query->where('q.status = :status')
-                ->setParameter('status', $status)
+                    ->andWhere('q.source = :source')
-                ->setParameter('source', $source);
+                    ->setParameter('status', JOStatus::PENDING)
-        }
+                    ->setParameter('source', TransactionOrigin::MOBILE_APP);
-        else
+
-        {
+                if (isset($datatable['query']['data-rows-search']))
-            // get all resq app job orders
+                {
-            $query->where('q.source = :source')
+                    $query->andWhere('q.plate_number like :filter')
-                ->setParameter('source', $source);
+                        ->orWhere('q.phone_mobile like :filter')
+                        ->orWhere('q.first_name like :filter')
+                        ->orWhere('q.last_name like :filter')
+                        ->setParameter('filter', $datatable['query']['data-rows-search'] . '%');
+                }
+
+                break;
+            case 'all':
+                if (isset($datatable['query']['data-rows-search']))
+                {
+                    $query->andWhere('q.plate_number like :filter')
+                        ->orWhere('q.phone_mobile like :filter')
+                        ->orWhere('q.first_name like :filter')
+                        ->orWhere('q.last_name like :filter')
+                        ->setParameter('filter', $datatable['query']['data-rows-search'] . '%');
+                }
+                if (isset($datatable['query']['rider']))
+                {
+                    $query->innerJoin('q.rider', 'r')
+                        ->andWhere('r.id = :rider_id')
+                        ->setParameter('rider_id', $datatable['query']['rider']);
+                }
+                if (isset($datatable['query']['schedule_date']))
+                {
+                    $start = $datatable['query']['schedule_date'][0] . ' ' . '00:00:00';
+                    $end = $datatable['query']['schedule_date'][1] . ' ' . '23:59:00';
+
+                    $date_start = DateTime::createFromFormat('m/d/Y H:i:s', $start);
+                    $date_end = DateTime::createFromFormat('m/d/Y H:i:s', $end);
+
+                    $query->andWhere('q.date_schedule >= :date_start')
+                        ->andWhere('q.date_schedule <= :date_end')
+                        ->setParameter('date_start', $date_start)
+                        ->setParameter('date_end', $date_end);
+                }
+
+                $query->andWhere('q.source = :source')
+                    ->setParameter('source', TransactionOrigin::MOBILE_APP);
+                
+                break;
+            default:
+                $query->where('q.source = :source')
+                    ->setParameter('source', TransactionOrigin::MOBILE_APP);
+                break; 
         }
+
+        error_log($query->getDQL());
     }
 }

templates/resq-job-order/list.all.html.twig

@@ -30,6 +30,29 @@
                                             </span>
                                         </div>
                                     </div>
+                                    <div class="col-md-4">
+                                        <div class="m-input-icon m-input-icon--left">
+                                            <div class="input-group">
+                                                <select class="form-control m-input" id="rider_list" name="rider_list">
+                                                    <option value="">All Riders</option>
+                                                    {% for rider in riders %}
+                                                        <option value="{{ rider.getID }}">{{ rider.getFirstName ~ ' ' ~ rider.getLastName }} </option>
+                                                    {% endfor %}
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="col-md-4">
+                                        <div class="m-input-icon m-input-icon--left">
+                                            <div class="input-daterange input-group" id="date-range">
+                                                <input role="presentation" type="text" class="form-control m-input" id="date_start" name="date_start" placeholder="Start date" />
+                                                <div class="input-group-append">
+                                                    <span class="input-group-text"><i class="la la-ellipsis-h"></i></span>
+                                                </div>
+                                                <input role="presentation" type="text" class="form-control" id="date_end" name="date_end" placeholder="End date" />
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -47,6 +70,10 @@
 {% block scripts %}
 <script>
 $(function() {
+    $("#date-range").datepicker({
+        orientation: "bottom"
+    });
+
     var options = {
         data: {
             type: 'remote',
@@ -73,20 +100,60 @@ $(function() {
                     var row_class = "m-table__row--" + attribute;
                     $(row).addClass(row_class);
                 }
-            }
+            },
+            afterTemplate: function (row, data, index) {
+                // if this row has an incrementing timer, handle the behavior
+                const timer = row.find('[data-incrementing]')[0];
+
+                if (timer) {
+                    setInterval(() => {
+                        const dateStart =  new moment(data.date_assign, moment.ISO_8601);
+                        const dateEnd = moment();
+
+                        timer.innerHTML = timeDiff(dateStart, dateEnd);
+                    }, 1000)
+                }
+            },
         },
         columns: [
         {
             field: 'id',
             title: 'JO Number'
         },
+        {
+            field: 'plate_number',
+            title: 'Plate #'
+        },
+        {
+            field: 'flag_cust_new',
+            title: 'New',
+            template: function (row, index, datatable) {
+                var tag = '';
+
+                if (row.flag_cust_new === true) {
+                    tag = '<span class="m-badge m-badge--success m-badge--wide">Yes</span>';
+                } else {
+                    tag = '<span class="m-badge m-badge--danger m-badge--wide">No</span>';
+                }
+
+                return tag;
+            }
+        },
+        {
+            field: 'customer_name',
+            title: 'Customer'
+        },
         {
             field: 'delivery_address',
             title: 'Customer Area'
         },
         {
-            field: 'type',
+            field: 'assigned_hub',
-            title: 'Schedule'
+            title: 'Assigned Hub'
+        },
+        {
+            field: 'service_type',
+            title: 'Transaction Type'
         },
         {
             field: 'date_schedule',
@@ -100,6 +167,42 @@ $(function() {
             field: 'processor',
             title: 'Dispatcher'
         },
+        {
+            field: '',
+            title: 'Dispatch Time',
+            sortable: false, 
+            searchable: false,
+            textAlign: 'right',
+            template: function (row, index, datatable) {
+                let dateAssign;
+                let dateEnd;
+                let incrementing = false;
+
+                // only display timer for these statuses
+                const statusesWithTimer = [
+                    'Assigned',
+                    'In Transit',
+                    'In Progress',
+                    'Completed', // NOTE: completed would be based off the fulfillment time
+                ];
+
+                if (row.date_assign && statusesWithTimer.includes(row.status)) {
+                    dateAssign = new moment(row.date_assign, moment.ISO_8601); 
+                            
+                    // on completed jos, use date_fulfill as end date and do not increment
+                    if (row.status == 'Completed') {
+                        if (row.date_fulfill) {
+                            dateEnd = new moment(row.date_fulfill, moment.ISO_8601);
+                        }   
+                    } else {
+                        dateEnd = moment();
+                        incrementing = true;
+                    }
+                }
+
+                return dateEnd ? '<span class="m-badge m-badge--wide m--font-boldest ' + (incrementing ? 'm-badge--warning" data-incrementing="1"' : 'm-badge--success"') + '>' + timeDiff(dateAssign, dateEnd) + '</span>' : '-';
+            },
+        },
         {
             field: 'Actions',
             width: 110,
@@ -128,6 +231,39 @@ $(function() {
     setInterval(function() {
         table.reload();
     }, {{ table_refresh_rate }});
+
+    $("#rider_list").on("change", function() {
+        table.search($(this).val(), "rider");
+    });
+
+    $("#date_start").on("change", function() {
+        var date_start = $(this).val();
+        var date_end = $("[name='date_end']").val();
+        var date_array = [date_start, date_end];
+
+        table.search(date_array, "schedule_date");
+    });
+
+    $("#date_end").on("change", function() {
+        console.log($(this).val());
+
+        var date_end = $(this).val();
+        var date_start = $("[name='date_start']").val();
+        var date_array = [date_start, date_end];
+
+        table.search(date_array, "schedule_date");
+    });
+
+    // get difference in hh:mm:ss format
+    const timeDiff = (startDate, endDate) => {
+        const seconds = Math.abs(startDate.diff(endDate, 'seconds'));
+
+        const hh = Math.floor(seconds / 3600).toString().padStart(2, "0");
+        const mm = Math.floor((seconds % 3600) / 60).toString().padStart(2, "0");
+        const ss = (seconds % 60).toString().padStart(2, "0");
+
+        return [hh, mm, ss].join(':');
+    }
 });
 
 function getRowAttribute(data) {