clinicedc 2.0.41__py3-none-any.whl → 2.0.42__py3-none-any.whl

edc_action_item/action.py

@@ -4,6 +4,7 @@ import logging
 from contextlib import suppress
 from typing import TYPE_CHECKING
 
+from clinicedc_constants import CLOSED, NEW, OPEN
 from django.apps import apps as django_apps
 from django.conf import settings
 from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist
@@ -12,7 +13,6 @@ from django.db import models
 from django.utils.formats import localize
 
 from edc_action_item.stubs import ActionItemStub
-from edc_constants.constants import CLOSED, NEW, OPEN
 from edc_model.constants import DEFAULT_BASE_FIELDS
 from edc_sites.utils import valid_site_for_subject_or_raise
 

edc_action_item/action_item_notification.py

@@ -1,7 +1,7 @@
+from clinicedc_constants import CLOSED, NEW, OPEN
 from django.core.exceptions import ObjectDoesNotExist
 from django.utils import timezone
 
-from edc_constants.constants import CLOSED, NEW, OPEN
 from edc_notification.notification import Notification
 
 NOTIFY_ON_NEW_AND_NO_REFERENCE_OBJ = "notify_on_new_and_no_reference_obj"

edc_action_item/choices.py

@@ -1,4 +1,4 @@
-from edc_constants.constants import (
+from clinicedc_constants import (
     CANCELLED,
     CLOSED,
     HIGH_PRIORITY,

edc_action_item/data_fixers.py

@@ -1,6 +1,7 @@
 import re
 import sys
 
+from clinicedc_constants import CLOSED, NEW, OPEN
 from django.core.exceptions import (
     FieldError,
     MultipleObjectsReturned,
@@ -9,8 +10,6 @@ from django.core.exceptions import (
 from django.db import connection
 from django.db.models.signals import post_delete, post_save, pre_save
 
-from edc_constants.constants import CLOSED, NEW, OPEN
-
 from .site_action_items import site_action_items
 
 

edc_action_item/delete_action_item.py

@@ -1,7 +1,6 @@
+from clinicedc_constants import NEW
 from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist
 
-from edc_constants.constants import NEW
-
 from .get_action_type import get_action_type
 
 

edc_action_item/forms/action_item_form.py

@@ -1,7 +1,7 @@
+from clinicedc_constants import CANCELLED, NEW, OPEN
 from django import forms
 from django.apps import apps as django_apps
 
-from edc_constants.constants import CANCELLED, NEW, OPEN
 from edc_model_form.mixins import BaseModelFormMixin
 
 from ..models import ActionItem

edc_action_item/models/action_item.py

@@ -3,13 +3,13 @@ from __future__ import annotations
 from datetime import datetime
 from typing import TYPE_CHECKING
 
+from clinicedc_constants import CANCELLED, NEW
 from django.apps import apps as django_apps
 from django.core.exceptions import ObjectDoesNotExist
 from django.db import models
 from django.db.models.deletion import PROTECT
 from django.utils import timezone
 
-from edc_constants.constants import CANCELLED, NEW
 from edc_identifier.model_mixins import NonUniqueSubjectIdentifierFieldMixin
 from edc_model.models import BaseUuidModel, HistoricalRecords
 from edc_notification.model_mixins import NotificationModelMixin

edc_action_item/models/action_type.py

@@ -2,10 +2,10 @@ from __future__ import annotations
 
 from typing import Any
 
+from clinicedc_constants import HIGH_PRIORITY
 from django.apps import apps as django_apps
 from django.db import models
 
-from edc_constants.constants import HIGH_PRIORITY
 from edc_model.models import BaseUuidModel
 
 from ..choices import PRIORITY

edc_action_item/models/signals.py

@@ -1,11 +1,11 @@
 from typing import Any
 
+from clinicedc_constants import CLOSED, NEW, OPEN
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.models.signals import m2m_changed, post_delete, post_save
 from django.dispatch import receiver
 from simple_history.signals import post_create_historical_record
 
-from edc_constants.constants import CLOSED, NEW, OPEN
 from edc_notification.site_notifications import site_notifications
 
 from ..utils import reset_and_delete_action_item

edc_action_item/templatetags/action_item_extras.py

@@ -2,10 +2,10 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
+from clinicedc_constants import CANCELLED, CLOSED, HIGH_PRIORITY, NEW, OPEN
 from django import template
 
 from edc_auth.utils import get_user
-from edc_constants.constants import CANCELLED, CLOSED, HIGH_PRIORITY, NEW, OPEN
 from edc_utils.date import to_local
 from edc_utils.text import formatted_date
 

edc_action_item/utils.py

@@ -2,12 +2,11 @@ from __future__ import annotations
 
 import contextlib
 
+from clinicedc_constants import CLOSED, NEW
 from django.apps import apps as django_apps
 from django.core.exceptions import ObjectDoesNotExist
 from tqdm import tqdm
 
-from edc_constants.constants import CLOSED, NEW
-
 from .create_or_update_action_type import create_or_update_action_type
 from .identifiers import ActionIdentifier
 from .models import ActionItem

edc_action_item/view_mixins/action_item_view_mixin.py

@@ -2,9 +2,9 @@ from __future__ import annotations
 
 from typing import Any
 
+from clinicedc_constants import NEW, OPEN
 from django.db.models import QuerySet
 
-from edc_constants.constants import NEW, OPEN
 from edc_sites.site import sites
 
 from ..models import ActionItem

edc_adherence/choices.py

@@ -1,4 +1,4 @@
-from edc_constants.constants import NEVER
+from clinicedc_constants import NEVER
 
 MISSED_PILLS = (
     ("today", "today"),

edc_adherence/form_validator_mixin.py

@@ -1,9 +1,8 @@
 from typing import Any
 
+from clinicedc_constants import NEVER, OTHER, YES
 from django import forms
 
-from edc_constants.constants import NEVER, OTHER, YES
-
 
 class MedicationAdherenceFormValidatorMixin:
     def clean(self: Any):

edc_adherence/list_data.py

@@ -1,4 +1,4 @@
-from edc_constants.constants import OTHER
+from clinicedc_constants import OTHER
 
 list_data = {
     "edc_adherence.nonadherencereasons": [

edc_adherence/model_mixins.py

@@ -1,10 +1,10 @@
+from clinicedc_constants import YES
 from django.conf import settings
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from django.utils.html import format_html
 
 from edc_constants.choices import YES_NO
-from edc_constants.constants import YES
 from edc_model import models as edc_models
 
 from .choices import MISSED_PILLS

edc_adverse_event/action_items/ae_followup_action.py

@@ -1,15 +1,9 @@
+from clinicedc_constants import DEAD, GRADE5, HIGH_PRIORITY, LTFU, YES
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 
 from edc_action_item.action_with_notification import ActionWithNotification
 from edc_action_item.site_action_items import site_action_items
-from edc_adverse_event.constants import (
-    AE_FOLLOWUP_ACTION,
-    AE_INITIAL_ACTION,
-    DEATH_REPORT_ACTION,
-)
-from edc_constants.constants import DEAD, GRADE5, HIGH_PRIORITY, YES
-from edc_ltfu.constants import LOST_TO_FOLLOWUP
 from edc_notification.utils import get_email_contacts
 from edc_visit_schedule.utils import (
     OnScheduleError,
@@ -17,7 +11,13 @@ from edc_visit_schedule.utils import (
     get_onschedule_models,
 )
 
-from ..constants import ADVERSE_EVENT_ADMIN_SITE, ADVERSE_EVENT_APP_LABEL
+from ..constants import (
+    ADVERSE_EVENT_ADMIN_SITE,
+    ADVERSE_EVENT_APP_LABEL,
+    AE_FOLLOWUP_ACTION,
+    AE_INITIAL_ACTION,
+    DEATH_REPORT_ACTION,
+)
 
 
 class AeFollowupAction(ActionWithNotification):
@@ -88,7 +88,7 @@ class AeFollowupAction(ActionWithNotification):
 
     def update_next_actions_ltfu(self, next_actions=None):
         """Add Study termination to next_actions if LTFU."""
-        if self.reference_obj.outcome and self.reference_obj.outcome == LOST_TO_FOLLOWUP:
+        if self.reference_obj.outcome and self.reference_obj.outcome == LTFU:
             if not self.onschedule_models:
                 raise OnScheduleError(
                     f"Subject cannot be lost to followup. "

edc_adverse_event/action_items/ae_initial_action.py

@@ -1,14 +1,16 @@
+from clinicedc_constants import DEAD, GRADE3, GRADE4, GRADE5, HIGH_PRIORITY, NO, YES
+
 from edc_action_item.action_with_notification import ActionWithNotification
-from edc_adverse_event.constants import (
+
+from ..constants import (
+    ADVERSE_EVENT_ADMIN_SITE,
+    ADVERSE_EVENT_APP_LABEL,
     AE_FOLLOWUP_ACTION,
     AE_INITIAL_ACTION,
     AE_SUSAR_ACTION,
     AE_TMG_ACTION,
     DEATH_REPORT_ACTION,
 )
-from edc_constants.constants import DEAD, GRADE3, GRADE4, GRADE5, HIGH_PRIORITY, NO, YES
-
-from ..constants import ADVERSE_EVENT_ADMIN_SITE, ADVERSE_EVENT_APP_LABEL
 
 
 class AeInitialAction(ActionWithNotification):
@@ -25,11 +27,9 @@ class AeInitialAction(ActionWithNotification):
 
     @property
     def deceased(self):
-        if (self.reference_obj.ae_grade and self.reference_obj.ae_grade == GRADE5) or (
+        return (self.reference_obj.ae_grade and self.reference_obj.ae_grade == GRADE5) or (
             self.reference_obj.sae_reason.name and self.reference_obj.sae_reason.name == DEAD
-        ):
-            return True
-        return False
+        )
 
     def get_next_actions(self):
         """Returns next actions."""
@@ -37,19 +37,17 @@ class AeInitialAction(ActionWithNotification):
         next_actions = self.append_ae_followup_next_action(next_actions)
         next_actions = self.append_ae_susar_next_action(next_actions)
         next_actions = self.append_ae_tmg_next_action(next_actions)
-        next_actions = self.append_death_report_next_action(next_actions)
-        return next_actions
+        return self.append_death_report_next_action(next_actions)
 
     def append_ae_susar_next_action(self, next_actions=None):
         """Add next AE_SUSAR_ACTION if SUSAR == YES."""
-        next_actions = self.append_to_next_if_required(
+        return self.append_to_next_if_required(
             next_actions=next_actions,
             action_name=AE_SUSAR_ACTION,
             required=(
                 self.reference_obj.susar == YES and self.reference_obj.susar_reported == NO
             ),
         )
-        return next_actions
 
     def append_ae_followup_next_action(self, next_actions=None):
         """Add next AeFollowup if not deceased."""
@@ -72,18 +70,16 @@ class AeInitialAction(ActionWithNotification):
             required=self.reference_obj.ae_grade == GRADE4,
         )
         # add next AeTmgAction if G3 and is an SAE
-        next_actions = self.append_to_next_if_required(
+        return self.append_to_next_if_required(
             next_actions=next_actions,
             action_name=AE_TMG_ACTION,
             required=(self.reference_obj.ae_grade == GRADE3 and self.reference_obj.sae == YES),
         )
-        return next_actions
 
     def append_death_report_next_action(self, next_actions=None):
         """Add next Death report if G5/Death."""
-        next_actions = self.append_to_next_if_required(
+        return self.append_to_next_if_required(
             next_actions=next_actions,
             action_name=DEATH_REPORT_ACTION,
             required=self.deceased,
         )
-        return next_actions

edc_adverse_event/action_items/ae_susar_action.py

@@ -1,5 +1,6 @@
+from clinicedc_constants import HIGH_PRIORITY
+
 from edc_action_item.action_with_notification import ActionWithNotification
-from edc_constants.constants import HIGH_PRIORITY
 
 from ..constants import (
     ADVERSE_EVENT_ADMIN_SITE,

edc_adverse_event/action_items/ae_tmg_action.py

@@ -1,12 +1,14 @@
+from clinicedc_constants import CLOSED, HIGH_PRIORITY
+
 from edc_action_item.action_with_notification import ActionWithNotification
-from edc_adverse_event.constants import (
+
+from ..constants import (
+    ADVERSE_EVENT_ADMIN_SITE,
+    ADVERSE_EVENT_APP_LABEL,
     AE_FOLLOWUP_ACTION,
     AE_INITIAL_ACTION,
     AE_TMG_ACTION,
 )
-from edc_constants.constants import CLOSED, HIGH_PRIORITY
-
-from ..constants import ADVERSE_EVENT_ADMIN_SITE, ADVERSE_EVENT_APP_LABEL
 
 
 class AeTmgAction(ActionWithNotification):

edc_adverse_event/action_items/death_report_action.py

@@ -1,16 +1,17 @@
+from clinicedc_constants import HIGH_PRIORITY
 from django.apps import apps as django_apps
 from django.core.exceptions import ObjectDoesNotExist
 
 from edc_action_item.action_with_notification import ActionWithNotification
-from edc_adverse_event.constants import (
+from edc_visit_schedule.utils import get_offschedule_models
+
+from ..constants import (
+    ADVERSE_EVENT_ADMIN_SITE,
+    ADVERSE_EVENT_APP_LABEL,
     AE_FOLLOWUP_ACTION,
     AE_INITIAL_ACTION,
     DEATH_REPORT_ACTION,
 )
-from edc_constants.constants import HIGH_PRIORITY
-from edc_visit_schedule.utils import get_offschedule_models
-
-from ..constants import ADVERSE_EVENT_ADMIN_SITE, ADVERSE_EVENT_APP_LABEL
 
 
 class DeathReportAction(ActionWithNotification):
@@ -35,8 +36,7 @@ class DeathReportAction(ActionWithNotification):
         next_actions = []
         if self.enable_tmg_workflow:
             next_actions = self.append_next_death_tmg_action(next_actions)
-        next_actions = self.append_next_off_schedule_action(next_actions)
-        return next_actions
+        return self.append_next_off_schedule_action(next_actions)
 
     def append_next_death_tmg_action(self, next_actions):
         if self.death_report_tmg_model:

edc_adverse_event/action_items/death_report_tmg_action.py

@@ -1,5 +1,6 @@
+from clinicedc_constants import CLOSED, HIGH_PRIORITY, NO, YES
+
 from edc_action_item.action_with_notification import ActionWithNotification
-from edc_constants.constants import CLOSED, HIGH_PRIORITY, NO, YES
 
 from ..constants import (
     ADVERSE_EVENT_ADMIN_SITE,

edc_adverse_event/action_items/death_report_tmg_second_action.py

@@ -1,5 +1,6 @@
+from clinicedc_constants import CLOSED, HIGH_PRIORITY
+
 from edc_action_item.action_with_notification import ActionWithNotification
-from edc_constants.constants import CLOSED, HIGH_PRIORITY
 
 from ..constants import (
     ADVERSE_EVENT_ADMIN_SITE,

edc_adverse_event/action_items/hospitalization_action.py

@@ -1,5 +1,6 @@
+from clinicedc_constants import HIGH_PRIORITY
+
 from edc_action_item.action_with_notification import ActionWithNotification
-from edc_constants.constants import HIGH_PRIORITY
 
 from ..constants import HOSPITALIZATION_ACTION
 

edc_adverse_event/auths.py

@@ -1,8 +1,11 @@
+from clinicedc_constants import AE, AE_REVIEW, AE_ROLE, AE_SUPER, TMG, TMG_REVIEW
+
 from edc_auth.constants import (
     AUDITOR_ROLE,
     CLINICIAN_ROLE,
     CLINICIAN_SUPER_ROLE,
     NURSE_ROLE,
+    TMG_ROLE,
 )
 from edc_auth.site_auths import site_auths
 from edc_auth.utils import remove_default_model_permissions_from_edc_permissions
@@ -15,7 +18,6 @@ from .auth_objects import (
     tmg_dashboard_tuples,
     tmg_navbar_tuples,
 )
-from .constants import AE, AE_REVIEW, AE_ROLE, AE_SUPER, TMG, TMG_REVIEW, TMG_ROLE
 
 
 def update_site_auths():

edc_adverse_event/choices.py

@@ -1,18 +1,25 @@
-from edc_constants.constants import DEAD, GRADE3, GRADE4, GRADE5, NOT_APPLICABLE, OTHER
-from edc_ltfu.constants import LOST_TO_FOLLOWUP
-from edc_reportable import MILD, MODERATE, SEVERE, SEVERITY_INCREASED_FROM_G3
-
-from .constants import (
+from clinicedc_constants import (
     AE_WITHDRAWN,
     CONTINUING_UPDATE,
+    DEAD,
     DEFINITELY_RELATED,
+    GRADE3,
+    GRADE4,
+    GRADE5,
+    LTFU,
+    MILD,
+    MODERATE,
+    NOT_APPLICABLE,
     NOT_RECOVERED,
     NOT_RELATED,
+    OTHER,
     POSSIBLY_RELATED,
     PROBABLY_RELATED,
     RECOVERED,
     RECOVERED_WITH_SEQUELAE,
     RECOVERING,
+    SEVERE,
+    SEVERITY_INCREASED_FROM_G3,
     UNLIKELY_RELATED,
 )
 
@@ -43,7 +50,7 @@ AE_OUTCOME = (
     (RECOVERED, "Recovered/Resolved"),
     (RECOVERING, "Recovering/Resolving at end of study"),
     (NOT_RECOVERED, "Not Recovered/Resolved at end of study"),
-    (LOST_TO_FOLLOWUP, "Unknown/Lost to follow-up"),
+    (LTFU, "Unknown/Lost to follow-up"),
     (RECOVERED_WITH_SEQUELAE, "Recovered with sequelae"),
     (DEAD, "Death"),
     (AE_WITHDRAWN, "Adverse event report withdrawn after TMG review"),

edc_adverse_event/constants.py

@@ -1,3 +1,4 @@
+# see clinicedc_constants
 from django.conf import settings
 
 ADVERSE_EVENT_APP_LABEL = getattr(settings, "ADVERSE_EVENT_APP_LABEL", "edc_adverse_event")
@@ -9,31 +10,8 @@ AE_FOLLOWUP_ACTION = "submit-ae-followup-report"
 AE_INITIAL_ACTION = "submit-initial-ae-report"
 AE_SUSAR_ACTION = "submit-ae-susar-report"
 AE_TMG_ACTION = "submit-ae-tmg-report"
-AE_WITHDRAWN = "ae_withdrawn"
-CONTINUING_UPDATE = "continuing/update"
 DEATH_REPORT_ACTION = "submit-death-report"
-DEATH_REPORT_NOT_FOUND = "DEATH_REPORT_NOT_FOUND"
 DEATH_REPORT_TMG_ACTION = "submit-death-report-tmg"
 DEATH_REPORT_TMG_SECOND_ACTION = "submit-death-report-tmg-2nd"
-DEFINITELY_RELATED = "definitely_related"
-DISCHARGED = "discharged"
 HOSPITALIZATION_ACTION = "submit-hospitalization-report"
-INPATIENT = "inpatient"
-NOT_RECOVERED = "not_recovered"
-NOT_RELATED = "not_related"
-POSSIBLY_RELATED = "possibly_related"
-PROBABLY_RELATED = "probably_related"
-RECOVERED = "recovered"
-RECOVERED_WITH_SEQUELAE = "recovered_with_sequelae"
-RECOVERING = "recovering"
 STUDY_TERMINATION_CONCLUSION_ACTION = "submit-study-termination-conclusion"
-UNLIKELY_RELATED = "unlikely_related"
-
-# roles
-AE = "AE"
-AE_REVIEW = "AE_REVIEW"
-AE_ROLE = "ae_role"
-AE_SUPER = "AE_SUPER"
-TMG = "TMG"
-TMG_REVIEW = "TMG_REVIEW"
-TMG_ROLE = "tmg"

edc_adverse_event/form_validator_mixins/death_report_form_validator.py

@@ -3,11 +3,11 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Any
 from zoneinfo import ZoneInfo
 
+from clinicedc_constants import CLOSED, OTHER
 from django import forms
 from django.apps import apps as django_apps
 from django.conf import settings
 
-from edc_constants.constants import CLOSED, OTHER
 from edc_form_validators.base_form_validator import INVALID_ERROR
 from edc_utils.text import convert_php_dateformat
 

edc_adverse_event/form_validator_mixins/requires_death_report_form_validator_mixin.py

@@ -4,14 +4,13 @@ from datetime import date
 from typing import TYPE_CHECKING
 from zoneinfo import ZoneInfo
 
+from clinicedc_constants import DEAD, DEATH_REPORT_NOT_FOUND
 from django import forms
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
 
-from edc_constants.constants import DEAD
 from edc_utils.text import convert_php_dateformat
 
-from ..constants import DEATH_REPORT_NOT_FOUND
 from ..utils import get_ae_model
 
 if TYPE_CHECKING:

edc_adverse_event/form_validators/ae_followup.py

@@ -1,7 +1,6 @@
-from edc_adverse_event.constants import AE_WITHDRAWN
-from edc_constants.constants import YES
+from clinicedc_constants import AE_WITHDRAWN, SEVERITY_INCREASED_FROM_G3, YES
+
 from edc_form_validators import INVALID_ERROR, FormValidator
-from edc_reportable import SEVERITY_INCREASED_FROM_G3
 
 
 class AeFollowupFormValidator(FormValidator):

edc_adverse_event/form_validators/ae_initial.py

@@ -1,4 +1,5 @@
-from edc_constants.constants import YES
+from clinicedc_constants import YES
+
 from edc_form_validators import FormValidator
 
 

edc_adverse_event/form_validators/ae_tmg.py

@@ -1,4 +1,5 @@
-from edc_constants.constants import CLOSED, NO
+from clinicedc_constants import CLOSED, NO
+
 from edc_form_validators import FormValidator
 
 

edc_adverse_event/form_validators/death_report_tmg.py

@@ -2,9 +2,9 @@ from __future__ import annotations
 
 from datetime import date
 
+from clinicedc_constants import CLOSED, NO, OTHER
 from django.core.exceptions import ObjectDoesNotExist
 
-from edc_constants.constants import CLOSED, NO, OTHER
 from edc_form_validators import INVALID_ERROR, FormValidator
 
 from ..form_validator_mixins import (

edc_adverse_event/form_validators/hospitalization.py

@@ -1,4 +1,5 @@
-from edc_constants.constants import YES
+from clinicedc_constants import YES
+
 from edc_form_validators import INVALID_ERROR
 from edc_form_validators.form_validator import FormValidator
 

edc_adverse_event/list_data.py

@@ -1,4 +1,4 @@
-from edc_constants.constants import DEAD, NOT_APPLICABLE, OTHER, UNKNOWN
+from clinicedc_constants import DEAD, NOT_APPLICABLE, OTHER, UNKNOWN
 
 list_data = {
     "edc_adverse_event.aeclassification": [

edc_adverse_event/model_mixins/ae_followup/ae_followup_fields_model_mixin.py

@@ -1,8 +1,8 @@
+from clinicedc_constants import NOT_APPLICABLE, YES
 from django.db import models
 from django.utils import timezone
 
 from edc_constants.choices import YES_NO
-from edc_constants.constants import NOT_APPLICABLE, YES
 from edc_model.validators import date_not_future
 
 from ...choices import AE_GRADE_SIMPLE, AE_OUTCOME

edc_adverse_event/model_mixins/ae_followup/ae_followup_methods_model_mixin.py

@@ -1,7 +1,6 @@
+from clinicedc_constants import NOT_APPLICABLE
 from django.db import models
 
-from edc_constants.constants import NOT_APPLICABLE
-
 
 class AeFollowupMethodsModelMixin(models.Model):
     def __str__(self):

edc_adverse_event/model_mixins/ae_initial/ae_initial_fields_model_mixin.py

@@ -1,7 +1,7 @@
 import django.utils.timezone
+from clinicedc_constants import NOT_APPLICABLE
 from django.db import models
 
-from edc_constants.constants import NOT_APPLICABLE
 from edc_model.validators import date_not_future
 from edc_model_fields.fields.other_charfield import OtherCharField
 

edc_adverse_event/model_mixins/ae_initial/ae_initial_susar_model_mixin.py

@@ -1,7 +1,7 @@
+from clinicedc_constants import NOT_APPLICABLE
 from django.db import models
 
 from edc_constants.choices import YES_NO, YES_NO_NA
-from edc_constants.constants import NOT_APPLICABLE
 
 
 class AeInitialSusarModelMixin(models.Model):
@@ -12,7 +12,7 @@ class AeInitialSusarModelMixin(models.Model):
         choices=YES_NO,
         max_length=5,
         help_text=(
-            "If yes, SUSAR must be reported to Principal " "Investigator and TMG immediately,"
+            "If yes, SUSAR must be reported to Principal Investigator and TMG immediately,"
         ),
     )
 

edc_adverse_event/model_mixins/ae_susar/ae_susar_methods_model_mixin.py

@@ -1,7 +1,6 @@
+from clinicedc_constants import CLOSED, OPEN
 from django.db import models
 
-from edc_constants.constants import CLOSED, OPEN
-
 
 class AeSusarMethodsModelMixin(models.Model):
     class Meta:

edc_adverse_event/model_mixins/ae_tmg/ae_tmg_fields_model_mixin.py

@@ -1,8 +1,8 @@
+from clinicedc_constants import NOT_APPLICABLE
 from django.db import models
 from django.utils import timezone
 
 from edc_constants.choices import YES_NO, YES_NO_NA
-from edc_constants.constants import NOT_APPLICABLE
 from edc_model.validators import datetime_not_future
 from edc_model_fields.fields import OtherCharField