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

edc_lab/model_mixins/shipping/verify_model_mixin.py

@@ -1,8 +1,7 @@
+from clinicedc_constants import OPEN
 from django.db import models
 from django.utils import timezone
 
-from edc_constants.constants import OPEN
-
 from ...constants import VERIFIED
 
 

edc_lab/models/box.py

@@ -1,8 +1,8 @@
+from clinicedc_constants import OPEN, OTHER
 from django.db import models
 from django.db.models.deletion import PROTECT
 from django.utils import timezone
 
-from edc_constants.constants import OPEN, OTHER
 from edc_model.models import BaseUuidModel, HistoricalRecords
 from edc_search.model_mixins import SearchSlugManager, SearchSlugModelMixin
 from edc_sites.managers import CurrentSiteManager

edc_lab_dashboard/middleware.py

@@ -1,4 +1,5 @@
 from django.conf import settings
+
 from edc_dashboard.middleware_mixins import EdcTemplateMiddlewareMixin
 from edc_lab.constants import SHIPPED
 

edc_lab_dashboard/urls.py

@@ -1,4 +1,5 @@
 from django.urls.conf import path, re_path
+
 from edc_dashboard.url_names import url_names
 
 from .dashboard_urls import dashboard_urls

edc_lab_dashboard/view_mixins/form_action_view_mixin.py

@@ -2,6 +2,7 @@ from typing import Any
 
 from django.urls.base import reverse
 from django.views.generic.base import ContextMixin
+
 from edc_dashboard.url_names import url_names
 
 

edc_lab_dashboard/view_mixins/process_requisition_view_mixin.py

@@ -1,8 +1,8 @@
 import re
 
+from clinicedc_constants import UUID_PATTERN
 from django.apps import apps as django_apps
 
-from edc_constants.constants import UUID_PATTERN
 from edc_lab.lab import Specimen as SpecimenObject
 from edc_lab.site_labs import site_labs
 from edc_label import LabPrintersMixin, add_job_results_to_messages

edc_lab_dashboard/views/action_views/manage_box_item_view.py

@@ -2,6 +2,7 @@ from django.contrib import messages
 from django.core.exceptions import ObjectDoesNotExist
 from django.urls import reverse
 from django.utils.html import format_html
+
 from edc_dashboard.url_names import url_names
 from edc_dashboard.view_mixins import EdcViewMixin
 from edc_lab import SHIPPED

edc_lab_dashboard/views/action_views/receive_view.py

@@ -1,8 +1,8 @@
+from clinicedc_constants import YES
 from django.apps import apps as django_apps
 from django.contrib import messages
 from django.utils import timezone
 
-from edc_constants.constants import YES
 from edc_dashboard.view_mixins import EdcViewMixin
 from edc_lab import Specimen
 from edc_lab.labels import AliquotLabel

edc_lab_dashboard/views/listboard_views/manage_box_listboard_view.py

@@ -2,6 +2,7 @@ from copy import copy
 from typing import Any
 
 from django.urls.base import reverse
+
 from edc_dashboard.url_names import url_names
 
 from .base_box_item_listboard_view import BaseBoxItemListboardView

edc_lab_dashboard/views/listboard_views/pack_listboard_view.py

@@ -1,8 +1,8 @@
 from typing import Any
 
+from clinicedc_constants import OPEN
 from django.apps import apps as django_apps
 
-from edc_constants.constants import OPEN
 from edc_lab.constants import SHIPPED
 from edc_lab.models import Manifest
 

edc_lab_dashboard/views/listboard_views/process_listboard_view.py

@@ -2,11 +2,12 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
+from clinicedc_constants import YES
 from django.apps import apps as django_apps
 from django.urls import reverse
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
-from edc_constants.constants import YES
+
 from edc_dashboard.url_names import url_names
 
 from .requisition_listboard_view import RequisitionListboardView

edc_lab_dashboard/views/listboard_views/receive_listboard_view.py

@@ -2,11 +2,12 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
+from clinicedc_constants import YES
 from django.apps import apps as django_apps
 from django.urls import reverse
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
-from edc_constants.constants import YES
+
 from edc_dashboard.url_names import url_names
 
 from .requisition_listboard_view import RequisitionListboardView

edc_lab_dashboard/views/listboard_views/requisition_listboard_view.py

@@ -2,13 +2,12 @@ from __future__ import annotations
 
 from typing import Any
 
+from clinicedc_constants import YES
 from django.conf import settings
 from django.contrib import messages
 from django.db.models import Q
 from django.utils.html import format_html
 
-from edc_constants.constants import YES
-
 from ..listboard_filters import RequisitionListboardViewFilters
 from .base_listboard_view import BaseListboardView
 

edc_lab_dashboard/views/listboard_views/verify_box_listboard_view.py

@@ -2,6 +2,7 @@ from copy import copy
 from typing import Any
 
 from django.urls import reverse
+
 from edc_dashboard.url_names import url_names
 from edc_lab.constants import SHIPPED
 

edc_lab_results/action_items.py

@@ -1,10 +1,10 @@
+from clinicedc_constants import HIGH_PRIORITY, YES
 from django.apps import apps as django_apps
 from django.conf import settings
 
 from edc_action_item.action import Action
 from edc_action_item.site_action_items import site_action_items
 from edc_adverse_event.constants import AE_INITIAL_ACTION
-from edc_constants.constants import HIGH_PRIORITY, YES
 from edc_visit_schedule.utils import is_baseline
 
 from .constants import (

edc_lab_results/form_validator_mixins/blood_results_fbg_form_validator_mixin.py

@@ -1,8 +1,8 @@
 from typing import Any
 
+from clinicedc_constants import FASTING, YES
 from django import forms
 
-from edc_constants.constants import FASTING, YES
 from edc_glucose.utils import validate_glucose_as_millimoles_per_liter
 
 

edc_lab_results/form_validator_mixins/blood_results_form_validator_mixin.py

@@ -2,7 +2,8 @@ import contextlib
 from collections import namedtuple
 from typing import Any
 
-from edc_constants.constants import NO, NULL_STRING, YES
+from clinicedc_constants import NO, NULL_STRING, YES
+
 from edc_lab import RequisitionPanel
 from edc_lab.form_validators import CrfRequisitionFormValidatorMixin
 from edc_reportable.forms import ReportablesFormValidatorMixin

edc_lab_results/model_mixin_factories/field_attrs.py

@@ -1,11 +1,11 @@
 from __future__ import annotations
 
+from clinicedc_constants import EQ
 from django.core.validators import MinValueValidator
 from django.db import models
 
 from edc_constants.choices import GRADING_SCALE_WITH_NOT_GRADED, YES_NO
 from edc_lab.choices import RESULT_QUANTIFIER
-from edc_lab.constants import EQ
 from edc_reportable.choices import REPORTABLE
 
 

edc_lab_results/model_mixins/electrolytes_model_mixins.py

@@ -1,7 +1,7 @@
+from clinicedc_constants import MILLIGRAMS_PER_DECILITER, MILLIMOLES_PER_LITER
 from django.db import models
 
-from edc_reportable import MILLIMOLES_PER_LITER_DISPLAY
-from edc_reportable.units import MILLIGRAMS_PER_DECILITER, MILLIMOLES_PER_LITER
+from edc_reportable.units import MILLIMOLES_PER_LITER_DISPLAY
 
 from ..model_mixin_factories import reportable_result_model_mixin_factory
 

edc_lab_results/model_mixins/fbc_model_mixins.py

@@ -1,3 +1,11 @@
+from clinicedc_constants import (
+    CELLS_PER_MILLIMETER_CUBED,
+    FEMTOLITERS_PER_CELL,
+    GRAMS_PER_DECILITER,
+    PERCENT,
+    PICOGRAMS_PER_CELL,
+    TEN_X_9_PER_LITER,
+)
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 
@@ -15,14 +23,7 @@ from edc_lab_panel.constants import (
     RBC,
     WBC,
 )
-from edc_reportable import GRAMS_PER_DECILITER, PERCENT
-from edc_reportable.units import (
-    CELLS_PER_MILLIMETER_CUBED,
-    CELLS_PER_MILLIMETER_CUBED_DISPLAY,
-    FEMTOLITERS_PER_CELL,
-    PICOGRAMS_PER_CELL,
-    TEN_X_9_PER_LITER,
-)
+from edc_reportable.units import CELLS_PER_MILLIMETER_CUBED_DISPLAY
 
 from ..model_mixin_factories import reportable_result_model_mixin_factory
 

edc_lab_results/model_mixins/fbg_model_mixin.py

@@ -1,16 +1,11 @@
+from clinicedc_constants import EQ, FASTING, MILLIGRAMS_PER_DECILITER, MILLIMOLES_PER_LITER
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 
 from edc_constants.choices import FASTING_CHOICES, YES_NO
-from edc_constants.constants import FASTING
 from edc_glucose.constants import GLUCOSE_HIGH_READING
 from edc_lab.choices import RESULT_QUANTIFIER
-from edc_lab.constants import EQ
-from edc_reportable import (
-    MILLIGRAMS_PER_DECILITER,
-    MILLIMOLES_PER_LITER,
-    MILLIMOLES_PER_LITER_DISPLAY,
-)
+from edc_reportable.units import MILLIMOLES_PER_LITER_DISPLAY
 
 from ..model_mixin_factories import reportable_result_model_mixin_factory
 

edc_lab_results/model_mixins/glucose_model_mixin.py

@@ -1,18 +1,13 @@
 from typing import Any
 
+from clinicedc_constants import EQ, FASTING, MILLIGRAMS_PER_DECILITER, MILLIMOLES_PER_LITER
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 
 from edc_constants.choices import FASTING_CHOICES, YES_NO
-from edc_constants.constants import FASTING
 from edc_glucose.constants import GLUCOSE_HIGH_READING
 from edc_lab.choices import RESULT_QUANTIFIER
-from edc_lab.constants import EQ
-from edc_reportable import (
-    MILLIGRAMS_PER_DECILITER,
-    MILLIMOLES_PER_LITER,
-    MILLIMOLES_PER_LITER_DISPLAY,
-)
+from edc_reportable.units import MILLIMOLES_PER_LITER_DISPLAY
 
 from ..model_mixin_factories import reportable_result_model_mixin_factory
 

edc_lab_results/model_mixins/insulin_model_mixin.py

@@ -1,9 +1,10 @@
+from clinicedc_constants import MICRO_IU_MILLILITER
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 
 from edc_constants.choices import YES_NO
 from edc_glucose.model_mixin_factories import fasting_model_mixin_factory
-from edc_reportable.units import MICRO_IU_MILLILITER, MICRO_IU_MILLILITER_DISPLAY
+from edc_reportable.units import MICRO_IU_MILLILITER_DISPLAY
 
 from ..model_mixin_factories import reportable_result_model_mixin_factory
 

edc_lab_results/model_mixins/lft_model_mixins.py

@@ -1,14 +1,15 @@
-from django.core.validators import MaxValueValidator, MinValueValidator
-from django.db import models
-
-from edc_reportable import GRAMS_PER_DECILITER, MICROMOLES_PER_LITER
-from edc_reportable.units import (
+from clinicedc_constants import (
+    GRAMS_PER_DECILITER,
     GRAMS_PER_LITER,
     IU_LITER,
-    IU_LITER_DISPLAY,
+    MICROMOLES_PER_LITER,
     MILLIGRAMS_PER_DECILITER,
     MILLIGRAMS_PER_LITER,
 )
+from django.core.validators import MaxValueValidator, MinValueValidator
+from django.db import models
+
+from edc_reportable.units import IU_LITER_DISPLAY
 
 from ..model_mixin_factories import reportable_result_model_mixin_factory
 

edc_lab_results/model_mixins/lipid_model_mixins.py

@@ -1,8 +1,7 @@
+from clinicedc_constants import MILLIMOLES_PER_LITER
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 
-from edc_reportable.units import MILLIMOLES_PER_LITER
-
 from ..model_mixin_factories import reportable_result_model_mixin_factory
 
 

edc_lab_results/model_mixins/proteinuria_model_mixin.py

@@ -1,7 +1,6 @@
+from clinicedc_constants import PLUS
 from django.db import models
 
-from edc_reportable.units import PLUS
-
 from ..model_mixin_factories import reportable_result_model_mixin_factory
 
 

edc_lab_results/model_mixins/rft_model_mixins.py

@@ -1,10 +1,12 @@
+from clinicedc_constants import (
+    MICROMOLES_PER_LITER,
+    MILLIGRAMS_PER_DECILITER,
+    MILLIMOLES_PER_LITER,
+)
 from django.db import models
 
 from edc_reportable.units import (
-    MICROMOLES_PER_LITER,
     MICROMOLES_PER_LITER_DISPLAY,
-    MILLIGRAMS_PER_DECILITER,
-    MILLIMOLES_PER_LITER,
     MILLIMOLES_PER_LITER_DISPLAY,
 )
 

edc_listboard/views/screen/screening_listboard_view.py

@@ -1,6 +1,6 @@
+from clinicedc_constants import ABNORMAL
 from django.db.models import Q
 
-from edc_constants.constants import ABNORMAL
 from edc_dashboard.view_mixins import EdcViewMixin
 from edc_navbar import NavbarViewMixin
 from edc_screening.utils import get_subject_screening_model

edc_locator/action_items.py

@@ -1,6 +1,7 @@
+from clinicedc_constants import HIGH_PRIORITY
+
 from edc_action_item.action import Action
 from edc_action_item.site_action_items import site_action_items
-from edc_constants.constants import HIGH_PRIORITY
 from edc_locator.utils import get_locator_model
 
 SUBJECT_LOCATOR_ACTION = "submit-subject-locator"

edc_locator/forms/subject_locator_form_validator.py

@@ -1,6 +1,6 @@
+from clinicedc_constants import NO, YES
 from django import forms
 
-from edc_constants.constants import NO, YES
 from edc_form_validators.form_validator import FormValidator
 
 

edc_locator/modeladmin_mixins.py

@@ -1,10 +1,10 @@
+from clinicedc_constants import NO, YES
 from django.contrib import admin
 from django.template.loader import render_to_string
 from django.utils import timezone
 from django_audit_fields.admin import audit_fieldset_tuple
 
 from edc_consent import site_consents
-from edc_constants.constants import NO, YES
 from edc_model_admin.mixins import ModelAdminProtectPiiMixin
 from edc_sites import site_sites
 from edc_utils.age import age

edc_ltfu/action_items.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 edc_offstudy.constants import END_OF_STUDY_ACTION
 from edc_visit_tracking.constants import VISIT_MISSED_ACTION
 

edc_ltfu/choices.py

@@ -1,4 +1,4 @@
-from edc_constants.constants import OTHER
+from clinicedc_constants import OTHER
 
 LTFU_CHOICES = (
     ("unknown_address", "Changed to an unknown address"),

edc_ltfu/constants.py

@@ -1,3 +1 @@
-LOST_TO_FOLLOWUP = "LTFU"
-LTFU = "LTFU"
 LTFU_ACTION = "submit_loss_to_followup"

edc_ltfu/forms/ltfu_form_validator.py

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

edc_ltfu/forms/ltfu_form_validator_mixin.py

@@ -1,10 +1,10 @@
+from clinicedc_constants import LTFU
 from django import forms
 from django.apps import apps as django_apps
 from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
 
 from edc_form_validators import FormValidator
 
-from ..constants import LTFU
 from ..utils import get_ltfu_model_name
 
 

edc_ltfu/modelform_mixins.py

@@ -1,16 +1,13 @@
+from clinicedc_constants import LTFU, NO, YES
 from django import forms
 from django.apps import apps as django_apps
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
-
-from edc_constants.constants import NO, YES
 from edc_form_validators import FormValidator
 from edc_utils.text import convert_php_dateformat
 from edc_visit_tracking.constants import MISSED_VISIT
 from edc_visit_tracking.utils import get_related_visit_model_cls
 
-from .constants import LOST_TO_FOLLOWUP
-
 
 class LossToFollowupFormValidator(FormValidator):
     def clean(self):
@@ -53,7 +50,7 @@ class RequiresLtfuFormValidatorMixin:
 
     ltfu_model = None  # "inte_prn.losstofollowup"
     ltfu_date_field = None  # "ltfu_date"
-    ltfu_reason = LOST_TO_FOLLOWUP
+    ltfu_reason = LTFU
 
     @property
     def ltfu_model_cls(self):

edc_metadata/admin/modeladmin_mixins.py

@@ -8,8 +8,12 @@ from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 from django_audit_fields import ModelAdminAuditFieldsMixin, audit_fieldset_tuple
 from django_revision.modeladmin_mixin import ModelAdminRevisionMixin
+from rangefilter.filters import DateRangeFilterBuilder
+
 from edc_appointment.utils import get_appointment_model_cls
 from edc_dashboard.url_names import url_names
+from edc_metadata import KEYED, REQUIRED
+from edc_metadata.admin.list_filters import CreatedListFilter
 from edc_model_admin.mixins import (
     ModelAdminInstitutionMixin,
     ModelAdminNextUrlRedirectMixin,
@@ -18,10 +22,6 @@ from edc_model_admin.mixins import (
     TemplatesModelAdminMixin,
 )
 from edc_sites.admin import SiteModelAdminMixin
-from rangefilter.filters import DateRangeFilterBuilder
-
-from edc_metadata import KEYED, REQUIRED
-from edc_metadata.admin.list_filters import CreatedListFilter
 
 
 class MetadataModelAdminMixin(

edc_model/choices.py

@@ -1,4 +1,4 @@
-from edc_constants.constants import CLOSED, OPEN
+from clinicedc_constants import CLOSED, OPEN
 
 REPORT_STATUS = (
     (OPEN, "Open. Some information is still pending."),

edc_model/models/fields/date_estimated.py

@@ -1,8 +1,8 @@
+from clinicedc_constants import NOT_APPLICABLE
 from django.db.models.fields import CharField
 from django.utils.translation import gettext as _
 
 from edc_constants.choices import DATE_ESTIMATED, DATE_ESTIMATED_NA
-from edc_constants.constants import NOT_APPLICABLE
 
 
 class IsDateEstimatedField(CharField):

edc_model_admin/context_processors.py

@@ -1,6 +1,6 @@
+from clinicedc_constants import LIVE, TEST
 from django.conf import settings
 
-from edc_constants.constants import LIVE, TEST
 from edc_protocol.research_protocol_config import ResearchProtocolConfig
 
 

edc_model_admin/list_filters/future_date_list_filter.py

@@ -1,12 +1,6 @@
 from __future__ import annotations
 
-from dateutil.relativedelta import MO, relativedelta
-from django.contrib.admin import SimpleListFilter
-from django.db.models import QuerySet
-from django.utils import timezone
-from django.utils.translation import gettext as _
-
-from edc_constants.constants import (
+from clinicedc_constants import (
     FUTURE_DATE,
     IS_NULL,
     LAST_WEEK,
@@ -17,6 +11,11 @@ from edc_constants.constants import (
     TODAY,
     TOMORROW,
 )
+from dateutil.relativedelta import MO, relativedelta
+from django.contrib.admin import SimpleListFilter
+from django.db.models import QuerySet
+from django.utils import timezone
+from django.utils.translation import gettext as _
 
 
 class FutureDateListFilter(SimpleListFilter):

edc_model_admin/list_filters/list_field_with_other_list_filter.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
+from clinicedc_constants import OTHER
 from django.contrib.admin import SimpleListFilter
 from django.core.exceptions import FieldError
 from django.db.models import Count, Q
 
-from edc_constants.constants import OTHER
 from edc_sites.site import sites
 
 

edc_model_admin/list_filters/past_date_list_filter.py

@@ -1,12 +1,6 @@
 from __future__ import annotations
 
-from dateutil.relativedelta import MO, relativedelta
-from django.contrib.admin import SimpleListFilter
-from django.db.models import QuerySet
-from django.utils import timezone
-from django.utils.translation import gettext as _
-
-from edc_constants.constants import (
+from clinicedc_constants import (
     FUTURE_DATE,
     IS_NULL,
     LAST_MONTH,
@@ -18,6 +12,11 @@ from edc_constants.constants import (
     TODAY,
     YESTERDAY,
 )
+from dateutil.relativedelta import MO, relativedelta
+from django.contrib.admin import SimpleListFilter
+from django.db.models import QuerySet
+from django.utils import timezone
+from django.utils.translation import gettext as _
 
 
 class PastDateListFilter(SimpleListFilter):

edc_model_admin/mixins/model_admin_redirect_on_delete_mixin.py

@@ -6,6 +6,7 @@ from django.contrib import messages
 from django.http.response import HttpResponseRedirect
 from django.urls import reverse
 from django.utils.encoding import force_str
+
 from edc_dashboard.url_names import InvalidDashboardUrlName, url_names
 
 

edc_model_admin/templatetags/edc_admin_modify.py

@@ -4,6 +4,7 @@ from typing import TYPE_CHECKING
 from urllib.parse import urlencode
 from warnings import warn
 
+from clinicedc_constants import NO, YES
 from django import template
 from django.contrib.admin.templatetags.admin_modify import (
     submit_row as django_submit_row,
@@ -12,7 +13,6 @@ from django.urls.base import reverse
 from django.urls.exceptions import NoReverseMatch
 from django_revision.revision import site_revision
 
-from edc_constants.constants import NO, YES
 from edc_model_admin.utils import get_next_url
 from edc_protocol.research_protocol_config import ResearchProtocolConfig
 

edc_model_fields/fields/date_estimated.py

@@ -1,8 +1,8 @@
+from clinicedc_constants import NOT_APPLICABLE
 from django.db.models.fields import CharField
 from django.utils.translation import gettext as _
 
 from edc_constants.choices import DATE_ESTIMATED, DATE_ESTIMATED_NA
-from edc_constants.constants import NOT_APPLICABLE
 
 
 class IsDateEstimatedField(CharField):

edc_model_to_dataframe/model_to_dataframe.py

@@ -5,6 +5,7 @@ from copy import copy
 
 import numpy as np
 import pandas as pd
+from clinicedc_constants import NULL_STRING
 from django.apps import apps as django_apps
 from django.contrib.sites.models import Site
 from django.core.exceptions import FieldError
@@ -13,7 +14,6 @@ from django.db.models import QuerySet
 from django_crypto_fields.utils import get_encrypted_fields, has_encrypted_fields
 from django_pandas.io import read_frame
 
-from edc_constants.constants import NULL_STRING
 from edc_lab.models import Panel
 from edc_list_data.model_mixins import ListModelMixin, ListUuidModelMixin
 

edc_navbar/navbar_item.py

@@ -6,6 +6,7 @@ from typing import TYPE_CHECKING
 from django.core.management.color import color_style
 from django.urls import NoReverseMatch
 from django.urls.base import reverse
+
 from edc_dashboard.url_names import InvalidDashboardUrlName, url_names
 
 if TYPE_CHECKING: