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

Fix display issue for search results #182

Browse source
This commit is contained in:
Korina Cordero 2019-03-15 05:16:22 -04:00
parent fc94bfbef1
commit b021479d2e
4 changed files with 80 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/routes/search.yaml
View file

@ -5,4 +5,4 @@ general_search:
search_history: search_history:
path: /search/history path: /search/history
controller: App\Controller\SearchController::search controller: App\Controller\SearchController::search
methods: [POST] methods: [GET]

10
src/Controller/SearchController.php
View file

@ -33,8 +33,9 @@ class SearchController extends BaseController
public function search(Request $req, GeneralSearch $search) public function search(Request $req, GeneralSearch $search)
{ {
$this->denyAccessUnlessGranted('general.search', null, 'No access.'); $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); $results = $search->search($search_term);
// process rows // process rows
@ -43,7 +44,7 @@ class SearchController extends BaseController
foreach($results['legacy_job_orders'] as $lrow) foreach($results['legacy_job_orders'] as $lrow)
{ {
$row['id'] = $lrow->getID(); $row['id'] = $lrow->getID();
$row['name'] = $lrow->getCustName(); $row['name'] = $lrow->getCustFirstName() . " " . $lrow->getCustLastName();
$row['plate_number'] = $lrow->getPlateNumber(); $row['plate_number'] = $lrow->getPlateNumber();
$rows[] = $row; $rows[] = $row;
@ -69,8 +70,7 @@ class SearchController extends BaseController
$rows[] = $row; $rows[] = $row;
} }
return $this->json([ $params['data'] = $rows;
'data' => $rows return $this->render('search/results.html.twig', $params);
]);
} }
} }

9
templates/search/list.html.twig
View file

@ -23,9 +23,9 @@
<div class="col-xl-8 order-2 order-xl-1"> <div class="col-xl-8 order-2 order-xl-1">
<div class="form-group m-form__group row align-items-center"> <div class="form-group m-form__group row align-items-center">
<div class="col-md-4"> <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"> <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 class="m-input-icon__icon m-input-icon__icon--left">
<span><i class="la la-search"></i></span> <span><i class="la la-search"></i></span>
</span> </span>
@ -37,7 +37,8 @@
</div> </div>
</div> </div>
<!--begin: Datatable --> <!--begin: Datatable -->
<div id="data-rows"></div> <div id="data-rows">
</div>
<!--end: Datatable --> <!--end: Datatable -->
</div> </div>
</div> </div>
@ -52,6 +53,8 @@
{ {
e.preventDefault(); e.preventDefault();
} }
</script> </script>
{% endblock %} {% endblock %}

68
templates/search/results.html.twig Normal file
View file

@ -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 %}