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

NDEV-69 Filters by Service, Category and Client do not work when adding Analyses into a Worksheet #221

Merged
merged 3 commits into from
Aug 25, 2017
Merged

NDEV-69 Filters by Service, Category and Client do not work when adding Analyses into a Worksheet #221

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff77d6d
Vocabularies for filter selectors
Aug 24, 2017
989eab7
loading filters and javascript
Aug 24, 2017
3e39eec
using more meaningful variables
Aug 25, 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
10 changes: 7 additions & 3 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 @@ -43,7 +43,7 @@ function WorksheetAddAnalysesView() {

// search form - selecting a category fills up the service selector
$('[name="list_getCategoryTitle"]').live("change", function(){
val = $('[name="list_getCategoryTitle"]').val();
val = $('[name="list_getCategoryTitle"]').find(":selected").val();
if(val == 'any'){
$('[name="list_Title"]').empty();
$('[name="list_Title"]').append("<option value='any'>"+_('Any')+"</option>");
Expand All @@ -53,7 +53,7 @@ function WorksheetAddAnalysesView() {
url: window.location.href.split("?")[0].replace("/add_analyses","") + "/getServices",
type: 'POST',
data: {'_authenticator': $('input[name="_authenticator"]').val(),
'getCategoryTitle': val},
'getCategoryUID': val},
dataType: "json",
success: function(data, textStatus, $XHR){
current_service_selection = $('[name="list_Title"]').val();
Expand All @@ -65,7 +65,9 @@ function WorksheetAddAnalysesView() {
} else {
selected = '';
}
$('[name="list_Title"]').append("<option "+selected+"value='"+data[i]+"'>"+data[i]+"</option>");
$('[name="list_Title"]').append(
"<option "+selected+"value='"+data[i][0]+
"'>"+data[i][1]+"</option>");
}
}
});
Expand Down Expand Up @@ -102,6 +104,8 @@ function WorksheetAddAnalysesView() {
replaceTarget: true,
data: form.formToArray(),
success: function () {
// Reload bika listing transitions watchers
window.bika.lims.BikaListingTableView.load();
}
}
var url = window.location.href.split("?")[0].split("/add_analyses")[0];
Expand Down
12 changes: 7 additions & 5 deletions bika/lims/browser/worksheet/ajax.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,13 @@ def __init__(self, context, request):
def __call__(self):
plone.protect.CheckAuthenticator(self.request)
bsc = getToolByName(self.context, 'bika_setup_catalog')
return json.dumps([c.Title for c in
bsc(portal_type = 'AnalysisService',
getCategoryTitle = self.request.get('getCategoryTitle', ''),
inactive_state = 'active',
sort_on = 'sortable_title')])
brains = bsc(
portal_type='AnalysisService',
getCategoryUID=self.request.get('getCategoryUID', ''),
inactive_state='active',
sort_on='sortable_title')
voc = [[brain.UID, brain.Title] for brain in brains]
return json.dumps(voc)


class AttachAnalyses():
Expand Down
24 changes: 14 additions & 10 deletions bika/lims/browser/worksheet/templates/add_analyses.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,15 @@
<input type="hidden" name="submitted" value="1"/>
<input tal:replace="structure context/@@authenticator/authenticator"/>
<label for="getWorksheetTemplate" i18n:translate="">Select template</label>
<select id="ProfileSelector" name="getWorksheetTemplate">
<select id="ProfileSelector" name="getWorksheetTemplate"
tal:define="olist view/getWorksheetTemplates">
Copy link
Member

Choose a reason for hiding this comment

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

Better to use a var name more meaningful, like ws_templates_list instead of olist

<option value=""></option>
<tal:profile repeat="profile view/getWorksheetTemplates">
<tal:profile repeat="profile olist">
<option
tal:attributes="
value python:profile[0];
value python:profile;
selected python: view.request.get('WorksheetTemplate', '') == profile[0] and 'selected' or ''"
tal:content="python:profile[1]"/>
tal:content="python:olist.getValue(profile)"/>
</tal:profile>
</select>&nbsp;
<input type="submit"
Expand All @@ -66,44 +67,47 @@
i18n:translate="">Category</label>
<select id="CategorySelector"
tal:attributes="name string:${form_id}_getCategoryTitle"
tal:define="olist view/getCategories"
Copy link
Member

Choose a reason for hiding this comment

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

Same here, better use categories_list instead of olist

class="listing-filter">
<option value="any" i18n:translate="">Any</option>
<tal:options repeat="category view/getCategories">
<tal:options repeat="category olist">
<option
tal:attributes="
value python:category;
selected python: view.request.form.get(form_id+'_getCategoryTitle', '') == category and 'selected' or ''"
tal:content="python:category"/>
tal:content="python:olist.getValue(category)"/>
</tal:options>
</select>

<label tal:attributes="for string:${form_id}_Title"
i18n:translate="">Service</label>
<select id="ServiceSelector"
tal:attributes="name string:${form_id}_Title"
tal:define="olist view/getServices"
class="listing-filter">
<option value="any" i18n:translate="">Any</option>
<tal:options repeat="service view/getServices">
<tal:options repeat="service olist">
<option
tal:attributes="
value python:service;
selected python: view.request.form.get(form_id+'_Title', '') == service and 'selected' or ''"
tal:content="python:service"/>
tal:content="python:olist.getValue(service)"/>
</tal:options>
</select>

<label tal:attributes="for string:${form_id}_getClientTitle"
i18n:translate="">Client</label>
<select id="ClientSelector"
tal:attributes="name string:${form_id}_getClientTitle"
tal:define="olist view/getClients"
class="listing-filter">
<option value="any" i18n:translate="">Any</option>
<tal:options repeat="client view/getClients">
<tal:options repeat="client olist">
<option
tal:attributes="
value python:client;
selected python: view.request.form.get(form_id+'_getClientTitle', '') == client and 'selected' or ''"
tal:content="python:client"/>
tal:content="python:olist.getValue(client)"/>
</tal:options>
</select>&nbsp;
<a tal:attributes="href view/view_url" i18n:translate=""
Expand Down
68 changes: 43 additions & 25 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 @@ -21,6 +21,7 @@
from bika.lims.browser.worksheet.tools import checkUserManage
from bika.lims.browser.worksheet.tools import showRejectionMessage
from bika.lims.utils import t
from bika.lims.vocabularies import CatalogVocabulary


class AddAnalysesView(BikaListingView):
Expand Down Expand Up @@ -102,9 +103,6 @@ def __call__(self):

showRejectionMessage(self.context)

translate = self.context.translate

form_id = self.form_id
form = self.request.form
rc = getToolByName(self.context, REFERENCE_CATALOG)
if 'submitted' in form:
Expand All @@ -123,6 +121,25 @@ def __call__(self):
_("No analyses were added to this worksheet."))
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
):
# Apply filter elements
# Note that the name of those fields is '..Title', but we
# are getting their UID.
category = form.get('list_getCategoryTitle', '')
if category:
self.contentFilter['getCategoryUID'] = category

service = form.get('list_Title', '')
if service:
self.contentFilter['getServiceUID'] = service

client = form.get('list_getClientTitle', '')
if client:
self.contentFilter['getClientUID'] = client

self._process_request()

Expand Down Expand Up @@ -197,32 +214,33 @@ def folderitem(self, obj, item, index):
return item

def getServices(self):
bsc = getToolByName(self.context, 'bika_setup_catalog')
return [c.Title for c in
bsc(portal_type = 'AnalysisService',
getCategoryUID = self.request.get('list_getCategoryUID', ''),
inactive_state = 'active',
sort_on = 'sortable_title')]
vocabulary = CatalogVocabulary(self)
vocabulary.catalog = 'bika_setup_catalog'
categoryUID = self.request.get('list_getCategoryUID', '')
if categoryUID:
return vocabulary(
portal_type='AnalysisService',
getCategoryUID=categoryUID,
sort_on='sortable_title'
)
return vocabulary(
portal_type='AnalysisService',
sort_on='sortable_title'
)

def getClients(self):
pc = getToolByName(self.context, 'portal_catalog')
return [c.Title for c in
pc(portal_type = 'Client',
inactive_state = 'active',
sort_on = 'sortable_title')]
vocabulary = CatalogVocabulary(self)
return vocabulary(portal_type='Client', sort_on='sortable_title')

def getCategories(self):
bsc = getToolByName(self.context, 'bika_setup_catalog')
return [c.Title for c in
bsc(portal_type = 'AnalysisCategory',
inactive_state = 'active',
sort_on = 'sortable_title')]
vocabulary = CatalogVocabulary(self)
vocabulary.catalog = 'bika_setup_catalog'
return vocabulary(
portal_type='AnalysisCategory', sort_on='sortable_title')

def getWorksheetTemplates(self):
""" Return WS Templates """
profiles = []
bsc = getToolByName(self.context, 'bika_setup_catalog')
return [(c.UID, c.Title) for c in
bsc(portal_type = 'WorksheetTemplate',
inactive_state = 'active',
sort_on = 'sortable_title')]
vocabulary = CatalogVocabulary(self)
vocabulary.catalog = 'bika_setup_catalog'
return vocabulary(
portal_type='WorksheetTemplate', sort_on='sortable_title')
3 changes: 2 additions & 1 deletion bika/lims/vocabularies/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,9 @@ def __call__(self, **kwargs):
site = getSite()
request = aq_get(site, 'REQUEST', None)
catalog = getToolByName(site, self.catalog)
allow_blank = False
if 'allow_blank' in kwargs:
allow_blank = True
allow_blank = kwargs.get('allow_blank')
del (kwargs['allow_blank'])

self.contentFilter.update(**kwargs)
Expand Down