clinicedc 2.0.4__py3-none-any.whl → 2.0.5__py3-none-any.whl

edc_pdf_reports/model_mixins.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django.core.handlers.wsgi import WSGIRequest
 
@@ -14,7 +14,7 @@ if TYPE_CHECKING:
 
 
 class PdfReportModelMixin:
-    pdf_report_cls: Type[CrfPdfReport]
+    pdf_report_cls: type[CrfPdfReport]
 
     def get_pdf_report(self: ModelMixin, request: WSGIRequest):
         return self.pdf_report_cls(model_obj=self, request=request, user=request.user)

edc_pdf_reports/report.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from abc import ABC
-from typing import Type
 from uuid import uuid4
 
 from django.conf import settings
@@ -48,7 +47,7 @@ class Report(ABC):
         header_line: str | None = None,
         filename: str | None = None,
         request: WSGIRequest | None = None,
-        numbered_canvas: Type[NumberedCanvas] | None = None,
+        numbered_canvas: type[NumberedCanvas] | None = None,
         footer_row_height: int | None = None,
     ):
         self._styles = None
@@ -77,12 +76,12 @@ class Report(ABC):
         return self._numbered_canvas
 
     @numbered_canvas.setter
-    def numbered_canvas(self, value: Type[NumberedCanvas]):
+    def numbered_canvas(self, value: type[NumberedCanvas]):
         self._numbered_canvas = value
         if self.watermark_word:
-            setattr(self._numbered_canvas, "watermark_word", self.watermark_word)
+            self._numbered_canvas.watermark_word = self.watermark_word
             if self.watermark_font:
-                setattr(self._numbered_canvas, "watermark_font", self.watermark_font)
+                self._numbered_canvas.watermark_font = self.watermark_font
 
     @property
     def report_filename(self) -> str:

edc_pdf_reports/utils.py

@@ -14,7 +14,7 @@ from .numbered_canvas import NumberedCanvas
 if TYPE_CHECKING:
     from .model_mixins import PdfReportModelMixin
 
-    class Model(PdfReportModelMixin, models.Model): ...  # noqa
+    class Model(PdfReportModelMixin, models.Model): ...
 
 
 mkdtemp()

edc_pdutils/dataframes/get_subject_consent.py

@@ -1,5 +1,3 @@
-from typing import Type
-
 import numpy as np
 import pandas as pd
 from django.apps import apps as django_apps
@@ -13,7 +11,7 @@ from ..utils import convert_dates_from_model
 
 def get_subject_consent(
     model: str | None = None,
-    model_cls: Type[Model] | None = None,
+    model_cls: type[Model] | None = None,
     subject_identifiers: list[str] | None = None,
     extra_columns: list[str] | None = None,
     normalize: bool | None = None,

edc_pdutils/df_exporters/csv_exporter.py

@@ -129,11 +129,10 @@ class CsvExporter:
             record_count = len(dataframe)
             if self.verbose:
                 sys.stdout.write(
-                    f'({style.SUCCESS("*")}) {self.model_name} {record_count}       \n'
+                    f"({style.SUCCESS('*')}) {self.model_name} {record_count}       \n"
                 )
-        else:
-            if self.verbose:
-                sys.stdout.write(f"(?) {self.model_name} empty  \n")
+        elif self.verbose:
+            sys.stdout.write(f"(?) {self.model_name} empty  \n")
         return Exported(path, self.model_name, record_count)
 
     def to_csv(self, dataframe: pd.DataFrame = None, export_folder: str = None) -> Exported:
@@ -244,14 +243,13 @@ class CsvExporter:
                 if fname in list(dataframe.columns):
                     for stored, displayed in responses:
                         labels.append(f'"{stored}" "{displayed}"')
-                    commands.append(f'label define {fname}l {" ".join(labels)}')
+                    commands.append(f"label define {fname}l {' '.join(labels)}")
                     commands.append(f"encode {fname}, generate({fname}_encoded) {fname}l")
                     commands.append(f"ren {fname} {fname}_edc")
                     commands.append(f"ren {fname}_encoded {fname}")
                     commands.append("")
             with open(f"{self.get_path()}.do", "w") as f:
-                for command in commands:
-                    f.write(f"{command}\n")
+                f.writelines(f"{command}\n" for command in commands)
         return commands
 
     def data_dictionary_qs(self, dataframe: pd.DataFrame) -> QuerySet:

edc_pdutils/df_exporters/tables_exporter.py

@@ -48,7 +48,7 @@ class TablesExporter:
     ):
         self.app_label = app_label or self.app_label
         if not self.app_label:
-            raise TablesExporterError(f"Missing app_label. Got None. See {repr(self)}")
+            raise TablesExporterError(f"Missing app_label. Got None. See {self!r}")
         self.export_folder = export_folder or get_export_folder()
         self.with_columns = with_columns or []
         self.without_columns = without_columns or []
@@ -63,7 +63,7 @@ class TablesExporter:
         self.table_names = self.get_table_names()
         if not self.table_names:
             raise TablesExporterError(
-                f"No tables found for app_label. Got {self.app_label}. See {repr(self)}"
+                f"No tables found for app_label. Got {self.app_label}. See {self!r}"
             )
         for hint in exclude_table_hints:
             for table_name in self.get_table_names():

edc_pdutils/df_handlers/crf_df_handler.py

@@ -36,8 +36,7 @@ class CrfDfHandler(DfHandler):
         """
         if not self.visit_column:
             raise CrfDfHandlerError(
-                f"visit column cannot be None. "
-                f"See class attr 'visit_column' on {repr(self)}"
+                f"visit column cannot be None. See class attr 'visit_column' on {self!r}"
             )
         self.dataframe = pd.merge(
             left=self.dataframe,

edc_pdutils/dialects/crf_dialect.py

@@ -19,7 +19,7 @@ class CrfDialect:
             f"LEFT JOIN {self.obj.visit_tbl} as V on A.id=V.appointment_id "  # nosec
             f"LEFT JOIN {self.obj.registered_subject_tbl} as R "  # nosec
             "on A.subject_identifier=R.subject_identifier "  # nosec
-        )  # noqa
+        )
         return sql, None
 
     @property
@@ -46,7 +46,7 @@ class CrfDialect:
             "on A.visit_definition_id=VDEF.id "  # nosec
             f"LEFT JOIN {self.obj.registered_subject_tbl} as R "  # nosec
             "on A.registered_subject_id=R.id "  # nosec
-        )  # noqa
+        )
         return sql, None
 
     @property
@@ -69,5 +69,5 @@ class CrfDialect:
             "on A.visit_definition_id=VDEF.id "  # nosec
             f"LEFT JOIN {self.obj.registered_subject_tbl} as R "  # nosec
             "on A.registered_subject_id=R.id "  # nosec
-        )  # noqa
+        )
         return sql, None

edc_pdutils/management/commands/export_models.py

@@ -223,14 +223,13 @@ class Command(BaseCommand):
         countries = options["countries"] or []
         if not countries:
             raise CommandError("Expected country.")
+        if countries == ALL_COUNTRIES:
+            countries = sites.countries
         else:
-            if countries == ALL_COUNTRIES:
-                countries = sites.countries
-            else:
-                countries = options["countries"].lower().split(",")
-                for country in countries:
-                    if country not in sites.countries:
-                        raise CommandError(f"Invalid country. Got {country}.")
+            countries = options["countries"].lower().split(",")
+            for country in countries:
+                if country not in sites.countries:
+                    raise CommandError(f"Invalid country. Got {country}.")
         return countries
 
     def get_models(

edc_pdutils/site_values_mappings.py

@@ -59,7 +59,7 @@ class SiteValuesMappings:
             try:
                 values_mapping.append((index, str(choice[1][::79])))
             except IndexError as e:
-                raise IndexError(f"{str(e)} Got {choice[1]}")
+                raise IndexError(f"{e!s} Got {choice[1]}")
         return tuple(values_mapping)
 
     def get_by_choices(self, tpl: tuple[tuple[str, Any]]) -> tuple[tuple[int, str]] | None:
@@ -87,7 +87,7 @@ class SiteValuesMappings:
                 except ImportError as e:
                     site_values_mappings.registry = before_import_registry
                     if module_has_submodule(mod, module_name):
-                        raise SiteValuesMappingError(f"{str(e)}. See {app}.{module_name}")
+                        raise SiteValuesMappingError(f"{e!s}. See {app}.{module_name}")
             except ImportError:
                 pass
 

edc_pdutils/utils/datetime_to_date.py

@@ -5,5 +5,4 @@ def datetime_to_date(value):
     """Convert a datetime to date."""
     if pd.notnull(value):
         return value.date()
-    else:
-        return value
+    return value

edc_pdutils/utils/refresh_model_from_dataframe.py

@@ -1,5 +1,3 @@
-from typing import Type
-
 import pandas as pd
 from django.apps import apps as django_apps
 from django.db import models
@@ -8,7 +6,7 @@ from django.db import models
 def refresh_model_from_dataframe(
     df: pd.DataFrame,
     model: str | None = None,
-    model_cls: Type[models.Model] | None = None,
+    model_cls: type[models.Model] | None = None,
     columns: list[str] | None = None,
 ) -> None:
     columns = columns or list(df.columns)

edc_pdutils/utils/table_names.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Type
-
 from ..database import Database
 
 
@@ -9,7 +7,7 @@ def get_table_names(
     app_label: str,
     with_columns: list[str] | None = None,
     without_columns: list[str] | None = None,
-    db_cls: Type[Database] | None = None,
+    db_cls: type[Database] | None = None,
 ) -> list[str]:
     """Returns a list of table names for this app_label."""
     db = (db_cls or Database)()
@@ -28,7 +26,7 @@ def get_model_names(
     app_label: str,
     with_columns: list[str] | None = None,
     without_columns: list[str] | None = None,
-    db_cls: Type[Database] | None = None,
+    db_cls: type[Database] | None = None,
     exclude_historical: bool | None = None,
     exclude_views: bool | None = None,
 ) -> list[str]:

edc_pdutils/utils/undash.py

@@ -12,5 +12,5 @@ def undash(value, exclude_pattern=None):
             else:
                 value = value.replace("-", "")
         except AttributeError as e:
-            raise AttributeError("{}. Got '{}'".format(str(e), value))
+            raise AttributeError(f"{e!s}. Got '{value}'")
     return value

edc_pharmacy/admin/medication/assignment_admin.py

@@ -1,5 +1,3 @@
-from typing import Tuple
-
 from django import forms
 from django.contrib import admin
 from django_audit_fields.admin import audit_fieldset_tuple
@@ -30,14 +28,14 @@ class AssignmentAdmin(ModelAdminMixin, admin.ModelAdmin):
         audit_fieldset_tuple,
     )
 
-    list_display: Tuple[str, ...] = (
+    list_display: tuple[str, ...] = (
         "name",
         "display_name",
         "created",
         "modified",
     )
 
-    search_fields: Tuple[str, ...] = ("name", "display_name")
+    search_fields: tuple[str, ...] = ("name", "display_name")
 
     def get_readonly_fields(self, request, obj=None):
         if obj:

edc_pharmacy/admin/medication/dosage_guideline_admin.py

@@ -1,5 +1,3 @@
-from typing import Tuple
-
 from django.contrib import admin
 from django_audit_fields.admin import audit_fieldset_tuple
 
@@ -34,5 +32,5 @@ class DosageGuidelineAdmin(ModelAdminMixin, admin.ModelAdmin):
         audit_fieldset_tuple,
     )
 
-    list_display: Tuple[str, ...] = ("__str__", "modified", "user_modified")
-    search_fields: Tuple[str, ...] = ("medication__name",)
+    list_display: tuple[str, ...] = ("__str__", "modified", "user_modified")
+    search_fields: tuple[str, ...] = ("medication__name",)

edc_pharmacy/admin/medication/formulation_admin.py

@@ -1,5 +1,3 @@
-from typing import Tuple
-
 from django.contrib import admin
 from django_audit_fields.admin import audit_fieldset_tuple
 
@@ -53,7 +51,7 @@ class FormulationAdmin(ModelAdminMixin, admin.ModelAdmin):
         "route": admin.VERTICAL,
     }
 
-    list_filter: Tuple[str, ...] = (
+    list_filter: tuple[str, ...] = (
         "imp",
         "strength",
         "units",
@@ -70,6 +68,6 @@ class FormulationAdmin(ModelAdminMixin, admin.ModelAdmin):
         "route",
     )
 
-    search_fields: Tuple[str, ...] = ("medication__name",)
+    search_fields: tuple[str, ...] = ("medication__name",)
 
-    ordering: Tuple[str, ...] = ("medication__name",)
+    ordering: tuple[str, ...] = ("medication__name",)

edc_pharmacy/admin/medication/medication_admin.py

@@ -1,5 +1,3 @@
-from typing import Tuple
-
 from django.contrib import admin
 from django_audit_fields.admin import audit_fieldset_tuple
 
@@ -23,8 +21,8 @@ class MedicationAdmin(ModelAdminMixin, admin.ModelAdmin):
         audit_fieldset_tuple,
     )
 
-    list_display: Tuple[str, ...] = ("name", "display_name", "created", "modified")
+    list_display: tuple[str, ...] = ("name", "display_name", "created", "modified")
 
-    search_fields: Tuple[str, ...] = ("name",)
+    search_fields: tuple[str, ...] = ("name",)
 
-    ordering: Tuple[str, ...] = ("name",)
+    ordering: tuple[str, ...] = ("name",)

edc_pharmacy/admin/prescription/rx_refill_admin.py

@@ -1,5 +1,3 @@
-from typing import Tuple
-
 from django.conf import settings
 from django.contrib import admin
 from django.template.loader import render_to_string
@@ -21,7 +19,7 @@ from ..model_admin_mixin import ModelAdminMixin
 class RxRefillAdmin(ModelAdminMixin, admin.ModelAdmin):
     show_object_tools = True
 
-    ordering: Tuple[str, ...] = ("refill_start_datetime",)
+    ordering: tuple[str, ...] = ("refill_start_datetime",)
 
     autocomplete_fields = ["dosage_guideline", "formulation"]
 
@@ -65,7 +63,7 @@ class RxRefillAdmin(ModelAdminMixin, admin.ModelAdmin):
         audit_fieldset_tuple,
     )
 
-    list_display: Tuple[str, ...] = (
+    list_display: tuple[str, ...] = (
         "subject_identifier",
         "dashboard",
         "duration",
@@ -79,7 +77,7 @@ class RxRefillAdmin(ModelAdminMixin, admin.ModelAdmin):
         "verified_datetime",
     )
 
-    list_filter: Tuple[str, ...] = (
+    list_filter: tuple[str, ...] = (
         "active",
         "refill_start_datetime",
         "refill_end_datetime",
@@ -89,7 +87,7 @@ class RxRefillAdmin(ModelAdminMixin, admin.ModelAdmin):
         "site",
     )
 
-    search_fields: Tuple[str, ...] = (
+    search_fields: tuple[str, ...] = (
         "id",
         "site__id",
         "rx__id",
@@ -178,7 +176,7 @@ class RxRefillInlineAdmin(admin.StackedInline):
 
     model = RxRefill
 
-    fields: Tuple[str, ...] = (
+    fields: tuple[str, ...] = (
         "dosage_guideline",
         "formulation",
         "refill_start_datetime",
@@ -189,8 +187,8 @@ class RxRefillInlineAdmin(admin.StackedInline):
         "frequency_units",
     )
 
-    search_fields: Tuple[str, ...] = "dosage_guideline__medication__name"
+    search_fields: tuple[str, ...] = "dosage_guideline__medication__name"
 
-    ordering: Tuple[str, ...] = ("refill_start_datetime",)
+    ordering: tuple[str, ...] = ("refill_start_datetime",)
 
     extra = 0

edc_pharmacy/admin/stock/lot_admin.py

@@ -1,5 +1,3 @@
-from typing import Tuple
-
 from django.contrib import admin
 from django_audit_fields.admin import audit_fieldset_tuple
 
@@ -67,7 +65,7 @@ class LotAdmin(ModelAdminMixin, SimpleHistoryAdmin):
         audit_fieldset_tuple,
     )
 
-    list_filter: Tuple[str, ...] = (
+    list_filter: tuple[str, ...] = (
         "lot_no",
         "expiration_date",
         "product",
@@ -77,7 +75,7 @@ class LotAdmin(ModelAdminMixin, SimpleHistoryAdmin):
         "modified",
     )
 
-    list_display: Tuple[str, ...] = (
+    list_display: tuple[str, ...] = (
         "lot_no",
         "expiration_date",
         "product",
@@ -86,11 +84,11 @@ class LotAdmin(ModelAdminMixin, SimpleHistoryAdmin):
         "created",
         "modified",
     )
-    radio_fields: Tuple[str, ...] = {"assignment": admin.VERTICAL}
+    radio_fields: tuple[str, ...] = {"assignment": admin.VERTICAL}
 
-    search_fields: Tuple[str, ...] = ("lot_no",)
+    search_fields: tuple[str, ...] = ("lot_no",)
 
-    ordering: Tuple[str, ...] = ("-expiration_date",)
+    ordering: tuple[str, ...] = ("-expiration_date",)
 
     def get_readonly_fields(self, request, obj=None):
         # if obj:

edc_pharmacy/admin/stock/order_admin.py

@@ -80,7 +80,7 @@ class OrderAdmin(ModelAdminMixin, SimpleHistoryAdmin):
         if obj.item_count > OrderItem.objects.filter(order=obj).count():
             url = reverse("edc_pharmacy_admin:edc_pharmacy_orderitem_add")
             next_url = "edc_pharmacy_admin:edc_pharmacy_order_changelist"
-            url = f"{url}?next={next_url}&order={str(obj.id)}&q={str(obj.order_identifier)}"
+            url = f"{url}?next={next_url}&order={obj.id!s}&q={obj.order_identifier!s}"
             context = dict(url=url, label="Add order item")
             add_order_items_button = render_to_string(
                 "edc_pharmacy/stock/items_as_button.html", context=context
@@ -112,7 +112,7 @@ class OrderAdmin(ModelAdminMixin, SimpleHistoryAdmin):
             pass
         else:
             url = reverse("edc_pharmacy_admin:edc_pharmacy_receive_changelist")
-            url = f"{url}?q={str(rcv_obj.receive_identifier)}"
+            url = f"{url}?q={rcv_obj.receive_identifier!s}"
             context = dict(url=url, label=rcv_obj.receive_identifier, title="Receive #")
             return render_to_string("edc_pharmacy/stock/items_as_link.html", context=context)
         return None

edc_pharmacy/admin/stock/order_item_admin.py

@@ -167,7 +167,7 @@ class OrderItemAdmin(ModelAdminMixin, SimpleHistoryAdmin):
     def get_status_label(self, obj: OrderItem) -> tuple[str, str]:
         if obj.unit_qty == 0:
             return RECEIVED, _("Received")
-        elif obj.unit_qty == obj.unit_qty_ordered:
+        if obj.unit_qty == obj.unit_qty_ordered:
             return NEW, _("New")
         return PARTIAL, _("Partial")
 
@@ -202,7 +202,7 @@ class OrderItemAdmin(ModelAdminMixin, SimpleHistoryAdmin):
     def render_start_receiving_button(obj: OrderItem) -> str:
         url = reverse("edc_pharmacy_admin:edc_pharmacy_receive_add")
         next_url = "edc_pharmacy_admin:edc_pharmacy_orderitem_changelist"
-        url = f"{url}?next={next_url}&q={str(obj.order.id)}&order={str(obj.order.id)}"
+        url = f"{url}?next={next_url}&q={obj.order.id!s}&order={obj.order.id!s}"
         context = dict(
             url=url,
             label=_("Start Receiving"),
@@ -216,7 +216,7 @@ class OrderItemAdmin(ModelAdminMixin, SimpleHistoryAdmin):
     @staticmethod
     def render_receive_changelist_link(receive: Receive) -> str:
         url = reverse("edc_pharmacy_admin:edc_pharmacy_receive_changelist")
-        url = f"{url}?q={str(receive.receive_identifier)}"
+        url = f"{url}?q={receive.receive_identifier!s}"
         context = dict(url=url, label=receive.receive_identifier, title=_("Receive"))
         return render_to_string(
             "edc_pharmacy/stock/items_as_link.html",
@@ -228,8 +228,8 @@ class OrderItemAdmin(ModelAdminMixin, SimpleHistoryAdmin):
         url = reverse("edc_pharmacy_admin:edc_pharmacy_receiveitem_add")
         next_url = "edc_pharmacy_admin:edc_pharmacy_orderitem_changelist"
         url = (
-            f"{url}?next={next_url}&order_item={str(obj.id)}&q={str(obj.order.id)}"
-            f"&receive={str(receive.id)}&container={str(obj.container.id)}"
+            f"{url}?next={next_url}&order_item={obj.id!s}&q={obj.order.id!s}"
+            f"&receive={receive.id!s}&container={obj.container.id!s}"
         )
         context = dict(
             url=url,
@@ -245,7 +245,7 @@ class OrderItemAdmin(ModelAdminMixin, SimpleHistoryAdmin):
         status, status_label = self.get_status_label(obj)
         if status != NEW:
             url = reverse("edc_pharmacy_admin:edc_pharmacy_receiveitem_changelist")
-            url = f"{url}?q={str(obj.pk)}"
+            url = f"{url}?q={obj.pk!s}"
             context = dict(url=url, label=status_label, title=_("Go to received items"))
             return render_to_string("edc_pharmacy/stock/items_as_link.html", context=context)
         return None

edc_pharmacy/admin/stock/receive_admin.py

@@ -105,7 +105,7 @@ class ReceiveAdmin(ModelAdminMixin, SimpleHistoryAdmin):
     @admin.display(description="Order #")
     def order_changelist(self, obj):
         url = reverse("edc_pharmacy_admin:edc_pharmacy_order_changelist")
-        url = f"{url}?q={str(obj.order.order_identifier)}"
+        url = f"{url}?q={obj.order.order_identifier!s}"
         context = dict(url=url, label=obj.order.order_identifier, title="Back to order")
         return render_to_string("edc_pharmacy/stock/items_as_link.html", context=context)
 

edc_pharmacy/admin/stock/receive_item_admin.py

@@ -122,7 +122,7 @@ class ReceiveItemAdmin(ModelAdminMixin, SimpleHistoryAdmin):
     @admin.display(description="Order #")
     def order_changelist(self, obj):
         url = reverse("edc_pharmacy_admin:edc_pharmacy_order_changelist")
-        url = f"{url}?q={str(obj.order_item.order.order_identifier)}"
+        url = f"{url}?q={obj.order_item.order.order_identifier!s}"
         context = dict(
             url=url, label=obj.order_item.order.order_identifier, title="Back to order"
         )
@@ -131,7 +131,7 @@ class ReceiveItemAdmin(ModelAdminMixin, SimpleHistoryAdmin):
     @admin.display(description="Order item #")
     def order_items_changelist(self, obj):
         url = reverse("edc_pharmacy_admin:edc_pharmacy_orderitem_changelist")
-        url = f"{url}?q={str(obj.order_item.id)}"
+        url = f"{url}?q={obj.order_item.id!s}"
         context = dict(
             url=url,
             label=obj.order_item.order_item_identifier,

edc_pharmacy/admin/stock/stock_request_admin.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from celery.result import AsyncResult
 from celery.states import SUCCESS
 from django.contrib import admin
@@ -46,16 +44,16 @@ class StatusListFilter(admin.SimpleListFilter):
                     .exclude(item_count=0)
                     .distinct()
                 )
-            elif self.value() == COMPLETE:
+            if self.value() == COMPLETE:
                 return (
                     queryset.filter(cancel__isnull=True)
                     .exclude(stockrequestitem__allocation__isnull=True)
                     .exclude(item_count=0)
                     .distinct()
                 )
-            elif self.value() == CANCELLED:
+            if self.value() == CANCELLED:
                 return queryset.filter(cancel__isnull=False)
-            elif self.value() == "ZERO":
+            if self.value() == "ZERO":
                 return queryset.filter(item_count=0, cancel__isnull=True)
         return None
 
@@ -148,7 +146,7 @@ class StockRequestAdmin(ModelAdminMixin, SimpleHistoryAdmin):
 
     readonly_fields = ("item_count",)
 
-    def redirect_url(self, request, obj, post_url_continue=None) -> Optional[str]:
+    def redirect_url(self, request, obj, post_url_continue=None) -> str | None:
         """Redirect to the review page immediately after saving model."""
         redirect_url = super().redirect_url(request, obj, post_url_continue)
         if obj.cancel == "CANCEL":

edc_pharmacy/dosage_calculator.py

@@ -1,5 +1,5 @@
 from decimal import Decimal
-from typing import Any, Optional, Union
+from typing import Any
 
 
 class DosageError(Exception):
@@ -9,9 +9,9 @@ class DosageError(Exception):
 class DosageCalculator:
     def __init__(
         self,
-        dosage_guideline: Optional[Any] = None,
-        formulation: Optional[Any] = None,
-        weight_in_kgs: Optional[Union[float, Decimal]] = None,
+        dosage_guideline: Any | None = None,
+        formulation: Any | None = None,
+        weight_in_kgs: float | Decimal | None = None,
     ) -> None:
         self.dosage_guideline = dosage_guideline
         self.formulation = formulation

edc_pharmacy/form_validators/crf/study_medication_form_validator.py

@@ -110,11 +110,10 @@ class StudyMedicationFormValidator(CrfFormValidator):
     def medication(self) -> Medication:
         if self.formulation:
             return self.formulation.medication
-        else:
-            self.raise_validation_error(
-                {"__all__": "Need the formulation to look up the prescription."},
-                INVALID_ERROR,
-            )
+        self.raise_validation_error(
+            {"__all__": "Need the formulation to look up the prescription."},
+            INVALID_ERROR,
+        )
 
     @property
     def next_appointment(self) -> Appointment | None:
@@ -154,9 +153,10 @@ class StudyMedicationFormValidator(CrfFormValidator):
                 "Subject is not receiving study medication. Refill end date "
                 "and time must exactly match refill start date and time."
             )
-            if not self.refill_end_datetime:
-                self.raise_validation_error({"refill_end_datetime": error_msg}, INVALID_ERROR)
-            elif self.refill_start_datetime != self.refill_end_datetime:
+            if (
+                not self.refill_end_datetime
+                or self.refill_start_datetime != self.refill_end_datetime
+            ):
                 self.raise_validation_error({"refill_end_datetime": error_msg}, INVALID_ERROR)
 
         if (

edc_pharmacy/forms/stock/stock_request_form.py

@@ -6,7 +6,6 @@ from ...models import Allocation, StockRequest
 
 
 class StockRequestForm(forms.ModelForm):
-
     def clean(self):
         cleaned_data = super().clean()
 
@@ -41,8 +40,7 @@ class StockRequestForm(forms.ModelForm):
                 raise forms.ValidationError(
                     {
                         "excluded_subject_identifiers": (
-                            "Not all subject identifiers are valid. "
-                            "Type one subject per line."
+                            "Not all subject identifiers are valid. Type one subject per line."
                         )
                     }
                 )
@@ -64,7 +62,7 @@ class StockRequestForm(forms.ModelForm):
 
         if not self.instance.id and cleaned_data.get("cancel") == "CANCEL":
             raise forms.ValidationError("Leave this blank")
-        elif cleaned_data.get("cancel") == "CANCEL":
+        if cleaned_data.get("cancel") == "CANCEL":
             if Allocation.objects.filter(
                 stock_request_item__stock_request=self.instance
             ).exists():