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

edc_navbar/auths.py

@@ -4,17 +4,22 @@ from edc_auth.utils import remove_default_model_permissions_from_edc_permissions
 
 from .auth_objects import custom_codename_tuples
 
-site_auths.add_post_update_func(
-    "edc_navbar", remove_default_model_permissions_from_edc_permissions
-)
-site_auths.add_custom_permissions_tuples(
-    model="edc_navbar.edcpermissions", codename_tuples=custom_codename_tuples
-)
 
-site_auths.update_group(
-    "edc_navbar.nav_administration",
-    "edc_navbar.nav_home",
-    "edc_navbar.nav_logout",
-    "edc_navbar.nav_public",
-    name=EVERYONE,
-)
+def update_site_auths():
+    site_auths.add_post_update_func(
+        "edc_navbar", remove_default_model_permissions_from_edc_permissions
+    )
+    site_auths.add_custom_permissions_tuples(
+        model="edc_navbar.edcpermissions", codename_tuples=custom_codename_tuples
+    )
+
+    site_auths.update_group(
+        "edc_navbar.nav_administration",
+        "edc_navbar.nav_home",
+        "edc_navbar.nav_logout",
+        "edc_navbar.nav_public",
+        name=EVERYONE,
+    )
+
+
+update_site_auths()

edc_navbar/migrations/0004_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):
@@ -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,
                     ),
                 ),
                 (

edc_navbar/migrations/0009_alter_edcpermissions_device_created_and_more.py

@@ -0,0 +1,49 @@
+# Generated by Django 5.2.6 on 2025-09-17 16:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("edc_navbar", "0008_alter_edcpermissions_revision"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="edcpermissions",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="edcpermissions",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="edcpermissions",
+            name="locale_created",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="Auto-updated by Modeladmin",
+                max_length=10,
+                verbose_name="Locale created",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="edcpermissions",
+            name="locale_modified",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="Auto-updated by Modeladmin",
+                max_length=10,
+                verbose_name="Locale modified",
+            ),
+        ),
+    ]

edc_notification/auths.py

@@ -6,7 +6,12 @@ from edc_export.constants import EXPORT
 
 from .auth_objects import NOTIFICATION, codenames
 
-site_auths.add_group(*codenames, name=NOTIFICATION)
-if django_apps.is_installed("edc_export"):
-    site_auths.update_group("edc_notification.export_notification", name=EXPORT)
-site_auths.update_role(NOTIFICATION, name=ACCOUNT_MANAGER_ROLE)
+
+def update_site_auths():
+    site_auths.add_group(*codenames, name=NOTIFICATION)
+    if django_apps.is_installed("edc_export"):
+        site_auths.update_group("edc_notification.export_notification", name=EXPORT)
+    site_auths.update_role(NOTIFICATION, name=ACCOUNT_MANAGER_ROLE)
+
+
+update_site_auths()

edc_notification/migrations/0001_initial.py

@@ -7,7 +7,7 @@ from django.db import migrations, models
 
 import edc_model_fields.fields.hostname_modification_field
 import edc_model_fields.fields.userfield
-import edc_utils
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -21,11 +21,11 @@ class Migration(migrations.Migration):
             fields=[
                 (
                     "created",
-                    models.DateTimeField(blank=True, default=edc_utils.date.get_utcnow),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "modified",
-                    models.DateTimeField(blank=True, default=edc_utils.date.get_utcnow),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "user_created",

edc_notification/migrations/0004_auto_20190305_0123.py

@@ -4,6 +4,7 @@ import django_audit_fields.fields.hostname_modification_field
 import django_audit_fields.fields.userfield
 import django_audit_fields.models.audit_model_mixin
 from django.db import migrations, models
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -13,9 +14,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="notification",
             name="created",
-            field=models.DateTimeField(
-                blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-            ),
+            field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
         ),
         migrations.AlterField(
             model_name="notification",
@@ -29,9 +28,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="notification",
             name="modified",
-            field=models.DateTimeField(
-                blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-            ),
+            field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
         ),
         migrations.AlterField(
             model_name="notification",

edc_notification/migrations/0011_alter_notification_device_created_and_more.py

@@ -0,0 +1,59 @@
+# Generated by Django 5.2.6 on 2025-09-17 16:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("edc_notification", "0010_alter_notification_revision"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="notification",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="notification",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="notification",
+            name="locale_created",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="Auto-updated by Modeladmin",
+                max_length=10,
+                verbose_name="Locale created",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="notification",
+            name="locale_modified",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="Auto-updated by Modeladmin",
+                max_length=10,
+                verbose_name="Locale modified",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="notification",
+            name="mailing_list_address",
+            field=models.EmailField(
+                blank=True,
+                default="",
+                max_length=254,
+                verbose_name="Mailing list address",
+            ),
+        ),
+    ]

edc_notification/models/notification.py

@@ -20,7 +20,7 @@ class Notification(BaseUuidModel):
 
     display_name = models.CharField(max_length=255, unique=True)
 
-    mailing_list_address = models.EmailField(_("Mailing list address"), blank=True, null=True)
+    mailing_list_address = models.EmailField(_("Mailing list address"), blank=True, default="")
 
     enabled = models.BooleanField(default=True)
 

edc_notification/notification/graded_event_notification.py

@@ -4,8 +4,8 @@ from .model_notification import ModelNotification
 class GradedEventNotification(ModelNotification):
     grade: int | None = None
     model: str | None = None
-    create_fields = ["ae_grade"]
-    update_fields = ["ae_grade"]
+    create_fields: tuple[str] = ("ae_grade",)
+    update_fields: tuple[str] = ("ae_grade",)
 
     def field_value_condition_on_create(self, field, current_value):
         return str(current_value) == str(self.grade)

edc_notification/notification/model_notification.py

@@ -17,10 +17,10 @@ class ModelNotification(Notification):
 
     model: str | None = None  # label_lower format
 
-    model_operations = [CREATE, UPDATE, DELETE]
+    model_operations: tuple[str] = (CREATE, UPDATE, DELETE)
 
-    create_fields = ["created"]
-    update_fields = ["modified"]
+    create_fields: tuple[str] = ("created",)
+    update_fields: tuple[str] = ("modified",)
 
     email_body_template: str = (
         "\n\nDo not reply to this email\n\n"
@@ -177,30 +177,3 @@ class ModelNotification(Notification):
         )
 
         return opts
-
-    # @property
-    # def test_template_options(self) -> dict:
-    #     class Site:
-    #         domain = "gaborone.example.com"
-    #         name = "gaborone"
-    #         id = 99
-    #
-    #     class Meta:
-    #         label_lower = self.model
-    #
-    #     class DummyHistory:
-    #         def __init__(self, objects):
-    #             self._objects = objects
-    #
-    #         def all(self):
-    #             return self._objects
-    #
-    #     class DummyInstance:
-    #         id = 99
-    #         subject_identifier = "123456910"
-    #         site = Site()
-    #         _meta = Meta()
-    #
-    #     instance = DummyInstance()
-    #     instance.history = DummyHistory(objects=[instance])
-    #     return dict(instance=instance)

edc_notification/notification/new_model_notification.py

@@ -3,4 +3,4 @@ from .model_notification import ModelNotification
 
 
 class NewModelNotification(ModelNotification):
-    model_operations = [CREATE]
+    model_operations = (CREATE,)

edc_notification/notification/notification.py

@@ -1,13 +1,15 @@
+import contextlib
+
 from django.apps import apps as django_apps
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.mail import EmailMessage
+from django.utils import timezone
 from twilio.base.exceptions import TwilioException, TwilioRestException
 from twilio.rest import Client
 
 from edc_protocol.research_protocol_config import ResearchProtocolConfig
 from edc_sites.site import SiteNotRegistered, sites
-from edc_utils import get_utcnow
 
 from ..site_notifications import site_notifications
 from ..stubs import NotificationModelStub
@@ -30,7 +32,7 @@ class Notification:
 
     sms_client = Client
 
-    email_from: list[str] = get_email_contacts("data_manager")
+    email_from: str = get_email_contacts("data_manager")
     email_to: list[str] | None = None  # usually a mailing list address
     email_message_cls = EmailMessage
 
@@ -124,9 +126,9 @@ class Notification:
             if use_sms:
                 sms_sent = self.send_sms(**kwargs)
             self.post_notification_actions(email_sent=email_sent, sms_sent=sms_sent, **kwargs)
-        return True if email_sent or sms_sent else False
+        return bool(email_sent or sms_sent)
 
-    def notify_on_condition(self, **kwargs) -> bool:
+    def notify_on_condition(self, **kwargs) -> bool:  # noqa: ARG002
         """Override to conditionally return True if the notification
         should be sent by email and/or sms.
 
@@ -174,7 +176,7 @@ class Notification:
             notification_model = notification_model_cls.objects.get(name=self.name)
         return notification_model
 
-    def get_display_name(self, **kwargs):
+    def get_display_name(self, **kwargs):  # noqa: ARG002
         return self.display_name
 
     def get_template_options(self, instance=None, test_message=None, **kwargs):
@@ -193,30 +195,28 @@ class Notification:
             test_subject_line=(self.email_test_subject_line if test_message else "").strip(),
             test_body_line=self.email_test_body_line if test_message else "",
             test_line=self.sms_test_line if test_message else "",
-            message_datetime=get_utcnow(),
+            message_datetime=timezone.now(),
             message_reference="",
         )
         if "subject_identifier" not in template_options:
-            try:
+            with contextlib.suppress(AttributeError):
                 template_options.update(subject_identifier=instance.subject_identifier)
-            except AttributeError:
-                pass
         if "site_name" not in template_options:
             try:
                 site_name = sites.get(instance.site.id).description
             except AttributeError:
                 pass
             except SiteNotRegistered as e:
-                raise NotificationError(e)
+                raise NotificationError(e) from e
             else:
                 template_options.update(site_name=site_name.replace("_", " ").title())
         return template_options
 
     def send_email(
         self,
+        email_to: list[str] | None = None,
         fail_silently: bool | None = None,
-        email_to: list[str] = None,
-        email_body_template: str = None,
+        email_body_template: str | None = None,
         **kwargs,
     ) -> int:
         kwargs.update(**self.get_template_options(**kwargs))

edc_notification/notification/updated_model_notification.py

@@ -3,9 +3,9 @@ from .model_notification import ModelNotification
 
 
 class UpdatedModelNotification(ModelNotification):
-    model_operations = [UPDATE]
+    model_operations = (UPDATE,)
 
-    update_fields = ["modified"]
+    update_fields = ("modified",)
 
     email_subject_template = (
         "*UPDATE* {test_subject_line}{protocol_name}: "

edc_offstudy/auths.py

@@ -8,10 +8,15 @@ from edc_auth.site_auths import site_auths
 
 from .auth_objects import OFFSTUDY, OFFSTUDY_SUPER, OFFSTUDY_VIEW, codenames
 
-site_auths.add_group(*codenames, name=OFFSTUDY, no_delete=True)
-site_auths.add_group(*codenames, name=OFFSTUDY_SUPER)
-site_auths.add_group(*codenames, name=OFFSTUDY_VIEW, view_only=True)
-site_auths.update_role(OFFSTUDY, name=CLINICIAN_ROLE)
-site_auths.update_role(OFFSTUDY, name=NURSE_ROLE)
-site_auths.update_role(OFFSTUDY_SUPER, name=CLINICIAN_SUPER_ROLE)
-site_auths.update_role(OFFSTUDY_VIEW, name=AUDITOR_ROLE)
+
+def update_site_auths():
+    site_auths.add_group(*codenames, name=OFFSTUDY, no_delete=True)
+    site_auths.add_group(*codenames, name=OFFSTUDY_SUPER)
+    site_auths.add_group(*codenames, name=OFFSTUDY_VIEW, view_only=True)
+    site_auths.update_role(OFFSTUDY, name=CLINICIAN_ROLE)
+    site_auths.update_role(OFFSTUDY, name=NURSE_ROLE)
+    site_auths.update_role(OFFSTUDY_SUPER, name=CLINICIAN_SUPER_ROLE)
+    site_auths.update_role(OFFSTUDY_VIEW, name=AUDITOR_ROLE)
+
+
+update_site_auths()

edc_offstudy/migrations/0001_initial.py

@@ -10,7 +10,7 @@ import edc_model_fields.fields.hostname_modification_field
 import edc_model_fields.fields.other_charfield
 import edc_model_fields.fields.userfield
 import edc_protocol.validators
-import edc_utils
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -24,11 +24,11 @@ class Migration(migrations.Migration):
             fields=[
                 (
                     "created",
-                    models.DateTimeField(blank=True, default=edc_utils.date.get_utcnow),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "modified",
-                    models.DateTimeField(blank=True, default=edc_utils.date.get_utcnow),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "user_created",
@@ -97,7 +97,7 @@ class Migration(migrations.Migration):
                 (
                     "offstudy_datetime",
                     models.DateTimeField(
-                        default=edc_utils.date.get_utcnow,
+                        default=django.utils.timezone.now,
                         validators=[
                             edc_protocol.validators.datetime_not_before_study_start,
                             edc_model.validators.date.datetime_not_future,

edc_offstudy/migrations/0002_auto_20180921_0434.py

@@ -14,7 +14,7 @@ import edc_model_fields.fields.other_charfield
 import edc_model_fields.fields.userfield
 import edc_protocol.validators
 import edc_sites.models
-import edc_utils
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -30,11 +30,11 @@ class Migration(migrations.Migration):
             fields=[
                 (
                     "created",
-                    models.DateTimeField(blank=True, default=edc_utils.date.get_utcnow),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "modified",
-                    models.DateTimeField(blank=True, default=edc_utils.date.get_utcnow),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "user_created",
@@ -102,7 +102,7 @@ class Migration(migrations.Migration):
                 (
                     "offstudy_datetime",
                     models.DateTimeField(
-                        default=edc_utils.date.get_utcnow,
+                        default=django.utils.timezone.now,
                         validators=[
                             edc_protocol.validators.datetime_not_before_study_start,
                             edc_model.validators.date.datetime_not_future,

edc_offstudy/migrations/0005_auto_20190305_0123.py

@@ -4,6 +4,7 @@ import django_audit_fields.fields.hostname_modification_field
 import django_audit_fields.fields.userfield
 import django_audit_fields.models.audit_model_mixin
 from django.db import migrations, models
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -13,9 +14,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="historicalsubjectoffstudy",
             name="created",
-            field=models.DateTimeField(
-                blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-            ),
+            field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
         ),
         migrations.AlterField(
             model_name="historicalsubjectoffstudy",
@@ -29,9 +28,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="historicalsubjectoffstudy",
             name="modified",
-            field=models.DateTimeField(
-                blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-            ),
+            field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
         ),
         migrations.AlterField(
             model_name="historicalsubjectoffstudy",
@@ -56,9 +53,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="subjectoffstudy",
             name="created",
-            field=models.DateTimeField(
-                blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-            ),
+            field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
         ),
         migrations.AlterField(
             model_name="subjectoffstudy",
@@ -72,9 +67,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="subjectoffstudy",
             name="modified",
-            field=models.DateTimeField(
-                blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-            ),
+            field=models.DateTimeField(blank=True, default=django.utils.timezone.now),
         ),
         migrations.AlterField(
             model_name="subjectoffstudy",