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

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)"