clinicedc 2.0.4__py3-none-any.whl → 2.0.5__py3-none-any.whl

edc_visit_tracking/utils.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import warnings
-from typing import TYPE_CHECKING, Type, TypeVar
+from typing import TYPE_CHECKING, TypeVar
 
 from django.apps import apps as django_apps
 from django.conf import settings
@@ -26,12 +26,12 @@ def get_related_visit_model() -> str:
     return getattr(settings, "SUBJECT_VISIT_MODEL", "edc_visit_tracking.subjectvisit")
 
 
-def get_related_visit_model_cls() -> Type[SubjectVisit]:
+def get_related_visit_model_cls() -> type[SubjectVisit]:
     model_cls = django_apps.get_model(get_related_visit_model())
     if model_cls._meta.proxy:
         # raise for now until we have a solution
         raise RelatedVisitModelError(
-            "Not allowed. Related visit model may not be a " f"proxy model. Got {model_cls}. "
+            f"Not allowed. Related visit model may not be a proxy model. Got {model_cls}. "
         )
     return model_cls
 
@@ -45,7 +45,7 @@ def get_subject_visit_model() -> str:
     return get_related_visit_model()
 
 
-def get_subject_visit_model_cls() -> Type[SubjectVisit]:
+def get_subject_visit_model_cls() -> type[SubjectVisit]:
     warnings.warn(
         "This func has been renamed to `get_related_visit_model_cls`.",
         DeprecationWarning,
@@ -75,7 +75,7 @@ def get_allow_missed_unscheduled_appts() -> bool:
     return getattr(settings, "EDC_VISIT_TRACKING_ALLOW_MISSED_UNSCHEDULED", False)
 
 
-def get_subject_visit_missed_model_cls() -> Type[SubjectVisitMissed]:
+def get_subject_visit_missed_model_cls() -> type[SubjectVisitMissed]:
     return django_apps.get_model(get_subject_visit_missed_model())
 
 

edc_visit_tracking/view_utils/related_visit_button.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, Type, TypeVar
+from typing import TYPE_CHECKING, TypeVar
 
 from django.utils.translation import gettext as _
 
@@ -31,7 +31,7 @@ class RelatedVisitButton(DashboardModelButton):
     appointment: Appointment = None
     model_obj: RelatedVisitModel = None
     labels: tuple[str, str, str] = field(default=("Start", "Visit Report", "Visit Report"))
-    model_cls: Type[RelatedVisitModel] = field(default=None)
+    model_cls: type[RelatedVisitModel] = field(default=None)
 
     def __post_init__(self):
         pass
@@ -55,9 +55,9 @@ class RelatedVisitButton(DashboardModelButton):
         """
         color = self.colors[VIEW]
         if self.appointment.appt_status == IN_PROGRESS_APPT:
-            if self.model_obj and self.model_obj.document_status == INCOMPLETE:
-                color = self.colors[ADD]
-            elif not self.model_obj:
+            if (
+                self.model_obj and self.model_obj.document_status == INCOMPLETE
+            ) or not self.model_obj:
                 color = self.colors[ADD]
             else:
                 color = self.colors[VIEW]  # default / grey

edc_vitals/calculators/bmi.py

@@ -3,7 +3,7 @@ from dateutil.relativedelta import relativedelta
 from edc_utils import age, get_utcnow
 from edc_utils.round_up import round_half_away_from_zero
 
-__all__ = ["calculate_bmi", "BMI", "CalculatorError"]
+__all__ = ["BMI", "CalculatorError", "calculate_bmi"]
 
 
 class CalculatorError(Exception):

edc_vitals/form_validators/blood_pressure_form_validator_mixin.py

@@ -18,23 +18,19 @@ class BloodPressureFormValidatorMixin:
         errmsg = {
             severe_htn_field_name: (errmsg or "Invalid. Patient has severe hypertension")
         }
-        use_avg = True if use_avg is None else False
+        use_avg = True if use_avg is None else False  # noqa: SIM210
         avg_sys, avg_dia = calculate_avg_bp(use_av=use_avg, **kwargs)
-        if has_severe_htn(sys=avg_sys, dia=avg_dia):
-            if severe_htn_response != YES:
-                raise forms.ValidationError(errmsg)
+        if has_severe_htn(sys=avg_sys, dia=avg_dia) and severe_htn_response != YES:
+            raise forms.ValidationError(errmsg)
 
     @staticmethod
-    def raise_on_systolic_lt_diastolic_bp(
-        sys_field: str = None, dia_field: str = None, **kwargs
-    ) -> None:
+    def raise_on_systolic_lt_diastolic_bp(sys_field: str, dia_field: str, **kwargs) -> None:
         """Raise if systolic BP is < diastolic BP."""
         sys_field = sys_field or "sys_blood_pressure"
         dia_field = dia_field or "dia_blood_pressure"
         sys_response = kwargs.get(sys_field)
         dia_response = kwargs.get(dia_field)
-        if sys_response and dia_response:
-            if sys_response < dia_response:
-                raise forms.ValidationError(
-                    {dia_field: "Invalid. Diastolic must be less than systolic."}
-                )
+        if sys_response and dia_response and sys_response < dia_response:
+            raise forms.ValidationError(
+                {dia_field: "Invalid. Diastolic must be less than systolic."}
+            )

edc_vitals/form_validators/bmi_form_validator_mixin.py

@@ -15,5 +15,5 @@ class BmiFormValidatorMixin:
                 **kwargs,
             )
         except CalculatorError as e:
-            raise forms.ValidationError(e)
+            raise forms.ValidationError(str(e)) from e
         return bmi

edc_vitals/form_validators/weight_height_with_bmi_form_validator_mixin.py

@@ -1,3 +1,5 @@
+from gettext import gettext as _
+
 from django import forms
 
 from ..calculators import CalculatorError, calculate_bmi
@@ -8,6 +10,7 @@ class WeightHeightBmiFormValidatorMixin:
     def validate_weight_height_with_bmi(weight_kg=None, height_cm=None, **kwargs):
         try:
             bmi = calculate_bmi(weight_kg=weight_kg, height_cm=height_cm, **kwargs)
-        except CalculatorError as e:
-            raise forms.ValidationError(f"Please check weight and height. {e}")
+        except CalculatorError as err:
+            errmsg = _("Please check weight and height. {err}").format(err=err)
+            raise forms.ValidationError(errmsg) from err
         return bmi

edc_vitals/model_mixins/blood_pressure_model_mixin.py

@@ -65,16 +65,15 @@ class BloodPressureModelMixin(models.Model):
         max_length=15,
         choices=YES_NO,
         help_text="Based on the above readings. Severe HTN is any BP reading > 180/110mmHg",
-        null=True,
         blank=True,
     )
 
+    class Meta:
+        abstract = True
+
     def save(self, *args, **kwargs):
         (
             self.sys_blood_pressure_avg,
             self.dia_blood_pressure_avg,
         ) = calculate_avg_bp(**self.__dict__)
         super().save(*args, **kwargs)
-
-    class Meta:
-        abstract = True

edc_vitals/model_mixins/weight_height_bmi_model_mixin.py

@@ -22,6 +22,9 @@ class WeightHeightBmiModelMixin(models.Model):
         help_text="system calculated",
     )
 
+    class Meta:
+        abstract = True
+
     def save(self, *args, **kwargs):
         bmi = calculate_bmi(
             weight_kg=self.weight,
@@ -36,7 +39,4 @@ class WeightHeightBmiModelMixin(models.Model):
 
     def get_dob(self):
         """Override to provides DoB if not on the model"""
-        return None
-
-    class Meta:
-        abstract = True
+        return

edc_vitals/utils.py

@@ -6,7 +6,7 @@ def calculate_avg_bp(
     sys_blood_pressure_two=None,
     dia_blood_pressure_one=None,
     dia_blood_pressure_two=None,
-    **kwargs,
+    **kwargs,  # noqa: ARG001
 ):
     avg_sys = None
     avg_dia = None

edc_vitals/validators.py

@@ -1,5 +1,5 @@
 from django.core.validators import RegexValidator
 
-bp_validator = RegexValidator(  # noqa
+bp_validator = RegexValidator(
     r"^\d{1,3}\/\d{1,3}$", message="Enter a valid BP in SYS/DIA format"
 )