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

Remove sampling rounds from core #1531

Merged
merged 39 commits into from
Feb 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
c628400
Removed stale type registrations
ramonski Feb 11, 2020
b516713
removed initialization of rejectanalysis
ramonski Feb 11, 2020
ddbd84d
removed invoice and invoicebatch from factorytool
ramonski Feb 11, 2020
dfaa817
Remove sampling rounds from core
ramonski Feb 11, 2020
c3ad165
Changelog updated
ramonski Feb 11, 2020
3a7965d
Merge branch 'remove-stale-types' into remove-sampling-rounds
ramonski Feb 11, 2020
d0f48e5
Changelog updated
ramonski Feb 11, 2020
a953eaa
Added link in upgrade step to PR
ramonski Feb 11, 2020
9636b70
Added link to PR in upgrade step
ramonski Feb 11, 2020
3d9d837
Merge branch 'remove-stale-types' into remove-sampling-rounds
ramonski Feb 11, 2020
108c072
Removed remaining permissions and icons
ramonski Feb 11, 2020
ece8ebb
Removed permission senaite.core: Field: Edit Sampling Round
ramonski Feb 11, 2020
9c820ac
Remove existing Sampling Rounds / SRTemplates
ramonski Feb 11, 2020
303430e
Upgrade step improved
ramonski Feb 11, 2020
f7cb21a
Deleted template
ramonski Feb 11, 2020
d493599
Ressurected Reject Analysis
ramonski Feb 12, 2020
9ffbe53
Merge branch 'remove-stale-types' into remove-sampling-rounds
ramonski Feb 12, 2020
6045134
Merge branch 'master' into remove-sampling-rounds
ramonski Feb 12, 2020
874af00
Don't remove existing samplingrounds and srtemplates in upgrade step
ramonski Feb 12, 2020
21f18fe
Merge branch 'master' into remove-stale-types
ramonski Feb 12, 2020
5e693f0
Removed Sample Content Class
ramonski Feb 12, 2020
b2c6b82
Removed Sample profiles as well
ramonski Feb 12, 2020
a735457
Removed stale Sample Partition
ramonski Feb 12, 2020
8bf637d
Remove SamplesFolder
ramonski Feb 12, 2020
97a3a6c
Removed Sample from factorytool/protperties profiles
ramonski Feb 12, 2020
338f8a9
Removed ARImport
ramonski Feb 12, 2020
9e1894b
Merge branch 'master' into remove-stale-types
ramonski Feb 12, 2020
055e44d
Removed stale imports for sample + samplepartition
ramonski Feb 12, 2020
71cbc97
Removed stale import from test
ramonski Feb 12, 2020
3796dd5
Removed stale import from API doctest
ramonski Feb 12, 2020
8808738
Removed stale import from WS doctest
ramonski Feb 12, 2020
0c27940
Merge branch 'master' into remove-stale-types
ramonski Feb 12, 2020
d5135e6
Merge branch 'remove-stale-types' into remove-sampling-rounds
ramonski Feb 12, 2020
06f160b
Merge branch 'master' of github.com:senaite/senaite.core into remove-…
xispa Feb 13, 2020
5c1938c
Merge branch 'remove-stale-types' into remove-sampling-rounds
xispa Feb 13, 2020
d0126b0
Merge branch 'master' into remove-sampling-rounds
xispa Feb 19, 2020
7d92642
We don't remove samplingrounds-like objects: keep legacy interfaces
xispa Feb 21, 2020
675606d
Fix Traceback when removing samplingrounds setup's folder
xispa Feb 21, 2020
40a915b
Prevent Traceback when upgrading site
xispa Feb 21, 2020
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 @@ -46,6 +46,7 @@ Changelog

**Removed**

- #1531 Remove sampling rounds from core
- #1551 Removed dependency to plone.app.iterate
- #1530 Removed ARImport
- #1530 Removed stale type registrations
Expand Down
2 changes: 0 additions & 2 deletions bika/lims/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ def initialize(context):
from content.samplepoint import SamplePoint # noqa
from content.sampletype import SampleType # noqa
from content.samplingdeviation import SamplingDeviation # noqa
from content.srtemplate import SRTemplate # noqa
from content.storagelocation import StorageLocation # noqa
from content.subgroup import SubGroup # noqa
from content.supplier import Supplier # noqa
Expand Down Expand Up @@ -164,7 +163,6 @@ def initialize(context):
from controlpanel.bika_samplepoints import SamplePoints # noqa
from controlpanel.bika_sampletypes import SampleTypes # noqa
from controlpanel.bika_samplingdeviations import SamplingDeviations # noqa
from controlpanel.bika_srtemplates import SRTemplates # noqa
from controlpanel.bika_storagelocations import StorageLocations # noqa
from controlpanel.bika_subgroups import SubGroups # noqa
from controlpanel.bika_suppliers import Suppliers # noqa
Expand Down
2 changes: 1 addition & 1 deletion bika/lims/adapters/widgetvisibility.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ class ScheduledSamplingFieldsVisibility(SenaiteATWidgetVisibility):
def __init__(self, context):
super(ScheduledSamplingFieldsVisibility, self).__init__(
context=context, sort=10,
field_names=["ScheduledSamplingSampler", "SamplingRound"])
field_names=["ScheduledSamplingSampler"])

def isVisible(self, field, mode="view", default="visible"):
if not self.context.bika_setup.getScheduleSamplingEnabled():
Expand Down
3 changes: 0 additions & 3 deletions bika/lims/browser/analysisrequest/add2.py
Original file line number Diff line number Diff line change
Expand Up @@ -855,9 +855,6 @@ def get_client_info(self, obj):
"Specification": {
"getClientUID": [uid, ""],
},
"SamplingRound": {
"getParentUID": [uid],
},
"Sample": {
"getClientUID": [uid],
},
Expand Down
2 changes: 0 additions & 2 deletions bika/lims/browser/client/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,9 @@
from views.analysisrequests import ClientAnalysisRequestsView
from views.analysisprofiles import ClientAnalysisProfilesView
from views.artemplates import ClientARTemplatesView
from views.srtemplates import ClientSamplingRoundTemplatesView
from views.samplepoints import ClientSamplePointsView
from views.analysisspecs import ClientAnalysisSpecsView
from views.attachments import ClientAttachmentsView
from views.orders import ClientOrdersView
from views.contacts import ClientContactsView
from views.contacts import ClientContactVocabularyFactory
from views.samplingrounds import ClientSamplingRoundsView
16 changes: 0 additions & 16 deletions bika/lims/browser/client/configure.zcml
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,6 @@
layer="bika.lims.interfaces.IBikaLIMS"
/>

<browser:page
for="bika.lims.interfaces.IClient"
name="srtemplates"
class="bika.lims.browser.client.ClientSamplingRoundTemplatesView"
permission="zope2.View"
layer="bika.lims.interfaces.IBikaLIMS"
/>

<browser:page
for="bika.lims.interfaces.IClient"
name="samplepoints"
Expand Down Expand Up @@ -91,12 +83,4 @@
layer="bika.lims.interfaces.IBikaLIMS"
/>

<browser:page
for="bika.lims.interfaces.IClient"
name="sampling_rounds_view"
class="bika.lims.browser.client.ClientSamplingRoundsView"
permission="zope2.View"
layer="bika.lims.interfaces.IBikaLIMS"
/>

</configure>
47 changes: 0 additions & 47 deletions bika/lims/browser/client/views/samplingrounds.py

This file was deleted.

30 changes: 0 additions & 30 deletions bika/lims/browser/client/views/srtemplates.py

This file was deleted.

2 changes: 0 additions & 2 deletions bika/lims/browser/configure.zcml
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@
<include package=".publish"/>
<include package=".reports"/>
<include package=".resultsimport"/>
<include package=".samplinground"/>
<include package=".srtemplate"/>
<include package=".viewlets"/>
<include package=".widgets"/>
<include package=".workflow"/>
Expand Down
Binary file removed bika/lims/browser/images/srtemplate.png
Binary file not shown.
Binary file removed bika/lims/browser/images/srtemplate_big.png
Binary file not shown.
8 changes: 0 additions & 8 deletions bika/lims/browser/js/bika.lims.loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,6 @@ window.bika.lims.controllers = {
"div.overlay #client-base-edit":
['ClientOverlayHandler'],

// Client Sampling Rounds
".template-bika-lims-content-samplingsround.portaltype-client":
['ClientSamplingRoundAddEditView'],

// Sampling Rounds PrintView
"#sr_publish_container":
['SamplingRoundPrintView'],

// Reference Samples
".portaltype-referencesample.template-analyses":
['ReferenceSampleAnalysesView'],
Expand Down
Loading