meta-edc 1.1.19__py3-none-any.whl → 1.2.0__py3-none-any.whl

meta_consent/admin/__init__.py

@@ -1,5 +1,4 @@
 from .subject_consent_admin import SubjectConsentAdmin
-from .subject_consent_spfq_admin import SubjectConsentSpfqAdmin
 from .subject_consent_v1_admin import SubjectConsentV1Admin
 from .subject_consent_v1_ext_admin import SubjectConsentV1ExtAdmin
 

meta_consent/forms/__init__.py

@@ -1,12 +1,10 @@
 from .subject_consent_form import SubjectConsentForm
-from .subject_consent_spfq_form import SubjectConsentSpfqForm
 from .subject_consent_v1_ext_form import SubjectConsentV1ExtForm
 from .subject_consent_v1_form import SubjectConsentV1Form
 from .subject_reconsent_form import SubjectReconsentForm
 
 __all__ = [
     "SubjectConsentForm",
-    "SubjectConsentSpfqForm",
     "SubjectConsentV1ExtForm",
     "SubjectConsentV1Form",
     "SubjectReconsentForm",

meta_consent/migrations/0034_remove_subjectconsentspfq_site_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.2.6 on 2025-09-30 22:50
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_consent", "0033_historicalsubjectconsentspfq_subjectconsentspfq"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="subjectconsentspfq",
+            name="site",
+        ),
+        migrations.DeleteModel(
+            name="HistoricalSubjectConsentSpfq",
+        ),
+        migrations.DeleteModel(
+            name="SubjectConsentSpfq",
+        ),
+    ]

meta_consent/models/__init__.py

@@ -1,13 +1,11 @@
 from .signals import subject_consent_on_post_delete, subject_consent_on_post_save
 from .subject_consent import SubjectConsent
-from .subject_consent_spfq import SubjectConsentSpfq
 from .subject_consent_v1 import SubjectConsentV1
 from .subject_consent_v1_ext import SubjectConsentV1Ext
 from .subject_reconsent import SubjectReconsent
 
 __all__ = [
     "SubjectConsent",
-    "SubjectConsentSpfq",
     "SubjectConsentV1",
     "SubjectConsentV1Ext",
     "SubjectReconsent",

meta_consent/models/signals.py

@@ -4,7 +4,6 @@ from django.core.exceptions import ValidationError
 from django.db.models.signals import post_delete, post_save
 from django.dispatch import receiver
 from edc_action_item.delete_action_item import ActionItemDeleteError, delete_action_item
-from edc_appointment.utils import refresh_appointments
 from edc_constants.constants import YES
 from edc_pharmacy.exceptions import PrescriptionAlreadyExists
 from edc_pharmacy.prescribe import create_prescription
@@ -14,12 +13,10 @@ from edc_visit_schedule.site_visit_schedules import site_visit_schedules
 from meta_edc.meta_version import get_meta_version
 from meta_screening.models import SubjectScreening
 from meta_subject.models import SubjectVisit
-from meta_visit_schedule.constants import SCHEDULE, VISIT_SCHEDULE
 
 from ..action_items import ReconsentAction
 from .subject_consent import SubjectConsent
 from .subject_consent_v1 import SubjectConsentV1
-from .subject_consent_v1_ext import SubjectConsentV1Ext
 
 
 @receiver(
@@ -85,19 +82,19 @@ def subject_consent_on_post_save(sender, instance, raw, created, **kwargs):  # n
                 )
 
 
-@receiver(
-    post_save,
-    weak=False,
-    sender=SubjectConsentV1Ext,
-    dispatch_uid="subject_consent_v1_ext_on_post_save",
-)
-def subject_consent_v1_ext_on_post_save(sender, instance, raw, created, **kwargs):  # noqa: ARG001
-    if not raw:
-        refresh_appointments(
-            subject_identifier=instance.subject_identifier,
-            visit_schedule_name=VISIT_SCHEDULE,
-            schedule_name=SCHEDULE,
-        )
+# @receiver(
+#     post_save,
+#     weak=False,
+#     sender=SubjectConsentV1Ext,
+#     dispatch_uid="subject_consent_v1_ext_on_post_save",
+# )
+# def subject_consent_v1_ext_on_post_save(sender, instance, raw, created, **kwargs):
+#     if not raw:
+#         refresh_appointments(
+#             subject_identifier=instance.subject_identifier,
+#             visit_schedule_name=VISIT_SCHEDULE,
+#             schedule_name=SCHEDULE,
+#         )
 
 
 @receiver(

meta_edc/settings/defaults.py

@@ -38,7 +38,7 @@ if os.getenv("DJANGO_BASE_DIR"):
     BASE_DIR = Path(os.getenv("DJANGO_BASE_DIR"))
 else:
     # when running from a repo
-    BASE_DIR = Path(__file__).resolve().parent.parent.parent
+    BASE_DIR = Path(__file__).resolve().parent.parent.parent.parent
 
 if os.getenv("DJANGO_ENV_DIR"):
     ENV_DIR = Path(os.getenv("DJANGO_ENV_DIR"))
@@ -54,6 +54,15 @@ else:
         raise FileExistsError(f"Environment file does not exist. Got `{(ENV_DIR / '.env')}`")
     env.read_env(ENV_DIR / ".env")
 
+# django_revision
+GIT_DIR = Path(env.str("EDC_REVISION_GIT_DIR", default=BASE_DIR))
+
+# django_crypto_fields
+KEY_PATH = env.str("DJANGO_KEY_FOLDER")
+AUTO_CREATE_KEYS = env("DJANGO_AUTO_CREATE_KEYS")
+
+EXPORT_FOLDER = env.str("DJANGO_EXPORT_FOLDER") or Path("~/").expanduser()
+
 
 LOGGING_ENABLED = env("DJANGO_LOGGING_ENABLED")
 if LOGGING_ENABLED:
@@ -188,6 +197,7 @@ INSTALLED_APPS = [
     "meta_pharmacy.apps.AppConfig",
     "meta_screening.apps.AppConfig",
     "meta_sites.apps.AppConfig",
+    "meta_spfq.apps.AppConfig",
     "meta_edc.apps.AppConfig",
     "edc_appconfig.apps.AppConfig",
 ]
@@ -485,15 +495,6 @@ if TWILIO_ENABLED:
     TWILIO_AUTH_TOKEN = env.str("TWILIO_AUTH_TOKEN")
     TWILIO_SENDER = env.str("TWILIO_SENDER")
 
-# django_revision
-GIT_DIR = BASE_DIR.parent
-
-# django_crypto_fields
-KEY_PATH = env.str("DJANGO_KEY_FOLDER")
-AUTO_CREATE_KEYS = env("DJANGO_AUTO_CREATE_KEYS")
-
-EXPORT_FOLDER = env.str("DJANGO_EXPORT_FOLDER") or Path("~/").expanduser()
-
 # django_simple_history
 SIMPLE_HISTORY_ENFORCE_HISTORY_MODEL_PERMISSIONS = True
 
@@ -592,3 +593,6 @@ if "test" in sys.argv:
     MIGRATION_MODULES = DisableMigrations()
     PASSWORD_HASHERS = ("django.contrib.auth.hashers.MD5PasswordHasher",)
     DEFAULT_FILE_STORAGE = "inmemorystorage.InMemoryStorage"
+
+
+META_SPFQ_LIST_FILENAME = env.str("META_SPFQ_LIST_FILENAME")

meta_edc/urls.py

@@ -69,6 +69,7 @@ urlpatterns = [
     *paths_for_urlpatterns("meta_screening"),
     *paths_for_urlpatterns("meta_subject"),
     *paths_for_urlpatterns("meta_reports"),
+    *paths_for_urlpatterns("meta_spfq"),
 ]
 
 if settings.DEFENDER_ENABLED:

{meta_edc-1.1.19.dist-info → meta_edc-1.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meta-edc
-Version: 1.1.19
+Version: 1.2.0
 Summary: META Trial EDC (https://www.isrctn.com/ISRCTN76157257)
 Keywords: django,clinicedc,META EDC,EDC,clinical trials,META Trial,ISRCTN76157257
 Author: Erik van Widenfelt, Jonathan Willitts
@@ -15,12 +15,13 @@ Classifier: Intended Audience :: Science/Research
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: clinicedc>=2.0.27
+Requires-Dist: clinicedc>=2.0.30
 Requires-Dist: edc-he>=1.2.0
 Requires-Dist: edc-microscopy>=1.2.0
 Requires-Dist: edc-mnsi>=1.2.0
 Requires-Dist: edc-phq9>=1.1.0
 Requires-Dist: edc-qol>=1.2.0
+Requires-Dist: notebook>=7.4.7
 Requires-Python: >=3.12, <3.14
 Description-Content-Type: text/x-rst
 
@@ -88,8 +89,8 @@ Assuming you are logged into the account ``myaccount``:
     mkdir ~/edc && \
     cd ~/edc && \
     uv venv && \
-    uv pip install -U meta-edc==1.1.18 && \
-    wget https://raw.githubusercontent.com/meta-trial/meta-edc/1.1.18/manage.py && \
+    uv pip install -U meta-edc==1.1.19 && \
+    wget https://raw.githubusercontent.com/meta-trial/meta-edc/1.1.19/manage.py && \
     uv pip freeze | grep meta-edc
 
 Copy your ``.env`` file to ``~/.etc``.
@@ -139,7 +140,7 @@ From the above example:
 
     cd ~/edc && \
     uv venv --clear && \
-    uv pip install -U meta-edc==1.1.18 && \
+    uv pip install -U meta-edc==1.1.19 && \
     wget -O manage.py https://raw.githubusercontent.com/meta-trial/meta-edc/1.1.10/manage.py && \
     uv pip freeze | grep meta-edc && \
     python manage.py check

{meta_edc-1.1.19.dist-info → meta_edc-1.2.0.dist-info}/RECORD

@@ -109,13 +109,12 @@ meta_auth/auths.py,sha256=EBdK6b5b2yduDvqYmnmJFRvuJ0fLDQ_q226iuwHA_QU,3008
 meta_auth/urls.py,sha256=_sVCnQeiAFRYKhxga3_DjoKj_4bgs1s2gjcynDiapvA,111
 meta_consent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_consent/action_items.py,sha256=tSt9PsKWommXY59d65gvT8YxJc55mwp5RDlRH6RqHZY,1425
-meta_consent/admin/__init__.py,sha256=xSwd9MBy1MyumjzbZc3-HL_9Oko6FepGbvEkK0PM5hA,349
+meta_consent/admin/__init__.py,sha256=d_6yWMi1yGgKxq4kFQIr7NNj96GqLDppXE0P83A14WQ,285
 meta_consent/admin/actions/__init__.py,sha256=dxQmm21wkVYcznzBeQU6cBEfPRnkEsBQLwptJr2xoYI,113
 meta_consent/admin/actions/create_missing_prescriptions.py,sha256=mksb9aAL8FK0KN3Z2a5N-QRrUSiilObUMCqoWCTlfv8,1500
 meta_consent/admin/list_filters.py,sha256=gVKcHW1YHT3X0fYDDgCI_PDY9F7A3Z3z8CRq2ZRC9MA,775
 meta_consent/admin/modeladmin_mixins.py,sha256=AWGHMjjZleGtE4UhfL_1hykiT1qpBkndgKbgeEo3ilo,5387
 meta_consent/admin/subject_consent_admin.py,sha256=IfGANb9TFvVs9yga8WOTxHxy2yRHP--KgsVUWEg30MQ,647
-meta_consent/admin/subject_consent_spfq_admin.py,sha256=Om1rkJSCfxLfHuTZ4K-q5pCSS5ZXnRfpeuJOrrM73lQ,1720
 meta_consent/admin/subject_consent_v1_admin.py,sha256=nmssuWL7eomQfXi3mVrszs3Ghufhz46JAwr9wFU3gkI,657
 meta_consent/admin/subject_consent_v1_ext_admin.py,sha256=o0XiCiyFr7ARV6f3Y-TLVknljomsoKrVFDxQfCRgEaY,2849
 meta_consent/admin_site.py,sha256=r5FtGwonVpqhyGekVNplmHr2mwbEGilJBiyvsIz2_lY,169
@@ -125,9 +124,8 @@ meta_consent/consents.py,sha256=JkO2dlt7Fn7ckWRGgdicAaXWgtIANo1amwxK5ykL5uk,1185
 meta_consent/constants.py,sha256=w5n3B4jwUDDZEc4gMpkKeffsHqi724GnoABFtjmvbQk,78
 meta_consent/form_validators/__init__.py,sha256=3xf1nNmydleMyROWyHvwI8-HC5y7gMYQW_bTeStiI7Q,115
 meta_consent/form_validators/subject_consent_form_validator.py,sha256=2f4FY1VZ1qU4u35LSoRtBIhmRhrflOhs0Zal8z1Ogo8,1258
-meta_consent/forms/__init__.py,sha256=5Q_KvDuxEJ_CR21RaGhMT2ZYva58JRAimMauTc16MGM,453
+meta_consent/forms/__init__.py,sha256=owYPqBIxjy6U58sdWHrCgxqBY0ObE_tlIOXOcnTy7LM,361
 meta_consent/forms/subject_consent_form.py,sha256=Dwnwn7y-8AABvzgTa1zfs2b2Mli0OKnNMsx0VOxO9n0,1293
-meta_consent/forms/subject_consent_spfq_form.py,sha256=NGC7HhL2uCqrDGnO7boe0Cq_2ZbVJYB9qeecu5aMZyY,2016
 meta_consent/forms/subject_consent_v1_ext_form.py,sha256=jkm3bDrmepChP2OsmiAalhCW-IwhsR7BhR_qcycrTlc,1735
 meta_consent/forms/subject_consent_v1_form.py,sha256=XHrklzP-wh6ny3VJ2Bf9v7BTaUlfTToYVrpIAm3JZFc,766
 meta_consent/forms/subject_reconsent_form.py,sha256=hR2c1SgBXDXbL2gv33ArACr6UoGsM22C03uyCtuwT8o,1350
@@ -169,12 +167,12 @@ meta_consent/migrations/0030_auto_20250120_2114.py,sha256=Unk3dddqbNTog5VZOmq-68
 meta_consent/migrations/0031_alter_historicalsubjectconsent_guardian_name_and_more.py,sha256=a3-_1ls36Z8UXe3v2U44SqPVeNiCgUjJX6jOWsk1EoQ,5645
 meta_consent/migrations/0032_alter_historicalsubjectconsent_device_created_and_more.py,sha256=Ty4I6TSHw_rHRKyrYQUMDuZmCSe9_rC4PMD8PM6EdB0,24682
 meta_consent/migrations/0033_historicalsubjectconsentspfq_subjectconsentspfq.py,sha256=6GKEKT1BbPqqq2U2rHMQWl1VITtB3Inzl3aJGiy26ro,25192
+meta_consent/migrations/0034_remove_subjectconsentspfq_site_and_more.py,sha256=RbTC6Oo2pOLYaOMkhPtdM612nyZwnOXdWVZ769WGF4o,546
 meta_consent/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meta_consent/models/__init__.py,sha256=DURcTNQg9A7ok4_SVKm59yQAACZbj0_moy_7EPb0nSQ,544
+meta_consent/models/__init__.py,sha256=qDfnpsbAP3hr5oKa80hkr5u9P2PN6KV8P5EMujfgt_8,465
 meta_consent/models/model_mixins.py,sha256=mEN2gDycLKoZiExM2_H3Dxz8AMAwRSrCq4vu3afr5hA,275
-meta_consent/models/signals.py,sha256=grdBFzC46jX_IpoMLhDkYY1MjeK4Xzc8kv-yXdF4mnY,5198
+meta_consent/models/signals.py,sha256=qjzBtnLR5qcOrn39sFrleUm6a9DG2yZnHGLnKQ-tLkc,5030
 meta_consent/models/subject_consent.py,sha256=Ssr94mZijpseoer-APH0jhh54cLeoUI0TPUah3od91c,3804
-meta_consent/models/subject_consent_spfq.py,sha256=vXMRfEU9AeOqKDGUzTNnZl6D_hM-H4_uEfcx3QjJlzc,3038
 meta_consent/models/subject_consent_v1.py,sha256=ELkFhv_6eRiuuoJOohdLwq3b2e2YXngK5omkGwMoRQE,457
 meta_consent/models/subject_consent_v1_ext.py,sha256=MpK5TlUqf2JuYRpmRLzYBClOFstC_6pIGwDRUckIztU,1033
 meta_consent/models/subject_reconsent.py,sha256=CqkrnThqjfnJnIj-k5QEEijue3gqp-0YvzcqKHjC8Gs,3605
@@ -233,14 +231,14 @@ meta_edc/models.py,sha256=DLA-hDdFszAVNCe1sZqVoLmIXifFW0HeZsipP9D1Ic4,46
 meta_edc/navbars.py,sha256=Rl2a62elRVTbkGVV9toYwwT388TE1BI7-1j1w2v1m-I,1208
 meta_edc/settings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_edc/settings/debug.py,sha256=XfYEL34kzpyiXQkTil34-r-NVKhmxs_kVQP2u5XtfVE,1313
-meta_edc/settings/defaults.py,sha256=uHcahlXL1lmgIzekQrfR6_wb07jcrBCz6BuJHQ_l7zc,20239
+meta_edc/settings/defaults.py,sha256=lXN6DoEbUudUQSqJ1BJ8dVcAo4q-ZoEMxbnN8xkMSro,20381
 meta_edc/settings/live.py,sha256=A4gDWiUIgcRDUWaT4oEOHkGmaeLRPNsr7MPrl0r8AuI,289
 meta_edc/settings/logging.py,sha256=7RQ2guyuMhK3MtoojmnD0CVqiFZZ6ZT6zc7Rwn0nYGk,2115
 meta_edc/settings/minimal.py,sha256=ZZM7hZ-3AH33nGpLJLbYgs50oa5meKv_aGShidnm9G0,511
 meta_edc/settings/uat.py,sha256=kA6Aw2qDeh6gXNJgtiR93D0rWmBNHswcrufPk40RYhc,295
 meta_edc/templates/meta_edc/base.html,sha256=SRsitjNhwDyPueJXm8gAyz9MsqDKFfhs50zl4dGBGsU,154
 meta_edc/templates/meta_edc/home.html,sha256=EMdNWUw3NURSrC8xlKCkxuV0SxVLcmB8kyy2N6LgFLQ,4579
-meta_edc/urls.py,sha256=NAiynaCQyd-9FqKD1QQriqJ9HbK6YX-kIjXMPfPrcqI,3640
+meta_edc/urls.py,sha256=XEqI0_flKCQO7_E8WQ_La_YhMnsx2c7N5mluAohEm1w,3681
 meta_edc/utils.py,sha256=BX6KQNiygI17TftUx-08-b1K30Kooxg0Kg1E5Auys5s,367
 meta_edc/views/__init__.py,sha256=8kC2jsMR87Hhtw86MHJD8hS_8k6ZqPSr9E4-dcRQmUM,56
 meta_edc/views/home_view.py,sha256=BXydy77TcdcM0-R3S_uHI4DtfnLMIzPJMyqjFJZFSsA,916
@@ -346,7 +344,7 @@ meta_prn/admin/protocol_incident_admin.py,sha256=42XTm6Z9EyKtSXWnIep3DmYwibCtMHx
 meta_prn/admin/subject_transfer_admin.py,sha256=ixYbel84vXwFuBaczTJBscpau3iMjHEzhpHvGRRXLD0,741
 meta_prn/admin_site.py,sha256=E4dJ6ofu9Kp-1SIWIuY3PraVPbEJSWBBqhorJPGUNqU,161
 meta_prn/apps.py,sha256=NEqrwzEW277BAPGeL1H1KdK9e74FqXfYHK6o46BtaJA,280
-meta_prn/baker_recipes.py,sha256=DAOuwnJCfRTou4WV4-oLdX_JHuov7KRZy4tcXF3TCBw,667
+meta_prn/baker_recipes.py,sha256=MgTdr_2wawEMSQifsgXpP7LS_8va9HjlXXE2etpq8sM,715
 meta_prn/choices.py,sha256=QmWGz2zpWIt5Uqa3QP_YC-Ky8eKYDPdA5R8vPsOP22Q,3318
 meta_prn/constants.py,sha256=Z0atxRnTIj-_bWbfYY0vZIwfmbwaFRpSZqb1-K1B4Jo,1018
 meta_prn/form_validators/__init__.py,sha256=bHMDsNInx7AEghhcU2_2Bmc5pgP_Y7p4fbklXiugjYQ,194
@@ -432,6 +430,7 @@ meta_prn/migrations/0065_alter_historicaloffstudymedication_subject_identifier_a
 meta_prn/migrations/0066_alter_historicallosstofollowup_subject_identifier_and_more.py,sha256=hUTNf3oiIxJODNXXwjTeVZS-xEMBsCn3XyR2aPcfO7o,662
 meta_prn/migrations/0067_alter_offschedule_managers_and_more.py,sha256=FgwTeEgMbvyH3G6C7p3O9jUcUf7aX0dOmTuULlpWHKU,95266
 meta_prn/migrations/0068_alter_dmreferral_referral_note_and_more.py,sha256=CKbtUdAVA4r74WTHMh_lAh7Fm7YC23A0aPD0mWs59sU,8347
+meta_prn/migrations/0069_alter_historicaloffstudymedication_singleton_field_and_more.py,sha256=oM6nxwAZOkJ0wjuNzVH-KrNEYUjLR97c1BTXY1lxab4,1085
 meta_prn/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_prn/models/__init__.py,sha256=RTi_GFeNhZEnB7_WR5bahlanI7BGR9rTC47TveoRrR4,1224
 meta_prn/models/dm_referral.py,sha256=_5sVeT9A2mnmbkv2LvbTkS4G-QYPWqR5zMRGDAWCENA,1153
@@ -457,10 +456,10 @@ meta_rando/migrations/0004_alter_randomizationlist_options_and_more.py,sha256=_U
 meta_rando/migrations/0005_alter_randomizationlist_options_and_more.py,sha256=GBaNqwy4SlmQ88lYX2uEqAI0FIUQem-C8qJLI6d6SfI,3248
 meta_rando/migrations/0006_alter_historicalrandomizationlist_allocated_user_and_more.py,sha256=XS6srUOHPAJWqsTLLPCHmcIKlOkEky95JrH1739gL2w,4584
 meta_rando/migrations/0007_spfqlist.py,sha256=UbzXuvNy3EuapG0ZQktiEVOM3BVjLgeAmTqViAh9cKg,7276
+meta_rando/migrations/0008_delete_spfqlist.py,sha256=hF6G6B5kMirD_W8xOCRe_IA2IIq2xkKEYcF5KTSgnSY,290
 meta_rando/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meta_rando/models/__init__.py,sha256=iKW5AvXiLK58AMspZmWYUzOmA7mrJQp3_FcMqtWa5xc,82
+meta_rando/models/__init__.py,sha256=Y723EYwgR2rCsy6GKK8uEh0V1-a3L1mr-n-vk6ZkQVs,50
 meta_rando/models/randomization_list.py,sha256=IBj1kSui1tHNgZdVbHvgmunw9BwBZ4ZZnft98x1B-Gg,510
-meta_rando/models/spfq_list.py,sha256=Ba0nasvtMAPnJVukOCFZ1EvVuyEeXxiPjDX0N1t4C9w,839
 meta_rando/randomizers.py,sha256=GpsV3kkqd-HupfnQw6Y7R172ZpOEpIbmVkXOwsOf-HA,1592
 meta_reports/__init__.py,sha256=huYR-GaImMWZqv6puEYfY7y_8m1OA_hRVXRYNBvNLkQ,80
 meta_reports/admin/__init__.py,sha256=V-rlMJJZCgnDaMOwk5PgZNIclOp_FW2y9yc-iCLQFHA,910
@@ -722,7 +721,7 @@ meta_sites/models.py,sha256=DLA-hDdFszAVNCe1sZqVoLmIXifFW0HeZsipP9D1Ic4,46
 meta_sites/sites.py,sha256=H26Erar3_fLVl5wf2ILDM5C6wGEoi0dQbiSPmzb9OGw,1625
 meta_subject/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_subject/action_items.py,sha256=l7Bw4m0Hu72bemH70UToI__VCERz8YKEKcsWCL6BJxk,6804
-meta_subject/admin/__init__.py,sha256=75Z-caHseLIT6Z5w5eYc8WUjmMlyNiGU8M5Ghiq95Tc,2830
+meta_subject/admin/__init__.py,sha256=04MeBKUNsTc1DKJDE7r9w-KfZWxBEB-QLBIiazhzzFs,2779
 meta_subject/admin/autocomplete_admin.py,sha256=bVxma7KTHhKHWqLPxbP2GwiGcHeBUyMutTDXZ2RomEY,1158
 meta_subject/admin/birth_outcome_admin.py,sha256=76hwS4wIbuFpxAvIoQwjVqyr4znVGhWOnuKBuk1FIZ8,3242
 meta_subject/admin/blood_results/__init__.py,sha256=24WaqyGYCj3F-8amy7HFEwet1Z1ZHgsVvdSrWmmGvVs,546
@@ -762,7 +761,6 @@ meta_subject/admin/patient_history_admin.py,sha256=xeHhoeZS-F7nXAopZI8HxAjZUFLDY
 meta_subject/admin/physical_exam_admin.py,sha256=NnYsclV3dAQZO9f9IUIj44d8ttbCFFmAPi-KXF8uVQg,1874
 meta_subject/admin/pregnancy_update_admin.py,sha256=g-pXELecNtxePvDGlx7Iwx7w0GNUtPMEw0q5eVdMAg0,929
 meta_subject/admin/sf12_admin.py,sha256=1PDNewdE_JDcjfyh0tb0MEWnBgpE3-7W0tkNfWkSX5U,742
-meta_subject/admin/spfg_admin.py,sha256=xAKximXRHtUgpuqDK4dmXbpN7OodLRQcEBbRy4Nb-iE,3522
 meta_subject/admin/study_medication_admin.py,sha256=E1xZDDEMDoCSfgYhJ7E815ClSrh-A4HTY7iOy52auF4,6146
 meta_subject/admin/subject_requisition_admin.py,sha256=CJxO4Qvphxm8RfjS0IFef9smMFVmVzI2KbSmdhpocXU,1864
 meta_subject/admin/subject_visit_admin.py,sha256=FMJ6-aB_3JLrYnCAKM8vvYyWqN9P58RwR25JB1Po6bc,1405
@@ -772,8 +770,8 @@ meta_subject/admin/urine_pregnancy_admin.py,sha256=o90kDiRm28SqgSR8pwj4MVSICkzt_
 meta_subject/admin_site.py,sha256=fxUn5QKgo6wYUG18HW11kVrPqWvmWV2_PzKbgZQM4pU,169
 meta_subject/apps.py,sha256=iAQ8lizUpKa4gJnCGkTsuRQPtGWmSjnshZn8rZUguO8,289
 meta_subject/baker_recipes.py,sha256=KEJQTjNH47KcGCR_2OxDwmSKhAWhmjiD3YsnqeqkzFU,2816
-meta_subject/choices.py,sha256=m-7bftnK_GoFEkeCDbBzxJGf6nf_6Ll0OShUGBo62oo,7721
-meta_subject/constants.py,sha256=LUbaJbgY88FgRiVStpWuyJn6LPhW_nUAfydPQkAL_84,1124
+meta_subject/choices.py,sha256=lFseBsxliIRshCmqsIwdPnYXs1p_WT5D_Dfn2PcWONs,6754
+meta_subject/constants.py,sha256=6rpHsHj3CPV7ntdWxYScRhPVoj4YIxX2lUZdZ9lrFN0,704
 meta_subject/form_validators/__init__.py,sha256=2g1unLOkE4Wj1ZrWkXSdnZzYnV0kggn_SCpMrhnc_Rg,840
 meta_subject/form_validators/birth_outcomes_form_validator.py,sha256=vujgXKIW4z8bJ536_9uBhETlbChhUvA3Rj5H8zR3UfI,349
 meta_subject/form_validators/delivery_form_validator.py,sha256=mmi6mnr-DLa93uGMoqud_J1LuM1nPyu-VcNyIwEOXk8,3205
@@ -783,7 +781,7 @@ meta_subject/form_validators/egfr_drop_notification_form_validator.py,sha256=y5M
 meta_subject/form_validators/followup_examination_form_validator.py,sha256=NS3Sa-bwC_HEe-CmezkFrbbjPanLe9p1v5ZOFspqgxg,4241
 meta_subject/form_validators/glucose_form_validator.py,sha256=azIttaercmdE2-KM8hrlAzBmH3LHknrIxQ-o_s1kYcE,3979
 meta_subject/form_validators/health_economics_form_validator.py,sha256=kp-LQU4ydBXlnYFt-0xKuVSb8Y4irlhz9d_X8ppvWgE,250
-meta_subject/forms/__init__.py,sha256=Zu39xg6SPfQUuh231UWe6BbPqWrXA-CPVJJF_VPnY7s,2824
+meta_subject/forms/__init__.py,sha256=LaxPRgHKMfmEWYnxHFbPkVFGSSNVrelG8dL2x49M5oU,2776
 meta_subject/forms/birth_outcomes_form.py,sha256=qqhZNQKiYk8C8CFebZTQB0hOm4ONrgkTG7hfuK7kW-o,374
 meta_subject/forms/blood_results/__init__.py,sha256=DYs2J30cgTPxvY9qDuKfr_kF_muoZ1iVmpu_I3wLpdM,528
 meta_subject/forms/blood_results/blood_results_fbc_form.py,sha256=g6m0HE9I3DIxDPgk6TZUPVU-vliOb3Fiqe3kDyN7h38,714
@@ -820,7 +818,6 @@ meta_subject/forms/physical_exam_form.py,sha256=QgH1zAmYgp8Hi1tU-e68HaRRkZxf-6xG
 meta_subject/forms/pregnancy_update_form.py,sha256=BTiWPoQ-HYbZhW0Go2DSqYU_e51pmJ_UIxEdSNlzTwE,559
 meta_subject/forms/sf12_form.py,sha256=VDV4hyU9UckPX70isylfHWggcWZwiQfCWrpk9kGvxis,397
 meta_subject/forms/slider_widget.py,sha256=aHUszQ1Xxjyf9Ph0echFMX1VuWl4mmabvWN2ixpRy-I,837
-meta_subject/forms/spfq_form.py,sha256=WNMawCxrKCKq3gV1GOoZpxAeF5oAh4QBt6TMu1xGRv0,2123
 meta_subject/forms/study_medication_form.py,sha256=zLPxVmxE3czWIRrSTnnD5-BRvIj5YDfOxhCNQELA9q4,3218
 meta_subject/forms/subject_requisition_form.py,sha256=wf_IVqrwrgaZrPxwyS7Ku-NfWR9eWGW4N9VexANcnHA,950
 meta_subject/forms/subject_visit_form.py,sha256=Zxyjb5-7wUmcLHD-M76ofuM8Vr92yzjvXqQ7GsB3U6o,1374
@@ -1071,6 +1068,7 @@ meta_subject/migrations/0230_alter_historicaldelivery_action_identifier_and_more
 meta_subject/migrations/0231_alter_historicalmedicationadherence_consent_model_and_more.py,sha256=LMY0vJ4utO36Zpk0uugU_KlXkv9bCG9-nf8oFsUuWII,78654
 meta_subject/migrations/0232_alter_patienthistory_concomitant_conditions_and_more.py,sha256=vX0wJmbLQSg7JYnvzAt3zA20bfPz1AnxNpodKAxdYhM,43686
 meta_subject/migrations/0233_historicalspfq_spfq.py,sha256=U8imocD_gtCGTC0zUNt6UZlqZYBUtUNB7cEdFxBbnjA,46072
+meta_subject/migrations/0234_remove_spfq_site_remove_spfq_subject_visit_and_more.py,sha256=s_1aOSihYNqca-oVYWxiC19joGtOgvB4nz0qtEqmdwQ,584
 meta_subject/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_subject/model_mixins/__init__.py,sha256=fWZpFJ_Ex-TOJFjgSGjcrquKSCenCh_K9Hiy8QUg36o,439
 meta_subject/model_mixins/arv_history_model_mixin.py,sha256=6ILacF2koyYmwZIFHmmQO1uIT1eWzrahXxhAlxpQiX0,2898
@@ -1078,7 +1076,7 @@ meta_subject/model_mixins/crf_model_mixin.py,sha256=UK1ycbYwaZ8LSNTJm74QJ5c-01HD
 meta_subject/model_mixins/crf_with_action_model_mixin.py,sha256=q1Q16YyPjQlpDtCPOXRkO5C7Vr7JO_QL8xWC48Uz33M,298
 meta_subject/model_mixins/search_slug_model_mixin.py,sha256=mEN2gDycLKoZiExM2_H3Dxz8AMAwRSrCq4vu3afr5hA,275
 meta_subject/model_mixins/vitals_fields_model_mixin.py,sha256=Uimo-sQS-l4I3KyHej8t0_49mT2UakMKCbO8giYUMQw,2205
-meta_subject/models/__init__.py,sha256=d2ruW2PO_9tCPts8tprk7kj2ScpUokwwGCm1PXlnvjY,3009
+meta_subject/models/__init__.py,sha256=NXw6Ba2QlYL7ZjZoWeoS1A5g6R3ONnOKtFEH8ltDTvg,2974
 meta_subject/models/birth_outcomes.py,sha256=DQp-8Cv5ZWBuaGdiYlL1V3uJaL6H2tf9gYPfYcMTCs8,3142
 meta_subject/models/blood_results/__init__.py,sha256=F2jncEUtvrb4G9v5V6p3gSi4dI721CFVCImdJ9qFHmQ,530
 meta_subject/models/blood_results/blood_results_fbc.py,sha256=kkOqCsqeIvCf2rw7vHGWMCEgo1_yiMDtTOi44aKtBro,1324
@@ -1105,7 +1103,7 @@ meta_subject/models/glucose_fbg.py,sha256=MzTPX1sVlp_ypqLmhsurVUV-Ks8XTIMHJy5MBj
 meta_subject/models/glucose_review.py,sha256=bCnSBe_C3LeBy1XrZpV9rv-hOk8onZ_Tl37t7dqm-sw,450
 meta_subject/models/health_economics/__init__.py,sha256=J557vTjzK1EvUAM4mx9zDVQ7Zr0W25stnWXz_zE2a-c,245
 meta_subject/models/health_economics/health_economics.py,sha256=pjEbz3d6s-Cy2DEPZnGcd8KjFc27pVed9D6vr3eYLVg,9709
-meta_subject/models/health_economics/health_economics_simple.py,sha256=pHMDPUi9ojPBI6koTtciVGUYV8oFr7VXTmf8JP_eU40,741
+meta_subject/models/health_economics/health_economics_simple.py,sha256=w46TrjNvfk736IjtZ8lrN0H3is_ddGRUq8v6MgSqoBY,711
 meta_subject/models/health_economics/health_economics_update.py,sha256=gzbu2lpVr9txwYUVfYKADgE0Om1YkNfrVPcwLczbNYc,3334
 meta_subject/models/hepatitis_test.py,sha256=_jfDlR_spt7h4KGsMDxmobgAaToKiAZdLGIXCqfH60o,1852
 meta_subject/models/malaria_test.py,sha256=4gQNBnvLDv70rjRcFBOpLPmYL8eeuqs0lRsJ7LrFqHM,343
@@ -1120,7 +1118,6 @@ meta_subject/models/physical_exam.py,sha256=0QH10ZutmowM6_uLyHaMsO0UiH3RrVWhfZD_
 meta_subject/models/pregnancy_update.py,sha256=yeoMeDkMQxUBjKYjFvqkQCwByTH50jU0QiNXchqJMZo,950
 meta_subject/models/sf12.py,sha256=1f6cAMtBUXy7jMaacAU8RJFFv73r9c3rJjBbNl-bSM4,283
 meta_subject/models/signals.py,sha256=Z5qoVkSmls9bVm2HwdbaBAPuI6X9Y8v-7PP5F-GQbiU,4568
-meta_subject/models/spfq.py,sha256=kJjwPsG9YNU8P1XHOmmFvuKX1C36Agm4Np2reWliYcc,6239
 meta_subject/models/study_medication.py,sha256=1kA_w4pYT1gcunfiQ46KdM01pd1jrQqLt4JEPLvfTTo,461
 meta_subject/models/subject_requisition.py,sha256=bSDwD-hpXeioH3xA7E6eGMu4hxWLDDSxhznfjrpXTjw,341
 meta_subject/models/subject_visit.py,sha256=UQQ31lsJS0znw-8d2ft7VOPamn1o-cixHQ9L8rV1vWA,2153
@@ -1147,7 +1144,7 @@ meta_visit_schedule/visit_schedules/phase_three/schedule.py,sha256=LU1HRaV6o1UeK
 meta_visit_schedule/visit_schedules/phase_three/schedule_dm_referral.py,sha256=q12p5wXc2D7lSiJVBnoSQw8Q3vL6uDx1t3PuDJO-Z-U,1735
 meta_visit_schedule/visit_schedules/phase_three/schedule_pregnancy.py,sha256=bEpbpCX3vfZmnsqudr0z8PU5kiaX4ws1sO5Im98Mo28,1106
 meta_visit_schedule/visit_schedules/phase_three/visit_schedule.py,sha256=ak4qazeKlpIlvpqrK9hDDO0fwWuWyvb4Ec-JU31IJxc,654
-meta_edc-1.1.19.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-meta_edc-1.1.19.dist-info/WHEEL,sha256=-neZj6nU9KAMg2CnCY6T3w8J53nx1kFGw_9HfoSzM60,79
-meta_edc-1.1.19.dist-info/METADATA,sha256=pms4LnnVTVZfwtk5LloEcHLiyPqQ6sgziU_MbCzrp4o,5136
-meta_edc-1.1.19.dist-info/RECORD,,
+meta_edc-1.2.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+meta_edc-1.2.0.dist-info/WHEEL,sha256=-neZj6nU9KAMg2CnCY6T3w8J53nx1kFGw_9HfoSzM60,79
+meta_edc-1.2.0.dist-info/METADATA,sha256=DiyZTaq7ut9pqEqAuJEpkcWT5wPdZDm5Ug_uyZokP9E,5166
+meta_edc-1.2.0.dist-info/RECORD,,

meta_prn/baker_recipes.py

@@ -1,6 +1,6 @@
 from dateutil.relativedelta import relativedelta
 from django.utils import timezone
-from edc_constants.constants import YES
+from edc_constants.constants import NULL_STRING, YES
 from faker import Faker
 from model_bakery.recipe import Recipe
 
@@ -12,17 +12,17 @@ fake = Faker()
 pregnancynotification = Recipe(
     PregnancyNotification,
     # site=None,
-    action_identifier=None,
-    subject_identifier=None,
+    action_identifier=NULL_STRING,
+    subject_identifier=NULL_STRING,
     report_datetime=timezone.now(),
     bhcg_confirmed=YES,
-    unconfirmed_details=None,
+    unconfirmed_details=NULL_STRING,
     edd=timezone.now() + relativedelta(months=6),
 )
 
 dmreferral = Recipe(
     DmReferral,
-    action_identifier=None,
-    subject_identifier=None,
+    action_identifier=NULL_STRING,
+    subject_identifier=NULL_STRING,
     report_datetime=timezone.now(),
 )

meta_prn/migrations/0069_alter_historicaloffstudymedication_singleton_field_and_more.py

@@ -0,0 +1,37 @@
+# Generated by Django 5.2.7 on 2025-10-01 14:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_prn", "0068_alter_dmreferral_referral_note_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="historicaloffstudymedication",
+            name="singleton_field",
+            field=models.CharField(
+                db_index=True,
+                default="",
+                editable=False,
+                help_text="auto updated for unique constraint",
+                max_length=50,
+                verbose_name="subject identifier",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="offstudymedication",
+            name="singleton_field",
+            field=models.CharField(
+                default="",
+                editable=False,
+                help_text="auto updated for unique constraint",
+                max_length=50,
+                unique=True,
+                verbose_name="subject identifier",
+            ),
+        ),
+    ]

meta_rando/migrations/0008_delete_spfqlist.py

@@ -0,0 +1,16 @@
+# Generated by Django 5.2.6 on 2025-09-30 22:50
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_rando", "0007_spfqlist"),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name="SpfqList",
+        ),
+    ]

meta_rando/models/__init__.py

@@ -1,2 +1 @@
 from .randomization_list import RandomizationList
-from .spfq_list import SpfqList

meta_subject/admin/__init__.py

@@ -28,7 +28,6 @@ from .patient_history_admin import PatientHistoryAdmin
 from .physical_exam_admin import PhysicalExamAdmin
 from .pregnancy_update_admin import PregnancyUpdateAdmin
 from .sf12_admin import Sf12Admin
-from .spfg_admin import SpfqAdmin
 from .study_medication_admin import StudyMedicationAdmin
 from .subject_requisition_admin import SubjectRequisitionAdmin
 from .subject_visit_admin import SubjectVisitAdmin
@@ -67,7 +66,6 @@ __all__ = [
     "PhysicalExamAdmin",
     "PregnancyUpdateAdmin",
     "Sf12Admin",
-    "SpfqAdmin",
     "StudyMedicationAdmin",
     "SubjectRequisitionAdmin",
     "SubjectVisitAdmin",

meta_subject/choices.py

@@ -26,28 +26,14 @@ from .constants import (
     ALL_OF_THE_TIME,
     APPT,
     APPT_OTHER,
-    EXTREME,
     GOOD_BIT_OF_THE_TIME,
-    HIGHLY,
     LITTLE_OF_THE_TIME,
     LIVE_AT_TERM,
     LIVE_PRETERM,
-    MODERATE,
-    MODERATELY,
     MOST_OF_THE_TIME,
-    MUCH_LESS_EXPECTED,
-    MUCH_MORE_EXPECTED,
     NO_COMPLICATIONS,
     NONE_OF_THE_TIME,
-    NOT_AT_ALL,
-    SAME_AS_EXPECTED,
-    SEVERE,
-    SLIGHT,
-    SLIGHTLY,
     SOME_OF_THE_TIME,
-    SOMEWHAT_LESS_EXPECTED,
-    SOMEWHAT_MORE_EXPECTED,
-    VERY_HIGHLY,
 )
 
 ACTIVITY_CHOICES = (
@@ -256,26 +242,3 @@ YES_NO_NO_EXAM = (
     (NO, _(NO)),
     (NO_EXAM, _("Exam not performed")),
 )
-
-NOT_AT_ALL_TO_SEVERE_CHOICE = (
-    (NOT_AT_ALL, _("Not at all")),
-    (SLIGHT, _("Slight")),
-    (MODERATE, _("Moderate")),
-    (EXTREME, _("Extreme")),
-    (SEVERE, _("Severe")),
-)
-
-NOT_AT_ALL_TO_HIGHLY_CHOICE = (
-    (NOT_AT_ALL, _("Not at all")),
-    (SLIGHTLY, _("Slightly")),
-    (MODERATELY, _("Moderately")),
-    (HIGHLY, _("Highly")),
-    (VERY_HIGHLY, _("Very highly")),
-)
-LESS_EXPECTED_TO_MORE_EXPECTED_CHOICE = (
-    (MUCH_LESS_EXPECTED, _("Much less than expected")),
-    (SOMEWHAT_LESS_EXPECTED, _("Somewhat less than expected")),
-    (SAME_AS_EXPECTED, _("Same as expected")),
-    (SOMEWHAT_MORE_EXPECTED, _("Somewhat more than expected")),
-    (MUCH_MORE_EXPECTED, _("Much more than expected")),
-)

meta_subject/constants.py

@@ -6,29 +6,15 @@ APPT = "appt"
 APPT_OTHER = "other_routine_appt"
 DELIVERY_ACTION = "delivery_action"
 DM_FOLLOWUP_ACTION = "dm_followup_action"
-EXTREME = "extreme"
 FOLLOWUP_EXAMINATION_ACTION = "followup-examination-ae"
 GOOD_BIT_OF_THE_TIME = "good_bit_of_the_time"
-HIGHLY = "highly"
 LITTLE_OF_THE_TIME = "little_of_the_time"
 LIVE_AT_TERM = "live_at_term"
 LIVE_PRETERM = "live_preterm"
 LOW_EGFR_ACTION = "low-egfr"
 MISSED_VISIT_ACTION = "missed_visit_action"
-MODERATE = "moderate"
-MODERATELY = "moderately"
 MOST_OF_THE_TIME = "most_of_the_time"
-MUCH_LESS_EXPECTED = "much_less_expected"
-MUCH_MORE_EXPECTED = "much_more_expected"
 NONE_OF_THE_TIME = "none_of_the_time"
-NOT_AT_ALL = "not_at_all"
 NO_COMPLICATIONS = "no_complications"
-SAME_AS_EXPECTED = "same_as_expected"
-SEVERE = "severe"
-SLIGHT = "slight"
-SLIGHTLY = "slightly"
-SOMEWHAT_LESS_EXPECTED = "somewhat_less_expected"
-SOMEWHAT_MORE_EXPECTED = "somewhat_more_expected"
 SOME_OF_THE_TIME = "some_of_the_time"
 URINE_PREGNANCY_ACTION = "urine_pregnancy_action"
-VERY_HIGHLY = "very_highly"

meta_subject/forms/__init__.py

@@ -29,7 +29,6 @@ from .patient_history_form import PatientHistoryForm
 from .physical_exam_form import PhysicalExamForm
 from .pregnancy_update_form import PregnancyUpdateForm
 from .sf12_form import Sf12Form
-from .spfq_form import SpfqForm
 from .study_medication_form import StudyMedicationForm
 from .subject_requisition_form import SubjectRequisitionForm
 from .subject_visit_form import SubjectVisitForm
@@ -70,7 +69,6 @@ __all__ = [
     "PhysicalExamForm",
     "PregnancyUpdateForm",
     "Sf12Form",
-    "SpfqForm",
     "StudyMedicationForm",
     "SubjectRequisitionForm",
     "SubjectVisitForm",

meta_subject/migrations/0234_remove_spfq_site_remove_spfq_subject_visit_and_more.py

@@ -0,0 +1,27 @@
+# Generated by Django 5.2.6 on 2025-09-30 22:50
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_subject", "0233_historicalspfq_spfq"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="spfq",
+            name="site",
+        ),
+        migrations.RemoveField(
+            model_name="spfq",
+            name="subject_visit",
+        ),
+        migrations.DeleteModel(
+            name="HistoricalSpfq",
+        ),
+        migrations.DeleteModel(
+            name="Spfq",
+        ),
+    ]

meta_subject/models/__init__.py

@@ -42,7 +42,6 @@ from .signals import (
     update_pregnancy_notification_on_delivery_post_save,
     update_schedule_on_delivery_post_save,
 )
-from .spfq import Spfq
 from .study_medication import StudyMedication
 from .subject_requisition import SubjectRequisition
 from .subject_visit import SubjectVisit
@@ -86,7 +85,6 @@ __all__ = [
     "PhysicalExam",
     "PregnancyUpdate",
     "Sf12",
-    "Spfq",
     "StudyMedication",
     "SubjectRequisition",
     "SubjectVisit",

meta_subject/models/health_economics/health_economics_simple.py

@@ -1,12 +1,12 @@
 from django.db import models
 from edc_constants.choices import MARITAL_STATUS
-from edc_he.model_mixins import HealthEconomicsEducationModelMixin
+from edc_he.model_mixins import EducationModelMixin
 from edc_model.models import BaseUuidModel
 
 from ...model_mixins import CrfModelMixin
 
 
-class HealthEconomicsSimple(HealthEconomicsEducationModelMixin, CrfModelMixin, BaseUuidModel):
+class HealthEconomicsSimple(EducationModelMixin, CrfModelMixin, BaseUuidModel):
     occupation = models.CharField(
         verbose_name="What is your occupation/profession?", max_length=50
     )

meta_consent/admin/subject_consent_spfq_admin.py

@@ -1,58 +0,0 @@
-from django.contrib import admin
-from django.utils.translation import gettext as _
-from django_audit_fields import audit_fieldset_tuple
-from edc_model_admin.dashboard import ModelAdminSubjectDashboardMixin
-from edc_model_admin.history import SimpleHistoryAdmin
-
-from ..admin_site import meta_consent_admin
-from ..forms import SubjectConsentSpfqForm
-from ..models import SubjectConsentSpfq
-
-
-@admin.register(SubjectConsentSpfq, site=meta_consent_admin)
-class SubjectConsentSpfqAdmin(
-    ModelAdminSubjectDashboardMixin,
-    SimpleHistoryAdmin,
-):
-    form = SubjectConsentSpfqForm
-
-    fieldsets = (
-        (
-            None,
-            {
-                "fields": (
-                    "subject_identifier",
-                    "initials",
-                    "gender",
-                    "language",
-                    "consent_datetime",
-                )
-            },
-        ),
-        (
-            "Review Questions",
-            {
-                "fields": (
-                    "consent_reviewed",
-                    "study_questions",
-                    "assessment_score",
-                    "consent_signature",
-                    "consent_copy",
-                ),
-                "description": _("The following questions are directed to the interviewer."),
-            },
-        ),
-        audit_fieldset_tuple,
-    )
-
-    search_fields = ("subject_identifier",)
-
-    radio_fields = {  # noqa: RUF012
-        "gender": admin.VERTICAL,
-        "assessment_score": admin.VERTICAL,
-        "consent_copy": admin.VERTICAL,
-        "consent_reviewed": admin.VERTICAL,
-        "consent_signature": admin.VERTICAL,
-        "language": admin.VERTICAL,
-        "study_questions": admin.VERTICAL,
-    }

meta_consent/forms/subject_consent_spfq_form.py

@@ -1,55 +0,0 @@
-from django import forms
-from django.core.exceptions import ObjectDoesNotExist
-from edc_action_item.forms import ActionItemFormMixin
-from edc_form_validators import FormValidatorMixin
-from edc_registration.models import RegisteredSubject
-from edc_sites.modelform_mixins import SiteModelFormMixin
-
-from meta_consent.models import SubjectConsentSpfq
-from meta_rando.models import SpfqList
-
-
-class SubjectConsentSpfqForm(
-    SiteModelFormMixin, ActionItemFormMixin, FormValidatorMixin, forms.ModelForm
-):
-    def clean(self):
-        cleaned_data = super().clean()
-
-        try:
-            RegisteredSubject.objects.get(
-                subject_identifier=cleaned_data.get("subject_identifier"),
-                initials=cleaned_data.get("initials"),
-                gender=cleaned_data.get("gender"),
-            )
-        except ObjectDoesNotExist as e:
-            raise forms.ValidationError(
-                {
-                    "__all__": (
-                        "Subject not known to the META trial. "
-                        "Check that the identifier, initials and gender match the patient "
-                        "register from the main META trial."
-                    )
-                }
-            ) from e
-        try:
-            SpfqList.objects.get(
-                subject_identifier=cleaned_data.get("subject_identifier"),
-            )
-        except ObjectDoesNotExist as e:
-            raise forms.ValidationError(
-                {
-                    "__all__": (
-                        "Subject not found .A subject with this identifier "
-                        "has not been selected for the sub-study."
-                    )
-                }
-            ) from e
-        return cleaned_data
-
-    class Meta:
-        model = SubjectConsentSpfq
-        fields = "__all__"
-        widgets = {  # noqa: RUF012
-            "action_identifier": forms.TextInput(attrs={"readonly": "readonly"}),
-            "subject_identifier": forms.TextInput(attrs={"readonly": "readonly"}),
-        }

meta_consent/models/subject_consent_spfq.py

@@ -1,103 +0,0 @@
-from django.conf import settings
-from django.contrib.sites.managers import CurrentSiteManager
-from django.core.validators import RegexValidator
-from django.db import models
-from django.utils import timezone
-from django.utils.translation import gettext_lazy as _
-from django_crypto_fields.fields import EncryptedCharField
-from edc_consent.field_mixins import (
-    ReviewFieldsMixin,
-)
-from edc_consent.managers import ConsentObjectsManager
-from edc_constants.choices import GENDER
-from edc_constants.constants import NULL_STRING
-from edc_model.models import BaseUuidModel, HistoricalRecords
-from edc_sites.model_mixins import SiteModelMixin
-
-from .model_mixins import SearchSlugModelMixin
-
-
-class SubjectConsentSpfq(
-    SiteModelMixin,
-    ReviewFieldsMixin,
-    SearchSlugModelMixin,
-    BaseUuidModel,
-):
-    """A model completed by the user that captures the ICF for SPFQ."""
-
-    subject_identifier = models.CharField(
-        verbose_name=_("Subject identifier"), max_length=50, unique=True
-    )
-
-    initials = EncryptedCharField(
-        validators=[
-            RegexValidator(
-                regex=r"^[A-Z]{2,3}$",
-                message="Ensure initials consist of letters only in upper case, no spaces.",
-            )
-        ],
-        default=NULL_STRING,
-    )
-
-    gender = models.CharField(
-        verbose_name="Gender",
-        choices=GENDER,
-        max_length=1,
-    )
-
-    consent_datetime = models.DateTimeField(
-        verbose_name=_("Consent datetime"), default=timezone.now
-    )
-
-    report_datetime = models.DateTimeField(null=True, editable=False)
-
-    language = models.CharField(
-        verbose_name=_("Language of consent"),
-        max_length=25,
-        choices=settings.LANGUAGES,
-        help_text=_(
-            "The language used for the consent process will "
-            "also be used during data collection."
-        ),
-    )
-
-    model_name = models.CharField(
-        verbose_name="model",
-        max_length=50,
-        help_text=(
-            "label_lower of this model class. Will be different if "
-            "instance has been added/edited via a proxy model"
-        ),
-        default=NULL_STRING,
-        editable=False,
-    )
-
-    version = models.CharField(
-        verbose_name="Consent version",
-        max_length=10,
-        default="1.0",
-        help_text="See 'consent definition' for consent versions by period.",
-        editable=False,
-    )
-
-    on_site = CurrentSiteManager()
-
-    objects = ConsentObjectsManager()
-
-    history = HistoricalRecords()
-
-    def __str__(self):
-        return f"{self.subject_identifier} V{self.version}"
-
-    def save(self, *args, **kwargs):
-        if not self.id:
-            self.model_name = self._meta.label_lower
-        self.report_datetime = self.consent_datetime
-        super().save(*args, **kwargs)
-
-    def natural_key(self):
-        return self.subject_identifier, self.version
-
-    class Meta(BaseUuidModel.Meta):
-        verbose_name = "Subject Consent for SPFQ"
-        verbose_name_plural = "Subject Consents for SPFQ"

meta_rando/models/spfq_list.py

@@ -1,26 +0,0 @@
-from django.db import models
-from edc_constants.choices import GENDER
-from edc_identifier.model_mixins import UniqueSubjectIdentifierFieldMixin
-from edc_model.models import BaseUuidModel
-from edc_sites.model_mixins import SiteModelMixin
-
-
-class SpfqList(SiteModelMixin, UniqueSubjectIdentifierFieldMixin, BaseUuidModel):
-    sid = models.IntegerField(unique=True)
-
-    last_visit_code = models.CharField(max_length=25)
-
-    last_appt_datetime = models.DateTimeField()
-
-    gender = models.CharField(max_length=10, choices=GENDER)
-
-    weight_bin = models.CharField(
-        max_length=25,
-        choices=(("lt_35", "<35"), ("gte_35__lte_49", "35-49"), ("gte_50", ">=50")),
-    )
-
-    date_generated = models.DateTimeField()
-
-    class Meta(BaseUuidModel.Meta):
-        verbose_name = "SPFQ List"
-        verbose_name_plural = "SPFQ List"

meta_subject/admin/spfg_admin.py

@@ -1,103 +0,0 @@
-from django.contrib import admin
-from django.utils.safestring import mark_safe
-from django_audit_fields import audit_fieldset_tuple
-from edc_crf.fieldset import crf_status_fieldset
-from edc_model_admin.history import SimpleHistoryAdmin
-
-from ..admin_site import meta_subject_admin
-from ..forms import SpfqForm
-from ..models import Spfq
-from .modeladmin import CrfModelAdminMixin
-
-
-@admin.register(Spfq, site=meta_subject_admin)
-class SpfqAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
-    additional_instructions = mark_safe(
-        "The Study Participant Feedback Questionnaire Toolkit (SPFQ) is a set of three "
-        "brief validated patient questionnaires designed to capture patients’ experiences "
-        "at the beginning, during, and end of each clinical study, independent of disease "
-        "and treatment.<BR>"
-        "<B><font color='orange'>Interviewer to read</font></B>: Thank you for your "
-        "participation. Your experiences in this trial are important to us and we "
-        "would like to hear about them. Your answers will help us improve future trials. "
-        "There are no right or wrong answers. Your answers will be kept anonymous and "
-        "will not impact your participation in this trial."
-    )
-
-    form = SpfqForm
-
-    fieldsets = (
-        (None, {"fields": ("subject_visit", "report_datetime")}),
-        (
-            "Section A: Your experience before you started the study",
-            {
-                "description": "Please select one response for each of the following items.",
-                "fields": ("a01", "a02", "a03", "a04"),
-            },
-        ),
-        (
-            "Section B: Your experience during the trial",
-            {
-                "description": "Please select one response for each of the following items.",
-                "fields": (
-                    "b01",
-                    "b02",
-                    "b03",
-                    "b04",
-                    "b05",
-                    "b06",
-                    "b07",
-                    "b08",
-                    "b09",
-                    "b10",
-                ),
-            },
-        ),
-        (
-            "Section C: Your experience at the end of the trial",
-            {
-                "description": "Please select one response for each of the following items.",
-                "fields": (
-                    "c01",
-                    "c02",
-                    "c03",
-                    "c04",
-                    "c05",
-                    "c06",
-                    "c07",
-                    "c08",
-                    "c09",
-                    "c10",
-                ),
-            },
-        ),
-        crf_status_fieldset,
-        audit_fieldset_tuple,
-    )
-
-    radio_fields = {  # noqa: RUF012
-        "a01": admin.VERTICAL,
-        "a02": admin.VERTICAL,
-        "a03": admin.VERTICAL,
-        "a04": admin.VERTICAL,
-        "b01": admin.VERTICAL,
-        "b02": admin.VERTICAL,
-        "b03": admin.VERTICAL,
-        "b04": admin.VERTICAL,
-        "b05": admin.VERTICAL,
-        "b06": admin.VERTICAL,
-        "b07": admin.VERTICAL,
-        "b08": admin.VERTICAL,
-        "b09": admin.VERTICAL,
-        "b10": admin.VERTICAL,
-        "c01": admin.VERTICAL,
-        "c02": admin.VERTICAL,
-        "c03": admin.VERTICAL,
-        "c04": admin.VERTICAL,
-        "c05": admin.VERTICAL,
-        "c06": admin.VERTICAL,
-        "c07": admin.VERTICAL,
-        "c08": admin.VERTICAL,
-        "c09": admin.VERTICAL,
-        "c10": admin.VERTICAL,
-    }

meta_subject/forms/spfq_form.py

@@ -1,65 +0,0 @@
-from django import forms
-from django.core.exceptions import ObjectDoesNotExist
-from edc_crf.crf_form_validator import CrfFormValidator
-from edc_crf.modelform_mixins import CrfModelFormMixin
-from edc_registration.models import RegisteredSubject
-
-from meta_consent.models import SubjectConsentSpfq
-from meta_rando.models import SpfqList
-
-from ..models import Spfq
-
-
-class SpfqFormValidator(CrfFormValidator):
-    pass
-
-
-class SpfqForm(CrfModelFormMixin, forms.ModelForm):
-    form_validator_cls = SpfqFormValidator
-
-    def clean(self):
-        cleaned_data = super().clean()
-
-        try:
-            RegisteredSubject.objects.get(
-                subject_identifier=cleaned_data.get("subject_identifier"),
-                initials=cleaned_data.get("initials"),
-                gender=cleaned_data.get("gender"),
-            )
-        except ObjectDoesNotExist as e:
-            raise forms.ValidationError(
-                {
-                    "__all__": (
-                        "Subject not known to the META trial. "
-                        "Check that the identifier, initials and gender match the patient "
-                        "register from the main META trial."
-                    )
-                }
-            ) from e
-        try:
-            SpfqList.objects.get(
-                subject_identifier=cleaned_data.get("subject_identifier"),
-            )
-        except ObjectDoesNotExist as e:
-            raise forms.ValidationError(
-                {
-                    "__all__": (
-                        "Subject not found. A subject with this identifier "
-                        "has not been selected for the sub-study."
-                    )
-                }
-            ) from e
-
-        try:
-            SubjectConsentSpfq.objects.get(
-                subject_identifier=cleaned_data.get("subject_identifier"),
-            )
-        except ObjectDoesNotExist as e:
-            raise forms.ValidationError(
-                {"__all__": "Subject not consented for the sub-study."}
-            ) from e
-        return cleaned_data
-
-    class Meta:
-        model = Spfq
-        fields = "__all__"

meta_subject/models/spfq.py

@@ -1,190 +0,0 @@
-from django.db import models
-from edc_constants.choices import DIFFICULT_TO_EASY_CHOICE, DISAGREE_TO_AGREE_CHOICE, YES_NO
-from edc_model.models import BaseUuidModel
-
-from ..choices import (
-    LESS_EXPECTED_TO_MORE_EXPECTED_CHOICE,
-    NOT_AT_ALL_TO_HIGHLY_CHOICE,
-    NOT_AT_ALL_TO_SEVERE_CHOICE,
-)
-from ..model_mixins import CrfModelMixin
-
-
-class Spfq(CrfModelMixin, BaseUuidModel):
-    a01 = models.CharField(
-        verbose_name="I understood the treatment process in this trial",
-        max_length=25,
-        choices=DISAGREE_TO_AGREE_CHOICE,
-        help_text="for example: when and how to take or use a treatment",
-    )
-    a02 = models.CharField(
-        verbose_name=(
-            "The information given to me before "
-            "I joined the trial was everything I wanted to know"
-        ),
-        max_length=25,
-        choices=DISAGREE_TO_AGREE_CHOICE,
-        help_text=(
-            "for example: visits and procedures, "
-            "time commitment, who to contact with questions"
-        ),
-    )
-    a03 = models.CharField(
-        verbose_name=(
-            "The information given to me before I "
-            "joined the trial was easy for me to understand"
-        ),
-        max_length=25,
-        choices=DISAGREE_TO_AGREE_CHOICE,
-        help_text=(
-            "for example: visits and procedures, "
-            "time commitment, who to contact with questions"
-        ),
-    )
-    a04 = models.CharField(
-        verbose_name=(
-            "I felt comfortable that I could ask any questions before I joined the trial"
-        ),
-        max_length=25,
-        choices=DISAGREE_TO_AGREE_CHOICE,
-    )
-    b01 = models.CharField(
-        verbose_name="Overall I was satisfied with the trial site",
-        max_length=25,
-        choices=DISAGREE_TO_AGREE_CHOICE,
-        help_text=(
-            "for example: comfort and privacy of treatment area, "
-            "waiting area, parking, ease of access to the site"
-        ),
-    )
-    b02 = models.CharField(
-        verbose_name="My trial visits were well organized",
-        max_length=25,
-        choices=DISAGREE_TO_AGREE_CHOICE,
-    )
-    b03 = models.CharField(
-        verbose_name="My trial visits were scheduled at a convenient time for me",
-        max_length=25,
-        choices=DISAGREE_TO_AGREE_CHOICE,
-    )
-    b04 = models.CharField(
-        verbose_name="The staff treated me with respect",
-        max_length=25,
-        choices=DISAGREE_TO_AGREE_CHOICE,
-    )
-    b05 = models.CharField(
-        verbose_name="I felt comfortable that I could ask questions during the trial",
-        max_length=25,
-        choices=DISAGREE_TO_AGREE_CHOICE,
-    )
-    b06 = models.CharField(
-        verbose_name=(
-            "I was satisfied with the answers I have received to my questions during the trial"
-        ),
-        max_length=25,
-        choices=DISAGREE_TO_AGREE_CHOICE,
-    )
-    b07 = models.CharField(
-        verbose_name="The time taken to collect data was acceptable to me",
-        max_length=25,
-        choices=YES_NO,
-        help_text="for example: in person visits, questionnaires, forms",
-    )
-    b08 = models.CharField(
-        verbose_name="The impact the trial has had on my daily activities is acceptable",
-        max_length=25,
-        choices=YES_NO,
-        help_text="for example: household chores, work commitments, eating",
-    )
-    b09 = models.CharField(
-        verbose_name="The way in which trial data is being collected is acceptable to me",
-        max_length=25,
-        choices=YES_NO,
-        help_text=(
-            "for example: in person, online questionnaire, "
-            "diary, wearable sensors, monitoring machines, technology"
-        ),
-    )
-    b10 = models.CharField(
-        verbose_name=(
-            "Optional: I am being kept informed of the results of "
-            "my medical tests done during the trial, including during screening"
-        ),
-        max_length=25,
-        choices=DISAGREE_TO_AGREE_CHOICE,
-        help_text="for example: blood tests, scans etc.",
-    )
-
-    c01 = models.CharField(
-        verbose_name="I was informed when I had completed the trial",
-        max_length=25,
-        choices=YES_NO,
-    )
-
-    c02 = models.CharField(
-        verbose_name=(
-            "I was informed of any future opportunities to "
-            "access the overall trial results if I wanted to"
-        ),
-        max_length=25,
-        choices=YES_NO,
-    )
-
-    c03 = models.CharField(
-        verbose_name="How easy was it to take the medication?",
-        max_length=25,
-        choices=DIFFICULT_TO_EASY_CHOICE,
-    )
-
-    c04 = models.CharField(
-        verbose_name="Did you experience any burden or side effects?",
-        max_length=25,
-        choices=NOT_AT_ALL_TO_SEVERE_CHOICE,
-    )
-
-    c05 = models.CharField(
-        verbose_name="How acceptable was it to take the drug?",
-        max_length=25,
-        choices=NOT_AT_ALL_TO_HIGHLY_CHOICE,
-    )
-
-    c06 = models.CharField(
-        verbose_name="How easy was it to fit the medication into your routine?",
-        max_length=25,
-        choices=DIFFICULT_TO_EASY_CHOICE,
-    )
-
-    c07 = models.CharField(
-        verbose_name="How burdensome was taking part in the trial?",
-        max_length=25,
-        choices=NOT_AT_ALL_TO_SEVERE_CHOICE,
-    )
-
-    c08 = models.CharField(
-        verbose_name=(
-            "Overall, I was satisfied with the information "
-            "I received about future support after the trial"
-        ),
-        max_length=25,
-        choices=DISAGREE_TO_AGREE_CHOICE,
-        help_text="for example: future treatment, follow-up contact details",
-    )
-
-    c09 = models.CharField(
-        verbose_name="Overall, I was satisfied with my trial experience",
-        max_length=25,
-        choices=DISAGREE_TO_AGREE_CHOICE,
-    )
-
-    c10 = models.CharField(
-        verbose_name=(
-            "Compared to when the trial started, the overall "
-            "commitment required was similar to what I expected"
-        ),
-        max_length=25,
-        choices=LESS_EXPECTED_TO_MORE_EXPECTED_CHOICE,
-    )
-
-    class Meta(CrfModelMixin.Meta, BaseUuidModel.Meta):
-        verbose_name = "Feedback Questionnaire (SPFQ)"
-        verbose_name_plural = "Feedback Questionnaires (SPFQ)"