clinicedc 2.0.6__py3-none-any.whl → 2.0.8__py3-none-any.whl

edc_action_item/send_email.py

@@ -1,85 +0,0 @@
-# import sys
-#
-# from django.conf import settings
-# from django.utils.safestring import mark_safe
-# from django.core.mail.message import EmailMessage
-# from edc_utils import get_utcnow
-#
-# NEW_REPORT = 'new_report'
-# UPDATED_REPORT = 'updated_report'
-#
-# message_templates = {
-#     NEW_REPORT: (
-#         'Do not reply to this email\n\n'
-#         '{test_message}'
-#         'A report has been submitted for patient '
-#         '{action_item.subject_identifier} '
-#         'at site {action_item.site} which may require '
-#         'your attention.\n\n'
-#         'Title: {action_item.action_type.display_name}\n\n'
-#         'You received this message because you are listed as a '
-#         'member the Ambition Trial TMG\n\n'
-#         '{test_message}'
-#         'Thanks.'),
-#     UPDATED_REPORT: (
-#         'Do not reply to this email\n\n'
-#         '{test_message}'
-#         'A report has been updated for patient '
-#         '{action_item.subject_identifier} '
-#         'at site {action_item.site} which may require '
-#         'your attention.\n\n'
-#         'Title: {action_item.action_type.display_name}\n\n'
-#         'Reason: {reason}\n\n'
-#         'You received this message because you are listed as a '
-#         'member the Ambition Trial TMG\n\n'
-#         '{test_message}'
-#         'Thanks.')
-# }
-#
-#
-# def send_email(action_item=None, reason=None, template_name=None,
-#                force_send=None, using=None):
-#     #     if template_name:
-#     #         print('send_email', f'action_item={action_item}',
-#     #               f'reason={reason}', f'template_name={template_name}')
-#     #     else:
-#     #         print('send_email', f'action_item={action_item}')
-#     return None
-#
-#     if 'migrate' not in sys.argv:
-#         template_name = template_name or 'new_report'
-#         updated = '*UPDATE* ' if template_name == 'updated_report' else ''
-#         email_recipients = action_item.action_cls.email_recipients
-#         try:
-#             email_enabled = settings.EMAIL_ENABLED
-#         except AttributeError:
-#             email_enabled = False
-#         if email_enabled and email_recipients and (
-#                 not action_item.emailed or force_send):
-#             test_message = ''
-#             test_subject = ''
-#             try:
-#                 live_system = settings.LIVE_SYSTEM
-#             except AttributeError:
-#                 live_system = False
-#             if not live_system:
-#                 test_message = 'THIS IS A TEST MESSAGE. NO ACTION IS REQUIRED\n\n'
-#                 test_subject = 'TEST/UAT -- '
-#             from_email = settings.EMAIL_CONTACTS.get('data_manager')
-#             message = message_templates[template_name].format(
-#                 test_message=test_message,
-#                 action_item=action_item,
-#                 reason=reason)
-#             body = [mark_safe(message)]
-#             email_message = EmailMessage(
-#                 subject=(
-#                     f'{test_subject}{updated}Ambition: '
-#                     f'{action_item.action_type.display_name} '
-#                     f'for {action_item.subject_identifier}'),
-#                 body='\n\n'.join(body),
-#                 from_email=from_email,
-#                 to=email_recipients)
-#             email_message.send()
-#             action_item.emailed = True
-#             action_item.emailed_datetime = get_utcnow()
-#             action_item.save(using=using)

edc_action_item/site_action_items.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import contextlib
 import copy
 import sys
 from dataclasses import InitVar, dataclass, field
@@ -26,7 +27,7 @@ if TYPE_CHECKING:
     from .action_with_notification import ActionWithNotification
 
 
-class AlreadyRegistered(Exception):
+class AlreadyRegistered(Exception):  # noqa: N818
     pass
 
 
@@ -84,10 +85,8 @@ class SiteActionItemCollection:
                 model=action_cls.get_reference_model(),
                 url_namespace=action_cls.admin_site_name,
             )
-            try:
+            with contextlib.suppress(PrnAlreadyRegistered):
                 site_prn_forms.register(prn)
-            except PrnAlreadyRegistered:
-                pass
         try:
             action_cls.notification_email_to
         except AttributeError:
@@ -103,10 +102,8 @@ class SiteActionItemCollection:
         See edc_notification.
         """
         if action_cls.notification_cls():
-            try:
+            with contextlib.suppress(NotificationAlreadyRegistered):
                 site_notifications.register(action_cls.notification_cls())
-            except NotificationAlreadyRegistered:
-                pass
 
     @property
     def all(self) -> dict[str, type[Action] | type[ActionWithNotification]]:
@@ -129,12 +126,11 @@ class SiteActionItemCollection:
         return None
 
     def get_add_actions_to_show(self) -> dict[str, type[Action]]:
-        actions = {
+        return {
             action_cls.name: action_cls
             for action_cls in self.registry.values()
             if action_cls.show_link_to_add
         }
-        return actions
 
     def create_or_update_action_types(self) -> None:
         """Populates the ActionType model."""

edc_action_item/utils.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import contextlib
+
 from django.apps import apps as django_apps
 from django.core.exceptions import ObjectDoesNotExist
 from tqdm import tqdm
@@ -68,10 +70,8 @@ def reset_and_delete_action_item(instance, using=None):
 
 def register_actions(*action_cls):
     for cls in action_cls:
-        try:
+        with contextlib.suppress(AlreadyRegistered):
             site_action_items.register(cls)
-        except AlreadyRegistered:
-            pass
 
 
 def get_reference_obj(action_item: ActionItem | None):

edc_adherence/migrations/0005_alter_nonadherencereasons_extra_value_and_more.py

@@ -0,0 +1,36 @@
+# Generated by Django 5.2.6 on 2025-09-17 16:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("edc_adherence", "0004_alter_nonadherencereasons_options_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="nonadherencereasons",
+            name="extra_value",
+            field=models.CharField(default="", max_length=250),
+        ),
+        migrations.AlterField(
+            model_name="nonadherencereasons",
+            name="field_name",
+            field=models.CharField(
+                blank=True,
+                default="",
+                editable=False,
+                help_text="Not required",
+                max_length=25,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="nonadherencereasons",
+            name="plural_name",
+            field=models.CharField(
+                default="", max_length=250, verbose_name="Plural name"
+            ),
+        ),
+    ]

edc_adherence/model_mixins.py

@@ -41,7 +41,7 @@ class MedicationAdherenceModelMixin(models.Model):
 
     pill_count_not_performed_reason = models.TextField(
         verbose_name="If not performed, please explain ...",
-        null=True,
+        default="",
         blank=True,
     )
 

edc_adverse_event/auths.py

@@ -17,65 +17,69 @@ from .auth_objects import (
 )
 from .constants import AE, AE_REVIEW, AE_ROLE, AE_SUPER, TMG, TMG_REVIEW, TMG_ROLE
 
-site_auths.add_post_update_func(
-    "edc_adverse_event", remove_default_model_permissions_from_edc_permissions
-)
 
-permissions_model = "edc_adverse_event.edcpermissions"
+def update_site_auths():
+    site_auths.add_post_update_func(
+        "edc_adverse_event", remove_default_model_permissions_from_edc_permissions
+    )
 
-# custom perms
-site_auths.add_custom_permissions_tuples(
-    model=permissions_model, codename_tuples=ae_dashboard_tuples
-)
-site_auths.add_custom_permissions_tuples(
-    model=permissions_model, codename_tuples=tmg_dashboard_tuples
-)
+    permissions_model = "edc_adverse_event.edcpermissions"
 
-site_auths.add_custom_permissions_tuples(
-    model=permissions_model, codename_tuples=tmg_navbar_tuples
-)
-site_auths.add_custom_permissions_tuples(
-    model=permissions_model, codename_tuples=ae_navbar_tuples
-)
+    # custom perms
+    site_auths.add_custom_permissions_tuples(
+        model=permissions_model, codename_tuples=ae_dashboard_tuples
+    )
+    site_auths.add_custom_permissions_tuples(
+        model=permissions_model, codename_tuples=tmg_dashboard_tuples
+    )
 
-# groups
-site_auths.add_group(*ae_codenames, name=AE, no_delete=True)
-site_auths.update_group(
-    *[c[0] for c in ae_dashboard_tuples], *[c[0] for c in ae_navbar_tuples], name=AE
-)
+    site_auths.add_custom_permissions_tuples(
+        model=permissions_model, codename_tuples=tmg_navbar_tuples
+    )
+    site_auths.add_custom_permissions_tuples(
+        model=permissions_model, codename_tuples=ae_navbar_tuples
+    )
 
-site_auths.add_group(*ae_codenames, name=AE_SUPER)
-site_auths.update_group(
-    *[c[0] for c in ae_dashboard_tuples],
-    *[c[0] for c in ae_navbar_tuples],
-    name=AE_SUPER,
-)
+    # groups
+    site_auths.add_group(*ae_codenames, name=AE, no_delete=True)
+    site_auths.update_group(
+        *[c[0] for c in ae_dashboard_tuples], *[c[0] for c in ae_navbar_tuples], name=AE
+    )
 
-site_auths.add_group(*ae_codenames, name=AE_REVIEW, view_only=True)
-site_auths.update_group(
-    *[c[0] for c in ae_dashboard_tuples],
-    *[c[0] for c in ae_navbar_tuples],
-    name=AE_REVIEW,
-)
+    site_auths.add_group(*ae_codenames, name=AE_SUPER)
+    site_auths.update_group(
+        *[c[0] for c in ae_dashboard_tuples],
+        *[c[0] for c in ae_navbar_tuples],
+        name=AE_SUPER,
+    )
 
-site_auths.add_group(*tmg_codenames, name=TMG)
-site_auths.update_group(
-    *[c[0] for c in tmg_dashboard_tuples], *[c[0] for c in tmg_navbar_tuples], name=TMG
-)
+    site_auths.add_group(*ae_codenames, name=AE_REVIEW, view_only=True)
+    site_auths.update_group(
+        *[c[0] for c in ae_dashboard_tuples],
+        *[c[0] for c in ae_navbar_tuples],
+        name=AE_REVIEW,
+    )
 
-site_auths.add_group(*tmg_codenames, name=TMG_REVIEW, view_only=True)
-site_auths.update_group(
-    *[c[0] for c in tmg_dashboard_tuples],
-    *[c[0] for c in tmg_navbar_tuples],
-    name=TMG_REVIEW,
-)
+    site_auths.add_group(*tmg_codenames, name=TMG)
+    site_auths.update_group(
+        *[c[0] for c in tmg_dashboard_tuples], *[c[0] for c in tmg_navbar_tuples], name=TMG
+    )
+
+    site_auths.add_group(*tmg_codenames, name=TMG_REVIEW, view_only=True)
+    site_auths.update_group(
+        *[c[0] for c in tmg_dashboard_tuples],
+        *[c[0] for c in tmg_navbar_tuples],
+        name=TMG_REVIEW,
+    )
+
+    # add roles
+    site_auths.add_role(AE, name=AE_ROLE)
+    site_auths.add_role(AE_REVIEW, TMG, name=TMG_ROLE)
 
-# add roles
-site_auths.add_role(AE, name=AE_ROLE)
-site_auths.add_role(AE_REVIEW, TMG, name=TMG_ROLE)
+    site_auths.update_role(AE, name=CLINICIAN_ROLE)
+    site_auths.update_role(AE, name=NURSE_ROLE)
+    site_auths.update_role(AE_REVIEW, TMG_REVIEW, name=AUDITOR_ROLE)
+    site_auths.update_role(AE_SUPER, name=CLINICIAN_SUPER_ROLE)
 
 
-site_auths.update_role(AE, name=CLINICIAN_ROLE)
-site_auths.update_role(AE, name=NURSE_ROLE)
-site_auths.update_role(AE_REVIEW, TMG_REVIEW, name=AUDITOR_ROLE)
-site_auths.update_role(AE_SUPER, name=CLINICIAN_SUPER_ROLE)
+update_site_auths()

edc_adverse_event/migrations/0001_initial.py

@@ -7,6 +7,7 @@ import django_audit_fields.fields.uuid_auto_field
 import django_audit_fields.models.audit_model_mixin
 import django_revision.revision_field
 from django.db import migrations, models
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -33,14 +34,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
@@ -154,14 +155,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (

edc_adverse_event/migrations/0002_auto_20190802_0059.py

@@ -7,6 +7,7 @@ import django_audit_fields.fields.uuid_auto_field
 import django_audit_fields.models.audit_model_mixin
 import django_revision.revision_field
 from django.db import migrations, models
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -31,14 +32,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (

edc_adverse_event/migrations/0008_auto_20220825_0451.py

@@ -7,6 +7,7 @@ import django_audit_fields.fields.uuid_auto_field
 import django_audit_fields.models.audit_model_mixin
 import django_revision.revision_field
 from django.db import migrations, models
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -36,14 +37,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (

edc_adverse_event/migrations/0009_auto_20220907_0157.py

@@ -7,6 +7,7 @@ import django_audit_fields.fields.uuid_auto_field
 import django_audit_fields.models.audit_model_mixin
 import django_revision.revision_field
 from django.db import migrations, models
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -33,14 +34,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (