meta-edc 0.3.53__py3-none-any.whl → 1.0.1__py3-none-any.whl

meta_ae/action_items.py

@@ -1,6 +1,8 @@
 from django.apps import apps as django_apps
 from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist
+from django.utils.html import format_html
 from django.utils.safestring import mark_safe
+from django.utils.translation import gettext as _
 from edc_action_item import ActionWithNotification, site_action_items
 from edc_adverse_event.constants import (
     AE_FOLLOWUP_ACTION,
@@ -39,10 +41,13 @@ class AeFollowupAction(ActionWithNotification):
     create_by_user = False
     show_link_to_changelist = True
     admin_site_name = "meta_ae_admin"
-    instructions = mark_safe(  # nosec B308, B703
-        "Upon submission the TMG group will be notified "
-        f'by email at <a href="mailto:{get_email_contacts("tmg") or "#"}">'
-        f'{get_email_contacts("tmg") or "unknown"}</a>'
+    instructions = format_html(
+        _(
+            "Upon submission the TMG group will be notified "
+            'by email at <a href="mailto:{email1}">{email2}</a>'
+        ),
+        email1=get_email_contacts("tmg") or "#",
+        email2=get_email_contacts("tmg") or "unknown",
     )
     priority = HIGH_PRIORITY
 

meta_ae/admin/ae_initial_admin.py

@@ -1,5 +1,6 @@
 from django.contrib import admin
 from django.utils.html import format_html
+from django.utils.translation import gettext as _
 from edc_adverse_event.modeladmin_mixins import AeInitialModelAdminMixin
 from edc_model_admin.history import SimpleHistoryAdmin
 from edc_notification.utils import get_email_contacts
@@ -15,8 +16,10 @@ class AeInitialAdmin(SiteModelAdminMixin, AeInitialModelAdminMixin, SimpleHistor
     form = AeInitialForm
     email_contact = get_email_contacts("ae_reports")
     additional_instructions = format_html(
-        "Complete the initial AE report and forward to the TMG. "
-        'Email to <a href="mailto:{}">{}</a>',
+        _(
+            "Complete the initial AE report and forward to the TMG. "
+            'Email to <a href="mailto:{}">{}</a>'
+        ),
         email_contact,
         email_contact,
     )

meta_ae/admin/modeladmin_mixins.py

@@ -6,6 +6,7 @@ from django.template.loader import render_to_string
 from django.urls.base import reverse
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
+from django.utils.translation import gettext as _
 from django_audit_fields.admin import audit_fieldset_tuple
 from edc_action_item import action_fieldset_tuple
 from edc_action_item.modeladmin_mixins import ActionItemModelAdminMixin
@@ -96,8 +97,8 @@ class AeReviewModelAdminMixin(
         if follow_up_reports:
             return format_html(
                 "{}. See {}",
-                mark_safe(obj.get_outcome_display()),  # nosec B703, B308
-                mark_safe(follow_up_reports),  # nosec B703, B308
+                mark_safe(_(obj.get_outcome_display())),  # nosec B703, B308
+                mark_safe(_(follow_up_reports)),  # nosec B703, B308
             )
         return obj.get_outcome_display()
 
@@ -111,8 +112,9 @@ class AeReviewModelAdminMixin(
             namespace = self.admin_site.name
             url = reverse(f"{namespace}:{url_name}_changelist")
             return format_html(
-                '<a data-toggle="tooltip" title="go to ae initial report" '
+                '<a data-toggle="tooltip" title="{title}" '
                 'href="{url}?q={action_identifier}">{identifier}</a>',
+                title=_("go to ae initial report"),
                 url=mark_safe(url),  # nosec B703, B308
                 action_identifier=mark_safe(  # nosec B703, B308
                     obj.ae_initial.action_identifier

meta_ae/templatetags/meta_ae_extras.py

@@ -6,14 +6,12 @@ from django.conf import settings
 from django.utils.safestring import mark_safe
 from edc_adverse_event.utils import get_adverse_event_app_label
 from edc_constants.constants import OTHER, YES
-from edc_dashboard.utils import get_bootstrap_version
 
 register = template.Library()
 
 
 format_ae_description_template_name = (
-    f"{get_adverse_event_app_label()}/bootstrap{get_bootstrap_version()}/"
-    f"ae_initial_description.html"
+    f"{get_adverse_event_app_label()}/ae_initial_description.html"
 )
 
 

meta_consent/action_items.py

@@ -31,6 +31,7 @@ class ConsentV1ExtensionAction(Action):
     show_on_dashboard = True
     show_link_to_changelist = True
     admin_site_name = "meta_consent_admin"
+    show_link_to_add = True
     create_by_user = True
     singleton = True
     instructions = "Participant must complete as soon as able. "

meta_consent/migrations/0030_auto_20250120_2114.py

@@ -0,0 +1,40 @@
+# Generated by Django 5.1.5 on 2025-01-20 18:14
+
+from django.core.exceptions import ObjectDoesNotExist
+from django.db import IntegrityError, migrations, transaction
+from edc_action_item.models import ActionItem
+from edc_registration.models import RegisteredSubject
+from tqdm import tqdm
+
+from meta_consent.action_items import ConsentV1ExtensionAction
+
+
+def update_missing_action_items(apps, schema_editor):
+    total = RegisteredSubject.objects.all().count()
+    for obj in tqdm(RegisteredSubject.objects.all(), total=total):
+        try:
+            ActionItem.objects.get(
+                subject_identifier=obj.subject_identifier, action_type__name="consent_v1_ext"
+            )
+        except ObjectDoesNotExist:
+            try:
+                with transaction.atomic():
+                    ConsentV1ExtensionAction(
+                        subject_identifier=obj.subject_identifier,
+                        skip_get_current_site=True,
+                        site_id=obj.site_id,
+                    )
+            except IntegrityError:
+                print(f"ERROR: Unable to create for {obj.subject_identifier}.")
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "meta_consent",
+            "0029_alter_historicalsubjectconsentv1ext_agrees_to_extension_and_more",
+        ),
+    ]
+
+    operations = []

meta_consent/migrations/0031_alter_historicalsubjectconsent_guardian_name_and_more.py

@@ -0,0 +1,124 @@
+# Generated by Django 5.1.5 on 2025-01-22 03:27
+
+import django_crypto_fields.fields.encrypted_char_field
+import django_crypto_fields.fields.lastname_field
+import edc_consent.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_consent", "0030_auto_20250120_2114"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="historicalsubjectconsent",
+            name="guardian_name",
+            field=django_crypto_fields.fields.encrypted_char_field.EncryptedCharField(
+                blank=True,
+                help_text="Required only if participant is a minor.<BR>Format is &#x27;LASTNAME, FIRSTNAME&#x27;. All uppercase separated by a comma. (Encryption: RSA local)",
+                max_length=71,
+                null=True,
+                validators=[edc_consent.validators.FullNameValidator()],
+                verbose_name="Guardian's last and first name",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectconsent",
+            name="is_incarcerated",
+            field=models.CharField(
+                choices=[("Yes", "Yes"), ("No", "No")],
+                help_text="If 'Yes' STOP participant cannot be consented.",
+                max_length=3,
+                null=True,
+                validators=[edc_consent.validators.eligible_if_no],
+                verbose_name="Is the participant under involuntary incarceration?",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectconsent",
+            name="witness_name",
+            field=django_crypto_fields.fields.lastname_field.LastnameField(
+                blank=True,
+                help_text="Required only if participant is illiterate.<BR>Format is &#x27;LASTNAME, FIRSTNAME&#x27;. All uppercase separated by a comma. (Encryption: RSA local)",
+                max_length=71,
+                null=True,
+                validators=[edc_consent.validators.FullNameValidator()],
+                verbose_name="Witness's last and first name",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectconsentv1",
+            name="guardian_name",
+            field=django_crypto_fields.fields.encrypted_char_field.EncryptedCharField(
+                blank=True,
+                help_text="Required only if participant is a minor.<BR>Format is &#x27;LASTNAME, FIRSTNAME&#x27;. All uppercase separated by a comma. (Encryption: RSA local)",
+                max_length=71,
+                null=True,
+                validators=[edc_consent.validators.FullNameValidator()],
+                verbose_name="Guardian's last and first name",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectconsentv1",
+            name="is_incarcerated",
+            field=models.CharField(
+                choices=[("Yes", "Yes"), ("No", "No")],
+                help_text="If 'Yes' STOP participant cannot be consented.",
+                max_length=3,
+                null=True,
+                validators=[edc_consent.validators.eligible_if_no],
+                verbose_name="Is the participant under involuntary incarceration?",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectconsentv1",
+            name="witness_name",
+            field=django_crypto_fields.fields.lastname_field.LastnameField(
+                blank=True,
+                help_text="Required only if participant is illiterate.<BR>Format is &#x27;LASTNAME, FIRSTNAME&#x27;. All uppercase separated by a comma. (Encryption: RSA local)",
+                max_length=71,
+                null=True,
+                validators=[edc_consent.validators.FullNameValidator()],
+                verbose_name="Witness's last and first name",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectconsent",
+            name="guardian_name",
+            field=django_crypto_fields.fields.encrypted_char_field.EncryptedCharField(
+                blank=True,
+                help_text="Required only if participant is a minor.<BR>Format is &#x27;LASTNAME, FIRSTNAME&#x27;. All uppercase separated by a comma. (Encryption: RSA local)",
+                max_length=71,
+                null=True,
+                validators=[edc_consent.validators.FullNameValidator()],
+                verbose_name="Guardian's last and first name",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectconsent",
+            name="is_incarcerated",
+            field=models.CharField(
+                choices=[("Yes", "Yes"), ("No", "No")],
+                help_text="If 'Yes' STOP participant cannot be consented.",
+                max_length=3,
+                null=True,
+                validators=[edc_consent.validators.eligible_if_no],
+                verbose_name="Is the participant under involuntary incarceration?",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectconsent",
+            name="witness_name",
+            field=django_crypto_fields.fields.lastname_field.LastnameField(
+                blank=True,
+                help_text="Required only if participant is illiterate.<BR>Format is &#x27;LASTNAME, FIRSTNAME&#x27;. All uppercase separated by a comma. (Encryption: RSA local)",
+                max_length=71,
+                null=True,
+                validators=[edc_consent.validators.FullNameValidator()],
+                verbose_name="Witness's last and first name",
+            ),
+        ),
+    ]

meta_dashboard/templates/meta_dashboard/{bootstrap3/subject → subject}/dashboard/sidebar.html

@@ -1,4 +1,4 @@
-{% extends 'edc_subject_dashboard/bootstrap3/dashboard/sidebar.html' %}
+{% extends 'edc_subject_dashboard/dashboard/sidebar.html' %}
 {% load edc_subject_dashboard_extras %}
 
 {% block consents %}

meta_dashboard/templates/meta_dashboard/{bootstrap3/subject → subject}/dashboard/top_bar.html

@@ -1,3 +1,3 @@
-{% extends 'edc_subject_dashboard/bootstrap3/dashboard/topbar.html' %}
+{% extends 'edc_subject_dashboard/dashboard/topbar.html' %}
 
 {% block close_url %}href="{% url subject_listboard_url|default:'subject_listboard_url_cannot_be_none' %}?q={{ subject_identifier }}"{% endblock close_url %}

meta_dashboard/templates/meta_dashboard/subject/dashboard.html

@@ -0,0 +1,14 @@
+{% extends 'edc_subject_dashboard/dashboard.html' %}
+
+{% load static %}
+
+{% block locator_information %}{% endblock locator_information %}
+
+{% block top_bar %}
+
+    {% include "meta_dashboard/subject/dashboard/top_bar.html" %}
+
+{% endblock top_bar %}
+
+
+{% block side_bar %}{% include 'meta_dashboard/subject/dashboard/sidebar.html' %}{% endblock side_bar %}

meta_dashboard/templatetags/meta_dashboard_extras.py

@@ -6,7 +6,6 @@ from bs4 import BeautifulSoup
 from django import template
 from edc_constants.constants import TBD
 from edc_dashboard.url_names import url_names
-from edc_dashboard.utils import get_bootstrap_version
 
 from meta_consent.models import SubjectConsent
 from meta_dashboard.view_utils import (
@@ -29,9 +28,7 @@ if TYPE_CHECKING:
 register = template.Library()
 
 
-@register.inclusion_tag(
-    f"meta_dashboard/bootstrap{get_bootstrap_version()}/" f"buttons/eligibility_button.html"
-)
+@register.inclusion_tag("meta_dashboard/buttons/eligibility_button.html")
 def eligibility_button(subject_screening: SubjectScreening):
     comment = []
     tooltip = None
@@ -52,7 +49,7 @@ def eligibility_button(subject_screening: SubjectScreening):
 
 
 @register.inclusion_tag(
-    f"meta_dashboard/bootstrap{get_bootstrap_version()}/buttons/add_consent_button.html",
+    "meta_dashboard/buttons/add_consent_button.html",
     takes_context=True,
 )
 def render_consent_button(context, subject_screening: SubjectScreening):
@@ -77,9 +74,7 @@ def refusal_button(context, subject_refusal):
     )
 
 
-@register.inclusion_tag(
-    f"edc_listboard/bootstrap{get_bootstrap_version()}/buttons/dashboard_button.html"
-)
+@register.inclusion_tag("edc_listboard/buttons/dashboard_button.html")
 def render_dashboard_button(subject_consent: SubjectConsent):
     subject_dashboard_url = url_names.get("subject_dashboard_url")
     return dict(
@@ -89,7 +84,7 @@ def render_dashboard_button(subject_consent: SubjectConsent):
 
 
 @register.inclusion_tag(
-    f"edc_subject_dashboard/bootstrap{get_bootstrap_version()}/buttons/forms_button.html",
+    "edc_subject_dashboard/buttons/forms_button.html",
     takes_context=True,
 )
 def render_screening_part_one_button(context, subject_screening: ScreeningPartOne) -> dict:
@@ -102,7 +97,7 @@ def render_screening_part_one_button(context, subject_screening: ScreeningPartOn
 
 
 @register.inclusion_tag(
-    f"edc_subject_dashboard/bootstrap{get_bootstrap_version()}/buttons/forms_button.html",
+    "edc_subject_dashboard/buttons/forms_button.html",
     takes_context=True,
 )
 def render_screening_part_two_button(context, subject_screening: ScreeningPartTwo) -> dict:
@@ -115,7 +110,7 @@ def render_screening_part_two_button(context, subject_screening: ScreeningPartTw
 
 
 @register.inclusion_tag(
-    f"edc_subject_dashboard/bootstrap{get_bootstrap_version()}/buttons/forms_button.html",
+    "edc_subject_dashboard/buttons/forms_button.html",
     takes_context=True,
 )
 def render_screening_part_three_button(context, subject_screening: ScreeningPartThree) -> dict:

meta_dashboard/views/subject/dashboard/dashboard_view.py

@@ -5,6 +5,7 @@ from django.core.checks import messages
 from django.core.exceptions import ObjectDoesNotExist
 from django.urls import reverse
 from django.utils.html import format_html
+from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
 from edc_subject_dashboard.views import SubjectDashboardView
 
@@ -28,11 +29,11 @@ class DashboardView(SubjectDashboardView):
         else:
             url = reverse("meta_reports_admin:meta_reports_glucosesummary_changelist")
             url = f"{url}?q={self.subject_identifier}"
-            message = _(
-                format_html(
-                    f"Subject has reached the protocol endpoint. "
-                    f'See <A href="{url}">{GlucoseSummary._meta.verbose_name}</A>'
-                )
+            message = format_html(
+                '{text} <A href="{url}">{verbose_name}</A>',
+                text=_("Subject has reached the protocol endpoint. See "),
+                url=mark_safe(url),  # nosec B703, B308
+                verbose_name=GlucoseSummary._meta.verbose_name,
             )
             self.message_user(message, level=messages.WARNING)
         return context

meta_edc/admin.py

@@ -1,13 +1,12 @@
 from django.contrib.admin import AdminSite as DjangoAdminSite
-from edc_dashboard.utils import get_bootstrap_version
 
 from .apps import AppConfig
 
 
 class AdminSite(DjangoAdminSite):
     app_index_template = "edc_model_admin/admin/app_index.html"
-    login_template = f"edc_auth/bootstrap{get_bootstrap_version()}/login.html"
-    logout_template = f"edc_auth/bootstrap{get_bootstrap_version()}/login.html"
+    login_template = "edc_auth/login.html"
+    logout_template = "edc_auth/login.html"
     enable_nav_sidebar = False  # DJ 3.1
     final_catch_all_view = True  # DJ 3.2
     site_title = AppConfig.verbose_name

meta_edc/settings/debug.py

@@ -7,11 +7,11 @@ from .defaults import *  # noqa
 print(f"Settings file {__file__}")
 
 # TZ Sites:
-# SITE_ID = SiteID(default=20)  # Amana
+SITE_ID = SiteID(default=20)  # Amana
 # SITE_ID = SiteID(default=10)  # Hindu Mandal
 # SITE_ID = SiteID(default=40)  # Mwananyamala
 # SITE_ID = SiteID(default=50)  # Mbagala
-SITE_ID = SiteID(default=60)  # Mnazi-Moja
+# SITE_ID = SiteID(default=60)  # Mnazi-Moja
 # SITE_ID = SiteID(default=30)  # Temeke
 INDEX_PAGE = "http://localhost:8000"
 EDC_SITES_UAT_DOMAIN = False

meta_edc/settings/defaults.py

@@ -19,7 +19,6 @@ env = environ.Env(
     DJANGO_AUTO_CREATE_KEYS=(bool, False),
     DJANGO_CSRF_COOKIE_SECURE=(bool, True),
     DJANGO_DEBUG=(bool, False),
-    DJANGO_EDC_BOOTSTRAP=(int, 3),
     DJANGO_EMAIL_ENABLED=(bool, False),
     DJANGO_EMAIL_USE_TLS=(bool, True),
     DJANGO_LIVE_SYSTEM=(bool, False),
@@ -375,7 +374,6 @@ EDC_DASHBOARD_APP_LABEL = "meta_dashboard"
 EDC_NAVBAR_DEFAULT = env("EDC_NAVBAR_DEFAULT")
 
 # dashboards
-EDC_BOOTSTRAP = env("DJANGO_EDC_BOOTSTRAP")
 DASHBOARD_URL_NAMES = env.dict("DJANGO_DASHBOARD_URL_NAMES")
 DASHBOARD_BASE_TEMPLATES = env.dict("DJANGO_DASHBOARD_BASE_TEMPLATES")
 LAB_DASHBOARD_BASE_TEMPLATES = env.dict("DJANGO_LAB_DASHBOARD_BASE_TEMPLATES")
@@ -446,7 +444,7 @@ MULTISITE_REGISTER_POST_MIGRATE_SYNC_ALIAS = False
 # and that redis server is running
 DEFENDER_REDIS_NAME = "default"
 DEFENDER_LOCK_OUT_BY_IP_AND_USERNAME = True
-DEFENDER_LOCKOUT_TEMPLATE = "edc_auth/bootstrap3/login.html"
+DEFENDER_LOCKOUT_TEMPLATE = "edc_auth/login.html"
 DEFENDER_LOGIN_FAILURE_LIMIT = 5
 
 # edc_crf

meta_edc/templates/meta_edc/{bootstrap3/base.html → base.html}

@@ -1,2 +1,2 @@
-{% extends 'edc_dashboard/bootstrap3/base.html' %}
+{% extends 'edc_dashboard/base.html' %}
 {% block footer %}{{ block.super }} {% comment %}META 2/3 base.html template{% endcomment %}{% endblock footer %}

meta_edc/templates/meta_edc/{bootstrap3/home.html → home.html}

@@ -1,4 +1,4 @@
-{% extends 'meta_edc/bootstrap3/base.html' %}
+{% extends 'meta_edc/base.html' %}
 {% load static edc_dashboard_extras %}
 
 {% block main %}

meta_edc/views/home_view.py

@@ -2,7 +2,6 @@ from typing import Any
 
 from django.conf import settings
 from django.views.generic import TemplateView
-from edc_dashboard.utils import get_bootstrap_version
 from edc_dashboard.view_mixins import EdcViewMixin
 from edc_navbar import NavbarViewMixin
 from edc_randomization.site_randomizers import site_randomizers
@@ -11,7 +10,7 @@ from meta_edc.meta_version import get_meta_version
 
 
 class HomeView(EdcViewMixin, NavbarViewMixin, TemplateView):
-    template_name = f"meta_edc/bootstrap{get_bootstrap_version()}/home.html"
+    template_name = "meta_edc/home.html"
     navbar_name = settings.APP_NAME
     navbar_selected_item = "home"
 

{meta_edc-0.3.53.dist-info → meta_edc-1.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: meta-edc
-Version: 0.3.53
+Version: 1.0.1
 Summary: META Trial EDC (http://www.isrctn.com/ISRCTN76157257)
 Home-page: https://github.com/meta-trial/meta-edc
 Author: Erik van Widenfelt
@@ -693,7 +693,7 @@ Requires-Python: >=3.12
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS
-Requires-Dist: edc==0.6.26
+Requires-Dist: edc==1.0.0
 Requires-Dist: edc-microscopy
 Requires-Dist: beautifulsoup4
 Requires-Dist: celery[redis]