diff --git a/public/assets/css/style.css b/public/assets/css/style.css index 96f1f655..f8e6318d 100644 --- a/public/assets/css/style.css +++ b/public/assets/css/style.css @@ -276,3 +276,22 @@ span.has-danger, max-width: 1024px; } } + +.input-group-append { + margin-left: -1px; +} + +.input-group-prepend, .input-group-append { + display: -webkit-box; + display: -ms-flexbox; + display: flex; +} + +.input-group>.input-group-append>.btn, .input-group>.input-group-append>.input-group-text, .input-group>.input-group-prepend:not(:first-child)>.btn, .input-group>.input-group-prepend:not(:first-child)>.input-group-text, .input-group>.input-group-prepend:first-child>.btn:not(:first-child), .input-group>.input-group-prepend:first-child>.input-group-text:not(:first-child) { + border-top-left-radius: 0; + border-bottom-left-radius: 0; +} + +.btn-icon { + margin-right: .5em; +} diff --git a/src/Controller/SearchController.php b/src/Controller/SearchController.php index 1d73c4d7..1e660e16 100644 --- a/src/Controller/SearchController.php +++ b/src/Controller/SearchController.php @@ -25,9 +25,10 @@ class SearchController extends BaseController { $this->denyaccessUnlessGranted('general.search', null, 'No access.'); $params = $this->initParameters('general_search'); + $params["mode"] = "form"; // response - return $this->render('search/list.html.twig', $params); + return $this->render('search/form.html.twig', $params); } public function search(Request $req, GeneralSearch $search) @@ -39,6 +40,10 @@ class SearchController extends BaseController $results = $search->search($search_term); $params['data'] = $results; - return $this->render('search/results.html.twig', $params); + $params['search_term'] = $search_term; + $params['mode'] = "results"; + + // response + return $this->render('search/form.html.twig', $params); } } diff --git a/templates/search/form.html.twig b/templates/search/form.html.twig new file mode 100644 index 00000000..1b61334d --- /dev/null +++ b/templates/search/form.html.twig @@ -0,0 +1,215 @@ +{% extends 'base.html.twig' %} + +{% block body %} + +
+
+
+

+ {% if mode == 'form' %} + Search + {% else %} + Search results for "{{ search_term }}" + {% endif %} +

+
+
+
+ +
+ +
+
+
+
+
+
+ + + +

+ Enter a search term +

+
+
+
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+ + {% if mode == 'results' %} + +
+
+
+
+
+
+

+ Legacy Job Orders +

+
+
+
+
+ {% if data.legacy_job_orders is empty %} + + {% else %} + + + + + + + + + + + {% for key, result in data.legacy_job_orders %} + + + + + + + {% endfor %} + +
IDLast NameFirst NamePlate Number
{{ result.getID|default("") }}{{ result.getCustLastName|default('') }}{{ result.getCustFirstName|default('') }}{{ result.getPlateNumber|default('') }}
+ {% endif %} +
+
+
+
+ + + +
+
+
+
+
+
+

+ Job Orders +

+
+
+
+
+ {% if data.job_orders is empty %} + + {% else %} + + + + + + + + + + + {% for key, result in data.job_orders %} + + + + + + + {% endfor %} + +
IDLast NameFirst NamePlate Number
{{ result.getID|default("") }}{{ result.getCustomer.getLastName|default("") }}{{ result.getCustomer.getFirstName|default("") }}{{ result.getCustomerVehicle.getPlateNumber|default("") }}
+ {% endif %} +
+
+
+
+ + + + +
+
+
+
+
+
+

+ Warranties +

+
+
+
+
+ {% if data.warranties is empty %} + + {% else %} + + + + + + + + + + + {% for key, result in data.warranties %} + + + + + + + {% endfor %} + +
IDLast NameFirst NamePlate Number
{{ result.getID|default("") }}{{ result.getLastName|default("") }}{{ result.getFirstName|default("") }}{{ result.getPlateNumber|default("") }}
+ {% endif %} +
+
+
+
+ + {% endif %} +
+{% endblock %} diff --git a/templates/search/list.html.twig b/templates/search/list.html.twig deleted file mode 100644 index 0d715c80..00000000 --- a/templates/search/list.html.twig +++ /dev/null @@ -1,60 +0,0 @@ -{% extends 'base.html.twig' %} - -{% block body %} - -
-
-
-

- Search -

-
-
-
- -
- -
-
-
-
-
-
-
-
-
-
-
- - - - -
-
-
-
-
-
-
- -
-
- -
-
-
-
-
-{% endblock %} - -{% block scripts %} - -{% endblock %} - - diff --git a/templates/search/results.html.twig b/templates/search/results.html.twig deleted file mode 100644 index 83d0ea93..00000000 --- a/templates/search/results.html.twig +++ /dev/null @@ -1,113 +0,0 @@ -{% extends 'base.html.twig' %} - -{% block body %} - -
-
-
-

- Search -

-
-
-
- -
- -
-
-
-
-
-
-
-
-
-
-
- - - - -
-
-
-
-
-
-
- -
-

Legacy Job Orders

- - {% if data.legacy_job_orders is empty %} - - {% else %} - - - - {% for key, result in data.legacy_job_orders %} - - - - - - - {% endfor %} - {% endif %} -
No records for legacy job orders ID Last Name Plate Number
{{ result.getID }} {{ result.getCustLastName | default('') }} {{ result.getCustFirstNamei | default('') }} {{ result.getPlateNumber | default('') }}
-

Job Orders

- - {% if data.job_orders is empty %} - - {% else %} - - - - {% for result in data.job_orders %} - - - - - - - {% endfor %} - {% endif %} -
No records for job orders ID Last Name Plate Number
{{ result.getID }} {{ result.getCustomer.getLastName }} {{ result.getCustomer.getFirstName }} {{ result.getCustomerVehicle.getPlateNumber }}
-

Warranties

- - {% if data.warranties is empty %} - - {% else %} - - - - {% for result in data.warranties %} - - - - - - - {% endfor %} - {% endif %} -
No records for warranties ID Last Name Plate Number
{{ result.getID }} {{ result.getLastName }} {{ result.getFirstName }} {{ result.getPlateNumber }}
-
- -
-
-
-
-
-{% endblock %} - -{% block scripts %} - -{% endblock %} -