clinicedc 2.0.6__py3-none-any.whl → 2.0.8__py3-none-any.whl

edc_visit_tracking/model_mixins/visit_model_mixin/visit_model_fields_mixin.py

@@ -1,4 +1,5 @@
 from django.db import models
+from django.utils import timezone
 
 from edc_constants.choices import ALIVE_DEAD_UNKNOWN_NA_MISSED, YES_NO
 from edc_constants.constants import ALIVE, NOT_APPLICABLE, YES
@@ -8,7 +9,6 @@ from edc_protocol.validators import (
     date_not_before_study_start,
     datetime_not_before_study_start,
 )
-from edc_utils import get_utcnow
 
 from ...choices import VISIT_REASON_UNSCHEDULED
 
@@ -17,7 +17,7 @@ class VisitModelFieldsMixin(models.Model):
     report_datetime = models.DateTimeField(
         verbose_name="Report date and time",
         validators=[datetime_not_before_study_start, datetime_not_future],
-        default=get_utcnow,
+        default=timezone.now,
         help_text="Date and time of this report",
     )
 
@@ -27,7 +27,7 @@ class VisitModelFieldsMixin(models.Model):
     )
 
     reason_unscheduled = models.CharField(
-        verbose_name="If 'unscheduled', provide the reason for " "the unscheduled visit",
+        verbose_name="If 'unscheduled', provide the reason for the unscheduled visit",
         max_length=25,
         choices=VISIT_REASON_UNSCHEDULED,
         default=NOT_APPLICABLE,
@@ -44,20 +44,20 @@ class VisitModelFieldsMixin(models.Model):
         verbose_name="If 'missed', provide the reason for the missed visit",
         max_length=35,
         blank=True,
-        null=True,
+        default="",
     )
 
     reason_missed_other = OtherCharField(
         verbose_name='If the reason for the missed visit is "other", specify',
         max_length=25,
         blank=True,
-        null=True,
+        default="",
     )
 
     study_status = models.CharField(
         verbose_name="What is the participant's current study status",
         max_length=50,
-        null=True,
+        default="",
     )
 
     require_crfs = models.CharField(
@@ -79,7 +79,6 @@ class VisitModelFieldsMixin(models.Model):
         max_length=10,
         verbose_name="Participant's survival status",
         choices=ALIVE_DEAD_UNKNOWN_NA_MISSED,
-        null=True,
         default=ALIVE,
         help_text="If YES, submit Death report",
     )
@@ -93,12 +92,10 @@ class VisitModelFieldsMixin(models.Model):
     )
 
     comments = models.TextField(
-        verbose_name=(
-            "Comment if any additional pertinent information " "about the participant"
-        ),
+        verbose_name=("Comment if any additional pertinent information about the participant"),
         max_length=250,
         blank=True,
-        null=True,
+        default="",
     )
 
     class Meta:

edc_visit_tracking/model_mixins/visit_model_mixin/visit_model_mixin.py

@@ -80,7 +80,7 @@ class VisitModelMixin(
             self.visit_code_sequence,
         )
 
-    natural_key.dependencies = ["edc_appointment.appointment"]  # type:ignore
+    natural_key.dependencies = ("edc_appointment.appointment",)  # type:ignore
 
     @property
     def timepoint(self) -> int:

edc_visit_tracking/models/signals.py

@@ -13,7 +13,7 @@ from ..model_mixins import SubjectVisitMissedModelMixin
 
 @receiver(post_save, weak=False, dispatch_uid="visit_tracking_check_in_progress_on_post_save")
 def visit_tracking_check_in_progress_on_post_save(
-    sender, instance, raw, created, using, update_fields, **kwargs  # noqa
+    sender, instance, raw, created, using, update_fields, **kwargs
 ):
     """Calls method on the visit tracking instance"""
     if not raw and not update_fields:
@@ -51,8 +51,8 @@ def subject_visit_missed_on_post_delete(sender, instance, using, **kwargs) -> No
             instance.related_visit.reason = SCHEDULED
             instance.related_visit.reason_unscheduled = NOT_APPLICABLE
             instance.related_visit.info_source = PATIENT
-            instance.related_visit.info_source_other = None
-            instance.related_visit.comment = None
+            instance.related_visit.info_source_other = ""
+            instance.related_visit.comment = ""
             instance.related_visit.modified = instance.modified
             instance.related_visit.user_modified = instance.user_modified
             instance.related_visit.save_base(

edc_visit_tracking/models/subject_visit.py

@@ -37,7 +37,7 @@ class SubjectVisit(
         max_length=35,
         choices=VISIT_REASON_MISSED,
         blank=True,
-        null=True,
+        default="",
     )
 
     info_source = models.CharField(

edc_vitals/calculators/bmi.py

@@ -1,6 +1,7 @@
 from dateutil.relativedelta import relativedelta
+from django.utils import timezone
 
-from edc_utils import age, get_utcnow
+from edc_utils.age import age
 from edc_utils.round_up import round_half_away_from_zero
 
 __all__ = ["BMI", "CalculatorError", "calculate_bmi"]
@@ -10,6 +11,9 @@ class CalculatorError(Exception):
     pass
 
 
+MIN_BMI_AGE = 18
+
+
 class BMI:
     """Calculate BMI, raise if not adult."""
 
@@ -21,11 +25,10 @@ class BMI:
         upper_bmi_value=None,
         dob=None,
         report_datetime=None,
-        **kwargs,
     ):
         if not weight_kg or not height_cm:
             raise CalculatorError(f"Unable to calculate BMI. Got {weight_kg}kg, {height_cm}cm")
-        if age(dob, report_datetime).years < 18:
+        if age(dob, report_datetime).years < MIN_BMI_AGE:
             raise CalculatorError("Unable to calculate BMI. Got age<18")
         self.lower = float(lower_bmi_value or 5.0)
         self.upper = float(upper_bmi_value or 75.0)
@@ -57,7 +60,7 @@ def calculate_bmi(
     Assumes adult dob (18) if dob not provided."""
     bmi = None
     if height_cm and weight_kg:
-        report_datetime = report_datetime or get_utcnow()
+        report_datetime = report_datetime or timezone.now()
         bmi = BMI(
             weight_kg=weight_kg,
             height_cm=height_cm,
@@ -65,6 +68,5 @@ def calculate_bmi(
             upper_bmi_value=upper_bmi_value,
             dob=dob or report_datetime - relativedelta(years=18),
             report_datetime=report_datetime,
-            **kwargs,
         )
     return bmi

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,  # noqa: ARG001
+    **kwargs,
 ):
     avg_sys = None
     avg_dia = None

edc_search/constants.py

@@ -1 +0,0 @@
-SEARCH_SLUG_SEP = "|"

edc_search/search_slug.py

@@ -1,50 +0,0 @@
-from __future__ import annotations
-
-import sys
-from typing import TYPE_CHECKING
-
-from django.apps import apps as django_apps
-from django.core.management.color import color_style
-from django.utils.text import slugify
-
-from .constants import SEARCH_SLUG_SEP
-
-style = color_style()
-if TYPE_CHECKING:
-    from edc_model.models import BaseUuidModel
-
-    from .model_mixins import SearchSlugModelMixin
-
-    class Model(SearchSlugModelMixin, BaseUuidModel):
-        pass
-
-
-class SearchSlug:
-    def __init__(self, obj: Model | SearchSlugModelMixin = None, fields: list[str] = None):
-        self.warning = None
-        self.slug = ""
-        self.model_cls = None
-        self.fields = None
-        if obj and fields:
-            self.model_cls = django_apps.get_model(obj._meta.label_lower)
-            self.fields = self.get_safe_fields(fields)
-            values = []
-            for field in fields:
-                value = obj
-                for f in field.split("."):
-                    value = getattr(value, f)
-                values.append(value)
-            slugs = [slugify(item or "") for item in values]
-            slug = SEARCH_SLUG_SEP.join(slugs)
-            if len(slug) > 250:
-                self.warning = f"Warning! Search slug string exceeds 250 chars. See {obj!r}\n"
-                sys.stdout.write(style.WARNING(self.warning))
-            self.slug = slug[:250]
-
-    def get_safe_fields(self, fields):
-        from django_crypto_fields.fields import BaseField
-
-        encrypted_fields = [
-            fld.name for fld in self.model_cls._meta.fields if isinstance(fld, BaseField)
-        ]
-        return [f for f in fields if f not in encrypted_fields]

edc_search/updater.py

@@ -1,30 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-from .search_slug import SearchSlug
-
-if TYPE_CHECKING:
-    from edc_model.models import BaseUuidModel
-
-    from .model_mixins import SearchSlugModelMixin
-
-    class Model(SearchSlugModelMixin, BaseUuidModel):
-        pass
-
-
-class SearchSlugDuplicateFields(Exception):
-    pass
-
-
-class SearchSlugUpdater:
-    search_slug_cls = SearchSlug
-
-    def __init__(self, fields: list[str], model_obj: Model | SearchSlugModelMixin = None):
-        if len(fields) > len(list(set(fields))):
-            raise SearchSlugDuplicateFields(
-                f"Duplicate search slug fields detected. Got {fields}. See {self!r}"
-            )
-        search_slug = self.search_slug_cls(obj=model_obj, fields=fields)
-        self.warning = search_slug.warning
-        self.slug = search_slug.slug

edc_search/wsgi.py

@@ -1,7 +0,0 @@
-import os
-
-from django.core.wsgi import get_wsgi_application
-
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "edc_search.settings")
-
-application = get_wsgi_application()