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

Issue-351: Fix traceback on listings #352

Merged
merged 3 commits into from
Nov 4, 2017
Merged

Issue-351: Fix traceback on listings #352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
340d165
get the state_var of the first workflow
ramonski Nov 4, 2017
0af9220
rebuild bika.lims.bikalisting.coffee to fix invalid syntax
ramonski Nov 4, 2017
cfacbfc
Changelog updated
ramonski Nov 4, 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
4 changes: 3 additions & 1 deletion CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,9 @@ Changelog
- #334 Fix TypeError (setRequestID, unexpected keyword argument) on AR Creation
- #327 Keep Laboratory name when reinstalling
- #339 Index not found warnings in bika listing.
- #348 Add Attachment objects to portal_catalog, to allow idserver to function correctly.
- #348 Add Attachment objects to portal_catalog, to allow idserver to function correctly.
- #352 Fix traceback on listings


1.0.0 (2017-10-13)
------------------
Expand Down
19 changes: 16 additions & 3 deletions bika/lims/browser/bika_listing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1257,11 +1257,24 @@ def _folderitems(self, full_objects=False):
after={},
replace={},
)
rs = self.workflow.getInfoFor(obj, 'review_state')
st_title = self.workflow.getTitleForStateOnType(rs, obj.portal_type)
st_title = t(PMF(st_title))

rs = None
wf_state_var = None

workflows = self.workflow.getWorkflowsFor(obj)
for wf in workflows:
if wf.state_var:
wf_state_var = wf.state_var
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is really nice! When we merge senaite-integration to master, most secondary workflows (notably cancellation and deactivation) will be removed, and review_state will be used to manage these states.

break

if wf_state_var is not None:
rs = self.workflow.getInfoFor(obj, wf_state_var)
st_title = self.workflow.getTitleForStateOnType(rs, obj.portal_type)
st_title = t(PMF(st_title))

if rs:
results_dict['review_state'] = rs

for state_var, state in states.items():
if not st_title:
st_title = self.workflow.getTitleForStateOnType(
Expand Down
234 changes: 112 additions & 122 deletions bika/lims/browser/js/bika.lims.bikalisting.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,131 +1,121 @@

/*
* Controller class for Bika Listing Table view
/* Please use this command to compile this file into the parent `js` directory:
coffee --no-header -w -o ../ -c bika.lims.bikalisting.coffee
*/

(function() {
window.BikaListingTableView = function () {

var autosave, build_typical_save_request, category_header_clicked,column_header_clicked, column_toggle_context_menu, column_toggle_context_menu_selection, filter_search_button_click, filter_search_keypress,
listing_string_input_keypress,
listing_string_select_changed, loadNewRemarksEventHandlers, load_export_buttons, load_transitions, loading_transitions,
pagesize_change, positionTooltip, render_transition_buttons, save_elements, select_all_clicked, select_one_clicked, show_more_clicked, that,
workflow_action_button_click;
that = this;
loading_transitions = false;
show_more_clicked=function () {
/*
* Controller class for Bika Listing Table view
*/

$('a.bika_listing_show_more').click(function(e){
var filter_options, filterbar, filters, filters1, filters2, formid, limit_from, pagesize, tbody, url;e.preventDefault();
formid = $(this).attr('data-form-id');
pagesize = parseInt($(this).attr('data-pagesize'));
url = $(this).attr('data-ajax-url');
limit_from = parseInt($(this).attr('data-limitfrom'));
url = url.replace('_limit_from=','_olf=');
url += '&'+formid+'_limit_from='+limit_from;
$('#'+formid+' a.bika_listing_show_more').fadeOut();
tbody = $('table.bika-listing-table[form_id="'+formid+'"] tbody.item-listing-tbody');
filter_options = [];
filters1 = $('.bika_listing_filter_bar input[name][value!=""]');
filters2 = $('.bika_listing_filter_bar select option:selected[value!=""]');
filters = $.merge(filters1, filters2);
$(filters).each(function(e) {
var opt;
(function() {
window.BikaListingTableView = function() {
var autosave, build_typical_save_request, category_header_clicked, column_header_clicked, column_toggle_context_menu, column_toggle_context_menu_selection, filter_search_button_click, filter_search_keypress, listing_string_input_keypress, listing_string_select_changed, loadNewRemarksEventHandlers, load_export_buttons, load_transitions, loading_transitions, pagesize_change, positionTooltip, render_transition_buttons, save_elements, select_all_clicked, select_one_clicked, show_more_clicked, that, workflow_action_button_click;
that = this;
loading_transitions = false;
show_more_clicked = function() {
$('a.bika_listing_show_more').click(function(e) {
var filter_options, filterbar, filters, filters1, filters2, formid, limit_from, pagesize, tbody, url;
e.preventDefault();
formid = $(this).attr('data-form-id');
pagesize = parseInt($(this).attr('data-pagesize'));
url = $(this).attr('data-ajax-url');
limit_from = parseInt($(this).attr('data-limitfrom'));
url = url.replace('_limit_from=', '_olf=');
url += '&' + formid + '_limit_from=' + limit_from;
$('#' + formid + ' a.bika_listing_show_more').fadeOut();
tbody = $('table.bika-listing-table[form_id="' + formid + '"] tbody.item-listing-tbody');
filter_options = [];
filters1 = $('.bika_listing_filter_bar input[name][value!=""]');
filters2 = $('.bika_listing_filter_bar select option:selected[value!=""]');
filters = $.merge(filters1, filters2);
$(filters).each(function(e) {
var opt;
opt = [$(this).attr('name'), $(this).val()];
filter_options.push(opt);
});
filterbar = {};
if (filter_options.length > 0) {
filterbar.bika_listing_filter_bar = $.toJSON(filter_options);
}
$.post(url, filterbar)
.done(function(data) {
var rows;try {
rows = $('<html><table>'+data+'</table></html>').find('tr');

$(tbody).append(rows);

$('#'+formid+' a.bika_listing_show_more').attr('data-limitfrom', limit_from+pagesize);
loadNewRemarksEventHandlers();
}
catch (error) {e= error;
$('#' + formid + ' a.bika_listing_show_more').hide();
console.log(e);
}
load_transitions();
}).fail(function () {
$('#'+formid+' a.bika_listing_show_more').hide();
console.log('bika_listing_show_more failed');
}).always(function() {
var numitems;
numitems = $('table.bika-listing-table[form_id="'+formid+'"] tbody.item-listing-tbody tr').length;
$('#'+formid+' span.number-items').html(numitems);
if (numitems % pagesize === 0) {
$('#'+formid+' a.bika_listing_show_more').fadeIn();
}
});
});
};

loadNewRemarksEventHandlers= function() {
var pointer, txt1;
$('a.add-remark').remove();
txt1 = '<a href="#" class="add-remark"><img src="'+window.portal_url+'/++resource++bika.lims.images/comment_ico.png" title="'+_('Add Remark')+'")"></a>';
pointer = $('.listing_remarks:contains(\'\')').closest('tr').prev().find('td.service_title span.before');

$(pointer).append(txt1);

$('a.add-remark').click(function(e){
var rmks;e.preventDefault();
rmks = $(this).closest('tr').next('tr').find('td.remarks');
if (rmks.length > 0) {
rmks.toggle();
}
});
$('td.remarks').hide();
};

column_header_clicked= function() {
$('th.sortable').live('click', function () {
var column_id, column_index, form, form_id, options, sort_on, sort_on_selector, sort_order, sort_order_selector, stored_form_action;form = $(this).parents('form');
form_id = $(form).attr('id');
column_id = this.id.split('-')[1];
column_index = $(this).parent().children('th').index(this);
sort_on_selector = '[name=' + form_id + '_sort_on]';
sort_on = $(sort_on_selector).val();
sort_order_selector = '[name=' + form_id + '_sort_order]';
sort_order = $(sort_order_selector).val();
if (sort_on === column_id) {

if (sort_order == = 'descending') {
sort_order = 'ascending';
}
else {
sort_order = 'descending';
}
}
else {
sort_on = column_id;
sort_order = 'ascending';
}

$(sort_on_selector).val(sort_on);
$(sort_order_selector).val(sort_order);


stored_form_action = $(form).attr('action');
$(form).attr('action', window.location.href);
$(form).append('<input type=\'hidden\' name=\'table_only\' value=\'' + form_id + '\'>');
options = {
target: $(this).parents('table'),
replaceTarget: true,
data: form.formToArray(),
success: load_transitions};
form.ajaxSubmit(options);
$('[name=\'table_only\']').remove();
$(form).attr('action', stored_form_action);
});
};
filter_options.push(opt);
});
filterbar = {};
if (filter_options.length > 0) {
filterbar.bika_listing_filter_bar = $.toJSON(filter_options);
}
$.post(url, filterbar).done(function(data) {
var rows;
try {
rows = $('<html><table>' + data + '</table></html>').find('tr');
$(tbody).append(rows);
$('#' + formid + ' a.bika_listing_show_more').attr('data-limitfrom', limit_from + pagesize);
loadNewRemarksEventHandlers();
} catch (error) {
e = error;
$('#' + formid + ' a.bika_listing_show_more').hide();
console.log(e);
}
load_transitions();
}).fail(function() {
$('#' + formid + ' a.bika_listing_show_more').hide();
console.log('bika_listing_show_more failed');
}).always(function() {
var numitems;
numitems = $('table.bika-listing-table[form_id="' + formid + '"] tbody.item-listing-tbody tr').length;
$('#' + formid + ' span.number-items').html(numitems);
if (numitems % pagesize === 0) {
$('#' + formid + ' a.bika_listing_show_more').fadeIn();
}
});
});
};
loadNewRemarksEventHandlers = function() {
var pointer, txt1;
$('a.add-remark').remove();
txt1 = '<a href="#" class="add-remark"><img src="' + window.portal_url + '/++resource++bika.lims.images/comment_ico.png" title="' + _('Add Remark') + '")"></a>';
pointer = $('.listing_remarks:contains(\'\')').closest('tr').prev().find('td.service_title span.before');
$(pointer).append(txt1);
$('a.add-remark').click(function(e) {
var rmks;
e.preventDefault();
rmks = $(this).closest('tr').next('tr').find('td.remarks');
if (rmks.length > 0) {
rmks.toggle();
}
});
$('td.remarks').hide();
};
column_header_clicked = function() {
$('th.sortable').live('click', function() {
var column_id, column_index, form, form_id, options, sort_on, sort_on_selector, sort_order, sort_order_selector, stored_form_action;
form = $(this).parents('form');
form_id = $(form).attr('id');
column_id = this.id.split('-')[1];
column_index = $(this).parent().children('th').index(this);
sort_on_selector = '[name=' + form_id + '_sort_on]';
sort_on = $(sort_on_selector).val();
sort_order_selector = '[name=' + form_id + '_sort_order]';
sort_order = $(sort_order_selector).val();
if (sort_on === column_id) {
if (sort_order === 'descending') {
sort_order = 'ascending';
} else {
sort_order = 'descending';
}
} else {
sort_on = column_id;
sort_order = 'ascending';
}
$(sort_on_selector).val(sort_on);
$(sort_order_selector).val(sort_order);
stored_form_action = $(form).attr('action');
$(form).attr('action', window.location.href);
$(form).append('<input type=\'hidden\' name=\'table_only\' value=\'' + form_id + '\'>');
options = {
target: $(this).parents('table'),
replaceTarget: true,
data: form.formToArray()
};
form.ajaxSubmit(options);
$('[name=\'table_only\']').remove();
$(form).attr('action', stored_form_action);
});
};

/*
* Fetch allowed transitions for all the objects listed in bika_listing and
Expand Down
4 changes: 4 additions & 0 deletions bika/lims/browser/js/coffee/bika.lims.bikalisting.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
### Please use this command to compile this file into the parent `js` directory:
coffee --no-header -w -o ../ -c bika.lims.bikalisting.coffee
###

###
# Controller class for Bika Listing Table view
###
Expand Down