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

edc_consent/consent_definition_extension.py

@@ -4,10 +4,10 @@ from dataclasses import KW_ONLY, dataclass, field
 from datetime import datetime
 from typing import TYPE_CHECKING
 
+from clinicedc_constants import YES
 from django.apps import apps as django_apps
 from django.core.exceptions import ObjectDoesNotExist
 
-from edc_constants.constants import YES
 from edc_protocol.research_protocol_config import ResearchProtocolConfig
 from edc_sites import site_sites
 from edc_utils import formatted_date

edc_consent/field_mixins/citizen_fields_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 CitizenFieldsMixin(models.Model):
@@ -13,7 +13,7 @@ class CitizenFieldsMixin(models.Model):
 
     legal_marriage = models.CharField(
         verbose_name=(
-            "If not a citizen, is the participant legally " "married to a Botswana citizen?"
+            "If not a citizen, is the participant legally married to a Botswana citizen?"
         ),
         max_length=3,
         choices=YES_NO_NA,
@@ -25,7 +25,7 @@ class CitizenFieldsMixin(models.Model):
 
     marriage_certificate = models.CharField(
         verbose_name=(
-            "[Interviewer] Has the participant produced " "the marriage certificate as proof? "
+            "[Interviewer] Has the participant produced the marriage certificate as proof? "
         ),
         max_length=3,
         choices=YES_NO_NA,

edc_consent/model_mixins/consent_model_mixin.py

@@ -1,10 +1,10 @@
 from uuid import uuid4
 
+from clinicedc_constants import OPEN
 from django.db import models
 from django.db.models import UniqueConstraint
 from django_crypto_fields.fields import EncryptedTextField
 
-from edc_constants.constants import OPEN
 from edc_data_manager.get_data_queries import get_data_queries
 from edc_model.validators import datetime_not_future
 from edc_protocol.validators import datetime_not_before_study_start

edc_consent/modelform_mixins/consent_modelform_mixin/consent_modelform_validation_mixin.py

@@ -3,10 +3,10 @@ from __future__ import annotations
 from datetime import datetime
 from typing import TYPE_CHECKING, Any
 
+from clinicedc_constants import NO, YES
 from dateutil.relativedelta import relativedelta
 from django import forms
 
-from edc_constants.constants import NO, YES
 from edc_model_form.utils import get_field_or_raise
 from edc_utils.age import AgeValueError, age, formatted_age
 

edc_consent/modelform_mixins/consent_modelform_mixin/review_fields_modelform_mixin.py

@@ -1,7 +1,6 @@
+from clinicedc_constants import NO, YES
 from django import forms
 
-from edc_constants.constants import NO, YES
-
 ___all__ = ["ReviewFieldsModelFormMixin"]
 
 

edc_consent/validators.py

@@ -1,10 +1,9 @@
 import re
 
+from clinicedc_constants import DECLINED, MALE, NEG, NO, POS, UNKNOWN, YES
 from django.core.exceptions import ValidationError
 from django.utils.deconstruct import deconstructible
 
-from edc_constants.constants import DECLINED, MALE, NEG, NO, POS, UNKNOWN, YES
-
 
 @deconstructible
 class SubjectTypeValidator:
@@ -14,7 +13,7 @@ class SubjectTypeValidator:
     def __call__(self, value):
         if value not in self.subject_types:
             raise ValidationError(
-                "Undefined subject type. Expected one of '{subject_types}'. " "Got '{value}'.",
+                "Undefined subject type. Expected one of '{subject_types}'. Got '{value}'.",
                 params={
                     "subject_types": "' or '".join(self.subject_types),
                     "value": value,
@@ -74,20 +73,16 @@ def eligible_if_male(value):
 
 def eligible_if_negative(value):
     if value != NEG:
-        raise ValidationError(
-            "Participant must be HIV Negative." "Participant is not eligible."
-        )
+        raise ValidationError("Participant must be HIV Negative.Participant is not eligible.")
 
 
 def eligible_if_positive(value):
     if value != POS:
-        raise ValidationError(
-            "Participant must be HIV Positive." "Participant is not eligible."
-        )
+        raise ValidationError("Participant must be HIV Positive.Participant is not eligible.")
 
 
 def eligible_not_positive(value):
     if value == POS:
         raise ValidationError(
-            "Participant must be HIV Negative / Unknown." "Participant is not eligible."
+            "Participant must be HIV Negative / Unknown.Participant is not eligible."
         )

edc_constants/__init__.py

@@ -1,3 +0,0 @@
-# from importlib.metadata import version
-#
-# __version__ = version("edc_constants")

edc_constants/choices.py

@@ -1,6 +1,4 @@
-from django.utils.translation import gettext_lazy as _
-
-from .constants import (
+from clinicedc_constants import (
     ABNORMAL,
     ABSENT,
     AFTERNOON,
@@ -68,6 +66,7 @@ from .constants import (
     WEEKENDS,
     YES,
 )
+from django.utils.translation import gettext_lazy as _
 
 ACU_EST = (
     ("Acute", _("Acute")),

edc_constants/context_processor.py

@@ -1,6 +1,4 @@
-from django.conf import settings
-
-from .constants import (
+from clinicedc_constants import (
     ABNORMAL,
     CANCELLED,
     CLOSED,
@@ -20,6 +18,7 @@ from .constants import (
     UNKNOWN,
     YES,
 )
+from django.conf import settings
 
 
 def constants(request) -> dict:

edc_constants/utils.py

@@ -1,4 +1,4 @@
-from .constants import QUESTION_RETIRED
+from clinicedc_constants import QUESTION_RETIRED
 
 
 def get_display(choices, label) -> str | None:
@@ -13,5 +13,4 @@ def get_display(choices, label) -> str | None:
 def append_question_retired_choice(choices) -> tuple[tuple[str, str], ...]:
     choices = list(choices)
     choices.append((QUESTION_RETIRED, QUESTION_RETIRED))
-    choices = tuple(choices)
-    return choices
+    return tuple(choices)

edc_crf/model_mixins/crf_status_model_mixin.py

@@ -1,9 +1,9 @@
+from clinicedc_constants import INCOMPLETE
 from django.conf import settings
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
 from edc_constants.choices import DOCUMENT_STATUS
-from edc_constants.constants import INCOMPLETE
 
 from ..update_crf_status_for_instance import update_crf_status_for_instance
 

edc_crf/model_mixins/singleton_crf_model_mixin.py

@@ -1,7 +1,6 @@
 from django.db import models
 
 
-
 class SingletonCrfModelMixin(models.Model):
     """Enforces one record per subject.
 

edc_crf/update_crf_status_command.py

@@ -1,7 +1,6 @@
+from clinicedc_constants import INCOMPLETE
 from django.apps import apps as django_apps
 
-from edc_constants.constants import INCOMPLETE
-
 from .model_mixins import CrfStatusModelMixin
 from .update_crf_status_for_instance import update_crf_status_for_instance
 

edc_crf/update_crf_status_for_instance.py

@@ -1,10 +1,9 @@
 from typing import Any
 
+from clinicedc_constants import COMPLETE, INCOMPLETE
 from django.apps import apps as django_apps
 from django.core.exceptions import ObjectDoesNotExist
 
-from edc_constants.constants import COMPLETE, INCOMPLETE
-
 
 def update_crf_status_for_instance(instance: Any) -> None:
     """Only works for CRFs, e.g. have related_visit."""

edc_dashboard/url_config.py

@@ -2,10 +2,9 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
+from clinicedc_constants import UUID_PATTERN
 from django.urls.conf import re_path
 
-from edc_constants.constants import UUID_PATTERN
-
 from .url_names import url_names
 
 if TYPE_CHECKING:

edc_dashboard/views/administration_view.py

@@ -1,5 +1,6 @@
 from django.conf import settings
 from django.views.generic import TemplateView
+
 from edc_navbar import NavbarViewMixin
 
 from ..view_mixins import AdministrationViewMixin, EdcViewMixin

edc_data_manager/action_items.py

@@ -1,10 +1,4 @@
-from django.conf import settings
-from django.template.loader import render_to_string
-from django.utils import timezone
-
-from edc_action_item.action import Action
-from edc_action_item.site_action_items import site_action_items
-from edc_constants.constants import (
+from clinicedc_constants import (
     CLOSED,
     FEEDBACK,
     HIGH_PRIORITY,
@@ -12,6 +6,12 @@ from edc_constants.constants import (
     NORMAL,
     RESOLVED,
 )
+from django.conf import settings
+from django.template.loader import render_to_string
+from django.utils import timezone
+
+from edc_action_item.action import Action
+from edc_action_item.site_action_items import site_action_items
 
 from .constants import CLOSED_WITH_ACTION
 

edc_data_manager/admin/actions.py

@@ -1,5 +1,6 @@
 from uuid import uuid4
 
+from clinicedc_constants import CLOSED, OPEN
 from django.conf import settings
 from django.contrib import admin, messages
 from django.core.exceptions import ObjectDoesNotExist
@@ -8,7 +9,6 @@ from django.utils import timezone
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 
-from edc_constants.constants import CLOSED, OPEN
 from edc_utils.text import formatted_datetime
 
 from ..models import QueryRule

edc_data_manager/admin/data_query_admin.py

@@ -1,5 +1,15 @@
 from textwrap import wrap
 
+from clinicedc_constants import (
+    CLOSED,
+    FEEDBACK,
+    HIGH_PRIORITY,
+    NEW,
+    NO,
+    OPEN,
+    RESOLVED,
+    YES,
+)
 from django.conf import settings
 from django.contrib import admin
 from django.contrib.admin.decorators import register
@@ -11,16 +21,6 @@ from django_audit_fields.admin import audit_fieldset_tuple
 
 from edc_action_item.fieldsets import action_fields, action_fieldset_tuple
 from edc_appointment.models import Appointment
-from edc_constants.constants import (
-    CLOSED,
-    FEEDBACK,
-    HIGH_PRIORITY,
-    NEW,
-    NO,
-    OPEN,
-    RESOLVED,
-    YES,
-)
 from edc_model_admin.dashboard import ModelAdminSubjectDashboardMixin
 from edc_model_admin.history import SimpleHistoryAdmin
 from edc_sites.admin import SiteModelAdminMixin

edc_data_manager/choices.py

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

edc_data_manager/forms/data_query.py

@@ -1,7 +1,7 @@
+from clinicedc_constants import CLOSED, FEEDBACK, HIGH_PRIORITY, NEW, OPEN, RESOLVED
 from django import forms
 
 from edc_action_item.forms.action_item_form_mixin import ActionItemFormMixin
-from edc_constants.constants import CLOSED, FEEDBACK, HIGH_PRIORITY, NEW, OPEN, RESOLVED
 from edc_form_validators import FormValidator, FormValidatorMixin
 
 from ..constants import CLOSED_WITH_ACTION

edc_data_manager/handlers/handlers.py

@@ -4,11 +4,11 @@ from datetime import datetime
 from typing import TYPE_CHECKING
 
 import arrow
+from clinicedc_constants import NO, OPEN, RESOLVED
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
 from django.utils import timezone
 
-from edc_constants.constants import NO, OPEN, RESOLVED
 from edc_lab.utils import get_requisition_model
 from edc_metadata.constants import KEYED, REQUIRED
 from edc_metadata.models import CrfMetadata, RequisitionMetadata

edc_data_manager/migrations/0043_alter_historicalqueryrule_comment_and_more.py

@@ -0,0 +1,51 @@
+# Generated by Django 5.2.7 on 2025-10-24 04:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("edc_data_manager", "0042_alter_datadictionary_revision_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="historicalqueryrule",
+            name="comment",
+            field=models.TextField(blank=True, default=""),
+        ),
+        migrations.AlterField(
+            model_name="historicalqueryrule",
+            name="query_text",
+            field=models.TextField(
+                blank=True,
+                default="",
+                help_text="Generic query text for auto-generated queries.",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalqueryrule",
+            name="reference_model",
+            field=models.CharField(default="", editable=False, max_length=150),
+        ),
+        migrations.AlterField(
+            model_name="queryrule",
+            name="comment",
+            field=models.TextField(blank=True, default=""),
+        ),
+        migrations.AlterField(
+            model_name="queryrule",
+            name="query_text",
+            field=models.TextField(
+                blank=True,
+                default="",
+                help_text="Generic query text for auto-generated queries.",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="queryrule",
+            name="reference_model",
+            field=models.CharField(default="", editable=False, max_length=150),
+        ),
+    ]

edc_data_manager/models/data_query.py

@@ -1,5 +1,6 @@
 from uuid import uuid4
 
+from clinicedc_constants import CLOSED, RESOLVED
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
@@ -9,7 +10,6 @@ from django.urls.base import reverse
 from django.utils import timezone
 
 from edc_action_item.models.action_model_mixin import ActionModelMixin
-from edc_constants.constants import CLOSED, RESOLVED
 from edc_dashboard.url_names import InvalidDashboardUrlName, url_names
 from edc_model.models import BaseUuidModel
 from edc_sites.managers import CurrentSiteManager

edc_data_manager/models/model_mixins.py

@@ -1,9 +1,8 @@
+from clinicedc_constants import CLOSED, NEW, NORMAL, OPEN, RESOLVED
 from django.db import models
 from django.db.models import PROTECT
 from django.utils import timezone
 
-from edc_constants.constants import CLOSED, NEW, NORMAL, OPEN, RESOLVED
-
 from ..choices import DM_STATUS, QUERY_PRIORITY, RESPONSE_STATUS
 from ..constants import CLOSED_WITH_ACTION
 from .user import DataManagerUser, QueryUser

edc_data_manager/models/query_rule.py

@@ -1,5 +1,6 @@
 from uuid import uuid4
 
+from clinicedc_constants import NORMAL, NULL_STRING
 from django.apps import apps as django_apps
 from django.conf import settings
 from django.contrib.sites.models import Site
@@ -7,7 +8,6 @@ from django.db import models
 from django.db.models.deletion import PROTECT
 from django.template.loader import render_to_string
 
-from edc_constants.constants import NORMAL, NULL_STRING
 from edc_model.models import BaseUuidModel, HistoricalRecords
 from edc_visit_schedule.constants import DAYS, HOURS, MONTHS, WEEKS
 

edc_data_manager/view_mixins/data_manager_view_mixin.py

@@ -1,9 +1,9 @@
 from typing import Any
 
+from clinicedc_constants import NEW, OPEN, RESOLVED
 from django.db.models import QuerySet
 
 from edc_action_item.models import ActionItem
-from edc_constants.constants import NEW, OPEN, RESOLVED
 from edc_data_manager.models import DataQuery
 from edc_sites.site import sites
 

edc_document_status/model_mixins.py

@@ -1,9 +1,9 @@
 from typing import Any
 
+from clinicedc_constants import COMPLETE
 from django.db import models
 
 from edc_constants.choices import DOCUMENT_STATUS
-from edc_constants.constants import COMPLETE
 
 
 class DocumentStatusModelMixin(models.Model):

edc_document_status/models/signals.py

@@ -1,9 +1,8 @@
+from clinicedc_constants import INCOMPLETE
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 
-from edc_constants.constants import INCOMPLETE
-
 
 @receiver(
     post_save,

edc_dx/diagnoses.py

@@ -2,9 +2,9 @@ from __future__ import annotations
 
 from datetime import date, datetime
 
+from clinicedc_constants import YES
 from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist
 
-from edc_constants.constants import YES
 from edc_dx_review.utils import (
     get_clinical_review_baseline_model_cls,
     get_clinical_review_model_cls,
@@ -183,8 +183,7 @@ class Diagnoses:
                     subject_visit = self.initial_diagnosis_visit(name)
                     if subject_visit:
                         visit_label = (
-                            f"{subject_visit.visit_code}."
-                            f"{subject_visit.visit_code_sequence}"
+                            f"{subject_visit.visit_code}.{subject_visit.visit_code_sequence}"
                         )
                         extra_msg = f"{description} was reported on visit {visit_label}. "
                     raise InitialReviewRequired(

edc_dx/form_validators/diagnosis_form_validator_mixin.py

@@ -1,7 +1,6 @@
+from clinicedc_constants import YES
 from django import forms
 
-from edc_constants.constants import YES
-
 from ..diagnoses import (
     ClinicalReviewBaselineRequired,
     Diagnoses,

edc_dx_review/choices.py

@@ -1,4 +1,4 @@
-from edc_constants.constants import NOT_APPLICABLE, OTHER
+from clinicedc_constants import NOT_APPLICABLE, OTHER
 
 from .constants import DIET_LIFESTYLE, DRUGS, INSULIN, THIS_CLINIC
 

edc_dx_review/form_validator_mixins/clinical_review_followup_form_validator_mixin.py

@@ -1,4 +1,5 @@
-from edc_constants.constants import OTHER, YES
+from clinicedc_constants import OTHER, YES
+
 from edc_dx import get_diagnosis_labels
 from edc_dx.form_validators import DiagnosisFormValidatorMixin
 from edc_visit_schedule.utils import raise_if_baseline

edc_dx_review/list_data.py

@@ -1,4 +1,4 @@
-from edc_constants.constants import OTHER, UNKNOWN
+from clinicedc_constants import OTHER, UNKNOWN
 
 list_data = {
     "edc_dx_review.diagnosislocations": [

edc_dx_review/medical_date.py

@@ -2,10 +2,10 @@ from __future__ import annotations
 
 from datetime import date, datetime
 
+from clinicedc_constants import GT, GTE, LT, LTE
 from django.conf import settings
 from django.core.exceptions import ValidationError
 
-from edc_constants.constants import GT, GTE, LT, LTE
 from edc_model import estimated_date_from_ago
 from edc_utils.text import convert_php_dateformat
 

edc_dx_review/model_mixins/clinical_review_baseline_model_mixin.py

@@ -1,7 +1,7 @@
+from clinicedc_constants import YES
 from django.db import models
 
 from edc_constants.choices import YES_NO
-from edc_constants.constants import YES
 from edc_crf.model_mixins import SingletonCrfModelMixin
 from edc_dx import raise_on_unknown_diagnosis_labels
 from edc_visit_schedule.utils import raise_if_not_baseline

edc_dx_review/model_mixins/clinical_review_followup/clinical_review_followup_chol_model_mixin.py

@@ -1,9 +1,9 @@
+from clinicedc_constants import NOT_APPLICABLE
 from django.db import models
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 
 from edc_constants.choices import YES_NO_NA
-from edc_constants.constants import NOT_APPLICABLE
 from edc_model import models as edc_models
 
 from ...utils import get_list_model_app

edc_dx_review/model_mixins/clinical_review_followup/clinical_review_followup_dm_model_mixin.py

@@ -1,9 +1,9 @@
+from clinicedc_constants import NOT_APPLICABLE
 from django.db import models
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 
 from edc_constants.choices import YES_NO_NA
-from edc_constants.constants import NOT_APPLICABLE
 from edc_model import models as edc_models
 
 from ...utils import get_list_model_app

edc_dx_review/model_mixins/clinical_review_followup/clinical_review_followup_hiv_model_mixin.py

@@ -1,9 +1,9 @@
+from clinicedc_constants import NOT_APPLICABLE
 from django.db import models
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 
 from edc_constants.choices import YES_NO_NA
-from edc_constants.constants import NOT_APPLICABLE
 from edc_model import models as edc_models
 
 from ...utils import get_list_model_app

edc_dx_review/model_mixins/clinical_review_followup/clinical_review_followup_htn_model_mixin.py

@@ -1,9 +1,9 @@
+from clinicedc_constants import NOT_APPLICABLE
 from django.db import models
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 
 from edc_constants.choices import YES_NO_NA
-from edc_constants.constants import NOT_APPLICABLE
 from edc_model import models as edc_models
 
 from ...utils import get_list_model_app

edc_dx_review/model_mixins/clinical_review_followup/clinical_review_followup_model_mixin.py

@@ -1,7 +1,7 @@
+from clinicedc_constants import YES
 from django.db import models
 
 from edc_constants.choices import YES_NO
-from edc_constants.constants import YES
 from edc_crf.model_mixins import SingletonCrfModelMixin
 from edc_dx import raise_on_unknown_diagnosis_labels
 from edc_visit_schedule.utils import raise_if_baseline

edc_dx_review/model_mixins/factory/baseline_review_model_mixin_factory.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
+from clinicedc_constants import CHOL, DM, HIV, HTN, NO
 from django.db import models
 
 from edc_constants.choices import YES_NO
-from edc_constants.constants import CHOL, DM, HIV, HTN, NO
 from edc_dx import get_diagnosis_labels
 
 default_prompts = {

edc_dx_review/model_mixins/factory/calculate_date.py

@@ -2,9 +2,9 @@ from __future__ import annotations
 
 from datetime import date
 
+from clinicedc_constants import NO, NOT_APPLICABLE, YES
 from django.db import models
 
-from edc_constants.constants import NO, NOT_APPLICABLE, YES
 from edc_model import duration_to_date
 
 

edc_dx_review/model_mixins/factory/dx_initial_review_model_mixin_factory.py

@@ -2,10 +2,10 @@ from __future__ import annotations
 
 from datetime import date
 
+from clinicedc_constants import NOT_APPLICABLE, YES
 from django.db import models
 
 from edc_constants.choices import YES_NO
-from edc_constants.constants import NOT_APPLICABLE, YES
 from edc_dx import Diagnoses
 from edc_model.models import DurationYMDField
 from edc_model.utils import get_report_datetime_field_name

edc_dx_review/model_mixins/factory/followup_review_model_mixin_factory.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
+from clinicedc_constants import CHOL, DM, HIV, HTN, NOT_APPLICABLE
 from django.db import models
 
 from edc_constants.choices import YES_NO_NA
-from edc_constants.constants import CHOL, DM, HIV, HTN, NOT_APPLICABLE
 from edc_dx import get_diagnosis_labels
 
 default_prompts = {