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

Always allow interim fields to be added to Analysis Services #820

Merged
merged 31 commits into from
May 22, 2018
Merged
Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
56c6cf9
Basic JS Class Stub created with bound event handlers
ramonski Apr 27, 2018
cb4f38d
Added element loaders
ramonski Apr 28, 2018
be58a31
Cleanup
ramonski Apr 28, 2018
0fa63db
Refactoring and interim initialization
ramonski Apr 29, 2018
12daf38
Default Calculation of Method handling
ramonski May 1, 2018
cac9dbc
Implemented calculation change
ramonski May 1, 2018
48f21a8
Handle method change
ramonski May 1, 2018
e9d17ac
Implemented Methods tab logic
ramonski May 4, 2018
d0d1fa2
Minor changes
ramonski May 4, 2018
8016525
Workaround for missing catalog index
ramonski May 4, 2018
e5fb725
Minor changes
ramonski May 4, 2018
99acd20
Handle initial selected values
ramonski May 6, 2018
1470e37
Updated form logic
ramonski May 9, 2018
e57444f
didsplay detection limit selector
ramonski May 9, 2018
7ebe5b3
Flush instrument when no instruments are allowed
ramonski May 9, 2018
e8426e4
Bound container event handlers
ramonski May 9, 2018
167f4e3
Added toggle checkbox helper
ramonski May 10, 2018
bd17aad
Invalid instrument handling
ramonski May 10, 2018
fcb43dd
defer initialization
ramonski May 10, 2018
a02e6ef
container handling
ramonski May 10, 2018
c1e1b47
Merge branch 'master' into i751
ramonski May 10, 2018
9019d61
Changelog updated
ramonski May 10, 2018
f549c56
Imports cleanup
ramonski May 20, 2018
920cbab
Changed field label
ramonski May 20, 2018
b17abcb
Handle interim override
ramonski May 20, 2018
8fd267c
Changed text message for invalid instruments
ramonski May 20, 2018
b92dd75
Removed `load_available_calculations`
ramonski May 20, 2018
2d90f20
Removed unused method
ramonski May 20, 2018
9f64610
Merge branch 'master' into i751
xispa May 21, 2018
822bbb4
Set interims of calculation
ramonski May 22, 2018
743978e
Merge branch 'i751' of git://github.com/senaite/senaite.core into i751
ramonski May 22, 2018
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
1 change: 1 addition & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Changelog

**Changed**

- #820 Always allow interim fields to be added to Analysis Services
- #826 Display signatures of verifiers instead of dept managers in results report
- #814 Change naming from Bika LIMS Configuration to LIMS Configuration in the Site Setup page
- #814 Change naming from Bika Setup to Setup in the LIMS Configuration section found in the Site Setup page
Expand Down
18 changes: 0 additions & 18 deletions bika/lims/browser/calcs.py
Original file line number Diff line number Diff line change
Expand Up @@ -359,21 +359,3 @@ def __call__(self):
calcdict = {'uid': calc.UID(),
'title': calc.Title()}
return json.dumps(calcdict)


class ajaxGetAvailableCalculations(BrowserView):
"""
Returns all available calculations.
"""
def __call__(self):
plone.protect.CheckAuthenticator(self.request)

bsc = getToolByName(self, 'bika_setup_catalog')
items = [(i.UID, i.Title)
for i in bsc(portal_type='Calculation',
inactive_state='active')]
items.sort(lambda x, y: cmp(x[1], y[1]))
items.insert(0, ('', _("None")))
calcdict = [{'uid': calc[0], 'title': calc[1]} for calc in items]

return json.dumps(calcdict)
7 changes: 0 additions & 7 deletions bika/lims/browser/calcs.zcml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,4 @@
permission="zope.Public"
layer="bika.lims.interfaces.IBikaLIMS"
/>
<browser:page
for="*"
name="get_available_calculations"
class="bika.lims.browser.calcs.ajaxGetAvailableCalculations"
permission="zope.Public"
layer="bika.lims.interfaces.IBikaLIMS"
/>
</configure>
Loading