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

edc_pharmacy/views/add_to_storage_bin_view.py

@@ -9,13 +9,13 @@ from django.contrib.auth.decorators import login_required
 from django.core.exceptions import ObjectDoesNotExist
 from django.http import HttpResponseRedirect
 from django.urls import reverse
+from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views.generic.base import TemplateView
 
 from edc_dashboard.view_mixins import EdcViewMixin
 from edc_navbar import NavbarViewMixin
 from edc_protocol.view_mixins import EdcProtocolViewMixin
-from edc_utils import get_utcnow
 
 from ..exceptions import StorageBinError
 from ..models import Stock, StorageBin, StorageBinItem
@@ -192,7 +192,7 @@ class AddToStorageBinView(EdcViewMixin, NavbarViewMixin, EdcProtocolViewMixin, T
                     storage_bin,
                     stock_codes,
                     user_created=request.user.username,
-                    created=get_utcnow(),
+                    created=timezone.now(),
                 )
             except StorageBinError as e:
                 messages.add_message(request, messages.ERROR, str(e))

edc_pharmacy/views/allocate_to_subject_view.py

@@ -9,6 +9,7 @@ from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import Count
 from django.http import HttpResponseRedirect
 from django.urls import reverse
+from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.utils.translation import gettext as _
 from django.views.generic.base import TemplateView
@@ -16,7 +17,6 @@ from django.views.generic.base import TemplateView
 from edc_dashboard.view_mixins import EdcViewMixin
 from edc_navbar import NavbarViewMixin
 from edc_protocol.view_mixins import EdcProtocolViewMixin
-from edc_utils import get_utcnow
 
 from ..exceptions import AllocationError, InsufficientStockError
 from ..models import Assignment, Stock, StockRequest, StockRequestItem
@@ -350,7 +350,7 @@ class AllocateToSubjectView(EdcViewMixin, NavbarViewMixin, EdcProtocolViewMixin,
                     allocation_data,
                     allocated_by=request.user.username,
                     user_created=request.user.username,
-                    created=get_utcnow(),
+                    created=timezone.now(),
                 )
             except AllocationError as e:
                 messages.add_message(request, messages.ERROR, str(e))

edc_pharmacy/views/dispense_view.py

@@ -6,13 +6,13 @@ from django.contrib.auth.decorators import login_required
 from django.core.exceptions import ObjectDoesNotExist
 from django.http import HttpResponseRedirect
 from django.urls import reverse
+from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views.generic.base import TemplateView
 
 from edc_dashboard.view_mixins import EdcViewMixin
 from edc_navbar import NavbarViewMixin
 from edc_protocol.view_mixins import EdcProtocolViewMixin
-from edc_utils import get_utcnow
 
 from ..models import ConfirmationAtSite, Formulation, Location, Rx
 from ..utils import dispense
@@ -61,7 +61,7 @@ class DispenseView(EdcViewMixin, NavbarViewMixin, EdcProtocolViewMixin, Template
                 f"Subject {subject_identifier} not found at {location.display_name}.",
             )
         else:
-            if rx.rx_expiration_date and rx.rx_expiration_date < get_utcnow():
+            if rx.rx_expiration_date and rx.rx_expiration_date < timezone.now():
                 messages.add_message(
                     self.request,
                     messages.WARNING,

edc_pharmacy/views/move_to_storage_bin_view.py

@@ -4,10 +4,9 @@ from django.contrib.auth.decorators import login_required
 from django.core.exceptions import ObjectDoesNotExist
 from django.http import HttpRequest, HttpResponseRedirect
 from django.urls import reverse
+from django.utils import timezone
 from django.utils.decorators import method_decorator
 
-from edc_utils import get_utcnow
-
 from ..models import Stock, StorageBin, StorageBinItem
 from .add_to_storage_bin_view import AddToStorageBinView, StorageBinError
 
@@ -58,7 +57,7 @@ def move_to_bin(
             else:
                 obj.storage_bin = storage_bin
                 obj.user_modified = user_modified
-                obj.modified = get_utcnow()
+                obj.modified = timezone.now()
                 obj.save()
                 codes_moved.append(code)
     return codes_moved, codes_not_moved

edc_pharmacy/views/print_labels_view.py

@@ -7,6 +7,7 @@ from django.contrib.auth.decorators import login_required
 from django.db.models import QuerySet
 from django.http import FileResponse, HttpResponseRedirect
 from django.urls import reverse
+from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views.generic.base import TemplateView
 from pylabels import Sheet, Specification
@@ -16,7 +17,6 @@ from edc_navbar import NavbarViewMixin
 from edc_protocol.view_mixins import EdcProtocolViewMixin
 from edc_pylabels.models import LabelConfiguration
 from edc_pylabels.site_label_configs import site_label_configs
-from edc_utils import get_utcnow
 
 from ..models import Stock
 
@@ -118,7 +118,7 @@ class PrintLabelsView(EdcViewMixin, NavbarViewMixin, EdcProtocolViewMixin, Templ
                 return HttpResponseRedirect(request.META.get("HTTP_REFERER", ""))
             else:
                 buffer = sheet.save_to_buffer()
-                now = get_utcnow()
+                now = timezone.now()
                 return FileResponse(
                     buffer,
                     as_attachment=True,

edc_protocol/research_protocol_config.py

@@ -3,10 +3,9 @@ from datetime import datetime
 
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
+from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 
-from edc_utils import get_utcnow
-
 from .address import Address
 
 
@@ -112,7 +111,7 @@ class ResearchProtocolConfig:
 
     @property
     def copyright(self) -> str:
-        return f"2010-{get_utcnow().year}"
+        return f"2010-{timezone.now().year}"
 
     @property
     def license(self) -> str:

edc_protocol_incident/migrations/0001_initial.py

@@ -15,7 +15,7 @@ from django.db import migrations, models
 
 import edc_action_item.managers
 import edc_model.validators.date
-import edc_utils.date
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -109,14 +109,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,
                     ),
                 ),
                 (
@@ -199,7 +199,7 @@ class Migration(migrations.Migration):
                 (
                     "report_datetime",
                     models.DateTimeField(
-                        default=edc_utils.date.get_utcnow,
+                        default=django.utils.timezone.now,
                         verbose_name="Report Date and Time",
                     ),
                 ),
@@ -371,14 +371,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,
                     ),
                 ),
                 (
@@ -453,7 +453,7 @@ class Migration(migrations.Migration):
                 (
                     "report_datetime",
                     models.DateTimeField(
-                        default=edc_utils.date.get_utcnow,
+                        default=django.utils.timezone.now,
                         verbose_name="Report Date and Time",
                     ),
                 ),

edc_protocol_incident/migrations/0001_squashed_0015_auto_20220927_0401.py

@@ -15,7 +15,7 @@ from django.db import migrations, models
 
 import edc_action_item.managers
 import edc_model.validators.date
-import edc_utils.date
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -133,14 +133,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,
                     ),
                 ),
                 (
@@ -223,7 +223,7 @@ class Migration(migrations.Migration):
                 (
                     "report_datetime",
                     models.DateTimeField(
-                        default=edc_utils.date.get_utcnow,
+                        default=django.utils.timezone.now,
                         verbose_name="Report Date and Time",
                     ),
                 ),
@@ -395,14 +395,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,
                     ),
                 ),
                 (
@@ -477,7 +477,7 @@ class Migration(migrations.Migration):
                 (
                     "report_datetime",
                     models.DateTimeField(
-                        default=edc_utils.date.get_utcnow,
+                        default=django.utils.timezone.now,
                         verbose_name="Report Date and Time",
                     ),
                 ),
@@ -971,14 +971,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,
                     ),
                 ),
                 (
@@ -1053,7 +1053,7 @@ class Migration(migrations.Migration):
                 (
                     "report_datetime",
                     models.DateTimeField(
-                        default=edc_utils.date.get_utcnow,
+                        default=django.utils.timezone.now,
                         verbose_name="Report Date and Time",
                     ),
                 ),
@@ -1285,14 +1285,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,
                     ),
                 ),
                 (
@@ -1375,7 +1375,7 @@ class Migration(migrations.Migration):
                 (
                     "report_datetime",
                     models.DateTimeField(
-                        default=edc_utils.date.get_utcnow,
+                        default=django.utils.timezone.now,
                         verbose_name="Report Date and Time",
                     ),
                 ),

edc_protocol_incident/migrations/0005_protocolincident_historicalprotocolincident_and_more.py

@@ -15,7 +15,7 @@ from django.db import migrations, models
 
 import edc_action_item.managers
 import edc_model.validators.date
-import edc_utils.date
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -45,14 +45,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,
                     ),
                 ),
                 (
@@ -127,7 +127,7 @@ class Migration(migrations.Migration):
                 (
                     "report_datetime",
                     models.DateTimeField(
-                        default=edc_utils.date.get_utcnow,
+                        default=django.utils.timezone.now,
                         verbose_name="Report Date and Time",
                     ),
                 ),
@@ -359,14 +359,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,
                     ),
                 ),
                 (
@@ -449,7 +449,7 @@ class Migration(migrations.Migration):
                 (
                     "report_datetime",
                     models.DateTimeField(
-                        default=edc_utils.date.get_utcnow,
+                        default=django.utils.timezone.now,
                         verbose_name="Report Date and Time",
                     ),
                 ),