From 6b0c225d9e02e4341095b14f3a4e243c02ca7cd7 Mon Sep 17 00:00:00 2001
From: Harrys <hra@esokia-webagency.com>
Date: Fri, 8 Mar 2019 15:51:47 +0400
Subject: [PATCH] PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query -
 Port_PHRAS-2381_to_41

---
 templates/web/prod/index.html.twig | 44 ++++++++++++++++++------------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig
index 7d68717ad0..32a331c8e4 100644
--- a/templates/web/prod/index.html.twig
+++ b/templates/web/prod/index.html.twig
@@ -264,6 +264,11 @@
         <div class="PNB" id="rightFrame" style="left:auto; width:{{ w2 ~ '%' }}">
             <div id="headBlock" class="PNB">
                 <div class="searchFormWrapper">
+                    {% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'start_page') == 'QUERY' %}
+                        <div id="FIRST_QUERY_CONTAINER" style="display: none" data-format="text">{{app['settings'].getUserSetting(app.getAuthenticatedUser(), 'start_page_jsonquery') | raw}}</div>
+                    {% elseif app['settings'].getUserSetting(app.getAuthenticatedUser(), 'start_page') == 'LAST_QUERY' %}
+                        <div id="FIRST_QUERY_CONTAINER" style="display: none" data-format="json">{{app['settings'].getUserSetting(app.getAuthenticatedUser(), 'last_jsonquery') | raw}}</div>
+                    {% endif %}
                     <form id="searchForm" method="POST" action="{{ path('prod_query') }}" name="phrasea_query" class="phrasea_query">
                         <input id="SENT_query" name="qry" type="hidden" value="{{app['settings'].getUserSetting(app.getAuthenticatedUser(), 'start_page_query')}}">
                         <input type="hidden" name="pag" id="formAnswerPage" value="">
@@ -404,27 +409,27 @@
                                                     </label>
 
                                                     <div class="term_select">
-                                                        <div class="term_select_wrapper">
-                                                            <select class="term_select_field" style="vertical-align:middle; width:30%;">
+                                                        <div class="term_select_wrapper_template" style="display: none;">
+                                                        <select class="term_select_field" style="vertical-align:middle; width:30%;">
                                                                 <option value="">{{ 'Select a field' | trans }}</option>
                                                                 {% for field_id, field in search_datas['fields'] %}
-                                                                    {% if field['type'] != 'date' %}
+                                                                   {# {% if field['type'] != 'date' %}#}
                                                                         <option class="dbx db_{{field['sbas']|join(' db_')}}" value="{{field_id}}">{{field['fieldname']}}</option>
-                                                                    {% endif %}
+                                                                    {#{% endif %}#}
                                                                 {% endfor %}
                                                             </select>
-                                                            <select disabled style="vertical-align:middle; width: 23%;">
-                                                                <option value="contains">{{ 'Contains' | trans }}</option>
-                                                                <option value="equals">{{ 'Equals' | trans }}</option>
+                                                            <select class="term_select_op" disabled style="vertical-align:middle; width: 23%;">
+                                                                <option value=":">{{ 'Contains' | trans }}</option>
+                                                                <option value="=">{{ 'Equals' | trans }}</option>
                                                             </select>
-                                                            <input disabled style="vertical-align:middle; width: 32%;" placeholder="{{ 'Ex : Paris, bleu, montagne' | trans }}">
-                                                            <input class="term_deleter" style="margin-bottom: 4px;" disabled>
+                                                            <input class="term_select_value" disabled style="vertical-align:middle; width: 32%;" placeholder="{{ 'Ex : Paris, bleu, montagne' | trans }}">
+                                                            <input class="term_deleter" style="margin-bottom: 4px;">
                                                         </div>
 
                                                         <button class="add_new_term"><span>&plus;</span> Add</button>
                                                     </div>
 
-                                                    <div style="display:none;">
+                                                   {# <div style="display:none;">
                                                         <select class="term_select_multiple" size="8" multiple onchange="prodApp.appEvents.emit('search.doCheckFilters', true);" name="fields[]" style="vertical-align:middle; width:99%;">
                                                             <option value="phraseanet--all--fields">{{ 'rechercher dans tous les champs' | trans }}</option>
                                                             {% for field_id, field in search_datas['fields'] %}
@@ -433,7 +438,7 @@
                                                                 {% endif %}
                                                             {% endfor %}
                                                         </select>
-                                                    </div>
+                                                    </div>#}
                                                 </div>
 
                                                 <div id="ADVSRCH_DATE_ZONE">
@@ -500,13 +505,16 @@
                                                             {% for status_bit, status in databox.status %}
                                                             <tr>
                                                                 <td>
+
                                                                     <label class="checkbox inline custom_checkbox_label">
                                                                         {% if status['img_off'] %}
                                                                             <img src="{{status['img_off']}}" title="{{status['labels_off_i18n'][app['locale']]}}" />
                                                                         {% endif %}
-                                                                        <input class="field_switch field_{{databox_id}} check-filters" data-save="true"
-                                                                        type="checkbox" value="0"
-                                                                        n="{{status_bit}}" name="status[{{databox_id}}][{{status_bit}}]" />
+                                                                        <input type="checkbox" onchange="advSearchChangeStatusBit(this);" class="field_switch field_{{databox_id}}"
+                                                                               value="0"
+                                                                               data-sbas_id="{{databox_id}}" data-sb="{{status_bit}}"
+                                                                               name="status[{{databox_id}}][{{status_bit}}]"
+                                                                        />
                                                                         <span class="custom_checkbox"></span>
                                                                         {{status['labels_off_i18n'][app['locale']]}}
                                                                     </label>
@@ -516,9 +524,11 @@
                                                                         {% if status['img_on'] %}
                                                                             <img src="{{status['img_on']}}" title="{{status['labels_on_i18n'][app['locale']]}}" />
                                                                         {% endif %}
-                                                                        <input class="field_switch field_{{databox_id}} check-filters" data-save="true"
-                                                                        type="checkbox" value="1"
-                                                                        n="{{status_bit}}" name="status[{{databox_id}}][{{status_bit}}]"/>
+                                                                        <input type="checkbox" onchange="advSearchChangeStatusBit(this);" class="field_switch field_{{databox_id}}"
+                                                                               value="1"
+                                                                               data-sbas_id="{{databox_id}}" data-sb="{{status_bit}}"
+                                                                               name="status[{{databox_id}}][{{status_bit}}]"
+                                                                        />
                                                                         <span class="custom_checkbox"></span>
                                                                         {{status['labels_on_i18n'][app['locale']]}}
                                                                     </label>