Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NMRL-396 Search using Client not working in Add Analyses (Worksheet) #248

Merged
merged 2 commits into from
Sep 6, 2017
Merged

NMRL-396 Search using Client not working in Add Analyses (Worksheet) #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56330c3
Redux of js from add_analyses filter selector
xispa Sep 5, 2017
7d362ed
Form prefix makes bikalisting to create an advanced query adding getC…
xispa Sep 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 27 additions & 34 deletions bika/lims/browser/js/bika.lims.worksheet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,50 +78,43 @@ 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 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') {
$("#list > [name='" + fi + "']").remove();
$.query.REMOVE(fi);
}
else {
$(form).append("<input type='hidden' name='" + fi + "' value='" + value + "'>");
$.query.SET(fi, value);
continue;
}
params[idx_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;
});
Expand Down
12 changes: 6 additions & 6 deletions bika/lims/browser/worksheet/views/add_analyses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down