From b021479d2ef791bd3da28c7074836cec07fdfa1c Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Fri, 15 Mar 2019 05:16:22 -0400
Subject: [PATCH] Fix display issue for search results #182

---
 config/routes/search.yaml           |  2 +-
 src/Controller/SearchController.php | 10 ++---
 templates/search/list.html.twig     |  9 ++--
 templates/search/results.html.twig  | 68 +++++++++++++++++++++++++++++
 4 files changed, 80 insertions(+), 9 deletions(-)
 create mode 100644 templates/search/results.html.twig

diff --git a/config/routes/search.yaml b/config/routes/search.yaml
index b3a53477..54bebd51 100644
--- a/config/routes/search.yaml
+++ b/config/routes/search.yaml
@@ -5,4 +5,4 @@ general_search:
 search_history:
     path: /search/history
     controller: App\Controller\SearchController::search
-    methods: [POST]
+    methods: [GET]
diff --git a/src/Controller/SearchController.php b/src/Controller/SearchController.php
index fe99eb86..45a582cd 100644
--- a/src/Controller/SearchController.php
+++ b/src/Controller/SearchController.php
@@ -33,8 +33,9 @@ class SearchController extends BaseController
     public function search(Request $req, GeneralSearch $search)
     {
         $this->denyAccessUnlessGranted('general.search', null, 'No access.');
+        $params = $this->initParameters('general_search');
 
-        $search_term = $req->request->get('data-rows-search');
+        $search_term = $req->query->get('search');
         $results = $search->search($search_term);
 
         // process rows
@@ -43,7 +44,7 @@ class SearchController extends BaseController
         foreach($results['legacy_job_orders'] as $lrow)
         {
             $row['id'] = $lrow->getID();
-            $row['name'] = $lrow->getCustName();
+            $row['name'] = $lrow->getCustFirstName() . " " . $lrow->getCustLastName();
             $row['plate_number'] = $lrow->getPlateNumber();
 
             $rows[] = $row;
@@ -69,8 +70,7 @@ class SearchController extends BaseController
             $rows[] = $row;
         }
 
-        return $this->json([
-            'data' => $rows
-        ]);
+        $params['data'] = $rows;
+        return $this->render('search/results.html.twig', $params);
     }
 }
diff --git a/templates/search/list.html.twig b/templates/search/list.html.twig
index 2a16c22d..0d715c80 100644
--- a/templates/search/list.html.twig
+++ b/templates/search/list.html.twig
@@ -23,9 +23,9 @@
                                                                 <div class="col-xl-8 order-2 order-xl-1">
                                                                         <div class="form-group m-form__group row align-items-center">
                                                                                 <div class="col-md-4">
-                                                                                    <form action= "{{ url('search_history') }}" method="post" onsubmit="handle">
+                                                                                    <form action= "{{ url('search_history') }}" method="get" onsubmit="handle">
                                                                                         <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" name="data-rows-search" >
+                                                                                                <input type="text" class="form-control m-input m-input--solid" placeholder="Search..." id="data-rows-search" name="search" >
                                                                                                 <span class="m-input-icon__icon m-input-icon__icon--left">
                                                                                                         <span><i class="la la-search"></i></span>
                                                                                                 </span>
@@ -37,7 +37,8 @@
                                                         </div>
                                                 </div>
                         <!--begin: Datatable -->
-                        <div id="data-rows"></div>
+                        <div id="data-rows">
+                        </div>
                         <!--end: Datatable -->
                     </div>
                 </div>
@@ -52,6 +53,8 @@
             {
                 e.preventDefault();
             }
+
         </script>
 {% endblock %}
 
+
diff --git a/templates/search/results.html.twig b/templates/search/results.html.twig
new file mode 100644
index 00000000..4b03c86c
--- /dev/null
+++ b/templates/search/results.html.twig
@@ -0,0 +1,68 @@
+{% 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">
+                   Search
+                </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-8 order-2 order-xl-1">
+                                                                        <div class="form-group m-form__group row align-items-center">
+                                                                                <div class="col-md-4">
+                                                                                    <form action= "{{ url('search_history') }}" method="get" onsubmit="handle">
+                                                                                        <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" name="search" >
+                                                                                                <span class="m-input-icon__icon m-input-icon__icon--left">
+                                                                                                        <span><i class="la la-search"></i></span>
+                                                                                                </span>
+                                                                                        </div>
+                                                                                    </form>
+                                                                                </div>
+                                                                        </div>
+                                                                </div>
+                                                        </div>
+                                                </div>
+                        <!--begin: Datatable -->
+                        <div id="data-rows">
+                            <table>
+                                {% for result in data %}
+                                    <tr>
+                                        <td> {{ result.id }}</td>
+                                        <td> {{ result.name }} </td>
+                                        <td> {{ result.plate_number }} </td>
+                                    </tr>
+                                {% endfor %}
+                            </table>
+                        </div>
+                        <!--end: Datatable -->
+                    </div>
+                </div>
+                        </div>
+                </div>
+        </div>
+{% endblock %}
+
+{% block scripts %}
+        <script>
+            function handle(e)
+            {
+                e.preventDefault();
+            }
+
+        </script>
+{% endblock %}
+