clinicedc 2.0.0__py3-none-any.whl → 2.0.2__py3-none-any.whl

edc_visit_schedule/migrations/0015_historicalonschedule_offschedule_onschedule.py

@@ -1,5 +1,7 @@
 # Generated by Django 5.0 on 2024-01-09 23:21
 
+import uuid
+
 import _socket
 import django.db.models.deletion
 import django_audit_fields.fields.hostname_modification_field
@@ -7,15 +9,15 @@ import django_audit_fields.fields.userfield
 import django_audit_fields.fields.uuid_auto_field
 import django_audit_fields.models.audit_model_mixin
 import django_revision.revision_field
+import simple_history.models
+from django.conf import settings
+from django.db import migrations, models
+
 import edc_identifier.managers
 import edc_model.validators.date
 import edc_protocol.validators
 import edc_sites.managers
 import edc_utils.date
-import simple_history.models
-import uuid
-from django.conf import settings
-from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
@@ -93,9 +95,7 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "device_created",
-                    models.CharField(
-                        blank=True, max_length=10, verbose_name="Device created"
-                    ),
+                    models.CharField(blank=True, max_length=10, verbose_name="Device created"),
                 ),
                 (
                     "device_modified",
@@ -259,9 +259,7 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "device_created",
-                    models.CharField(
-                        blank=True, max_length=10, verbose_name="Device created"
-                    ),
+                    models.CharField(blank=True, max_length=10, verbose_name="Device created"),
                 ),
                 (
                     "device_modified",
@@ -413,9 +411,7 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "device_created",
-                    models.CharField(
-                        blank=True, max_length=10, verbose_name="Device created"
-                    ),
+                    models.CharField(blank=True, max_length=10, verbose_name="Device created"),
                 ),
                 (
                     "device_modified",

edc_visit_schedule/migrations/0017_alter_onschedule_managers.py

@@ -1,8 +1,9 @@
 # Generated by Django 5.1.2 on 2025-01-15 13:29
 
+from django.db import migrations
+
 import edc_sites.managers
 import edc_visit_schedule.model_mixins.on_schedule_model_mixin
-from django.db import migrations
 
 
 class Migration(migrations.Migration):

edc_visit_schedule/migrations/0018_alter_historicalonschedule_revision_and_more.py

@@ -0,0 +1,86 @@
+# Generated by Django 5.2.4 on 2025-09-10 03:24
+
+import django_revision.revision_field
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("edc_visit_schedule", "0017_alter_onschedule_managers"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="historicalonschedule",
+            name="revision",
+            field=django_revision.revision_field.RevisionField(
+                blank=True,
+                editable=False,
+                help_text="System field. From git repository (tag:branch:commit), project metadata, project toml, project VERSION, or settings.",
+                max_length=75,
+                null=True,
+                verbose_name="Revision",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalvisitschedule",
+            name="revision",
+            field=django_revision.revision_field.RevisionField(
+                blank=True,
+                editable=False,
+                help_text="System field. From git repository (tag:branch:commit), project metadata, project toml, project VERSION, or settings.",
+                max_length=75,
+                null=True,
+                verbose_name="Revision",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="offschedule",
+            name="revision",
+            field=django_revision.revision_field.RevisionField(
+                blank=True,
+                editable=False,
+                help_text="System field. From git repository (tag:branch:commit), project metadata, project toml, project VERSION, or settings.",
+                max_length=75,
+                null=True,
+                verbose_name="Revision",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="onschedule",
+            name="revision",
+            field=django_revision.revision_field.RevisionField(
+                blank=True,
+                editable=False,
+                help_text="System field. From git repository (tag:branch:commit), project metadata, project toml, project VERSION, or settings.",
+                max_length=75,
+                null=True,
+                verbose_name="Revision",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectschedulehistory",
+            name="revision",
+            field=django_revision.revision_field.RevisionField(
+                blank=True,
+                editable=False,
+                help_text="System field. From git repository (tag:branch:commit), project metadata, project toml, project VERSION, or settings.",
+                max_length=75,
+                null=True,
+                verbose_name="Revision",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="visitschedule",
+            name="revision",
+            field=django_revision.revision_field.RevisionField(
+                blank=True,
+                editable=False,
+                help_text="System field. From git repository (tag:branch:commit), project metadata, project toml, project VERSION, or settings.",
+                max_length=75,
+                null=True,
+                verbose_name="Revision",
+            ),
+        ),
+    ]

edc_visit_schedule/model_mixins/crf/crf_schedule_model_mixin.py

@@ -45,7 +45,7 @@ class CrfScheduleModelMixin(models.Model):
         return self.related_visit.schedule
 
     def is_onschedule_or_raise(self) -> None:
-        cdefs = self.schedule.consent_definitions
+        # cdefs = self.schedule.consent_definitions
         subject_schedule = SubjectSchedule(
             self.subject_identifier,
             visit_schedule=self.visit_schedule,

edc_visit_schedule/model_mixins/off_schedule_model_mixin.py

@@ -59,9 +59,7 @@ class OffScheduleModelMixin(UniqueSubjectIdentifierFieldMixin, models.Model):
                 f"cannot be None. See model {self.__class__.__name__}"
             )
         if self.offschedule_datetime_field_attr != "offschedule_datetime":
-            self.offschedule_datetime = getattr(
-                self, self.offschedule_datetime_field_attr
-            )
+            self.offschedule_datetime = getattr(self, self.offschedule_datetime_field_attr)
         try:
             self.offschedule_datetime.date()
         except AttributeError:
@@ -91,6 +89,4 @@ class OffScheduleModelMixin(UniqueSubjectIdentifierFieldMixin, models.Model):
 
     class Meta:
         abstract = True
-        indexes = [
-            models.Index(fields=["subject_identifier", "offschedule_datetime", "site"])
-        ]
+        indexes = [models.Index(fields=["subject_identifier", "offschedule_datetime", "site"])]

edc_visit_schedule/model_mixins/on_schedule_model_mixin.py

@@ -89,6 +89,4 @@ class OnScheduleModelMixin(UniqueSubjectIdentifierFieldMixin, models.Model):
 
     class Meta:
         abstract = True
-        indexes = [
-            models.Index(fields=["subject_identifier", "onschedule_datetime", "site"])
-        ]
+        indexes = [models.Index(fields=["subject_identifier", "onschedule_datetime", "site"])]

edc_visit_schedule/modelform_mixins/off_schedule_modelform_mixin.py

@@ -22,9 +22,7 @@ class OffScheduleModelFormMixin(VisitScheduleNonCrfModelFormMixin):
                 visit_schedule_name=self.visit_schedule_name,
             )
             try:
-                self.schedule.subject(
-                    self.get_subject_identifier()
-                ).update_history_or_raise(
+                self.schedule.subject(self.get_subject_identifier()).update_history_or_raise(
                     history_obj=history_obj,
                     offschedule_datetime=self.offschedule_datetime,
                     update=False,

edc_visit_schedule/models/subject_schedule_history.py

@@ -19,9 +19,7 @@ class OnScheduleModelError(Exception):
 
 
 class SubjectScheduleModelManager(models.Manager):
-    def get_by_natural_key(
-        self, subject_identifier, visit_schedule_name, schedule_name
-    ):
+    def get_by_natural_key(self, subject_identifier, visit_schedule_name, schedule_name):
         return self.get(
             subject_identifier=subject_identifier,
             visit_schedule_name=visit_schedule_name,
@@ -69,9 +67,7 @@ class SubjectScheduleHistory(
         validators=[datetime_not_before_study_start, datetime_not_future], null=True
     )
 
-    schedule_status = models.CharField(
-        max_length=15, choices=SCHEDULE_STATUS, null=True
-    )
+    schedule_status = models.CharField(max_length=15, choices=SCHEDULE_STATUS, null=True)
 
     objects = SubjectScheduleModelManager()
 
@@ -112,6 +108,5 @@ class SubjectScheduleHistory(
             )
         ]
         indexes = (
-            BaseUuidModel.Meta.indexes
-            + NonUniqueSubjectIdentifierFieldMixin.Meta.indexes
+            BaseUuidModel.Meta.indexes + NonUniqueSubjectIdentifierFieldMixin.Meta.indexes
         )

edc_visit_schedule/ordered_collection.py

@@ -15,9 +15,7 @@ class OrderedCollection(OrderedDict):
         super().update(*args, **kwargs)
         od = self.copy()
         self.clear()
-        super().update(
-            **{getattr(v, self.key): v for v in sorted(od.values(), key=key_order)}
-        )
+        super().update(**{getattr(v, self.key): v for v in sorted(od.values(), key=key_order)})
 
     @property
     def first(self):

edc_visit_schedule/schedule/schedule.py

@@ -4,7 +4,7 @@ import re
 from copy import deepcopy
 from datetime import datetime
 from decimal import Decimal
-from typing import Type, TYPE_CHECKING
+from typing import TYPE_CHECKING, Type
 
 from django.apps import apps as django_apps
 
@@ -17,12 +17,13 @@ from edc_registration import get_registered_subject_model_cls
 from edc_sites import site_sites
 from edc_sites.single_site import SingleSite
 from edc_utils import formatted_date
-from .visit_collection import VisitCollection
-from .window import Window
+
 from ..exceptions import NotOnScheduleError, NotOnScheduleForDateError
 from ..site_visit_schedules import site_visit_schedules
 from ..subject_schedule import SubjectSchedule
 from ..visit import Visit
+from .visit_collection import VisitCollection
+from .window import Window
 
 if TYPE_CHECKING:
     from edc_appointment.models import Appointment
@@ -106,13 +107,9 @@ class Schedule:
             None if loss_to_followup_model is None else loss_to_followup_model.lower()
         )
         self.offstudymedication_model = (
-            None
-            if offstudymedication_model is None
-            else offstudymedication_model.lower()
-        )
-        self.history_model = (
-            history_model or "edc_visit_schedule.subjectschedulehistory"
+            None if offstudymedication_model is None else offstudymedication_model.lower()
         )
+        self.history_model = history_model or "edc_visit_schedule.subjectschedulehistory"
 
     def __repr__(self):
         return f"Schedule({self.name})"
@@ -139,9 +136,7 @@ class Schedule:
                 f"ConsentDefinition(s) may not be None. See Schedule `{self}`. "
                 f"Got `{consent_definitions}`."
             )
-        self._consent_definitions = sorted(
-            self._consent_definitions, key=lambda x: x.version
-        )
+        self._consent_definitions = sorted(self._consent_definitions, key=lambda x: x.version)
 
     @property
     def visits(self) -> VisitCollection:
@@ -288,8 +283,7 @@ class Schedule:
         ]
         if not consent_definition:
             raise ScheduleError(
-                "Consent definition may not be None. Expected one of "
-                f"{formatted_cdefs}."
+                "Consent definition may not be None. Expected one of " f"{formatted_cdefs}."
             )
 
         if consent_definition not in self.consent_definitions:
@@ -327,9 +321,7 @@ class Schedule:
         return True
 
     def datetime_in_window(self, **kwargs):
-        return self.window_cls(
-            name=self.name, visits=self.visits, **kwargs
-        ).datetime_in_window
+        return self.window_cls(name=self.name, visits=self.visits, **kwargs).datetime_in_window
 
     @property
     def onschedule_model_cls(self) -> Type[OnSchedule]:
@@ -370,9 +362,7 @@ class Schedule:
         """
         if consent_definition:
             consent_definitions = [
-                c
-                for c in self.consent_definitions
-                if c.version == consent_definition.version
+                c for c in self.consent_definitions if c.version == consent_definition.version
             ]
         else:
             consent_definitions = self.consent_definitions

edc_visit_schedule/simple_model_validator.py

@@ -15,15 +15,10 @@ class SimpleModelValidator:
         try:
             app_label, _ = model.split(".")
         except AttributeError:
-            raise InvalidModel(
-                f"Invalid label lower format for '{attr}'. " f"Got {model}"
-            )
+            raise InvalidModel(f"Invalid label lower format for '{attr}'. " f"Got {model}")
         else:
-            app_labels = [
-                app_config.name for app_config in django_apps.get_app_configs()
-            ]
+            app_labels = [app_config.name for app_config in django_apps.get_app_configs()]
             if app_label not in app_labels:
                 raise InvalidModel(
-                    f"Invalid model. app_label does not exist for "
-                    f"'{attr}'. Got {model}"
+                    f"Invalid model. app_label does not exist for " f"'{attr}'. Got {model}"
                 )

edc_visit_schedule/site_visit_schedules.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import copy
 import sys
-from typing import Tuple, TYPE_CHECKING
+from typing import TYPE_CHECKING, Tuple
 
 from django.apps import apps as django_apps
 from django.core.exceptions import ObjectDoesNotExist
@@ -92,9 +92,7 @@ class SiteVisitSchedules:
                 visit_schedule_name = visit_schedule_name.split(".")[0]
             except AttributeError:
                 pass
-            visit_schedules[visit_schedule_name] = self.get_visit_schedule(
-                visit_schedule_name
-            )
+            visit_schedules[visit_schedule_name] = self.get_visit_schedule(visit_schedule_name)
         return visit_schedules or self.registry
 
     def get_by_consent_definition(
@@ -154,9 +152,7 @@ class SiteVisitSchedules:
 
         attr `loss_to_followup_model` is in "label_lower" format.
         """
-        return self.get_by_model(
-            attr="loss_to_followup_model", model=loss_to_followup_model
-        )
+        return self.get_by_model(attr="loss_to_followup_model", model=loss_to_followup_model)
 
     def get_by_model(
         self, attr: str = None, model: str = None
@@ -207,9 +203,7 @@ class SiteVisitSchedules:
         site: SingleSite | None = None,
     ) -> str:
         """Returns the consent model name specified on the schedule"""
-        schedule = self.get_visit_schedule(visit_schedule_name).schedules.get(
-            schedule_name
-        )
+        schedule = self.get_visit_schedule(visit_schedule_name).schedules.get(schedule_name)
         if isinstance(schedule.consent_model, (dict,)):
             # schedule returns a dict, get model name for this
             # site_id or country
@@ -223,9 +217,7 @@ class SiteVisitSchedules:
 
     def get_onschedule_model(self, visit_schedule_name: str, schedule_name: str) -> str:
         """Returns the onschedule model name"""
-        schedule = self.get_visit_schedule(visit_schedule_name).schedules.get(
-            schedule_name
-        )
+        schedule = self.get_visit_schedule(visit_schedule_name).schedules.get(schedule_name)
         return schedule.onschedule_model
 
     @staticmethod
@@ -321,9 +313,7 @@ class SiteVisitSchedules:
                     before_import_registry = copy.copy(site_visit_schedules._registry)
                     import_module(f"{app}.{module_name}")
                     if verbose:
-                        sys.stdout.write(
-                            "   - registered visit schedule from " f"'{app}'\n"
-                        )
+                        sys.stdout.write("   - registered visit schedule from " f"'{app}'\n")
                 except Exception as e:
                     if f"No module named '{app}.{module_name}'" not in str(e):
                         raise

edc_visit_schedule/subject_schedule.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from datetime import datetime
-from typing import Type, TYPE_CHECKING
+from typing import TYPE_CHECKING, Type
 
 from django.apps import apps as django_apps
 from django.conf import settings
@@ -16,6 +16,7 @@ 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, get_utcnow
 from edc_utils.date import to_local
+
 from .constants import OFF_SCHEDULE, ON_SCHEDULE
 from .exceptions import (
     InvalidOffscheduleDate,
@@ -76,9 +77,7 @@ class SubjectSchedule:
         )
 
     def __str__(self):
-        return (
-            f"{self.subject_identifier} {self.visit_schedule_name}.{self.schedule_name}"
-        )
+        return f"{self.subject_identifier} {self.visit_schedule_name}.{self.schedule_name}"
 
     @property
     def onschedule_model_cls(self) -> Type[OnSchedule]:
@@ -293,11 +292,7 @@ class SubjectSchedule:
                 subject_identifier=self.subject_identifier,
                 schedule_name=self.schedule_name,
                 visit_schedule_name=self.visit_schedule_name,
-                **{
-                    f"{related_visit_model_attr}__report_datetime__gt": (
-                        offschedule_datetime
-                    )
-                },
+                **{f"{related_visit_model_attr}__report_datetime__gt": (offschedule_datetime)},
             )
         except ObjectDoesNotExist:
             appointments = None
@@ -306,11 +301,7 @@ class SubjectSchedule:
                 subject_identifier=self.subject_identifier,
                 schedule_name=self.schedule_name,
                 visit_schedule_name=self.visit_schedule_name,
-                **{
-                    f"{related_visit_model_attr}__report_datetime__gt": (
-                        offschedule_datetime
-                    )
-                },
+                **{f"{related_visit_model_attr}__report_datetime__gt": (offschedule_datetime)},
             )
         if appointments:
             raise InvalidOffscheduleDate(
@@ -369,9 +360,7 @@ class SubjectSchedule:
         """Raise an exception if subject is not on the schedule during
         the given date.
         """
-        compare_as_datetimes = (
-            True if compare_as_datetimes is None else compare_as_datetimes
-        )
+        compare_as_datetimes = True if compare_as_datetimes is None else compare_as_datetimes
 
         onschedule_obj = self.onschedule_obj
 

edc_visit_schedule/system_checks.py

@@ -183,9 +183,7 @@ def check_multiple_proxies_same_proxy_root(
 
     # Find proxy models declared as sharing a proxy root
     proxies_sharing_roots = get_proxy_models_from_collection(
-        collection=CrfCollection(
-            *[f for f in visit_crf_collection if f.shares_proxy_root]
-        )
+        collection=CrfCollection(*[f for f in visit_crf_collection if f.shares_proxy_root])
     ) + get_proxy_models_from_collection(
         collection=CrfCollection(*[f for f in visit.crfs_prn if f.shares_proxy_root])
     )

edc_visit_schedule/utils.py

@@ -68,16 +68,12 @@ def is_baseline(
 
 def raise_if_baseline(subject_visit) -> None:
     if subject_visit and is_baseline(instance=subject_visit):
-        raise forms.ValidationError(
-            "This form is not available for completion at baseline."
-        )
+        raise forms.ValidationError("This form is not available for completion at baseline.")
 
 
 def raise_if_not_baseline(subject_visit) -> None:
     if subject_visit and not is_baseline(instance=subject_visit):
-        raise forms.ValidationError(
-            "This form is only available for completion at baseline."
-        )
+        raise forms.ValidationError("This form is only available for completion at baseline.")
 
 
 def get_onschedule_models(
@@ -163,9 +159,7 @@ def off_all_schedules_or_raise(subject_identifier: str = None):
                             subject_identifier=subject_identifier
                         )
                 except ObjectDoesNotExist:
-                    model_name = (
-                        schedule.offschedule_model_cls()._meta.verbose_name.title()
-                    )
+                    model_name = schedule.offschedule_model_cls()._meta.verbose_name.title()
                     raise OffScheduleError(
                         f"Subject cannot be taken off study. Subject is still on a "
                         f"schedule. Got schedule '{visit_schedule.name}."
@@ -247,9 +241,7 @@ def report_datetime_within_onschedule_offschedule_datetimes(
     ):
         onschedule_datetime = formatted_datetime(onschedule_obj.onschedule_datetime)
         if offschedule_obj:
-            offschedule_datetime = formatted_datetime(
-                offschedule_obj.offschedule_datetime
-            )
+            offschedule_datetime = formatted_datetime(offschedule_obj.offschedule_datetime)
             error_msg = (
                 "Invalid report datetime. Expected a datetime between "
                 f"{onschedule_datetime} and {offschedule_datetime}. "
@@ -274,15 +266,14 @@ def get_onschedule_model_instance(
     Increment reference_datetime by 1 sec to avoid millisecond
     in lte comparison.
     """
-    schedule = site_visit_schedules.get_visit_schedule(
-        visit_schedule_name
-    ).schedules.get(schedule_name)
+    schedule = site_visit_schedules.get_visit_schedule(visit_schedule_name).schedules.get(
+        schedule_name
+    )
     model_cls = django_apps.get_model(schedule.onschedule_model)
     try:
         onschedule_obj = model_cls.objects.get(
             subject_identifier=subject_identifier,
-            onschedule_datetime__lte=to_utc(reference_datetime)
-            + relativedelta(seconds=1),
+            onschedule_datetime__lte=to_utc(reference_datetime) + relativedelta(seconds=1),
         )
     except ObjectDoesNotExist as e:
         dte_as_str = formatted_datetime(to_local(reference_datetime))

edc_visit_schedule/view_mixins.py

@@ -31,21 +31,15 @@ class VisitScheduleViewMixin:
             if self.subject_identifier:
                 for schedule in visit_schedule.schedules.values():
                     try:
-                        onschedule_model_obj = (
-                            schedule.onschedule_model_cls.objects.get(
-                                subject_identifier=self.subject_identifier
-                            )
+                        onschedule_model_obj = schedule.onschedule_model_cls.objects.get(
+                            subject_identifier=self.subject_identifier
                         )
                     except ObjectDoesNotExist:
                         pass
                     else:
                         self.onschedule_models.append(onschedule_model_obj)
-                        self.visit_schedules.update(
-                            {visit_schedule.name: visit_schedule}
-                        )
-                        if schedule.is_onschedule(
-                            self.subject_identifier, get_utcnow()
-                        ):
+                        self.visit_schedules.update({visit_schedule.name: visit_schedule})
+                        if schedule.is_onschedule(self.subject_identifier, get_utcnow()):
                             self.current_schedule = schedule
                             self.current_visit_schedule = visit_schedule
                             self.current_onschedule_model = onschedule_model_obj

edc_visit_schedule/visit/crf.py

@@ -39,8 +39,7 @@ class Crf:
 
     def __repr__(self) -> str:
         return (
-            f"{self.__class__.__name__}({self.show_order}, "
-            f"{self.model}, {self.required})"
+            f"{self.__class__.__name__}({self.show_order}, " f"{self.model}, {self.required})"
         )
 
     def __str__(self) -> str:

edc_visit_schedule/visit/requisition.py

@@ -24,9 +24,7 @@ class Requisition(Crf):
                 f"Was the panel referred to by this schedule's requisition "
                 f"added to a lab profile and registered with site_labs?"
             )
-        super().__init__(
-            required=required, model=self.panel.requisition_model, **kwargs
-        )
+        super().__init__(required=required, model=self.panel.requisition_model, **kwargs)
 
     def __repr__(self):
         return f"{self.__class__.__name__}({self.show_order}, {self.panel.name})"

edc_visit_schedule/visit/visit.py

@@ -80,8 +80,7 @@ class VisitDate:
     def lower(self) -> datetime:
         if not self.base:
             raise BaseDatetimeNotSet(
-                "Base datetime is None, set the base datetime "
-                "before accessing attr lower"
+                "Base datetime is None, set the base datetime " "before accessing attr lower"
             )
         return self._lower
 
@@ -89,8 +88,7 @@ class VisitDate:
     def upper(self) -> datetime:
         if not self.base:
             raise BaseDatetimeNotSet(
-                "Base datetime is None, set the base datetime "
-                "before accessing attr upper"
+                "Base datetime is None, set the base datetime " "before accessing attr upper"
             )
         return self._upper
 
@@ -136,9 +134,7 @@ class Visit:
         self.crfs_prn: CrfCollection = crfs_prn or CrfCollection()
         for prn in self.crfs_prn:
             prn.required = False
-        self.requisitions: RequisitionCollection = (
-            requisitions or RequisitionCollection()
-        )
+        self.requisitions: RequisitionCollection = requisitions or RequisitionCollection()
         self.requisitions_unscheduled: RequisitionCollection = (
             requisitions_unscheduled or RequisitionCollection()
         )
@@ -220,9 +216,7 @@ class Visit:
             if crf.model not in [crf.model for crf in self.crfs]
         ]
         crfs = crfs + [
-            crf
-            for crf in self.crfs_missed
-            if crf.model not in [crf.model for crf in crfs]
+            crf for crf in self.crfs_missed if crf.model not in [crf.model for crf in crfs]
         ]
         crfs = crfs + [
             crf for crf in self.crfs_prn if crf.model not in [crf.model for crf in crfs]
@@ -236,9 +230,7 @@ class Visit:
             r for r in self.requisitions_unscheduled if r.name not in names
         ]
         names = list(set([r.name for r in requisitions]))
-        requisitions = requisitions + [
-            r for r in self.requisitions_prn if r.name not in names
-        ]
+        requisitions = requisitions + [r for r in self.requisitions_prn if r.name not in names]
         return RequisitionCollection(
             *requisitions, name="all_requisitions", check_sequence=False
         )
@@ -285,9 +277,7 @@ class Visit:
     def to_dict(self):
         return dict(
             crfs=[(crf.model, crf.required) for crf in self.crfs],
-            crfs_unscheduled=[
-                (crf.model, crf.required) for crf in self.crfs_unscheduled
-            ],
+            crfs_unscheduled=[(crf.model, crf.required) for crf in self.crfs_unscheduled],
             crfs_prn=[(crf.model, crf.required) for crf in self.crfs_prn],
             crfs_missed=[(crf.model, crf.required) for crf in self.crfs_missed],
             requisitions=[