meta-edc 1.1.5__py3-none-any.whl → 1.1.7__py3-none-any.whl

{meta_edc-1.1.5.dist-info → meta_edc-1.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meta-edc
-Version: 1.1.5
+Version: 1.1.7
 Summary: META Trial EDC (http://www.isrctn.com/ISRCTN76157257)
 Home-page: https://github.com/meta-trial/meta-edc
 Author: Erik van Widenfelt
@@ -694,7 +694,7 @@ Requires-Python: >=3.12
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS.rst
-Requires-Dist: edc==1.1.4
+Requires-Dist: edc==1.1.6
 Requires-Dist: beautifulsoup4
 Requires-Dist: celery[redis]
 Requires-Dist: django-pylabels

{meta_edc-1.1.5.dist-info → meta_edc-1.1.7.dist-info}/RECORD

@@ -290,8 +290,8 @@ meta_edc/tests/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 meta_edc/tests/tests/test_endpoints.py,sha256=5FdIHTd1xhUIgQLBzMV-Ml3VoFrlBrLLUbNarme5raw,23541
 meta_edc/views/__init__.py,sha256=TBXTih4Mpsg5Oh2jbyXqL9kH7bu3vWNRgVe93hvLCl8,32
 meta_edc/views/home_view.py,sha256=BXydy77TcdcM0-R3S_uHI4DtfnLMIzPJMyqjFJZFSsA,916
-meta_edc-1.1.5.dist-info/licenses/AUTHORS.rst,sha256=wL4KUOd7FAFThhkLAJxSLQ2BPzd3ikG9q0UVZr3BbLg,244
-meta_edc-1.1.5.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+meta_edc-1.1.7.dist-info/licenses/AUTHORS.rst,sha256=wL4KUOd7FAFThhkLAJxSLQ2BPzd3ikG9q0UVZr3BbLg,244
+meta_edc-1.1.7.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
 meta_export/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_export/admin_site.py,sha256=CiKAf0gDFvBKVc-1VM6KwM905ayVZuiY1tgaTeUeCi0,167
 meta_export/apps.py,sha256=3_5LB1MLtzfKekI2vT9Cm6puAx6t6AjtIfTTVdItdKg,226
@@ -303,10 +303,10 @@ meta_labs/lab_profiles.py,sha256=I3s07bzAQaRzNSAqBuprx6uIO048ovffL5gD28ZE2N0,957
 meta_labs/labs.py,sha256=0mpfORDUsjxBeyJdEC5NiF4kQHSQTfKiQuMKZ9Svaqw,128
 meta_labs/list_data.py,sha256=ZWvQ7ZuOgNZ8Cz-y5lzrAYCZC2HarlnlleFXdsI1P9c,477
 meta_labs/processing_profiles.py,sha256=fRX72FOl2rsnOJYhgup5QacfGSXKtWqn2gD3Giz2GDA,500
-meta_labs/reportables.py,sha256=OX1rxiWKmsi7_ODxH1O8yBGgOq56HAaiG1XTEDGaOhM,586
+meta_labs/reportables.py,sha256=AgONHYWB7QsQ53ZsQOYcpgtV7Tl8yyt28GEkgjZ5lms,2204
 meta_labs/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_labs/tests/test_labs.py,sha256=49COK2X8F5kvwsIuuPaxBSzDo665J2ctd1DZzo-O4Cs,967
-meta_labs/tests/test_reportables.py,sha256=VxTQDScHxaQP1PNut7i4ATr4hTqVpmYUjDK7HQJ7vOI,1302
+meta_labs/tests/test_reportables.py,sha256=Otp9ILx44Bmz59pNt85UJSEScPE0lo69MRJkLMwX05g,2659
 meta_labs/tests/urls.py,sha256=_sVCnQeiAFRYKhxga3_DjoKj_4bgs1s2gjcynDiapvA,111
 meta_lists/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_lists/admin.py,sha256=g05vpXfVIEBVG03aiPD8Vn-AnR7gL60MbPJAfzsO6R8,2157
@@ -1241,7 +1241,7 @@ tests/etc/user-rsa-restricted-private.pem,sha256=CUcHW9bznWdmmASN00hCzvxFPAFl4N2
 tests/etc/user-rsa-restricted-public.pem,sha256=mt84djoL-uHw6Wc5SJh0zml6VzXulnf8eQSFg7-fheg,450
 tests/etc/user-salt-local.key,sha256=x5anBw9fvbHurczouT3CjrkWb_xs7Ypm1htIJsgiuiw,256
 tests/etc/user-salt-restricted.key,sha256=pxmpcfBRNB-4C6wTvHXz-9fOfJgKIFOjaAF8ZFfa4q4,256
-meta_edc-1.1.5.dist-info/METADATA,sha256=tGv9WuDrOcQPZYvqP1TGT2_RodSMFYL3Vcbtz4Eg2gY,43587
-meta_edc-1.1.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-meta_edc-1.1.5.dist-info/top_level.txt,sha256=RkzjNXwRq2kg_uZ_1bDwPUntijSXoY2YBqtByDwvvrc,244
-meta_edc-1.1.5.dist-info/RECORD,,
+meta_edc-1.1.7.dist-info/METADATA,sha256=x8g7TgVmIZHGaqFK1KPhyc2yOIC-H0FelJqXFlNt-7A,43587
+meta_edc-1.1.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+meta_edc-1.1.7.dist-info/top_level.txt,sha256=RkzjNXwRq2kg_uZ_1bDwPUntijSXoY2YBqtByDwvvrc,244
+meta_edc-1.1.7.dist-info/RECORD,,

meta_labs/reportables.py

@@ -1,4 +1,8 @@
+from edc_constants.constants import FEMALE, MALE
+from edc_reportable import MILLIGRAMS_PER_DECILITER, MILLIMOLES_PER_LITER, Formula
+from edc_reportable.adult_age_options import adult_age_options
 from edc_reportable.data import africa, daids_july_2017
+from edc_reportable.units import MICRO_IU_MILLILITER
 
 grading_data = {}
 grading_data.update(**daids_july_2017.dummies)
@@ -10,6 +14,63 @@ normal_data = africa.normal_data
 reportable_grades = [3, 4]
 reportable_grades_exceptions = {}
 
+normal_data.update(
+    {
+        "glucose": [
+            Formula(
+                "0<=x<=99999",
+                units=MILLIMOLES_PER_LITER,
+                gender=[MALE, FEMALE],
+                **adult_age_options,
+            ),
+            Formula(
+                "0<=x<=99999",
+                units=MILLIGRAMS_PER_DECILITER,
+                gender=[MALE, FEMALE],
+                **adult_age_options,
+            ),
+        ],
+        "ins": [
+            Formula(
+                "0<=x<=99999",
+                units=MICRO_IU_MILLILITER,
+                gender=[MALE, FEMALE],
+                **adult_age_options,
+            ),
+        ],
+    }
+)
+
+grading_data.update(
+    {
+        "glucose": [
+            Formula(
+                "x<0",
+                grade=0,
+                units=MILLIMOLES_PER_LITER,
+                gender=[MALE, FEMALE],
+                **adult_age_options,
+            ),
+            Formula(
+                "x<0",
+                grade=0,
+                units=MILLIGRAMS_PER_DECILITER,
+                gender=[MALE, FEMALE],
+                **adult_age_options,
+            ),
+        ],
+        "ins": [
+            Formula(
+                "x<0",
+                grade=0,
+                units=MICRO_IU_MILLILITER,
+                gender=[MALE, FEMALE],
+                **adult_age_options,
+            ),
+        ],
+    }
+)
+
 reference_range_options = dict(
     collection_name=collection_name,
     normal_data=africa.normal_data,

meta_labs/tests/test_reportables.py

@@ -1,9 +1,11 @@
-from django.test import TestCase
+from django.test import TestCase, tag
+from edc_lab import site_labs
 from edc_reportable.models import GradingData, NormalData, ReferenceRangeCollection
 from edc_reportable.utils import load_reference_ranges
 
 
 class TestReportables(TestCase):
+    @tag("37")
     def test_load_reference_ranges(self):
 
         from meta_labs.reportables import (
@@ -23,15 +25,46 @@ class TestReportables(TestCase):
         )
         self.assertTrue(ReferenceRangeCollection.objects.filter(name=collection_name).exists())
         reference_range_collection = ReferenceRangeCollection.objects.get(name=collection_name)
+
+        for panel_name, requisition_panel in site_labs.lab_profiles.get(
+            "subject_lab_profile"
+        ).panels.items():
+            for utest_id in requisition_panel.utest_ids:
+                try:
+                    utest_id, _ = utest_id
+                except ValueError:
+                    pass
+                if not NormalData.objects.filter(label=utest_id).exists():
+                    print(f"{utest_id} does not exist in NormalData")
+                if not GradingData.objects.filter(label=utest_id).exists():
+                    print(f"{utest_id} does not exist in GradingData")
+
+        for panel_name, requisition_panel in site_labs.lab_profiles.get(
+            "subject_lab_profile"
+        ).panels.items():
+            for utest_id in requisition_panel.utest_ids:
+                try:
+                    utest_id, _ = utest_id
+                except ValueError:
+                    pass
+                self.assertTrue(
+                    NormalData.objects.filter(label=utest_id).exists(),
+                    msg=f"{utest_id} does not exist in NormalData",
+                )
+                self.assertTrue(
+                    GradingData.objects.filter(label=utest_id).exists(),
+                    msg=f"{utest_id} does not exist in GradingData",
+                )
+
         self.assertEqual(
             NormalData.objects.filter(
                 reference_range_collection=reference_range_collection
             ).count(),
-            82,
+            88,
         )
         self.assertEqual(
             GradingData.objects.filter(
                 reference_range_collection=reference_range_collection
             ).count(),
-            174,
+            180,
         )