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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of meta-edc might be problematic. Click here for more details.

Files changed (130) hide show
  1. meta_ae/action_items.py +12 -12
  2. meta_ae/admin/modeladmin_mixins.py +1 -1
  3. meta_ae/baker_recipes.py +1 -2
  4. meta_ae/choices.py +1 -1
  5. meta_ae/forms/death_report_form.py +1 -1
  6. meta_ae/list_data.py +1 -1
  7. meta_ae/migrations/0017_auto_20221130_2257.py +1 -1
  8. meta_ae/templatetags/meta_ae_extras.py +1 -1
  9. meta_analytics/dataframes/get_glucose_fbg_df.py +1 -1
  10. meta_analytics/dataframes/glucose_endpoints/endpoint_by_date.py +1 -1
  11. meta_analytics/dataframes/glucose_endpoints/glucose_endpoints_by_date.py +1 -1
  12. meta_analytics/dataframes/utils.py +1 -1
  13. meta_auth/auths.py +1 -1
  14. meta_consent/action_items.py +1 -1
  15. meta_consent/admin/list_filters.py +1 -1
  16. meta_consent/baker_recipes.py +1 -1
  17. meta_consent/consents.py +1 -1
  18. meta_consent/forms/subject_consent_v1_ext_form.py +1 -1
  19. meta_consent/models/signals.py +1 -1
  20. meta_consent/models/subject_consent.py +1 -1
  21. meta_consent/models/subject_reconsent.py +1 -1
  22. meta_dashboard/templatetags/meta_dashboard_extras.py +1 -1
  23. meta_dashboard/view_utils/subject_screening_button.py +1 -1
  24. meta_edc/settings/defaults.py +1 -1
  25. {meta_edc-1.2.8.dist-info → meta_edc-1.2.9.dist-info}/METADATA +11 -10
  26. {meta_edc-1.2.8.dist-info → meta_edc-1.2.9.dist-info}/RECORD +130 -130
  27. meta_labs/reportables.py +8 -3
  28. meta_lists/list_data.py +3 -3
  29. meta_lists/migrations/0008_auto_20200528_1517.py +2 -2
  30. meta_pharmacy/constants.py +1 -1
  31. meta_pharmacy/models/substitutions.py +1 -1
  32. meta_prn/action_items.py +1 -1
  33. meta_prn/admin/end_of_study_admin.py +1 -1
  34. meta_prn/baker_recipes.py +1 -1
  35. meta_prn/choices.py +1 -1
  36. meta_prn/form_validators/end_of_study.py +1 -2
  37. meta_prn/form_validators/protocol_incident.py +1 -1
  38. meta_prn/forms/loss_to_followup_form.py +1 -1
  39. meta_prn/forms/pregnancy_notification_form.py +1 -1
  40. meta_prn/list_data.py +1 -1
  41. meta_prn/migrations/0034_auto_20220630_1110.py +1 -1
  42. meta_prn/migrations/0035_auto_20220630_1140.py +1 -1
  43. meta_prn/migrations/0061_auto_20250115_2025.py +1 -2
  44. meta_prn/models/dm_referral.py +1 -1
  45. meta_prn/models/end_of_study.py +6 -6
  46. meta_prn/models/loss_to_followup.py +1 -1
  47. meta_prn/models/off_study_medication.py +1 -1
  48. meta_prn/models/pregnancy_notification.py +1 -1
  49. meta_prn/models/protocol_incident.py +1 -1
  50. meta_prn/models/signals.py +1 -1
  51. meta_rando/randomizers.py +1 -1
  52. meta_reports/admin/dbviews/glucose_summary_admin.py +1 -1
  53. meta_reports/admin/list_filters.py +1 -1
  54. meta_reports/death_report.py +1 -1
  55. meta_reports/forms/missing_ogtt_note_form.py +1 -1
  56. meta_reports/models/dbviews/glucose_summary/unmanaged_model.py +1 -1
  57. meta_reports/models/dbviews/imp_substitutions/unmanaged_model.py +1 -1
  58. meta_reports/models/dbviews/missing_screening_ogtt/note_model.py +1 -1
  59. meta_reports/models/dbviews/on_study_missing_values/qa_cases.py +1 -1
  60. meta_reports/models/endpoints.py +1 -1
  61. meta_screening/admin/list_filters.py +1 -1
  62. meta_screening/admin/subject_screening_admin.py +1 -1
  63. meta_screening/baker_recipes.py +10 -2
  64. meta_screening/calculators.py +1 -1
  65. meta_screening/choices.py +1 -1
  66. meta_screening/constants.py +1 -1
  67. meta_screening/eligibility/eligibility.py +1 -1
  68. meta_screening/eligibility/eligibility_part_one.py +1 -1
  69. meta_screening/eligibility/eligibility_part_three/base_eligibility_part_three.py +14 -7
  70. meta_screening/eligibility/eligibility_part_three/eligibility_part_three_phase_three.py +1 -1
  71. meta_screening/eligibility/eligibility_part_two.py +1 -1
  72. meta_screening/form_validators/screening_part_one.py +1 -1
  73. meta_screening/form_validators/screening_part_three.py +1 -2
  74. meta_screening/form_validators/screening_part_two.py +1 -1
  75. meta_screening/form_validators/subject_refusal.py +1 -1
  76. meta_screening/migrations/0012_auto_20191107_0427.py +1 -1
  77. meta_screening/model_mixins/calculated_model_mixin.py +2 -2
  78. meta_screening/model_mixins/creatinine_fields_model_mixin.py +1 -1
  79. meta_screening/model_mixins/eligibility_model_mixin.py +1 -1
  80. meta_screening/model_mixins/part_one_fields_model_mixin.py +1 -1
  81. meta_screening/model_mixins/part_three_fields_model_mixin.py +1 -1
  82. meta_screening/model_mixins/part_two_fields_model_mixin.py +1 -1
  83. meta_screening/models/proxy_models.py +1 -1
  84. meta_screening/models/signals.py +1 -1
  85. meta_screening/models/subject_screening.py +1 -1
  86. meta_subject/action_items.py +1 -1
  87. meta_subject/admin/followup_examination_admin.py +1 -1
  88. meta_subject/admin/list_filters.py +1 -1
  89. meta_subject/admin/subject_requisition_admin.py +1 -1
  90. meta_subject/baker_recipes.py +1 -1
  91. meta_subject/choices.py +2 -2
  92. meta_subject/form_validators/delivery_form_validator.py +1 -1
  93. meta_subject/form_validators/dm_followup_form_validator.py +1 -1
  94. meta_subject/form_validators/egfr_drop_notification_form_validator.py +1 -1
  95. meta_subject/form_validators/followup_examination_form_validator.py +1 -1
  96. meta_subject/form_validators/glucose_fbg_form_validator.py +2 -3
  97. meta_subject/form_validators/glucose_form_validator.py +1 -1
  98. meta_subject/form_validators/hiv_exit_review_form_validator.py +1 -1
  99. meta_subject/form_validators/mixins.py +1 -1
  100. meta_subject/forms/followup_vitals_form.py +1 -1
  101. meta_subject/forms/hepatitis_test_form.py +1 -1
  102. meta_subject/forms/mixins.py +1 -1
  103. meta_subject/forms/other_arv_regimens_form.py +1 -1
  104. meta_subject/forms/patient_history_form.py +1 -1
  105. meta_subject/forms/physical_exam_form.py +1 -1
  106. meta_subject/forms/pregnancy_update_form.py +1 -1
  107. meta_subject/forms/subject_visit_missed_form.py +1 -1
  108. meta_subject/forms/urine_dipstick_test_form.py +1 -1
  109. meta_subject/forms/urine_pregnancy_form.py +1 -1
  110. meta_subject/metadata_rules/predicates.py +1 -1
  111. meta_subject/migrations/0128_auto_20220720_0055.py +1 -1
  112. meta_subject/migrations/0131_auto_20220722_0411.py +1 -1
  113. meta_subject/migrations/0199_auto_20240516_0247.py +1 -1
  114. meta_subject/migrations/0212_auto_20240827_2222.py +1 -1
  115. meta_subject/model_mixins/arv_review_model_mixin.py +2 -2
  116. meta_subject/model_mixins/vitals_fields_model_mixin.py +1 -1
  117. meta_subject/models/delivery.py +1 -1
  118. meta_subject/models/diabetes/dm_endpoint.py +1 -1
  119. meta_subject/models/diabetes/dm_followup.py +1 -1
  120. meta_subject/models/followup_examination.py +1 -1
  121. meta_subject/models/glucose.py +1 -1
  122. meta_subject/models/glucose_fbg.py +1 -1
  123. meta_subject/models/health_economics/health_economics.py +1 -1
  124. meta_subject/models/health_economics/health_economics_update.py +1 -1
  125. meta_subject/models/hiv_exit_review.py +1 -1
  126. meta_subject/models/patient_history.py +1 -1
  127. meta_subject/models/subject_visit.py +1 -1
  128. meta_subject/models/urine_dipstick_test.py +1 -1
  129. {meta_edc-1.2.8.dist-info → meta_edc-1.2.9.dist-info}/WHEEL +0 -0
  130. {meta_edc-1.2.8.dist-info → meta_edc-1.2.9.dist-info}/licenses/LICENSE +0 -0
meta_labs/reportables.py CHANGED
@@ -1,8 +1,13 @@
1
- from edc_constants.constants import FEMALE, MALE
2
- from edc_reportable import MILLIGRAMS_PER_DECILITER, MILLIMOLES_PER_LITER, Formula
1
+ from clinicedc_constants import (
2
+ FEMALE,
3
+ MALE,
4
+ MICRO_IU_MILLILITER,
5
+ MILLIGRAMS_PER_DECILITER,
6
+ MILLIMOLES_PER_LITER,
7
+ )
3
8
  from edc_reportable.adult_age_options import adult_age_options
4
9
  from edc_reportable.data import africa, daids_july_2017
5
- from edc_reportable.units import MICRO_IU_MILLILITER
10
+ from edc_reportable.formula import Formula
6
11
 
7
12
  grading_data = {}
8
13
  grading_data.update(**daids_july_2017.dummies)
meta_lists/list_data.py CHANGED
@@ -1,15 +1,15 @@
1
- from edc_constants.constants import (
1
+ from clinicedc_constants import (
2
2
  CLINIC,
3
3
  DEAD,
4
4
  DELIVERY,
5
5
  DIABETES,
6
+ LTFU,
6
7
  NONE,
7
8
  OTHER,
8
9
  PREGNANCY,
9
10
  TOXICITY,
10
11
  UNKNOWN,
11
12
  )
12
- from edc_ltfu.constants import LOST_TO_FOLLOWUP
13
13
  from edc_offstudy.constants import COMPLETED_FOLLOWUP, WITHDRAWAL
14
14
  from edc_transfer.constants import TRANSFERRED
15
15
 
@@ -216,7 +216,7 @@ list_data = {
216
216
  "intercurrent_illness",
217
217
  "Intercurrent illness which prevents further treatment", # see limit_choices_to
218
218
  ),
219
- (LOST_TO_FOLLOWUP, "Patient lost to follow-up"),
219
+ (LTFU, "Patient lost to follow-up"),
220
220
  (DEAD, "Patient reported/known to have died"),
221
221
  (WITHDRAWAL, "Patient withdrew consent to participate further"),
222
222
  (
@@ -2,7 +2,7 @@
2
2
  from django.core.exceptions import ObjectDoesNotExist
3
3
  from django.db import migrations
4
4
  from django.db.migrations import RunPython
5
- from edc_ltfu.constants import LOST_TO_FOLLOWUP
5
+ from clinicedc_constants import LTFU
6
6
 
7
7
 
8
8
  def update_ltfu(apps, schema_editor):
@@ -12,7 +12,7 @@ def update_ltfu(apps, schema_editor):
12
12
  except ObjectDoesNotExist:
13
13
  pass
14
14
  else:
15
- obj.name = LOST_TO_FOLLOWUP
15
+ obj.name = LTFU
16
16
  obj.save_base(update_fields=["name"])
17
17
 
18
18
 
@@ -1,4 +1,4 @@
1
- from edc_constants.constants import OK
1
+ from clinicedc_constants import OK
2
2
 
3
3
  METFORMIN = "metformin"
4
4
  REVIEW = "REVIEW"
@@ -1,8 +1,8 @@
1
+ from clinicedc_constants import NO, NOT_EVALUATED, YES
1
2
  from django.core.exceptions import ObjectDoesNotExist
2
3
  from django.db import models
3
4
  from django.db.models import Index
4
5
  from edc_constants.choices import YES_NO_NOT_EVALUATED
5
- from edc_constants.constants import NO, NOT_EVALUATED, YES
6
6
  from edc_identifier.model_mixins import NonUniqueSubjectIdentifierFieldMixin
7
7
  from edc_model.models import BaseUuidModel, HistoricalRecords
8
8
  from edc_sites.managers import CurrentSiteManager
meta_prn/action_items.py CHANGED
@@ -1,9 +1,9 @@
1
+ from clinicedc_constants import HIGH_PRIORITY, NOT_SURE, TBD, YES
1
2
  from django.apps import apps as django_apps
2
3
  from django.utils.safestring import mark_safe
3
4
  from edc_action_item.action_with_notification import ActionWithNotification
4
5
  from edc_action_item.site_action_items import site_action_items
5
6
  from edc_adverse_event.constants import DEATH_REPORT_ACTION
6
- from edc_constants.constants import HIGH_PRIORITY, NOT_SURE, TBD, YES
7
7
  from edc_lab_results import BLOOD_RESULTS_RFT_ACTION
8
8
  from edc_ltfu.constants import LTFU_ACTION
9
9
  from edc_offstudy.constants import END_OF_STUDY_ACTION
@@ -1,3 +1,4 @@
1
+ from clinicedc_constants import OTHER
1
2
  from dateutil.relativedelta import relativedelta
2
3
  from django.contrib import admin
3
4
  from django.template.loader import render_to_string
@@ -6,7 +7,6 @@ from django.utils.safestring import mark_safe
6
7
  from django_audit_fields.admin import audit_fieldset_tuple
7
8
  from edc_action_item.fieldsets import action_fieldset_tuple
8
9
  from edc_action_item.modeladmin_mixins import ActionItemModelAdminMixin
9
- from edc_constants.constants import OTHER
10
10
  from edc_model_admin.dashboard import ModelAdminSubjectDashboardMixin
11
11
  from edc_model_admin.history import SimpleHistoryAdmin
12
12
  from edc_sites.admin import SiteModelAdminMixin
meta_prn/baker_recipes.py CHANGED
@@ -1,6 +1,6 @@
1
+ from clinicedc_constants import NULL_STRING, YES
1
2
  from dateutil.relativedelta import relativedelta
2
3
  from django.utils import timezone
3
- from edc_constants.constants import NULL_STRING, YES
4
4
  from faker import Faker
5
5
  from model_bakery.recipe import Recipe
6
6
 
meta_prn/choices.py CHANGED
@@ -1,4 +1,4 @@
1
- from edc_constants.constants import NOT_APPLICABLE, OTHER, PATIENT, PREGNANCY, UNKNOWN
1
+ from clinicedc_constants import NOT_APPLICABLE, OTHER, PATIENT, PREGNANCY, UNKNOWN
2
2
 
3
3
  from .constants import CLINICIAN, INVESTIGATOR, REFERRAL, SAE
4
4
 
@@ -1,5 +1,6 @@
1
1
  from urllib import parse
2
2
 
3
+ from clinicedc_constants import DEAD, DELIVERY, LTFU, PREGNANCY, TOXICITY
3
4
  from django import forms
4
5
  from django.apps import apps as django_apps
5
6
  from django.core.exceptions import ObjectDoesNotExist
@@ -11,9 +12,7 @@ from edc_adverse_event.form_validator_mixins import (
11
12
  RequiresDeathReportFormValidatorMixin,
12
13
  )
13
14
  from edc_consent.constants import CONSENT_WITHDRAWAL
14
- from edc_constants.constants import DEAD, DELIVERY, PREGNANCY, TOXICITY
15
15
  from edc_form_validators import INVALID_ERROR, FormValidator
16
- from edc_ltfu.constants import LTFU
17
16
  from edc_ltfu.modelform_mixins import RequiresLtfuFormValidatorMixin
18
17
  from edc_offstudy.constants import COMPLETED_FOLLOWUP
19
18
  from edc_offstudy.utils import OffstudyError
@@ -1,4 +1,4 @@
1
- from edc_constants.constants import CLOSED, OTHER, YES
1
+ from clinicedc_constants import CLOSED, OTHER, YES
2
2
  from edc_form_validators import FormValidator
3
3
  from edc_prn.modelform_mixins import PrnFormValidatorMixin
4
4
 
@@ -1,6 +1,6 @@
1
+ from clinicedc_constants import YES
1
2
  from django import forms
2
3
  from edc_action_item.forms.action_item_form_mixin import ActionItemFormMixin
3
- from edc_constants.constants import YES
4
4
  from edc_form_validators.form_validator import FormValidator
5
5
  from edc_form_validators.form_validator_mixins import FormValidatorMixin
6
6
  from edc_model_form.mixins import BaseModelFormMixin
@@ -1,8 +1,8 @@
1
+ from clinicedc_constants import FEMALE, NO, YES
1
2
  from dateutil.relativedelta import relativedelta
2
3
  from django import forms
3
4
  from django.core.exceptions import ObjectDoesNotExist
4
5
  from edc_action_item.forms.action_item_form_mixin import ActionItemFormMixin
5
- from edc_constants.constants import FEMALE, NO, YES
6
6
  from edc_form_validators import INVALID_ERROR
7
7
  from edc_form_validators.form_validator import FormValidator
8
8
  from edc_form_validators.form_validator_mixins import FormValidatorMixin
meta_prn/list_data.py CHANGED
@@ -1,4 +1,4 @@
1
- from edc_constants.constants import NOT_APPLICABLE, OTHER
1
+ from clinicedc_constants import NOT_APPLICABLE, OTHER
2
2
 
3
3
  list_data = {
4
4
  "edc_protocol_incident.protocolviolations": [
@@ -2,7 +2,7 @@
2
2
  from django.core.exceptions import ObjectDoesNotExist
3
3
  from django.db import migrations
4
4
  from django.db.models.signals import post_save, pre_save
5
- from edc_constants.constants import HIGH
5
+ from clinicedc_constants import HIGH
6
6
  from edc_protocol_incident.constants import PROTOCOL_INCIDENT_ACTION
7
7
  from edc_utils import DisableSignals
8
8
 
@@ -4,7 +4,7 @@ from uuid import uuid4
4
4
  from django.core.exceptions import ObjectDoesNotExist
5
5
  from django.db import migrations
6
6
  from edc_action_item.identifiers import ActionIdentifier
7
- from edc_constants.constants import CLOSED, HIGH_PRIORITY, NEW
7
+ from clinicedc_constants import CLOSED, HIGH_PRIORITY, NEW
8
8
  from edc_visit_schedule.constants import OFFSCHEDULE_ACTION
9
9
  from tqdm import tqdm
10
10
 
@@ -1,7 +1,7 @@
1
1
  # Generated by Django 5.1.2 on 2025-01-15 17:25
2
2
 
3
3
  from django.db import IntegrityError, migrations, transaction
4
- from edc_constants.constants import OTHER
4
+ from clinicedc_constants import OTHER
5
5
  from edc_utils import get_utcnow
6
6
 
7
7
  from meta_lists.models import OffstudyReasons
@@ -49,7 +49,6 @@ def update_offstudy_reason(apps, schema_editor):
49
49
 
50
50
 
51
51
  class Migration(migrations.Migration):
52
-
53
52
  dependencies = [
54
53
  ("meta_prn", "0060_alter_onschedule_managers_and_more"),
55
54
  ]
@@ -1,6 +1,6 @@
1
+ from clinicedc_constants import NULL_STRING
1
2
  from django.db import models
2
3
  from edc_action_item.models import ActionModelMixin
3
- from edc_constants.constants import NULL_STRING
4
4
  from edc_identifier.model_mixins import UniqueSubjectIdentifierFieldMixin
5
5
  from edc_model.models import BaseUuidModel
6
6
  from edc_sites.model_mixins import SiteModelMixin
@@ -1,17 +1,17 @@
1
- from django.db import models
2
- from edc_action_item.models import ActionModelMixin
3
- from edc_constants.choices import YES_NO_NA
4
- from edc_constants.constants import (
1
+ from clinicedc_constants import (
5
2
  DEAD,
6
3
  DELIVERY,
7
4
  DIABETES,
5
+ LTFU,
8
6
  NOT_APPLICABLE,
9
7
  NULL_STRING,
10
8
  OTHER,
11
9
  PREGNANCY,
12
10
  TOXICITY,
13
11
  )
14
- from edc_ltfu.constants import LOST_TO_FOLLOWUP
12
+ from django.db import models
13
+ from edc_action_item.models import ActionModelMixin
14
+ from edc_constants.choices import YES_NO_NA
15
15
  from edc_model.models import BaseUuidModel
16
16
  from edc_model.validators import date_not_future
17
17
  from edc_offstudy.constants import (
@@ -60,7 +60,7 @@ class EndOfStudy(ActionModelMixin, SiteModelMixin, OffstudyModelMixin, BaseUuidM
60
60
  PREGNANCY,
61
61
  CLINICAL_WITHDRAWAL,
62
62
  DEAD,
63
- LOST_TO_FOLLOWUP,
63
+ LTFU,
64
64
  TOXICITY,
65
65
  TRANSFERRED,
66
66
  WITHDRAWAL,
@@ -1,7 +1,7 @@
1
+ from clinicedc_constants import NULL_STRING, OTHER
1
2
  from django.db import models
2
3
  from edc_action_item.models.action_model_mixin import ActionModelMixin
3
4
  from edc_constants.choices import YES_NO
4
- from edc_constants.constants import NULL_STRING, OTHER
5
5
  from edc_identifier.model_mixins import UniqueSubjectIdentifierFieldMixin
6
6
  from edc_ltfu.constants import LTFU_ACTION
7
7
  from edc_model.models import BaseUuidModel, OtherCharField
@@ -1,6 +1,6 @@
1
+ from clinicedc_constants import NULL_STRING
1
2
  from django.db import models
2
3
  from edc_action_item.models import ActionModelMixin
3
- from edc_constants.constants import NULL_STRING
4
4
  from edc_identifier.model_mixins import UniqueSubjectIdentifierFieldMixin
5
5
  from edc_model.models import BaseUuidModel
6
6
  from edc_pharmacy.models import Medication
@@ -1,7 +1,7 @@
1
+ from clinicedc_constants import NULL_STRING, YES
1
2
  from django.db import models
2
3
  from edc_action_item.models import ActionModelMixin
3
4
  from edc_constants.choices import YES_NO, YES_NO_UNSURE
4
- from edc_constants.constants import NULL_STRING, YES
5
5
  from edc_identifier.model_mixins import NonUniqueSubjectIdentifierFieldMixin
6
6
  from edc_model.models import BaseUuidModel
7
7
  from edc_sites.model_mixins import SiteModelMixin
@@ -1,6 +1,6 @@
1
+ from clinicedc_constants import NULL_STRING
1
2
  from django.db import models
2
3
  from edc_action_item.models import ActionItem, ActionModelMixin
3
- from edc_constants.constants import NULL_STRING
4
4
  from edc_identifier.model_mixins import NonUniqueSubjectIdentifierFieldMixin
5
5
  from edc_model.models import BaseUuidModel
6
6
  from edc_protocol_incident.constants import PROTOCOL_INCIDENT_ACTION
@@ -1,7 +1,7 @@
1
+ from clinicedc_constants import YES
1
2
  from django.core.exceptions import ObjectDoesNotExist
2
3
  from django.db.models.signals import post_save
3
4
  from django.dispatch import receiver
4
- from edc_constants.constants import YES
5
5
  from edc_visit_schedule.site_visit_schedules import site_visit_schedules
6
6
 
7
7
  from meta_subject.models import SubjectVisit, UrinePregnancy
meta_rando/randomizers.py CHANGED
@@ -1,4 +1,4 @@
1
- from edc_constants.constants import FEMALE, MALE
1
+ from clinicedc_constants import FEMALE, MALE
2
2
  from edc_randomization.randomization_list_importer import (
3
3
  RandomizationListImporter,
4
4
  RandomizationListImportError,
@@ -1,8 +1,8 @@
1
+ from clinicedc_constants import YES
1
2
  from django.contrib import admin
2
3
  from django.core.exceptions import ObjectDoesNotExist
3
4
  from django.template.loader import render_to_string
4
5
  from django.urls import reverse
5
- from edc_constants.constants import YES
6
6
  from edc_glucose.list_filters import FbgListFilter, OgttListFilter
7
7
  from edc_model_admin.dashboard import ModelAdminDashboardMixin
8
8
  from edc_model_admin.mixins import TemplatesModelAdminMixin
@@ -1,5 +1,5 @@
1
+ from clinicedc_constants import NO, YES
1
2
  from django.contrib.admin import SimpleListFilter
2
- from edc_constants.constants import NO, YES
3
3
 
4
4
  from meta_reports.models import Endpoints
5
5
 
@@ -1,8 +1,8 @@
1
1
  from textwrap import fill
2
2
 
3
3
  import inflect
4
+ from clinicedc_constants import OTHER, TUBERCULOSIS
4
5
  from django.contrib.auth import get_user_model
5
- from edc_constants.constants import OTHER, TUBERCULOSIS
6
6
  from reportlab.lib import colors
7
7
  from reportlab.lib.units import cm
8
8
  from reportlab.platypus.flowables import Spacer
@@ -1,5 +1,5 @@
1
+ from clinicedc_constants import NO, YES
1
2
  from django import forms
2
- from edc_constants.constants import NO, YES
3
3
  from edc_form_validators import FormValidator, FormValidatorMixin
4
4
  from edc_glucose.form_validators import OgttFormValidatorMixin
5
5
  from edc_glucose.utils import validate_glucose_as_millimoles_per_liter
@@ -1,6 +1,6 @@
1
+ from clinicedc_constants import NULL_STRING
1
2
  from django.db import models
2
3
  from django_db_views.db_view import DBView
3
- from edc_constants.constants import NULL_STRING
4
4
  from edc_qareports.model_mixins import QaReportModelMixin, qa_reports_permissions
5
5
 
6
6
  from .view_definition import get_view_definition
@@ -1,7 +1,7 @@
1
+ from clinicedc_constants import NOT_EVALUATED
1
2
  from django.db import models
2
3
  from django_db_views.db_view import DBView
3
4
  from edc_constants.choices import YES_NO_NOT_EVALUATED
4
- from edc_constants.constants import NOT_EVALUATED
5
5
  from edc_qareports.model_mixins import QaReportModelMixin, qa_reports_permissions
6
6
 
7
7
  from .view_definition import get_view_definition
@@ -1,6 +1,6 @@
1
+ from clinicedc_constants import COMPLETE, DONE, NOT_APPLICABLE, NOT_AVAILABLE, YES
1
2
  from django.db import models
2
3
  from edc_constants.choices import YES_NO, YES_NO_NA
3
- from edc_constants.constants import COMPLETE, DONE, NOT_APPLICABLE, NOT_AVAILABLE, YES
4
4
  from edc_glucose.model_mixin_factories import (
5
5
  fasting_model_mixin_factory,
6
6
  ogtt_model_mixin_factory,
@@ -1,4 +1,4 @@
1
- from edc_constants.constants import OTHER, YES
1
+ from clinicedc_constants import OTHER, YES
2
2
  from edc_qareports.sql_generator import CrfCase
3
3
 
4
4
  from meta_visit_schedule.constants import MONTH36, MONTH48
@@ -1,5 +1,5 @@
1
+ from clinicedc_constants import NULL_STRING
1
2
  from django.db import models
2
- from edc_constants.constants import NULL_STRING
3
3
  from edc_qareports.model_mixins import QaReportModelMixin, qa_reports_permissions
4
4
 
5
5
 
@@ -1,7 +1,7 @@
1
+ from clinicedc_constants import NO, NOT_APPLICABLE, PENDING, TBD, YES
1
2
  from django.contrib import admin
2
3
  from django.db.models import Q
3
4
  from edc_appointment.admin import AppointmentListFilter
4
- from edc_constants.constants import NO, NOT_APPLICABLE, PENDING, TBD, YES
5
5
 
6
6
  from ..constants import PENDING_REPEAT
7
7
 
@@ -1,3 +1,4 @@
1
+ from clinicedc_constants import YES
1
2
  from django.contrib import admin
2
3
  from django.template.loader import render_to_string
3
4
  from django.urls.base import reverse
@@ -6,7 +7,6 @@ from django.utils.html import format_html
6
7
  from django.utils.safestring import mark_safe
7
8
  from django.utils.translation import gettext_lazy as _
8
9
  from django_audit_fields.admin import audit_fieldset_tuple
9
- from edc_constants.constants import YES
10
10
  from edc_dashboard.url_names import url_names
11
11
  from edc_model_admin.dashboard import ModelAdminSubjectDashboardMixin
12
12
  from edc_model_admin.history import SimpleHistoryAdmin
@@ -1,8 +1,16 @@
1
+ from clinicedc_constants import (
2
+ BLACK,
3
+ FEMALE,
4
+ MILLIGRAMS_PER_DECILITER,
5
+ MILLIMOLES_PER_LITER,
6
+ NO,
7
+ NOT_APPLICABLE,
8
+ NULL_STRING,
9
+ YES,
10
+ )
1
11
  from dateutil.relativedelta import relativedelta
2
12
  from django.contrib.sites.models import Site
3
13
  from django.utils import timezone
4
- from edc_constants.constants import BLACK, FEMALE, NO, NOT_APPLICABLE, NULL_STRING, YES
5
- from edc_reportable.units import MILLIGRAMS_PER_DECILITER, MILLIMOLES_PER_LITER
6
14
  from faker import Faker
7
15
  from model_bakery.recipe import Recipe
8
16
 
@@ -1,4 +1,4 @@
1
- from edc_constants.constants import NO, TBD, YES
1
+ from clinicedc_constants import NO, TBD, YES
2
2
 
3
3
 
4
4
  def calculate_inclusion_field_values_phase_two(obj):
meta_screening/choices.py CHANGED
@@ -1,4 +1,4 @@
1
- from edc_constants.constants import BLACK, NO, NOT_APPLICABLE, OTHER, PENDING, YES
1
+ from clinicedc_constants import BLACK, NO, NOT_APPLICABLE, OTHER, PENDING, YES
2
2
 
3
3
  ETHNICITY = ((BLACK, "Black"), (OTHER, "Other"))
4
4
 
@@ -1,4 +1,4 @@
1
- from edc_constants.constants import NO, NOT_APPLICABLE, YES
1
+ from clinicedc_constants import NO, NOT_APPLICABLE, YES
2
2
 
3
3
  BMI_FBG_OGTT_INCOMPLETE = "BMI/FBG/OGTT incomplete"
4
4
  BMI_FBG_OGTT = "BMI/FBG/OGTT"
@@ -1,9 +1,9 @@
1
1
  from typing import Any
2
2
 
3
+ from clinicedc_constants import NO, TBD, YES
3
4
  from django.db import models
4
5
  from django.urls import reverse
5
6
  from django.utils.html import format_html
6
- from edc_constants.constants import NO, TBD, YES
7
7
  from edc_utils import get_utcnow
8
8
 
9
9
  from ..constants import EGFR_NOT_CALCULATED
@@ -1,4 +1,4 @@
1
- from edc_constants.constants import FEMALE, MALE, NO, NOT_APPLICABLE, YES
1
+ from clinicedc_constants import FEMALE, MALE, NO, NOT_APPLICABLE, YES
2
2
  from edc_screening.fc import FC
3
3
  from edc_screening.screening_eligibility import ScreeningEligibility
4
4
 
@@ -1,11 +1,18 @@
1
1
  import contextlib
2
2
 
3
- from edc_constants.constants import NEG, NO, NOT_APPLICABLE
4
- from edc_egfr import EgfrCkdEpi
5
- from edc_egfr.calculators import EgfrCalculatorError
6
- from edc_reportable.exceptions import ConversionNotHandled
7
- from edc_reportable.units import MICROMOLES_PER_LITER, MILLIMOLES_PER_LITER
8
- from edc_reportable.utils import convert_units
3
+ from clinicedc_constants import (
4
+ MICROMOLES_PER_LITER,
5
+ MILLIMOLES_PER_LITER,
6
+ NEG,
7
+ NO,
8
+ NOT_APPLICABLE,
9
+ )
10
+ from clinicedc_utils import (
11
+ ConversionNotHandled,
12
+ EgfrCalculatorError,
13
+ EgfrCkdEpi2009,
14
+ convert_units,
15
+ )
9
16
  from edc_screening.fc import FC
10
17
  from edc_screening.screening_eligibility import ScreeningEligibility
11
18
  from edc_vitals.calculators import calculate_bmi
@@ -40,7 +47,7 @@ class BaseEligibilityPartThree(ScreeningEligibility):
40
47
  if self.weight and self.height:
41
48
  self.bmi = calculate_bmi(weight_kg=self.weight, height_cm=self.height)
42
49
  with contextlib.suppress(EgfrCalculatorError):
43
- self.calculated_egfr_value = EgfrCkdEpi(
50
+ self.calculated_egfr_value = EgfrCkdEpi2009(
44
51
  gender=self.model_obj.gender,
45
52
  age_in_years=self.model_obj.age_in_years,
46
53
  ethnicity=self.model_obj.gender,
@@ -1,6 +1,6 @@
1
1
  from typing import Any
2
2
 
3
- from edc_constants.constants import DM, NO, NORMAL, NOT_APPLICABLE, PENDING, TBD, YES
3
+ from clinicedc_constants import DM, NO, NORMAL, NOT_APPLICABLE, PENDING, TBD, YES
4
4
  from edc_screening.fc import FC
5
5
 
6
6
  from ...constants import (
@@ -1,4 +1,4 @@
1
- from edc_constants.constants import NO, NOT_APPLICABLE, YES
1
+ from clinicedc_constants import NO, NOT_APPLICABLE, YES
2
2
  from edc_screening.fc import FC
3
3
  from edc_screening.screening_eligibility import ScreeningEligibility
4
4
 
@@ -1,5 +1,5 @@
1
+ from clinicedc_constants import MALE, YES
1
2
  from django import forms
2
- from edc_constants.constants import MALE, YES
3
3
  from edc_form_validators import FormValidator
4
4
  from edc_prn.modelform_mixins import PrnFormValidatorMixin
5
5
 
@@ -2,8 +2,8 @@ from __future__ import annotations
2
2
 
3
3
  from datetime import datetime
4
4
 
5
+ from clinicedc_constants import NO, YES
5
6
  from django import forms
6
- from edc_constants.constants import NO, YES
7
7
  from edc_egfr.form_validator_mixins import EgfrCkdEpiFormValidatorMixin
8
8
  from edc_form_validators import INVALID_ERROR, FormValidator
9
9
  from edc_glucose.form_validators import (
@@ -77,7 +77,6 @@ class ScreeningPartThreeFormValidator(
77
77
  self.validate_egfr(
78
78
  gender=self.instance.gender,
79
79
  age_in_years=self.instance.age_in_years,
80
- weight_in_kgs=self.cleaned_data.get("weight"),
81
80
  ethnicity=self.instance.ethnicity,
82
81
  )
83
82
  self.validate_suitability_for_study()
@@ -2,8 +2,8 @@ from __future__ import annotations
2
2
 
3
3
  from datetime import datetime
4
4
 
5
+ from clinicedc_constants import NO, YES
5
6
  from django import forms
6
- from edc_constants.constants import NO, YES
7
7
  from edc_form_validators import INVALID_ERROR, FormValidator
8
8
  from edc_prn.modelform_mixins import PrnFormValidatorMixin
9
9
  from edc_utils import formatted_datetime, get_utcnow, to_utc
@@ -1,4 +1,4 @@
1
- from edc_constants.constants import OTHER
1
+ from clinicedc_constants import OTHER
2
2
  from edc_form_validators import FormValidator
3
3
  from edc_prn.modelform_mixins import PrnFormValidatorMixin
4
4
 
@@ -1,7 +1,7 @@
1
1
  # Generated by Django 2.2.6 on 2019-11-07 01:27
2
2
 
3
3
  from django.db import migrations
4
- from edc_reportable import MILLIMOLES_PER_LITER
4
+ from clinicedc_constants import MILLIMOLES_PER_LITER
5
5
 
6
6
 
7
7
  def update_fbg(apps, schema_editor):
@@ -1,7 +1,7 @@
1
+ from clinicedc_constants import MILLIMOLES_PER_LITER, TBD
1
2
  from django.db import models
2
3
  from edc_constants.choices import YES_NO_TBD
3
- from edc_constants.constants import TBD
4
- from edc_reportable.units import MICROMOLES_PER_LITER_DISPLAY, MILLIMOLES_PER_LITER
4
+ from edc_reportable.units import MICROMOLES_PER_LITER_DISPLAY
5
5
 
6
6
 
7
7
  class CalculatedModelMixin(models.Model):
@@ -1,5 +1,5 @@
1
+ from clinicedc_constants import NOT_APPLICABLE
1
2
  from django.db import models
2
- from edc_constants.constants import NOT_APPLICABLE
3
3
  from edc_lab.choices import SERUM_CREATININE_UNITS_NA
4
4
 
5
5
 
@@ -1,6 +1,6 @@
1
+ from clinicedc_constants import TBD
1
2
  from django.db import models
2
3
  from edc_constants.choices import YES_NO_TBD
3
- from edc_constants.constants import TBD
4
4
  from edc_screening.model_mixins import (
5
5
  EligibilityModelMixin as BaseEligibilityModelMixin,
6
6
  )
@@ -1,8 +1,8 @@
1
+ from clinicedc_constants import YES
1
2
  from django.db import models
2
3
  from django.utils.safestring import mark_safe
3
4
  from django_crypto_fields.fields import EncryptedCharField
4
5
  from edc_constants.choices import SELECTION_METHOD, YES_NO, YES_NO_NA, YESDEFAULT_NO
5
- from edc_constants.constants import YES
6
6
 
7
7
  from ..choices import ETHNICITY
8
8
  from ..constants import PREG_YES_NO_NA
@@ -1,8 +1,8 @@
1
+ from clinicedc_constants import NOT_APPLICABLE
1
2
  from django.contrib import admin
2
3
  from django.core.validators import MaxValueValidator, MinValueValidator
3
4
  from django.db import models
4
5
  from edc_constants.choices import NO, YES_NO, YES_NO_PENDING_NA_GLUCOSE_SCREENING
5
- from edc_constants.constants import NOT_APPLICABLE
6
6
  from edc_glucose.model_mixin_factories import (
7
7
  fasting_model_mixin_factory,
8
8
  fbg_model_mixin_factory,