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

Analysisservice interim fields not shown #308

Merged
merged 3 commits into from
Oct 25, 2017
Merged

Analysisservice interim fields not shown #308

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
23de031
Add bika.lims.analysisservice.coffee
rockfruit Oct 25, 2017
689812d
PEP8 and remove `import *` from interimfieldsfield.py
rockfruit Oct 25, 2017
c8d2343
PEP8 and fix imports in content/analysisservice.py
rockfruit Oct 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
55 changes: 32 additions & 23 deletions bika/lims/browser/fields/interimfieldsfield.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,10 @@
from AccessControl import ClassSecurityInfo
from Products.ATExtensions.ateapi import RecordsField
from Products.Archetypes.Registry import registerField
from Products.Archetypes.public import *
from bika.lims import bikaMessageFactory as _
from bika.lims.utils import t


class InterimFieldsField(RecordsField):

"""a list of InterimFields for calculations """
_properties = RecordsField._properties.copy()
_properties.update({
Expand All @@ -22,25 +19,37 @@ class InterimFieldsField(RecordsField):
'type': 'InterimFields',
'subfields': ('keyword', 'title', 'value', 'unit', 'hidden', 'wide'),
'required_subfields': ('keyword', 'title'),
'subfield_labels': {'keyword': _('Keyword'),
'title': _('Field Title'),
'value': _('Default value'),
'unit': _('Unit'),
'hidden': _('Hidden Field'),
'wide': _('Apply wide')},
'subfield_types': {'hidden': 'boolean', 'value': 'float', 'wide': 'boolean'},
'subfield_sizes': {'keyword': 20,
'title': 20,
'value': 10,
'unit': 10},
'subfield_validators': {'keyword': 'interimfieldsvalidator',
'title': 'interimfieldsvalidator',
'value': 'interimfieldsvalidator',
'unit': 'interimfieldsvalidator'},
})
'subfield_labels': {
'keyword': _('Keyword'),
'title': _('Field Title'),
'value': _('Default value'),
'unit': _('Unit'),
'hidden': _('Hidden Field'),
'wide': _('Apply wide'),
},
'subfield_types': {
'hidden': 'boolean',
'value': 'float',
'wide': 'boolean',
},
'subfield_sizes': {
'keyword': 20,
'title': 20,
'value': 10,
'unit': 10,
},
'subfield_validators': {
'keyword': 'interimfieldsvalidator',
'title': 'interimfieldsvalidator',
'value': 'interimfieldsvalidator',
'unit': 'interimfieldsvalidator',
},
})
security = ClassSecurityInfo()

registerField(InterimFieldsField,
title="Interim Fields",
description="Used for storing Interim Fields or Interim Results.",
)

registerField(
InterimFieldsField,
title="Interim Fields",
description="Used for storing Interim Fields or Interim Results."
)
Loading