Fix custom DQL & render HTML

Datatable/Events.php

@@ -137,6 +137,13 @@ class Events
      */
     protected $xhr;
 
+    /**
+     * Fired when responsive extension resizing table.
+     *
+     * @var null|array
+     */
+    protected $responsiveResize;
+
     //-------------------------------------------------
     // Ctor.
     //-------------------------------------------------
@@ -178,6 +185,7 @@ public function configureOptions(OptionsResolver $resolver)
             'state_load_params' => null,
             'state_save_params' => null,
             'xhr' => null,
+            'responsive_resize' => null,
         ));
 
         $resolver->setAllowedTypes('column_sizing', array('null', 'array'));
@@ -195,6 +203,7 @@ public function configureOptions(OptionsResolver $resolver)
         $resolver->setAllowedTypes('state_load_params', array('null', 'array'));
         $resolver->setAllowedTypes('state_save_params', array('null', 'array'));
         $resolver->setAllowedTypes('xhr', array('null', 'array'));
+        $resolver->setAllowedTypes('responsive_resize', array('null', 'array'));
 
         return $this;
     }
@@ -622,4 +631,32 @@ public function setXhr($xhr)
 
         return $this;
     }
+
+    /**
+     * Get ResponsiveResize.
+     *
+     * @return array|null
+     */
+    public function getResponsiveResize()
+    {
+        return $this->responsiveResize;
+    }
+
+    /**
+     * Set responsiveResize.
+     *
+     * @param array|null $responsiveResize
+     *
+     * @return $this
+     */
+    public function setResponsiveResize($responsiveResize)
+    {
+        if (is_array($responsiveResize)) {
+            $this->validateArrayForTemplateAndOther($responsiveResize);
+        }
+
+        $this->responsiveResize = $responsiveResize;
+
+        return $this;
+    }
 }

Resources/views/datatable/datatable_html.html.twig

@@ -38,13 +38,6 @@
                 </tr>
             {% endif %}
         {% endif %}
-        <tr>
-            {% for column in sg_datatables_view.columnBuilder.columns %}
-                {% if column.sentInResponse %}
-                    <th>{{ column.title }}</th>
-                {% endif %}
-            {% endfor %}
-        </tr>
     </thead>
         {% if true == individual_filtering %}
             {% if 'foot' == sg_datatables_view.options.individualFilteringPosition or 'both' == sg_datatables_view.options.individualFilteringPosition%}

Resources/views/datatable/events.html.twig

@@ -126,3 +126,11 @@
     {% endif %}
     .on('xhr.dt', {% include sg_datatables_view.events.xhr['template'] with vars %})
 {% endif %}
+{% if sg_datatables_view.events.responsiveResize is not same as(null) %}
+    {% if sg_datatables_view.events.responsiveResize['vars'] is defined %}
+        {% set vars = sg_datatables_view.events.responsiveResize['vars'] %}
+    {% else %}
+        {% set vars = {} %}
+    {% endif %}
+    .on('responsive-resize.dt', {% include sg_datatables_view.events.responsiveResize['template'] with vars %})
+{% endif %}

Resources/views/render/datetime.html.twig

@@ -6,34 +6,34 @@
  # For the full copyright and license information, please view the LICENSE
  # file that was distributed with this source code.
  #}
-{%- set datetime_id_selector -%}
-    sg-datatables-{{ datatable_name }}-datetime-{{ row_id }}
+ {%- set datetime_id_selector -%}
+ sg-datatables-{{ datatable_name }}-datetime-{{ row_id }}
 {%- endset -%}
 
 {%- set datetime_selector -%}
-    id="{{ datetime_id_selector }}"
+ id="{{ datetime_id_selector }}"
 {%- endset -%}
 
 {% if column_class_editable_selector is defined %}
-    <div {{ datetime_selector }} class="{{ column_class_editable_selector }}" data-pk="{{ pk }}" {% if path is not same as(null) %}data-path="{{ path }}"{% endif %}></div>
+ <span {{ datetime_selector }} class="{{ datetime_id_selector }} {{ column_class_editable_selector }}" data-pk="{{ pk }}" {% if path is not same as(null) %}data-path="{{ path }}"{% endif %}></span>
 {% else %}
-    <div {{ datetime_selector }}>
-        {% if data is same as(null) and default_content is not same as(null) %}
-            {{ default_content }}
-        {% endif %}
-    </div>
+ <span {{ datetime_selector }} class="{{ datetime_id_selector }}">
+     {% if data is same as(null) and default_content is not same as(null) %}
+         {{ default_content }}
+     {% endif %}
+ </span>
 {% endif %}
 
 {% if data is not same as(null) %}
-    <script type="text/javascript">
-        $(function() {
-            moment.locale("{{ app.request.locale }}");
+ <script type="text/javascript">
+     $(function() {
+         moment.locale("{{ app.request.locale }}");
 
-            {% if timeago is same as(false) %}
-                $("#{{ datetime_id_selector }}").html(moment.unix({{ data|date('U') }}).format("{{ date_format }}"));
-            {% else %}
-                $("#{{ datetime_id_selector }}").html(moment.unix({{ data|date('U') }}).fromNow());
-            {% endif %}
-        });
-    </script>
+         {% if timeago is same as(false) %}
+             $(".{{ datetime_id_selector }}").html(moment.unix({{ data|date('U') }}).format("{{ date_format }}"));
+         {% else %}
+             $(".{{ datetime_id_selector }}").html(moment.unix({{ data|date('U') }}).fromNow());
+         {% endif %}
+     });
+ </script>
 {% endif %}

Response/DatatableQueryBuilder.php

@@ -251,7 +251,12 @@ private function initColumnArrays()
                 // Order on alias column name
                 $this->addOrderColumn($column, null, $columnAlias);
                 // Fix subqueries alias duplication
-                $searchDql = preg_replace('/\{([\w]+)\}/', '$1_search', $dql);
+                // Another fix customDql to identify field select from base request and Subrequest
+                if (preg_match('/^SELECT/i', $dql)) {
+                    $searchDql = preg_replace('/\{([\w]+)\}/', '$1_search', $dql); // original
+                } else {
+                    $searchDql = preg_replace('/\{([\w]+)\}/', '$1', $dql);
+                }
                 $this->addSearchColumn($column, null, $searchDql);
             } elseif (true === $this->accessor->getValue($column, 'selectColumn')) {
                 $parts = explode('.', $dql);