Skip to content

Commit

Permalink
Merge branch 'master' into patch-3
Browse files Browse the repository at this point in the history
  • Loading branch information
ramonski authored Feb 9, 2024
2 parents 25f1c19 + 3032f6b commit e626688
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 10 deletions.
1 change: 1 addition & 0 deletions docs/Changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
------------------

- #33 Fix date issues when user inputs: date out of bound or date_to earlier than date_from
- #35 Allow to query Auto Import Log type


1.4.1 (2024-01-03)
Expand Down
2 changes: 1 addition & 1 deletion src/senaite/databox/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
# "AttachmentType",
"AttachmentTypes",
"AuditLog",
"AutoImportLog",
# "AutoImportLog",
# "Batch",
"BatchFolder",
# "BatchLabel",
Expand Down
19 changes: 10 additions & 9 deletions src/senaite/databox/tests/doctests/Databox.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,14 @@ Setup the testing environment:

>>> portal = self.portal
>>> request = self.request
>>> setup = portal.bika_setup
>>> setup = portal.setup
>>> bikasetup = portal.bika_setup
>>> user = api.get_current_user()
>>> date_now = DateTime().strftime("%Y-%m-%d")
>>> date_future = (DateTime() + 5).strftime("%Y-%m-%d")
>>> analysisservices = setup.bika_analysisservices
>>> labcontacts = setup.bika_labcontacts
>>> analysiscategories = setup.bika_analysiscategories
>>> analysisservices = bikasetup.bika_analysisservices
>>> labcontacts = bikasetup.bika_labcontacts
>>> analysiscategories = bikasetup.bika_analysiscategories

Functional Helpers:

Expand Down Expand Up @@ -79,7 +80,7 @@ LIMS Setup

Setup the Lab for testing:

>>> setup.setSelfVerificationEnabled(True)
>>> bikasetup.setSelfVerificationEnabled(True)

>>> client1 = api.create(portal.clients, "Client", Name="Happy Hills", ClientID="HH")
>>> client2 = api.create(portal.clients, "Client", Name="Sunny Side", ClientID="SS")
Expand All @@ -90,11 +91,11 @@ Setup the Lab for testing:
>>> labcontact1 = api.create(labcontacts, "LabContact", Firstname="Lab", Lastname="Contact 1")
>>> labcontact2 = api.create(labcontacts, "LabContact", Firstname="Lab", Lastname="Contact 2")

>>> sampletype1 = api.create(setup.bika_sampletypes, "SampleType", title="Metals", Prefix="Metals")
>>> sampletype2 = api.create(setup.bika_sampletypes, "SampleType", title="Water", Prefix="Water")
>>> sampletype1 = api.create(bikasetup.bika_sampletypes, "SampleType", title="Metals", Prefix="Metals")
>>> sampletype2 = api.create(bikasetup.bika_sampletypes, "SampleType", title="Water", Prefix="Water")

>>> department1 = api.create(setup.bika_departments, "Department", title="Chemistry", Manager=labcontact1)
>>> department2 = api.create(setup.bika_departments, "Department", title="Microbiology", Manager=labcontact2)
>>> department1 = api.create(setup.departments, "Department", title="Chemistry", Manager=labcontact1)
>>> department2 = api.create(setup.departments, "Department", title="Microbiology", Manager=labcontact2)

>>> category1 = api.create(analysiscategories, "AnalysisCategory", title="Metals", Department=department1)
>>> category2 = api.create(analysiscategories, "AnalysisCategory", title="Microbiology", Department=department2)
Expand Down

0 comments on commit e626688

Please sign in to comment.