meta-edc 1.2.7__py3-none-any.whl → 1.2.9__py3-none-any.whl

meta_screening/model_mixins/part_two_fields_model_mixin.py

@@ -1,7 +1,7 @@
+from clinicedc_constants import NO, NOT_APPLICABLE
 from django.contrib import admin
 from django.db import models
 from edc_constants.choices import POS_NEG_NA, YES_NO, YES_NO_NA
-from edc_constants.constants import NO, NOT_APPLICABLE
 
 from ..choices import YES_NO_NOT_ELIGIBLE, YES_PENDING_NA
 from ..constants import PREG_YES_NO_NA

meta_screening/models/proxy_models.py

@@ -1,4 +1,4 @@
-from edc_constants.constants import NO, TBD, YES
+from clinicedc_constants import NO, TBD, YES
 
 from meta_consent.consents import consent_v1
 

meta_screening/models/signals.py

@@ -1,6 +1,6 @@
+from clinicedc_constants import NOT_APPLICABLE, NULL_STRING
 from django.db.models.signals import post_save
 from django.dispatch import receiver
-from edc_constants.constants import NOT_APPLICABLE, NULL_STRING
 
 from .proxy_models import ScreeningPartThree
 

meta_screening/models/subject_screening.py

@@ -1,8 +1,8 @@
+from clinicedc_constants import PENDING, QUESTION_RETIRED
 from django.contrib.sites.models import Site
 from django.core.validators import RegexValidator
 from django.db import models
 from django_crypto_fields.fields import EncryptedCharField
-from edc_constants.constants import PENDING, QUESTION_RETIRED
 from edc_model.models import BaseUuidModel
 from edc_screening.model_mixins import ScreeningModelMixin
 from edc_screening.screening_identifier import (

meta_subject/action_items.py

@@ -1,9 +1,9 @@
+from clinicedc_constants import GRADE3, GRADE4, HIGH_PRIORITY, NEW, NONE, POS, YES
 from django.apps import apps as django_apps
 from edc_action_item.action import Action
 from edc_action_item.action_with_notification import ActionWithNotification
 from edc_action_item.site_action_items import AlreadyRegistered, site_action_items
 from edc_adverse_event.constants import AE_INITIAL_ACTION
-from edc_constants.constants import GRADE3, GRADE4, HIGH_PRIORITY, NEW, NONE, POS, YES
 from edc_egfr.constants import EGFR_DROP_NOTIFICATION_ACTION
 from edc_lab_results.action_items import (
     BloodResultsFbcAction,

meta_subject/admin/followup_examination_admin.py

@@ -1,8 +1,8 @@
+from clinicedc_constants import NONE, YES
 from django.contrib import admin
 from django_audit_fields.admin import audit_fieldset_tuple
 from edc_action_item.fieldsets import action_fieldset_tuple
 from edc_action_item.modeladmin_mixins import ActionItemModelAdminMixin
-from edc_constants.constants import NONE, YES
 from edc_crf.fieldset import crf_status_fieldset
 from edc_form_label.form_label_modeladmin_mixin import FormLabelModelAdminMixin
 from edc_model_admin.history import SimpleHistoryAdmin

meta_subject/admin/hiv_exit_review_admin.py

@@ -47,3 +47,9 @@ class HivExitReviewAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
         crf_status_fieldset,
         audit_fieldset_tuple,
     )
+
+    list_filter = ("available",)
+
+    radio_fields = {  # noqa: RUF012
+        "available": admin.VERTICAL,
+    }

meta_subject/admin/list_filters.py

@@ -1,6 +1,6 @@
+from clinicedc_constants import HIGH, NORMAL
 from django.contrib.admin import SimpleListFilter
 from django.db.models import Q
-from edc_constants.constants import HIGH, NORMAL
 from edc_model_admin.list_filters import FutureDateListFilter, PastDateListFilter
 
 from meta_subject.models import Glucose, GlucoseFbg

meta_subject/admin/subject_requisition_admin.py

@@ -1,8 +1,8 @@
 from urllib.parse import parse_qs, urlsplit
 
+from clinicedc_constants import YES
 from django.contrib import admin
 from django_audit_fields.admin import audit_fieldset_tuple
-from edc_constants.constants import YES
 from edc_lab.admin import (
     RequisitionAdminMixin,
     requisition_fieldset,

meta_subject/baker_recipes.py

@@ -1,5 +1,5 @@
+from clinicedc_constants import NO, NOT_APPLICABLE, NULL_STRING, PATIENT, POS, YES
 from django.utils import timezone
-from edc_constants.constants import NO, NOT_APPLICABLE, NULL_STRING, PATIENT, POS, YES
 from edc_visit_tracking.constants import SCHEDULED
 from faker import Faker
 from model_bakery.recipe import Recipe

meta_subject/choices.py

@@ -1,5 +1,4 @@
-from django.utils.translation import gettext_lazy as _
-from edc_constants.constants import (
+from clinicedc_constants import (
     ABSENT,
     CLOSED,
     DEAD,
@@ -17,6 +16,7 @@ from edc_constants.constants import (
     PRESENT_WITH_REINFORCEMENT,
     YES,
 )
+from django.utils.translation import gettext_lazy as _
 from edc_visit_tracking.constants import MISSED_VISIT, SCHEDULED, UNSCHEDULED
 
 from meta_ae.choices import INFORMANT_RELATIONSHIP

meta_subject/form_validators/delivery_form_validator.py

@@ -1,6 +1,6 @@
+from clinicedc_constants import NO, OTHER
 from django import forms
 from django.core.exceptions import ObjectDoesNotExist
-from edc_constants.constants import NO, OTHER
 from edc_crf.crf_form_validator import CrfFormValidator
 from edc_form_validators import INVALID_ERROR
 from edc_utils import formatted_date

meta_subject/form_validators/dm_followup_form_validator.py

@@ -1,6 +1,6 @@
+from clinicedc_constants import NO, OTHER, YES
 from django import forms
 from django.core.exceptions import ObjectDoesNotExist
-from edc_constants.constants import NO, OTHER, YES
 from edc_crf.crf_form_validator import CrfFormValidator
 from edc_form_validators import INVALID_ERROR
 from edc_utils import formatted_date

meta_subject/form_validators/egfr_drop_notification_form_validator.py

@@ -1,4 +1,4 @@
-from edc_constants.constants import CLOSED, NEW, OPEN
+from clinicedc_constants import CLOSED, NEW, OPEN
 from edc_crf.crf_form_validator import CrfFormValidator
 from edc_form_validators import INVALID_ERROR
 

meta_subject/form_validators/followup_examination_form_validator.py

@@ -1,5 +1,5 @@
+from clinicedc_constants import NONE, OTHER, YES
 from django import forms
-from edc_constants.constants import NONE, OTHER, YES
 from edc_crf.crf_form_validator import CrfFormValidator
 
 

meta_subject/form_validators/glucose_fbg_form_validator.py

@@ -1,11 +1,10 @@
 from decimal import Decimal
 
-from edc_constants.constants import NO, PENDING, YES
+from clinicedc_constants import MILLIMOLES_PER_LITER, NO, PENDING, YES
+from clinicedc_utils import convert_units
 from edc_crf.crf_form_validator import CrfFormValidator
 from edc_form_validators import INVALID_ERROR
 from edc_glucose.utils import validate_glucose_as_millimoles_per_liter
-from edc_reportable import MILLIMOLES_PER_LITER
-from edc_reportable.utils import convert_units
 
 from meta_reports.models import GlucoseSummary
 

meta_subject/form_validators/glucose_form_validator.py

@@ -1,4 +1,4 @@
-from edc_constants.constants import PENDING
+from clinicedc_constants import PENDING
 from edc_crf.crf_form_validator import CrfFormValidator
 from edc_glucose.form_validators import FbgOgttFormValidatorMixin
 

meta_subject/form_validators/hiv_exit_review_form_validator.py

@@ -1,4 +1,4 @@
-from edc_constants.constants import NO, OTHER
+from clinicedc_constants import NO, OTHER
 from edc_crf.crf_form_validator import CrfFormValidator
 
 

meta_subject/form_validators/mixins.py

@@ -1,6 +1,6 @@
 from decimal import Decimal
 
-from edc_constants.constants import NO, PENDING, YES
+from clinicedc_constants import NO, PENDING, YES
 from edc_form_validators import INVALID_ERROR
 
 from meta_reports.models import GlucoseSummary

meta_subject/forms/followup_vitals_form.py

@@ -1,5 +1,5 @@
+from clinicedc_constants import NO, YES
 from django import forms
-from edc_constants.constants import NO, YES
 from edc_crf.crf_form_validator import CrfFormValidator
 from edc_crf.modelform_mixins import CrfModelFormMixin
 from edc_visit_schedule.constants import MONTH36, MONTH48

meta_subject/forms/hepatitis_test_form.py

@@ -1,5 +1,5 @@
+from clinicedc_constants import YES
 from django import forms
-from edc_constants.constants import YES
 from edc_crf.crf_form_validator import CrfFormValidator
 from edc_crf.modelform_mixins import CrfModelFormMixin
 

meta_subject/forms/mixins.py

@@ -1,4 +1,4 @@
-from edc_constants.constants import NO, OTHER, YES
+from clinicedc_constants import NO, OTHER, YES
 
 
 class ArvHistoryFormValidatorMixin:

meta_subject/forms/other_arv_regimens_form.py

@@ -1,5 +1,5 @@
+from clinicedc_constants import YES
 from django import forms
-from edc_constants.constants import YES
 from edc_crf.crf_form_validator import CrfFormValidator
 from edc_crf.modelform_mixins import CrfModelFormMixin
 from edc_model_form.mixins import InlineModelFormMixin

meta_subject/forms/patient_history_form.py

@@ -1,5 +1,5 @@
+from clinicedc_constants import NO, NONE, OTHER, YES
 from django import forms
-from edc_constants.constants import NO, NONE, OTHER, YES
 from edc_crf.crf_form_validator import CrfFormValidator
 from edc_crf.modelform_mixins import CrfModelFormMixin
 

meta_subject/forms/physical_exam_form.py

@@ -1,5 +1,5 @@
+from clinicedc_constants import YES
 from django import forms
-from edc_constants.constants import YES
 from edc_crf.crf_form_validator import CrfFormValidator
 from edc_crf.modelform_mixins import CrfModelFormMixin
 

meta_subject/forms/pregnancy_update_form.py

@@ -1,5 +1,5 @@
+from clinicedc_constants import YES
 from django import forms
-from edc_constants.constants import YES
 from edc_crf.crf_form_validator import CrfFormValidator
 from edc_crf.modelform_mixins import CrfModelFormMixin
 

meta_subject/forms/subject_visit_missed_form.py

@@ -1,5 +1,5 @@
+from clinicedc_constants import NO, NOT_APPLICABLE, OTHER, YES
 from django import forms
-from edc_constants.constants import NO, NOT_APPLICABLE, OTHER, YES
 from edc_crf.crf_form_validator import CrfFormValidator
 from edc_crf.modelform_mixins import CrfModelFormMixin
 from edc_form_validators import INVALID_ERROR

meta_subject/forms/urine_dipstick_test_form.py

@@ -1,5 +1,5 @@
+from clinicedc_constants import NO, YES
 from django import forms
-from edc_constants.constants import NO, YES
 from edc_crf.crf_form_validator import CrfFormValidator
 from edc_crf.modelform_mixins import CrfModelFormMixin
 

meta_subject/forms/urine_pregnancy_form.py

@@ -1,6 +1,6 @@
+from clinicedc_constants import NO, YES
 from django import forms
 from edc_action_item.forms import ActionItemCrfFormMixin
-from edc_constants.constants import NO, YES
 from edc_crf.crf_form_validator import CrfFormValidator
 from edc_crf.modelform_mixins import CrfModelFormMixin
 from edc_form_validators import INVALID_ERROR

meta_subject/metadata_rules/predicates.py

@@ -1,10 +1,10 @@
 from datetime import datetime
 from zoneinfo import ZoneInfo
 
+from clinicedc_constants import YES
 from django.apps import apps as django_apps
 from django.core.exceptions import ObjectDoesNotExist
 from edc_appointment.constants import NEW_APPT
-from edc_constants.constants import YES
 from edc_lab_panel.panels import hba1c_panel, insulin_panel
 from edc_metadata.metadata_rules import PersistantSingletonMixin
 from edc_sites.site import sites

meta_subject/migrations/0128_auto_20220720_0055.py

@@ -2,7 +2,7 @@
 
 from django.db import migrations
 from django.db.models import F
-from edc_reportable import PERCENT
+from clinicedc_constants import PERCENT
 
 
 def update_new_egfr_drop_field(apps, schema_editor):

meta_subject/migrations/0131_auto_20220722_0411.py

@@ -2,7 +2,7 @@
 from django.core.exceptions import ObjectDoesNotExist
 from django.db import migrations
 from edc_action_item.identifiers import ActionIdentifier
-from edc_constants.constants import CLOSED, HIGH_PRIORITY
+from clinicedc_constants import CLOSED, HIGH_PRIORITY
 from tqdm import tqdm
 
 from meta_subject.constants import MISSED_VISIT_ACTION

meta_subject/migrations/0199_auto_20240516_0247.py

@@ -1,7 +1,7 @@
 # Generated by Django 4.2.11 on 2024-05-15 23:47
 
 from django.db import migrations
-from edc_constants.constants import YES
+from clinicedc_constants import YES
 
 
 def update_fasting_duration(apps, schema_editor):

meta_subject/migrations/0212_auto_20240827_2222.py

@@ -2,7 +2,7 @@
 
 from django.db import migrations
 from django.db.migrations import RunPython
-from edc_constants.constants import NO, YES
+from clinicedc_constants import NO, YES
 
 
 def update_old_fasting_choices(apps, schema_editor):

meta_subject/model_mixins/arv_review_model_mixin.py

@@ -1,8 +1,8 @@
+from clinicedc_constants import COPIES_PER_MILLILITER, NULL_STRING
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
-from edc_constants.constants import NULL_STRING
 from edc_model.models import OtherCharField
-from edc_reportable import CELLS_PER_MILLIMETER_CUBED_DISPLAY, COPIES_PER_MILLILITER
+from edc_reportable.units import CELLS_PER_MILLIMETER_CUBED_DISPLAY
 
 from meta_lists.models import ArvRegimens
 

meta_subject/model_mixins/vitals_fields_model_mixin.py

@@ -1,7 +1,7 @@
+from clinicedc_constants import NO
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from edc_constants.choices import YES_NO
-from edc_constants.constants import NO
 from edc_vitals.models import WeightField
 
 

meta_subject/models/delivery.py

@@ -1,12 +1,12 @@
 # TODO: urine_bhcg form (probably not necessary)
 # TODO: if pos, take of study drug and estimate
 #  delivery date for the pregnancy outcomes form. See Form 25/26
+from clinicedc_constants import NOT_APPLICABLE, PATIENT, YES
 from django.apps import apps as django_apps
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from django_crypto_fields.fields import EncryptedTextField
 from edc_constants.choices import YES_NO, YES_NO_NA
-from edc_constants.constants import NOT_APPLICABLE, PATIENT, YES
 from edc_model.models import BaseUuidModel
 from edc_model.validators import datetime_not_future
 from edc_model_fields.fields import OtherCharField

meta_subject/models/diabetes/dm_endpoint.py

@@ -1,6 +1,6 @@
+from clinicedc_constants import QUESTION_RETIRED
 from django.db import models
 from edc_constants.choices import YES_NO, YES_NO_RETIRED
-from edc_constants.constants import QUESTION_RETIRED
 from edc_model.models import BaseUuidModel
 from edc_model_fields.fields import OtherCharField
 

meta_subject/models/diabetes/dm_followup.py

@@ -1,10 +1,10 @@
+from clinicedc_constants import NOT_APPLICABLE, QUESTION_RETIRED
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from django.utils.safestring import mark_safe
 from edc_action_item.models import ActionItem
 from edc_adherence.choices import MISSED_PILLS
 from edc_constants.choices import YES_NO, YES_NO_NA
-from edc_constants.constants import NOT_APPLICABLE, QUESTION_RETIRED
 from edc_model.models import BaseUuidModel
 from edc_model_fields.fields import OtherCharField
 

meta_subject/models/followup_examination.py

@@ -1,8 +1,8 @@
+from clinicedc_constants import NOT_APPLICABLE
 from django.db import models
 from django.db.models import PROTECT
 from django.utils.safestring import mark_safe
 from edc_constants.choices import YES_NO, YES_NO_NA, YES_NO_NOT_EVALUATED
-from edc_constants.constants import NOT_APPLICABLE
 from edc_model.models import BaseUuidModel
 from edc_model_fields.fields import OtherCharField
 

meta_subject/models/glucose.py

@@ -1,6 +1,6 @@
+from clinicedc_constants import NOT_APPLICABLE
 from django.db import models
 from edc_constants.choices import YES_NO
-from edc_constants.constants import NOT_APPLICABLE
 from edc_glucose.model_mixin_factories import (
     fasting_model_mixin_factory,
     fbg_model_mixin_factory,

meta_subject/models/glucose_fbg.py

@@ -1,6 +1,6 @@
+from clinicedc_constants import NO, NOT_APPLICABLE
 from django.db import models
 from edc_constants.choices import YES_NO
-from edc_constants.constants import NO, NOT_APPLICABLE
 from edc_glucose.model_mixin_factories import (
     fasting_model_mixin_factory,
     fbg_model_mixin_factory,

meta_subject/models/health_economics/health_economics.py

@@ -1,7 +1,7 @@
+from clinicedc_constants import NOT_APPLICABLE
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from edc_constants.choices import YES_NO, YES_NO_NA
-from edc_constants.constants import NOT_APPLICABLE
 from edc_model.models import BaseUuidModel
 
 from ...choices import (

meta_subject/models/health_economics/health_economics_update.py

@@ -1,8 +1,8 @@
+from clinicedc_constants import NOT_APPLICABLE
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from django.utils.translation import gettext as _
 from edc_constants.choices import YES_NO
-from edc_constants.constants import NOT_APPLICABLE
 from edc_crf.model_mixins import SingletonCrfModelMixin
 from edc_he.choices import RELATIONSHIP_CHOICES, STATUS
 from edc_he.model_mixin_factories import income_model_mixin_factory

meta_subject/models/hiv_exit_review.py

@@ -1,6 +1,6 @@
+from clinicedc_constants import NULL_STRING, YES
 from django.db import models
 from edc_constants.choices import YES_NO
-from edc_constants.constants import NULL_STRING, YES
 from edc_crf.model_mixins import SingletonCrfModelMixin
 from edc_model.models import BaseUuidModel
 

meta_subject/models/patient_history.py

@@ -1,7 +1,7 @@
+from clinicedc_constants import NOT_APPLICABLE
 from django.db import models
 from django.utils.safestring import mark_safe
 from edc_constants.choices import YES_NO, YES_NO_NA
-from edc_constants.constants import NOT_APPLICABLE
 from edc_model.models import BaseUuidModel
 from edc_model_fields.fields import OtherCharField
 

meta_subject/models/subject_visit.py

@@ -1,7 +1,7 @@
+from clinicedc_constants import NO, NOT_APPLICABLE
 from django.db import models
 from edc_consent.model_mixins import RequiresConsentFieldsModelMixin
 from edc_constants.choices import YES_NO
-from edc_constants.constants import NO, NOT_APPLICABLE
 from edc_metadata.model_mixins.creates import CreatesMetadataModelMixin
 from edc_model.models import BaseUuidModel, HistoricalRecords
 from edc_sites.model_mixins import SiteModelMixin

meta_subject/models/urine_dipstick_test.py

@@ -1,6 +1,6 @@
+from clinicedc_constants import NOT_APPLICABLE
 from django.db import models
 from edc_constants.choices import PRESENT_ABSENT_NA, YES_NO
-from edc_constants.constants import NOT_APPLICABLE
 from edc_model import models as edc_models
 
 from ..model_mixins import CrfModelMixin