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.

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

Traceback when submitting duplicate when Duplicate Variation is not set #769

Merged
merged 2 commits into from
Apr 20, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 2 additions & 4 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,8 @@ Changelog

**Removed**


**Fixed**

- #771 Slow Searches in Listing Views
- #769 Traceback when submitting duplicate when Duplicate Variation is not set
- #771 Slow Searches in Listing Views
- #774 When retracting an Analysis Requests its analyses are also retracted
- #772 Improved UID check in API

Expand Down
1 change: 1 addition & 0 deletions bika/lims/content/abstractbaseanalysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,7 @@
# The amount of difference allowed between this analysis, and any duplicates.
DuplicateVariation = FixedPointField(
'DuplicateVariation',
default='0.00',
schemata="Method",
widget=DecimalWidget(
label=_("Duplicate Variation %"),
Expand Down
33 changes: 33 additions & 0 deletions bika/lims/upgrade/v01_02_005.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,42 @@ def upgrade(tool):
logger.info("Upgrading {0}: {1} -> {2}".format(product, ver_from, version))

# -------- ADD YOUR STUFF HERE --------

# Traceback when submitting duplicate when Duplicate Variation is not set
# Walkthrough all analyses and analyses services and set 0.00 value for
# DuplicateVariation if returns None
# https://github.com/senaite/senaite.core/issues/768
fix_duplicate_variation_nonfloatable_values()

ut.addIndex(CATALOG_ANALYSIS_REQUEST_LISTING, "listing_searchable_text",
"TextIndexNG3")
ut.refreshCatalogs()
logger.info("{0} upgraded to version {1}".format(product, version))

return True

def fix_duplicate_variation_nonfloatable_values():
# Update Analysis Services
catalog = api.get_tool('bika_setup_catalog')
brains = catalog(portal_type='AnalysisService')
for brain in brains:
service = api.get_object(brain)
dup_var = service.getDuplicateVariation()
if api.is_floatable(dup_var):
continue
service.setDuplicateVariation(0.0)
logger.info("Updated Duplicate Variation for Service '%s': '0.0'" % (
service.Title()))

# Update Analyses
catalog = api.get_tool('bika_analysis_catalog')
portal_types = ['Analysis', 'ReferenceAnalysis', 'DuplicateAnalysis']
brains = catalog(portal_type=portal_types)
for brain in brains:
analysis = api.get_object(brain)
dup_var = analysis.getDuplicateVariation()
if api.is_floatable(dup_var):
continue
analysis.setDuplicateVariation(0.0)
logger.info("Updated Duplicate Variation for Analysis '%s': '0.0'" % (
analysis.Title()))