clinicedc 2.0.19__py3-none-any.whl → 2.0.20__py3-none-any.whl

{clinicedc-2.0.19.dist-info → clinicedc-2.0.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clinicedc
-Version: 2.0.19
+Version: 2.0.20
 Summary: A clinical trials data management framework built on Django
 Keywords: django,clinicedc,edc,clinical trials,research,data management,esource
 Author: Erik van Widenfelt, Jonathan Willitts
@@ -63,7 +63,7 @@ Project-URL: Homepage, https://github.com/clinicedc/clinicedc
 Project-URL: Repository, https://github.com/clinicedc/clinicedc.git
 Description-Content-Type: text/x-rst
 
-|pypi| |actions| |uv| |ruff| |downloads| |django-packages|
+s|pypi| |actions| |uv| |ruff| |downloads| |django-packages|
 
 clinicedc -  A clinical trials data management framework built on Django
 ========================================================================
@@ -72,7 +72,9 @@ A data management framework built on Django for multisite randomized longitudina
 
 Documentation: `clinicedc.readthedocs.io <https://clinicedc.readthedocs.io/>`_
 
-`Here are a set of python modules that extend Django <https://github.com/clinicedc/edc>`__ to empower you to build an EDC / eSource system to handle data
+Source code: https://github.com/clinicedc/clinicedc
+
+`Here is a python module that extends Django <https://github.com/clinicedc/clinicedc>`__ to empower you to build an EDC / eSource system to handle data
 collection and management for multi-site longitudinal clinical trials.
 
 Refer to the specific open projects listed below for example EDC systems built with these modules.
@@ -93,7 +95,7 @@ See also https://www.ucl.ac.uk/global-health/respond-africa
 
 The implementations we develop with this framework are mostly eSource systems rather than the traditional EDCs.
 
-The ``clinicedc's`` listed below consist of a subset of trial-specific modules that make heavy use of modules in this framework.
+The projects listed below consist of a subset of trial-specific modules that make heavy use of modules in this framework.
 
 Contacts
 --------
@@ -113,8 +115,8 @@ python 3.12+ Django 5.2+  mysql 8+
 ============ ============ =========
 
 
-How we describe the EDC in our protocol documents
--------------------------------------------------
+How we describe the CLINICEDC projects in our protocol documents
+----------------------------------------------------------------
 
 Here is a simple example of a data management section for a study protocol document: `data_management_section`_
 
@@ -224,10 +226,7 @@ Optional modules
 
 =========================== ============================= ==================================
 edc-csf_                    |edc-csf|                     |pypi-edc-csf|
-edc-dx_                     |edc-dx|                      |pypi-edc-dx|
-edc-dx-review_              |edc-dx-review|               |pypi-edc-dx-review|
 edc-he_                     |edc-he|                      |pypi-edc-he|
-edc-icecap-a_               |edc-icecap-a|                |pypi-edc-icecap-a|
 edc-microbiology_           |edc-microbiology|            |pypi-edc-microbiology|
 edc-microscopy_             |edc-microscopy|              |pypi-edc-microscopy|
 edc-mnsi_                   |edc-mnsi|                    |pypi-edc-mnsi|
@@ -250,7 +249,7 @@ Env
 
     uv venv
     source .venv/bin/activate
-    uv sync --no-sources
+    uv sync --no-sources --upgrade
 
 Tests
 -----

{clinicedc-2.0.19.dist-info → clinicedc-2.0.20.dist-info}/RECORD

@@ -930,7 +930,7 @@ edc_egfr/apps.py,sha256=CdF04HAYAsjSXFn-3zZmYilyevUxMsVX5uv2tc9iNpY,111
 edc_egfr/calculators/__init__.py,sha256=3KRcG4NEA9EzUIcNq_5cTcaEavzRM-OH02GsUV8dRBs,182
 edc_egfr/calculators/base_egrfr.py,sha256=2ut7xv0onJVt2pyt0uuzo4MaDfZuFgaPr7wCtC4Hd4c,1931
 edc_egfr/calculators/egfr_ckd_epi.py,sha256=YVCuBgiSLvmIyOxXYfLwwJ_y-74vFo9GGUB32TySNk0,2116
-edc_egfr/calculators/egfr_cockcroft_gault.py,sha256=vRB1fsDdluvRoPJw0Y7GcE7XvQdrMB2VmsCdYbMicto,1979
+edc_egfr/calculators/egfr_cockcroft_gault.py,sha256=y_HlNUiIb1xf8lOm00qpRp2bGAuKQ3rmEgDE5TT4stc,1992
 edc_egfr/calculators/percent_change.py,sha256=YVKho6PrqDdfdwV6Ndrzw_9fRJquCWxTlk782YVKmq0,313
 edc_egfr/constants.py,sha256=9L7NcsG-rbd-yg7TnW95XCF5vSL4BO7eaDQD4-mgD80,59
 edc_egfr/egfr.py,sha256=1S8okz_ALH_hFfAA6BF77Oz8_f2RkrT9JK4Q4DqpWA8,9485
@@ -1937,7 +1937,7 @@ edc_model_admin/templates/edc_model_admin/navbar_for_admin_templates_b3.html,sha
 edc_model_admin/templates/edc_model_admin/yes_no_coloring.html,sha256=yrvwV6fRoBLWOXVhIOyNrjgQGU_O_QDjPOTR7Y0NoYg,105
 edc_model_admin/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edc_model_admin/templatetags/edc_admin_modify.py,sha256=JCNVc1G7rPNGyFI_bUIxeXkafsQBzCWy1p4G8foavJk,6372
-edc_model_admin/utils.py,sha256=NzoSKZJHDsiwnLdNAReNWwP85cLI5bqrHt1_UZS1hiQ,1932
+edc_model_admin/utils.py,sha256=D4VLfgZipQRMJMRAP4gHfoe-0diIcSi5Z9NmHOsEKuw,1969
 edc_model_fields/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edc_model_fields/apps.py,sha256=QWZWN2EmsEyp_6I5GldSqSkRfxjcPkyA2zvF1NfzjRM,157
 edc_model_fields/fields/__init__.py,sha256=rqpLbES3_W7CX2wTIafezwgn0qWsS9b_dLZ2rhJFjzM,388
@@ -1952,21 +1952,21 @@ edc_model_fields/models.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edc_model_fields/static/edc_model_fields/slider.css,sha256=PutHKEddHvRqm59fv6rR0yj4Msx6UlCyGkbq3C_2KgE,1360
 edc_model_fields/static/edc_model_fields/slider.png,sha256=uQPOOegrQGf0VGhudDMja-WthzmQ0mCLEtUJPYHqxl4,10150
 edc_model_fields/templates/edc_model_fields/widgets/slider.html,sha256=ejTSfyXrB_SZyFI1HHAH2VR5QiLVrgKu_14UN8bJHqY,916
-edc_model_fields/utils.py,sha256=A0gE463okqHaQPgJZOl9W5eDkFUoma-UQ2At5ajdDlY,1610
+edc_model_fields/utils.py,sha256=_beJkz2Vn2gN_OxqI0PJ17Ycm2wVWfKZhZrDD2EAYlU,1607
 edc_model_fields/widgets/__init__.py,sha256=Q1L6XHWfrMmlOq4iBSvOatqudtp7_Vf3C3pPvxgVwGg,40
-edc_model_fields/widgets/slider_widget.py,sha256=5CWN__T3WRs8gHQYTpJC7TnfTr2NKzSH1gcC1vry6DE,1223
+edc_model_fields/widgets/slider_widget.py,sha256=oow_e3nA-7cnsEa3OOG9D9_5x4La0-PdNB_La3x-948,1239
 edc_model_form/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edc_model_form/apps.py,sha256=bTK1QIa1fNzk3_H4UoweAYYZdEcg8BGz9PD8ksY25f8,238
 edc_model_form/mixins/__init__.py,sha256=Lf2Qld0bPNrdW-uQKE5XT_Uu2obRtIHza57bqv4A6g8,297
-edc_model_form/mixins/base_model_form_mixin.py,sha256=Wjm_ZWtH7lhlv-gWZ4IssdSGcvEyeSExYQKmbprbyFw,2139
-edc_model_form/mixins/inline_model_form_mixin.py,sha256=dxpzFcwHoNi2y7vWF1QdAqObU7rcr1j5J_Pj4Nk1aOY,3647
+edc_model_form/mixins/base_model_form_mixin.py,sha256=zsLiKfEkQFf3Pm7rvIym9L3_CQnZC1IDYfHncgV5cgw,2151
+edc_model_form/mixins/inline_model_form_mixin.py,sha256=pywvLu_QCLTB5npoTtgDjk8yU2dLepsKhfBZLr5K4Vg,3659
 edc_model_form/mixins/report_datetime_modelform_mixin.py,sha256=f1DrM-aUh2o3DM65MM3nwiZUXhhnvth8_3tvbS1cWOQ,1008
 edc_model_form/urls.py,sha256=_sVCnQeiAFRYKhxga3_DjoKj_4bgs1s2gjcynDiapvA,111
 edc_model_form/utils.py,sha256=gGe3etrp5YF4AKMGFIR3I9V1CfX4c5Wm6fK-8JkUeT4,538
 edc_model_to_dataframe/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edc_model_to_dataframe/apps.py,sha256=US1ehhJPgkvmIDZXiUPMoSjHTWIztUbYGtx_azTXPIQ,290
 edc_model_to_dataframe/constants.py,sha256=xgCr2ZXUsjZqf4wfpY0JBhQoARzQEVS8tnkfBWwOMVQ,702
-edc_model_to_dataframe/model_to_dataframe.py,sha256=cOTcoe9ivJERAXt3dULtoon6j9_cgh2-T-y3P0FBimo,18493
+edc_model_to_dataframe/model_to_dataframe.py,sha256=Nix-anMRh_KXOo8SQdWw0UgngJhJYWIRYPKekhYYYxU,18504
 edc_model_to_dataframe/read_frame_edc.py,sha256=UNe2f5bJi1Wkn4Jyva5TMnhyxk8vvGpG4U12kGyqqVY,820
 edc_model_to_dataframe/urls.py,sha256=KChLHeE6yfONC6IdMm3Q4U3u7tmy_Mb1w2lrbpFz96g,148
 edc_navbar/__init__.py,sha256=Y95juevvOawGZmOV3Ofef7oGwYSWWttAYT0v0mehkJc,195
@@ -2926,10 +2926,10 @@ edc_reportable/models/grading_data.py,sha256=JE3f-kNAeQ4uunNIO5pYyc24EbAGA4299Uv
 edc_reportable/models/grading_exception.py,sha256=yFHtLplZJdX1zBtIZk27jWFOjfLgtL0PWFRVwfg7vn8,802
 edc_reportable/models/mw.py,sha256=maFsgwP3buRNF-D3AKPjKUisrpatqncdf5pK3qy9U90,498
 edc_reportable/models/normal_data.py,sha256=AofGm0in2gg5cXNRHEeq08K1BF6iA5z5V66w8exBUq0,1913
-edc_reportable/models/reference_model_mixins.py,sha256=iizhIvUM16vEa3M6Qteuv2iaooGWlwCE_jY8Or-eToU,4772
+edc_reportable/models/reference_model_mixins.py,sha256=Afl45lq1hc5i5O11wgZ_tzo0yuUga9jqRki8hw31wzQ,4791
 edc_reportable/models/reference_range_collection.py,sha256=zRunJ1NPL9C5Zda-gkuBR46eyd-NJTQwv0pNwvZHLzU,4204
 edc_reportable/post_migrate_signals.py,sha256=SgoII3XJgkvTkFVrKvx7BWrSQ-giGqrfCadupklRJl4,717
-edc_reportable/reference_range_evaluator.py,sha256=yKsGf0k66NyMW-91KJvAE0InUHdC7lE3-Ks2XELXwoc,11159
+edc_reportable/reference_range_evaluator.py,sha256=JbdRlkiT6euAUm9is1Lt4Ztn3WFqph_ZcGVh_OrcgZw,11211
 edc_reportable/units.py,sha256=zrYjO8MqipIYjRFB8hQJy2HSuo17PwNDlUsekdkH_Vk,1207
 edc_reportable/urls.py,sha256=K164a5FVdOBOKt0wBfM4boTvlnGV7KlaE8Xjma5-eh8,309
 edc_reportable/utils/__init__.py,sha256=hYzfyJjWw4_tdlpW-ba3Rdg_YaOny5ywJrt5c9mOvU4,952
@@ -3301,7 +3301,7 @@ edc_visit_schedule/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 edc_visit_schedule/templatetags/edc_visit_schedule_extras.py,sha256=jaK2EbZinGFe3fPgXBQJbtWDSK4y4M-ds1iYI_ULWMc,2829
 edc_visit_schedule/typing_stubs.py,sha256=NCrQqqL0Z9l296gh_RgdHdnN7mhGBGMIoHQ6u92sy78,247
 edc_visit_schedule/urls.py,sha256=x5Q8_HGtN2GMXY5XVi2E1QiRMcGaiGWRBah5SXy-svI,973
-edc_visit_schedule/utils.py,sha256=YPukJ1lN19K-itqi6A4yCC4FIShMc-zLzIHoyJR551E,13887
+edc_visit_schedule/utils.py,sha256=D2PmhjImwBkl4OcRhj-7mid7Hwtqn-kqE-WDZ_ACmcA,13899
 edc_visit_schedule/view_mixins.py,sha256=PkM33v8wyMizeX96yTizhMurlmtmIuS-8O2iypZidY8,2292
 edc_visit_schedule/views/__init__.py,sha256=r_po9VhEv8GN_rqvYsHnV0WKpA5s7cgt-fYU7FjGjZA,83
 edc_visit_schedule/views/home_view.py,sha256=nbwQVkQPK7yWrMpo8NftqnN1zu9DpSVkNHErdr8EZBM,350
@@ -3406,7 +3406,7 @@ edc_vitals/models/fields/waist_circumference.py,sha256=fZcHFDdEwWLjIVLktKrFCD9UU
 edc_vitals/models/fields/weight.py,sha256=zo9_9e3Cpu0UqoRbWS-iDkcDo6fK80b1dDQy4x4MyxE,921
 edc_vitals/utils.py,sha256=vXid44KUXxeaSyund_y5MNXc5DFJs052_PwUAjszE2k,1384
 edc_vitals/validators.py,sha256=vNiElWMs0rRnHRNuVoPLRf0rW_C_0xcfUyep1Y_Si5s,156
-clinicedc-2.0.19.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
-clinicedc-2.0.19.dist-info/WHEEL,sha256=-neZj6nU9KAMg2CnCY6T3w8J53nx1kFGw_9HfoSzM60,79
-clinicedc-2.0.19.dist-info/METADATA,sha256=MxLUOCH2SVCI3h2msdlezc308-PIFLfGaLjFKjKh3JU,15899
-clinicedc-2.0.19.dist-info/RECORD,,
+clinicedc-2.0.20.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+clinicedc-2.0.20.dist-info/WHEEL,sha256=-neZj6nU9KAMg2CnCY6T3w8J53nx1kFGw_9HfoSzM60,79
+clinicedc-2.0.20.dist-info/METADATA,sha256=vcdhv-kZx0P0xjAnRKHVdCxVIjy_-BwbGBzjslDSTkU,15755
+clinicedc-2.0.20.dist-info/RECORD,,

edc_egfr/calculators/egfr_cockcroft_gault.py

@@ -25,9 +25,9 @@ class EgfrCockcroftGault(BaseEgfr):
     https://www.ncbi.nlm.nih.gov/pmc/articles/PMC2763564/
 
     GFR = 141 × min(Scr/κ, 1)α × max(Scr/κ, 1)-1.209 × 0.993Age
-    """
+    """  # noqa: RUF002
 
-    def __init__(self, weight: int | float | Decimal = None, **kwargs):
+    def __init__(self, weight: int | float | Decimal | None = None, **kwargs):
         self.weight = float(weight) if weight else None
         super().__init__(**kwargs)
 
@@ -39,7 +39,7 @@ class EgfrCockcroftGault(BaseEgfr):
         serum creatinine (μmol/L)
 
         *constant = 1.23 for males and 1.05 for females
-        """
+        """  # noqa: RUF002
         if (
             self.gender
             and self.age_in_years
@@ -48,10 +48,9 @@ class EgfrCockcroftGault(BaseEgfr):
         ):
             gender_factor = 1.05 if self.gender == FEMALE else 1.23
             adjusted_age = 140.00 - self.age_in_years
-            value = (adjusted_age * self.weight * gender_factor) / float(
+            return (adjusted_age * self.weight * gender_factor) / float(
                 self.scr.get(MICROMOLES_PER_LITER)
             )
-            return value
         opts = dict(
             gender=self.gender,
             age_in_years=self.age_in_years,

edc_model_admin/utils.py

@@ -44,7 +44,9 @@ def get_value_from_lookup_string(search_field_name: str = None, obj=None, reques
         try:
             value = getattr(value or obj, field)
         except AttributeError as e:
-            raise SearchTermLookupError(f"Invalid search term. `{search_field_name}`. Got {e}")
+            raise SearchTermLookupError(
+                f"Invalid search term. `{search_field_name}`. Got {e}"
+            ) from e
         if value is None:
             break
     return value

edc_model_fields/utils.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from collections.abc import Generator
+
 
 class ChoicesError(Exception):
     pass
@@ -41,9 +43,8 @@ class Choices:
     def __str__(self) -> str:
         return str(self.choices)
 
-    def __call__(self, *args, **kwargs) -> tuple[tuple[str, str], ...]:
+    def __call__(self, *args, **kwargs) -> tuple[tuple[str, str], ...]:  # noqa: ARG002
         return tuple((c[self.STORE], c[self.DISPLAY]) for c in self.choices)
 
-    def __iter__(self) -> tuple[str | int, str, str | int]:
-        for store, display, meta in self.choices:
-            yield store, display, meta
+    def __iter__(self) -> Generator[tuple[str, str, str]]:
+        yield from self.choices

edc_model_fields/widgets/slider_widget.py

@@ -36,4 +36,4 @@ class SliderWidget(Input):
         return context
 
     class Media:
-        css = {"all": ("edc_model_fields/slider.css",)}
+        css = {"all": ("edc_model_fields/slider.css",)}  # noqa: RUF012

edc_model_form/mixins/base_model_form_mixin.py

@@ -53,7 +53,7 @@ class BaseModelFormMixin(ReportDatetimeModelFormMixin):
             get_registered_subject_model_cls().objects.get(
                 subject_identifier=self.get_subject_identifier()
             )
-        except ObjectDoesNotExist:
+        except ObjectDoesNotExist as e:
             raise ValidationError(
                 {
                     "subject_identifier": (
@@ -61,4 +61,4 @@ class BaseModelFormMixin(ReportDatetimeModelFormMixin):
                         f"Got {self.get_subject_identifier()}."
                     )
                 }
-            )
+            ) from e

edc_model_form/mixins/inline_model_form_mixin.py

@@ -50,10 +50,10 @@ class InlineModelFormMixin:
             if dte_as_str:
                 try:
                     dte = datetime.fromisoformat(dte_as_str)
-                except ValueError:
+                except ValueError as e:
                     raise forms.ValidationError(
                         f"{field_label}: Invalid date or date format. Got {dte_as_str}"
-                    )
+                    ) from e
                 else:
                     if dte.astimezone(ZoneInfo(settings.TIME_ZONE)) > self.cleaned_data.get(
                         "report_datetime"

edc_model_to_dataframe/model_to_dataframe.py

@@ -12,8 +12,8 @@ from django.db import OperationalError
 from django.db.models import QuerySet
 from django_crypto_fields.utils import get_encrypted_fields, has_encrypted_fields
 from django_pandas.io import read_frame
-from pandas import Series
 
+from edc_constants.constants import NULL_STRING
 from edc_lab.models import Panel
 from edc_list_data.model_mixins import ListModelMixin, ListUuidModelMixin
 
@@ -228,15 +228,15 @@ class ModelToDataframe:
             dataframe = dataframe.merge(df_m2m, on="id", how="left")
         return dataframe
 
-    def _clean_chars(self, s: Series) -> Series:
-        if not s.empty:
+    def _clean_chars(self, s: str) -> str:
+        if s:
             for k, v in self.illegal_chars.items():
                 try:
                     s = s.replace(k, v)
                 except (AttributeError, TypeError):
                     break
             return s
-        return np.nan
+        return NULL_STRING
 
     def move_sys_columns_to_end(self, columns: dict[str, str]) -> dict[str, str]:
         system_columns = [

edc_reportable/models/reference_model_mixins.py

@@ -10,6 +10,8 @@ from ..exceptions import ValueBoundryError
 from ..formula import clean_and_validate_phrase
 from .reference_range_collection import ReferenceRangeCollection
 
+MAX_AGE = 130.0
+
 
 class ReferenceModelMixin(models.Model):
     reference_range_collection = models.ForeignKey(
@@ -117,12 +119,12 @@ class ReferenceModelMixin(models.Model):
             )
         rdelta = age(dob, report_datetime)
         age_value = getattr(rdelta, age_units)
-        if not isinstance(age_value, (int, float)) or not (0.0 <= age_value <= 130.0):
+        if not isinstance(age_value, (int, float)) or not (0.0 <= age_value <= MAX_AGE):
             raise ValueError(f"Invalid age value. Got {age_value}.")
         age_condition_str = self.age_phrase % dict(age_value=age_value)
         if not re.match(pattern, age_condition_str):
             raise ValueError(f"Invalid age condition string. Got {age_condition_str}.")
-        if not eval(age_condition_str):  # nosec B307
+        if not eval(age_condition_str):  # noqa: S307
             raise ValueBoundryError(
                 f"Age is out of bounds. See {self}. Got AGE={age_value} {age_units}."
             )

edc_reportable/reference_range_evaluator.py

@@ -41,12 +41,13 @@ class UserFormResponse:
 class ReferenceRangeEvaluator:
     def __init__(
         self,
-        reference_range_collection_name=None,
-        cleaned_data: dict = None,
-        gender: str = None,
-        dob: date = None,
-        report_datetime: datetime = None,
-        age_units: str = None,
+        *,
+        reference_range_collection_name,
+        cleaned_data: dict,
+        gender: str,
+        dob: date,
+        report_datetime: datetime,
+        age_units: str,
         value_field_suffix: str | None = None,
         **extra_options,
     ):
@@ -55,7 +56,7 @@ class ReferenceRangeEvaluator:
         ).exists():
             raise forms.ValidationError(
                 {
-                    "Invalid reference range collection. "
+                    "__all__": "Invalid reference range collection. "
                     f"Got '{reference_range_collection_name}'"
                 },
                 code=INVALID_REFERENCE,
@@ -121,7 +122,7 @@ class ReferenceRangeEvaluator:
             word="reportable",
         )
 
-    def _grade_or_check_normal_range(self, utest_id, value, field):
+    def _grade_or_check_normal_range(self, utest_id: str, value: int | float, field: str):
         """Evaluate a single result value.
 
         Grading is done first. If the value is not gradeable,
@@ -198,11 +199,17 @@ class ReferenceRangeEvaluator:
                 {f"{utest_id}_reportable": "Invalid. Expected 'No' or 'Not applicable'."}
             )
         self._check_normal_range(
-            utest_id, value, field, grading_data, user_form_response, opts
+            utest_id=utest_id,
+            value=value,
+            field=field,
+            grading_data=grading_data,
+            user_form_response=user_form_response,
+            opts=opts,
         )
 
     def _check_normal_range(
         self,
+        *,
         utest_id: str,
         value: int | float,
         field: str,
@@ -217,7 +224,7 @@ class ReferenceRangeEvaluator:
                 **opts,
             )
         except NotEvaluated as e:
-            raise forms.ValidationError({field: str(e)})
+            raise forms.ValidationError({field: str(e)}) from e
         else:
             try:
                 is_normal = normal_data.value_in_normal_range_or_raise(
@@ -268,12 +275,7 @@ class ReferenceRangeEvaluator:
                 )
 
     def _validate_final_assessment(
-        self,
-        field: str = None,
-        responses: list[str] = None,
-        suffix: str = None,
-        word: str = None,
-        utest_id: str = None,
+        self, *, field: str, suffix: str, word: str, responses: list[str] | None = None
     ):
         """Common code to validate fields `results_abnormal`
         and `results_reportable`.
@@ -295,6 +297,5 @@ class ReferenceRangeEvaluator:
                 raise forms.ValidationError(
                     {field: f"{len(answers_as_bool)} of the above results {are} {word}"}
                 )
-        elif self.cleaned_data.get(field) == YES:
-            if not any(answers_as_bool):
-                raise forms.ValidationError({field: f"None of the above results are {word}"})
+        elif self.cleaned_data.get(field) == YES and not any(answers_as_bool):
+            raise forms.ValidationError({field: f"None of the above results are {word}"})

edc_visit_schedule/utils.py

@@ -158,7 +158,7 @@ def off_all_schedules_or_raise(subject_identifier: str = None):
                         schedule.offschedule_model_cls.objects.get(
                             subject_identifier=subject_identifier
                         )
-                except ObjectDoesNotExist:
+                except ObjectDoesNotExist as e:
                     model_name = schedule.offschedule_model_cls()._meta.verbose_name.title()
                     raise OffScheduleError(
                         f"Subject cannot be taken off study. Subject is still on a "
@@ -166,7 +166,7 @@ def off_all_schedules_or_raise(subject_identifier: str = None):
                         f"{schedule.name}. "
                         f"Complete the offschedule form `{model_name}` first. "
                         f"Subject identifier='{subject_identifier}', "
-                    )
+                    ) from e
     return True