From 9031323b424ef8ba29b104c93c9ccb83d6e7ab08 Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Fri, 9 Feb 2024 13:20:04 +0100 Subject: [PATCH 1/3] Allow to query Auto Import Log types --- src/senaite/databox/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/senaite/databox/config.py b/src/senaite/databox/config.py index bec5642..aab1d83 100644 --- a/src/senaite/databox/config.py +++ b/src/senaite/databox/config.py @@ -86,7 +86,7 @@ # "AttachmentType", "AttachmentTypes", "AuditLog", - "AutoImportLog", + # "AutoImportLog", # "Batch", "BatchFolder", # "BatchLabel", From 271e74a0e2382830c3e78172ee5be950626fa3a8 Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Fri, 9 Feb 2024 13:22:50 +0100 Subject: [PATCH 2/3] Changelog updated --- docs/Changelog.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Changelog.rst b/docs/Changelog.rst index 0ae42a7..47df56c 100644 --- a/docs/Changelog.rst +++ b/docs/Changelog.rst @@ -1,7 +1,7 @@ 1.5.0 (unreleased) ------------------ -- no changes yet +- #35 Allow to query Auto Import Log type 1.4.1 (2024-01-03) From 98b54ae01a815ace45aee3d194cee4cb20ba512b Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Fri, 9 Feb 2024 13:29:59 +0100 Subject: [PATCH 3/3] Fixed test --- .../databox/tests/doctests/Databox.rst | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/senaite/databox/tests/doctests/Databox.rst b/src/senaite/databox/tests/doctests/Databox.rst index 64dada5..a4c8e54 100644 --- a/src/senaite/databox/tests/doctests/Databox.rst +++ b/src/senaite/databox/tests/doctests/Databox.rst @@ -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: @@ -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") @@ -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)