From 56330c3798b7f26a41c39faa5b9cf257f084d4b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jordi=20Puiggen=C3=A9?= <jpuiggene@naralabs.com>
Date: Wed, 6 Sep 2017 01:14:15 +0200
Subject: [PATCH 1/2] Redux of js from add_analyses filter selector

---
 bika/lims/browser/js/bika.lims.worksheet.js | 60 +++++++++------------
 1 file changed, 26 insertions(+), 34 deletions(-)

diff --git a/bika/lims/browser/js/bika.lims.worksheet.js b/bika/lims/browser/js/bika.lims.worksheet.js
index 781c842478..43a132b6e1 100644
--- a/bika/lims/browser/js/bika.lims.worksheet.js
+++ b/bika/lims/browser/js/bika.lims.worksheet.js
@@ -78,50 +78,42 @@ function WorksheetAddAnalysesView() {
         $('.ws-analyses-search-button').live('click', function (event) {
             // in this context we already know there is only one bika-listing-form
             var form_id = "list";
-            var form = $("#list");
+            var form = $('form[id="'+form_id+'"]');
+            var params = {};
 
-            // request new table content by re-routing bika_listing_table form submit
-            $(form).append("<input type='hidden' name='table_only' value='" + form_id + "'>");
             // dropdowns are printed in ../templates/worksheet_add_analyses.pt
             // We add <formid>_<index>=<value>, which are checked in bika_listing.py
             var filter_indexes = ['getCategoryTitle', 'Title', 'getClientTitle'];
-            var i, fi;
-            for (i = 0; i < filter_indexes.length; i++) {
-                fi = form_id + "_" + filter_indexes[i];
-                var value = $("[name='" + fi + "']").val();
+            var field_set = $(this).parent('fieldset');
+            for (var i=0; i<filter_indexes.length; i++) {
+                var field_name = form_id+"_"+filter_indexes[i];
+                var element = $(field_set).find('[name="'+field_name+'"]');
+                var value = $(element).val();
                 if (value == undefined || value == null || value == 'any') {
-                    $("#list > [name='" + fi + "']").remove();
-                    $.query.REMOVE(fi);
-                }
-                else {
-                    $(form).append("<input type='hidden' name='" + fi + "' value='" + value + "'>");
-                    $.query.SET(fi, value);
+                    continue;
                 }
+                params[field_name] = value;
             }
-
-            var options = {
-                target: $('.bika-listing-table'),
-                replaceTarget: true,
-                data: form.formToArray(),
-                success: function () {
-                    // Reload bika listing transitions watchers
-                    window.bika.lims.BikaListingTableView.load();
+            // Add other fields required from bikalisting form
+            params['form_id'] = form_id;
+            params['table_only'] = form_id;
+            params['portal_type'] = 'Analysis';
+            params['submitted'] = '1';
+            var base_fields = ['_authenticator', 'view_url', 'list_sort_on', 'list_sort_order'];
+            for (var i=0; i<base_fields.length; i++) {
+                var field_name = base_fields[i];
+                var field = $(form).find('input[name="'+field_name+'"]');
+                var value = $(field).val();
+                if (value == undefined || value == null) {
+                    continue;
                 }
+                params[field_name] = value;
             }
-            var url = window.location.href.split("?")[0].split("/add_analyses")[0];
-            url = url + "/add_analyses" + $.query.toString();
-            window.history.replaceState({}, window.document.title, url);
-
-            var stored_form_action = $(form).attr("action");
-            $(form).attr("action", window.location.href);
-            form.ajaxSubmit(options);
 
-            for (i = 0; i < filter_indexes.length; i++) {
-                fi = form_id + "_" + filter_indexes[i];
-                $("#list > [name='" + fi + "']").remove();
-            }
-            $(form).attr("action", stored_form_action);
-            $("[name='table_only']").remove();
+            $.post(window.location.href, params).done(function(data) {
+                $(form).find('.bika-listing-table-container').html(data);
+                window.bika.lims.BikaListingTableView.load();
+            });
 
             return false;
         });

From 7d362ed8338b5b41a159276fd83265c8602cce7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jordi=20Puiggen=C3=A9?= <jpuiggene@naralabs.com>
Date: Wed, 6 Sep 2017 09:52:28 +0200
Subject: [PATCH 2/2] Form prefix makes bikalisting to create an advanced query
 adding getClientTitle in criteria

---
 bika/lims/browser/js/bika.lims.worksheet.js       |  5 +++--
 bika/lims/browser/worksheet/views/add_analyses.py | 12 ++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/bika/lims/browser/js/bika.lims.worksheet.js b/bika/lims/browser/js/bika.lims.worksheet.js
index 43a132b6e1..ef3a62e242 100644
--- a/bika/lims/browser/js/bika.lims.worksheet.js
+++ b/bika/lims/browser/js/bika.lims.worksheet.js
@@ -86,13 +86,14 @@ function WorksheetAddAnalysesView() {
             var filter_indexes = ['getCategoryTitle', 'Title', 'getClientTitle'];
             var field_set = $(this).parent('fieldset');
             for (var i=0; i<filter_indexes.length; i++) {
-                var field_name = form_id+"_"+filter_indexes[i];
+                var idx_name = filter_indexes[i];
+                var field_name = form_id+"_"+idx_name;
                 var element = $(field_set).find('[name="'+field_name+'"]');
                 var value = $(element).val();
                 if (value == undefined || value == null || value == 'any') {
                     continue;
                 }
-                params[field_name] = value;
+                params[idx_name] = value;
             }
             // Add other fields required from bikalisting form
             params['form_id'] = form_id;
diff --git a/bika/lims/browser/worksheet/views/add_analyses.py b/bika/lims/browser/worksheet/views/add_analyses.py
index cf639f845d..29f9f08a06 100644
--- a/bika/lims/browser/worksheet/views/add_analyses.py
+++ b/bika/lims/browser/worksheet/views/add_analyses.py
@@ -128,22 +128,22 @@ def __call__(self):
                     self.request.RESPONSE.redirect(self.context.absolute_url() +
                                                    "/add_analyses")
             elif (
-                'list_getCategoryTitle' in form or
-                'list_Title' in form or
-                'list_getClientTitle' in form
+                'getCategoryTitle' in form or
+                'Title' in form or
+                'getClientTitle' in form
                     ):
                 # Apply filter elements
                 # Note that the name of those fields is '..Title', but we
                 # are getting their UID.
-                category = form.get('list_getCategoryTitle', '')
+                category = form.get('getCategoryTitle', '')
                 if category:
                     self.contentFilter['getCategoryUID'] = category
 
-                service = form.get('list_Title', '')
+                service = form.get('Title', '')
                 if service:
                     self.contentFilter['getServiceUID'] = service
 
-                client = form.get('list_getClientTitle', '')
+                client = form.get('getClientTitle', '')
                 if client:
                     self.contentFilter['getClientUID'] = client