clinicedc 2.0.36__tar.gz → 2.0.38__tar.gz

{clinicedc-2.0.36 → clinicedc-2.0.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clinicedc
-Version: 2.0.36
+Version: 2.0.38
 Summary: A clinical trials data management framework built on Django
 Keywords: django,clinicedc,edc,clinical trials,research,data management,esource
 Author: Erik van Widenfelt, Jonathan Willitts

{clinicedc-2.0.36 → clinicedc-2.0.38}/pyproject.toml

@@ -82,7 +82,7 @@ namespace = false
 
 [project]
 name = "clinicedc"
-version = "2.0.36"
+version = "2.0.38"
 description = "A clinical trials data management framework built on Django"
 readme = {file = "README.rst", content-type = "text/x-rst"}
 keywords = ["django", "clinicedc", "edc", "clinical trials", "research", "data management", "esource"]

{clinicedc-2.0.36 → clinicedc-2.0.38}/src/edc_adverse_event/pdf_reports/ae_pdf_report.py

@@ -1,14 +1,14 @@
 from textwrap import fill
 
 import inflect
+from django.conf import settings
+from edc_constants.constants import OTHER, YES
+from edc_pdf_reports.crf_pdf_report import CrfPdfReport
 from reportlab.lib import colors
 from reportlab.lib.units import cm
 from reportlab.platypus import Paragraph, Table
 from reportlab.platypus.flowables import KeepTogether, Spacer
 
-from edc_constants.constants import OTHER, YES
-from edc_pdf_reports.crf_pdf_report import CrfPdfReport
-
 from ..utils import get_adverse_event_app_label, get_ae_model
 
 p = inflect.engine()
@@ -20,6 +20,7 @@ class AePdfReport(CrfPdfReport):
         f"{get_adverse_event_app_label()}_admin:{get_adverse_event_app_label()}_"
         "aeinitial_changelist"
     )
+    draw_logo = getattr(settings, "EDC_PDF_REPORTS_DRAW_LOGO", True)
 
     def get_report_story(self, **kwargs):
         story = []

{clinicedc-2.0.36 → clinicedc-2.0.38}/src/edc_adverse_event/pdf_reports/death_pdf_report.py

@@ -1,16 +1,16 @@
 from textwrap import fill
 
 import inflect
+from django.conf import settings
 from django.contrib.auth import get_user_model
+from edc_constants.constants import OTHER
+from edc_pdf_reports.crf_pdf_report import CrfPdfReport
 from reportlab.lib import colors
 from reportlab.lib.units import cm
 from reportlab.platypus.flowables import Spacer
 from reportlab.platypus.para import Paragraph
 from reportlab.platypus.tables import Table
 
-from edc_constants.constants import OTHER
-from edc_pdf_reports.crf_pdf_report import CrfPdfReport
-
 from ..utils import get_adverse_event_app_label, get_ae_model
 
 User = get_user_model()
@@ -25,6 +25,7 @@ class DeathPdfReport(CrfPdfReport):
     )
 
     not_reported_text = "not reported"
+    draw_logo = getattr(settings, "EDC_PDF_REPORTS_DRAW_LOGO", True)
 
     def get_report_story(self, **kwargs):
         story = []

{clinicedc-2.0.36 → clinicedc-2.0.38}/src/edc_lab/form_validators/crf_requisition_form_validator_mixin.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 
 from django import forms
-
 from edc_utils.date import to_local
 from edc_utils.text import formatted_datetime
 
@@ -32,6 +31,7 @@ class CrfRequisitionFormValidatorMixin:
 
     assay_datetime_field: str = "assay_datetime"
     requisition_field: str = "requisition"
+    allow_assay_datetime_after_report_datetime = True
 
     def validate_requisition(
         self,
@@ -68,15 +68,23 @@ class CrfRequisitionFormValidatorMixin:
     ) -> None:
         """Validate assay datetime is on or after requisition
         datetime.
+
+        If `allow_assay_datetime_after_report_datetime` is False,
+        raise if assay datetime is after report_datetime.
+
         """
         assay_datetime = self.cleaned_data.get(
             assay_datetime_field or self.assay_datetime_field
         )
-        if assay_datetime > self.report_datetime:
+        if (
+            not self.allow_assay_datetime_after_report_datetime
+            and assay_datetime
+            and assay_datetime > self.report_datetime
+        ):
             raise forms.ValidationError(
                 {assay_datetime_field: "Invalid. Cannot be after report datetime."}
             )
-        if assay_datetime < requisition.requisition_datetime:
+        if assay_datetime and assay_datetime < requisition.requisition_datetime:
             raise forms.ValidationError(
                 {
                     assay_datetime_field: (

{clinicedc-2.0.36 → clinicedc-2.0.38}/src/edc_pdf_reports/crf_pdf_report.py

@@ -9,14 +9,6 @@ from django.apps import apps as django_apps
 from django.contrib.auth import get_user_model
 from django.core.exceptions import ObjectDoesNotExist
 from django.utils.text import slugify
-from reportlab.lib import colors
-from reportlab.lib.pagesizes import A4
-from reportlab.lib.units import cm
-from reportlab.lib.utils import ImageReader
-from reportlab.platypus import Paragraph, TableStyle
-from reportlab.platypus.flowables import KeepTogether, Spacer
-from reportlab.platypus.tables import Table
-
 from edc_data_manager.get_longitudinal_value import (
     DataDictionaryError,
     get_longitudinal_value,
@@ -26,13 +18,19 @@ from edc_randomization.auth_objects import RANDO_UNBLINDED
 from edc_utils.age import formatted_age
 from edc_utils.date import to_local
 from edc_utils.get_static_file import get_static_file
+from reportlab.lib import colors
+from reportlab.lib.pagesizes import A4
+from reportlab.lib.units import cm
+from reportlab.lib.utils import ImageReader
+from reportlab.platypus import Paragraph, TableStyle
+from reportlab.platypus.flowables import KeepTogether, Spacer
+from reportlab.platypus.tables import Table
 
 from .report import Report
 
 if TYPE_CHECKING:
     from django.contrib.auth.models import User
     from django.core.handlers.wsgi import WSGIRequest
-
     from edc_crf.model_mixins import CrfModelMixin
     from edc_identifier.model_mixins import UniqueSubjectIdentifierModelMixin
 
@@ -50,7 +48,7 @@ class CrfPdfReport(Report):
     report_url: str = None
     changelist_url: str = None
 
-    default_page = dict(
+    default_page = dict(  # noqa: RUF012
         rightMargin=1.5 * cm,
         leftMargin=1.5 * cm,
         topMargin=2.0 * cm,
@@ -66,7 +64,7 @@ class CrfPdfReport(Report):
 
     open_label = True
 
-    logo_data = {
+    logo_data = {  # noqa: RUF012
         "app_label": "edc_pdf_reports",
         "filename": "clinicedc_logo.jpg",
         "first_page": (0.83 * cm, 0.83 * cm),