From d824b3158f9d73af1b4c52329ee06fe623de5fca Mon Sep 17 00:00:00 2001
From: Filip Vilic <filip.t.vilic@gmail.com>
Date: Thu, 13 Dec 2018 13:58:51 +0100
Subject: [PATCH 1/2] PHRAS-2327_report_refacto_41 base collections fix

---
 resources/www/report/js/report.js | 36 +++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/resources/www/report/js/report.js b/resources/www/report/js/report.js
index fbdfeb8ec2..015dfb1ece 100644
--- a/resources/www/report/js/report.js
+++ b/resources/www/report/js/report.js
@@ -52,19 +52,30 @@ $(document).ready(function () {
             $list.hide();
         });
 
-        $(".form2 .select-options li").click(function(e) {
-            e.stopPropagation();
-            var value = $(this).attr('rel'),
-                form = $(this).closest('form');
-            $(".form2 .collist", form).hide();
-            $(".form2 .collist-" + value, form).show();
-        });
-      
         $(document).click(function() {
             $styledSelect.removeClass('active');
             $list.hide();
         });
-     });
+     });        
+     
+     $(".form2 .select-options li").click(function(e) {
+        e.stopPropagation();
+        var $this = $(this),
+            value = $this.attr('rel'),
+            form = $this.closest('form');
+        $(".form2 .collist", form).hide();
+        $(".form2 .collist-" + value, form).show();
+
+        $(".form2 .collist", form).each(function(i, list) {            
+            if ($(list).is(':visible') === true) {
+                $(list).find('input').prop('checked', true);
+            }
+            else {
+                $(list).find('input').prop('checked', false);
+            }
+            
+        });
+    });
 
     $('.form2 .collist').each(function() {
         var $this = $(this),
@@ -73,6 +84,13 @@ $(document).ready(function () {
         ;
         $this.hide();        
         $(".collist-" + i, form).show();
+
+        if ($this.hasClass('collist-1')) {
+            $this.find('input').prop('checked', true);
+        }
+        else {
+            $this.find('input').prop('checked', false);
+        }
     });
 
     $('.form2').each(function() {

From 5a291a549cee9d24e84cd30d84d370cf40e51d54 Mon Sep 17 00:00:00 2001
From: Filip Vilic <filip.t.vilic@gmail.com>
Date: Thu, 13 Dec 2018 15:22:56 +0100
Subject: [PATCH 2/2] PHRAS-2327_report_refacto_41 base collections/fields fix

---
 .../web/report/report_layout_child.html.twig  | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/templates/web/report/report_layout_child.html.twig b/templates/web/report/report_layout_child.html.twig
index 7189f73fec..2fcfe60cb7 100644
--- a/templates/web/report/report_layout_child.html.twig
+++ b/templates/web/report/report_layout_child.html.twig
@@ -61,30 +61,30 @@
             <div class="form3 form_content">
                 <div class="form_titre">{{ "report:: 4 - Fields" | trans }}</div>
 
-                <div class="collist">
+                {% for sbas_id,databox in granted_bases %}
+                <div class="collist collist-{{ sbas_id }}">
                     <div class="collist_buttons">
-                        <button class="select-all btn btn-mini" data-target_selector="#chkfld-records input:checkbox">
+                        <button class="select-all btn btn-mini" data-target_selector="#chkfld-records-{{ sbas_id }} input:checkbox">
                             {% trans %}Select all{% endtrans %}
                         </button>
-                        <button class="unselect-all btn btn-mini" data-target_selector="#chkfld-records input:checkbox">
+                        <button class="unselect-all btn btn-mini" data-target_selector="#chkfld-records-{{ sbas_id }} input:checkbox">
                             {% trans %}Deselect all{% endtrans %}
                         </button>
                     </div>
 
-                    <ul id="chkfld-records" style="max-height: 150px; overflow-y: auto; overflow-x: hidden;">
-                        {% for sbas_id,databox in granted_bases %}
-                            {% for meta in databox.metas %}
-                            <li>
-                                <label class="checkbox custom_checkbox_label">
-                                    <input name="meta[]" checked="checked" type="checkbox" value="{{ meta }}">
-                                    <span class="custom_checkbox"></span>
-                                    {{ meta }}
-                                </label>
-                            </li>
-                            {% endfor %}
-                        {% endfor %}
+                    <ul id="chkfld-records-{{ sbas_id }}" style="max-height: 150px; overflow-y: auto; overflow-x: hidden;">
+                    {% for meta in databox.metas %}
+                        <li>
+                            <label class="checkbox custom_checkbox_label">
+                                <input name="meta[]" checked="checked" type="checkbox" value="{{ meta }}">
+                                <span class="custom_checkbox"></span>
+                                {{ meta }}
+                            </label>
+                        </li>
+                    {% endfor %}
                     </ul>
                 </div>
+                {% endfor %}
             </div>
             {% endblock form_records %}
         </form>