clinicedc 2.0.33__py3-none-any.whl → 2.0.35__py3-none-any.whl

edc_visit_schedule/schedule/visit_collection.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from datetime import datetime
 from typing import TYPE_CHECKING
 
-from edc_utils import to_local
+from edc_utils.date import to_local
 
 from ..ordered_collection import OrderedCollection
 

edc_visit_schedule/schedule/window.py

@@ -76,8 +76,6 @@ class Window:
         window period for a scheduled `visit` otherwise
         raises an exception.
 
-        Ensure all datetimes in UTC before comparison.
-
         In this case, `visit` is the object from schedule and
         not a model instance.
         """

edc_visit_schedule/subject_schedule.py

@@ -15,8 +15,8 @@ from edc_consent.exceptions import ConsentDefinitionError
 from edc_consent.site_consents import site_consents
 from edc_sites.site import sites as site_sites
 from edc_sites.utils import valid_site_for_subject_or_raise
-from edc_utils import convert_php_dateformat, formatted_datetime
 from edc_utils.date import to_local
+from edc_utils.text import convert_php_dateformat, formatted_datetime
 
 from .constants import OFF_SCHEDULE, ON_SCHEDULE
 from .exceptions import (

edc_visit_schedule/utils.py

@@ -12,7 +12,7 @@ from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
 from django.db import transaction
 
-from edc_utils import floor_secs, formatted_datetime, to_utc
+from edc_utils import floor_secs, formatted_datetime
 from edc_utils.date import to_local
 
 from .baseline import Baseline
@@ -39,14 +39,14 @@ def get_lower_datetime(instance: Appointment) -> datetime:
     if instance.related_visit:
         dte = instance.appt_datetime
     else:
-        instance.visit.dates.base = to_utc(instance.first.timepoint_datetime)
+        instance.visit.dates.base = instance.first.timepoint_datetime
         dte = instance.visit.dates.lower
     return dte
 
 
 def get_upper_datetime(instance) -> datetime:
     """Returns the datetime of the upper window"""
-    instance.visit.dates.base = to_utc(instance.first.timepoint_datetime)
+    instance.visit.dates.base = instance.first.timepoint_datetime
     return instance.visit.dates.upper
 
 
@@ -271,7 +271,7 @@ def get_onschedule_model_instance(
     try:
         onschedule_obj = model_cls.objects.get(
             subject_identifier=subject_identifier,
-            onschedule_datetime__lte=to_utc(reference_datetime) + relativedelta(seconds=1),
+            onschedule_datetime__lte=reference_datetime + relativedelta(seconds=1),
         )
     except ObjectDoesNotExist as e:
         dte_as_str = formatted_datetime(to_local(reference_datetime))

edc_visit_schedule/visit/visit.py

@@ -8,8 +8,9 @@ from django.apps import apps as django_apps
 from django.utils import timezone
 
 from edc_facility.utils import get_default_facility_name, get_facility
-from edc_utils import to_local
+from edc_utils.date import to_local
 
+from .crf import Crf
 from .crf_collection import CrfCollection
 from .forms_collection import FormsCollection
 from .requisition_collection import RequisitionCollection
@@ -22,7 +23,6 @@ if TYPE_CHECKING:
 
     from edc_facility.facility import Facility
 
-    from .crf import Crf
     from .requisition import Requisition
 
 
@@ -132,7 +132,9 @@ class Visit:
         self.base_timepoint = base_timepoint or Decimal("0.0")
         self.crfs: CrfCollection = crfs or CrfCollection()
         self.crfs_unscheduled: CrfCollection = crfs_unscheduled or CrfCollection()
-        self.crfs_missed: CrfCollection = crfs_missed or CrfCollection()
+        self.crfs_missed: CrfCollection = crfs_missed or CrfCollection(
+            Crf(show_order=1, model="edc_visit_tracking.subjectvisitmissed", required=True)
+        )
         self.crfs_prn: CrfCollection = crfs_prn or CrfCollection()
         for prn in self.crfs_prn:
             prn.required = False
@@ -181,6 +183,10 @@ class Visit:
         self.name = self.code
         self.facility_name = facility_name or get_default_facility_name()
         self.allow_unscheduled = allow_unscheduled
+        if self.allow_unscheduled and not crfs_unscheduled:
+            raise VisitError(
+                f"crfs_unscheduled may not be null if allow_unscheduled=True. See {self!r}"
+            )
         if timepoint is None:
             raise VisitError(f"Timepoint not specified. Got None. See Visit {code}.")
 

edc_visit_schedule/visit/window_period.py

@@ -8,7 +8,7 @@ from zoneinfo import ZoneInfo
 from dateutil.relativedelta import relativedelta
 from django.conf import settings
 
-from edc_utils import to_local
+from edc_utils.date import to_local
 
 
 class WindowPeriod:

edc_visit_tracking/form_validators/visit_form_validator.py

@@ -18,7 +18,7 @@ from edc_metadata.utils import (
     get_crf_metadata_model_cls,
     get_requisition_metadata_model_cls,
 )
-from edc_utils import formatted_datetime
+from edc_utils.text import formatted_datetime
 from edc_visit_schedule.utils import is_baseline
 
 from ..constants import MISSED_VISIT, UNSCHEDULED

edc_metadata/metadata_wrappers/__init__.py

@@ -1,5 +0,0 @@
-# from .crf_metadata_wrapper import CrfMetadataWrapper
-# from .crf_metadata_wrappers import CrfMetadataWrappers
-# from .metadata_wrapper import MetadataWrapper, MetadataWrapperError
-# from .requisition_metadata_wrapper import RequisitionMetadataWrapper
-# from .requisition_metadata_wrappers import RequisitionMetadataWrappers

edc_metadata/metadata_wrappers/crf_metadata_wrapper.py

@@ -1,5 +0,0 @@
-from .metadata_wrapper import MetadataWrapper
-
-
-class CrfMetadataWrapper(MetadataWrapper):
-    label = "CRF"

edc_metadata/metadata_wrappers/crf_metadata_wrappers.py

@@ -1,8 +0,0 @@
-from ..metadata import CrfMetadataGetter
-from .crf_metadata_wrapper import CrfMetadataWrapper
-from .metadata_wrappers import MetadataWrappers
-
-
-class CrfMetadataWrappers(MetadataWrappers):
-    metadata_getter_cls = CrfMetadataGetter
-    metadata_wrapper_cls = CrfMetadataWrapper

edc_metadata/metadata_wrappers/metadata_wrapper.py

@@ -1,74 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING, Any
-
-from django.apps import apps as django_apps
-from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
-
-from edc_visit_tracking.typing_stubs import RelatedVisitProtocol
-
-if TYPE_CHECKING:
-    from edc_crf.model_mixins import CrfModelMixin
-    from edc_metadata.models import CrfMetadata, RequisitionMetadata
-
-
-class MetadataWrapperError(Exception):
-    pass
-
-
-class MetadataWrapper:
-    """A class that wraps the corresponding model instance, or not, for the
-    given metadata object and sets it to itself along with other
-    attributes like the visit, model class, metadata_obj, etc.
-    """
-
-    label: str | None = None
-
-    def __init__(
-        self,
-        visit: RelatedVisitProtocol,
-        metadata_obj: CrfMetadata | RequisitionMetadata,
-    ) -> None:
-        self._source_model_obj = None
-        self.metadata_obj = metadata_obj
-        self.visit = visit
-
-        # visit codes (and sequence) must match
-        if (self.visit.visit_code != self.metadata_obj.visit_code) or (
-            self.visit.visit_code_sequence != self.metadata_obj.visit_code_sequence
-        ):
-            raise MetadataWrapperError(
-                f"Visit code mismatch. Visit is {self.visit.visit_code}."
-                f"{self.visit.visit_code_sequence} but metadata object has "
-                f"{self.metadata_obj.visit_code}."
-                f"{self.metadata_obj.visit_code_sequence}. Got {metadata_obj!r}."
-            )
-
-    def __repr__(self) -> str:
-        return f"{self.__class__.__name__}({self.visit}, {self.metadata_obj})"
-
-    @property
-    def options(self) -> dict[str, Any]:
-        """Returns a dictionary of query options."""
-        return {f"{self.source_model_cls.related_visit_model_attr()}": self.visit}
-
-    @property
-    def source_model_obj(self) -> CrfModelMixin:
-        if not self._source_model_obj:
-            try:
-                self._source_model_obj = self.source_model_cls.objects.get(**self.options)
-            except AttributeError as e:
-                if "related_visit_model_attr" not in str(e):
-                    raise ImproperlyConfigured(f"{e} See {self.source_model_cls!r}")
-            except ObjectDoesNotExist:
-                self._source_model_obj = None
-        return self._source_model_obj
-
-    @source_model_obj.setter
-    def source_model_obj(self, value=None) -> None:
-        self._source_model_obj = value
-
-    @property
-    def source_model_cls(self) -> type[CrfModelMixin]:
-        """Returns a CRF model class"""
-        return django_apps.get_model(self.metadata_obj.model)

edc_metadata/metadata_wrappers/metadata_wrappers.py

@@ -1,33 +0,0 @@
-from __future__ import annotations
-
-from django.core.management.color import color_style
-
-from ..metadata import MetadataGetter
-from .metadata_wrapper import MetadataWrapper
-
-style = color_style()
-
-
-class MetadataWrappers:
-    """A class that generates a collection of MetadataWrapper objects, e.g. CRF
-    or REQUISITION, from a queryset of metadata objects.
-
-    See also classes Crf, Requisition in edc_visit_schedule.
-    """
-
-    metadata_getter_cls: MetadataGetter = MetadataGetter
-    metadata_wrapper_cls: MetadataWrapper = MetadataWrapper
-
-    def __init__(self, **kwargs) -> None:
-        metadata_getter = self.metadata_getter_cls(**kwargs)
-        self.objects = []
-        if metadata_getter.related_visit:
-            for metadata_obj in metadata_getter.metadata_objects:
-                metadata_wrapper = self.metadata_wrapper_cls(
-                    metadata_obj=metadata_obj,
-                    visit=metadata_getter.related_visit,
-                )
-                self.objects.append(metadata_wrapper)
-
-    def __repr__(self) -> str:
-        return f"{self.__class__.__name__}({self.objects})"

edc_metadata/metadata_wrappers/requisition_metadata_wrapper.py

@@ -1,26 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-from .metadata_wrapper import MetadataWrapper
-
-if TYPE_CHECKING:
-    from ..models import RequisitionMetadata
-
-
-class RequisitionMetadataWrapper(MetadataWrapper):
-    label = "Requisition"
-
-    def __init__(self, metadata_obj: RequisitionMetadata = None, **kwargs) -> None:
-        self.panel_name = metadata_obj.panel_name
-        super().__init__(metadata_obj=metadata_obj, **kwargs)
-
-    @property
-    def options(self) -> dict:
-        options = super().options
-        options.update(panel__name=self.panel_name)
-        return options
-
-    @property
-    def html_id(self) -> str:
-        return f"id_{self.panel_name}"

edc_metadata/metadata_wrappers/requisition_metadata_wrappers.py

@@ -1,10 +0,0 @@
-from __future__ import annotations
-
-from ..metadata import RequisitionMetadataGetter
-from .metadata_wrappers import MetadataWrappers
-from .requisition_metadata_wrapper import RequisitionMetadataWrapper
-
-
-class RequisitionMetadataWrappers(MetadataWrappers):
-    metadata_getter_cls: RequisitionMetadataGetter = RequisitionMetadataGetter
-    metadata_wrapper_cls: RequisitionMetadataWrapper = RequisitionMetadataWrapper

edc_pharmacy/management/commands/update_initial_pharmacy_data.py

@@ -1,10 +0,0 @@
-from django.core.management import BaseCommand
-from meta_pharmacy.utils import update_initial_pharmacy_data
-
-
-class Command(BaseCommand):
-
-    def handle(self, *args, **options):
-        """This is an example of an initial set of data"""
-        update_initial_pharmacy_data()
-        print("Done")