clinicedc 2.0.36__py3-none-any.whl → 2.0.38__py3-none-any.whl

{clinicedc-2.0.36.dist-info → clinicedc-2.0.38.dist-info}/METADATA

@@ -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.dist-info → clinicedc-2.0.38.dist-info}/RECORD

@@ -244,8 +244,8 @@ edc_adverse_event/models/signals.py,sha256=K1N0Cn_rlrX2X3xSu-eqyDinyUtqjFeni6kTa
 edc_adverse_event/navbars.py,sha256=88JxlC6a7lb_ba2Y1fPUIrfQN820SlWhi026MOm1oko,758
 edc_adverse_event/notifications.py,sha256=6yAqd-pLTwwl43zZcDQWJEn0DCLjYBhlST4b9hPzPwM,1269
 edc_adverse_event/pdf_reports/__init__.py,sha256=8_T_bOqSRwSBUttzTB-3qMwwKubfjTeCcXsAltBTmXg,84
-edc_adverse_event/pdf_reports/ae_pdf_report.py,sha256=vjawwSZP9HwJ0sXXcRaQpMPlK7VIQ-5YCO2C6w-stwI,9677
-edc_adverse_event/pdf_reports/death_pdf_report.py,sha256=pO3qD-YtHG2RmaG27P73EeOY2sVgD1s6OmAaxvM8e9M,4993
+edc_adverse_event/pdf_reports/ae_pdf_report.py,sha256=kJwgkA7XN96chLs8DDhNf0S8CKXKBjiAWTT3yJNlI18,9778
+edc_adverse_event/pdf_reports/death_pdf_report.py,sha256=J1hD2cnh6rmeP6cTRJDsENWeOZgLgIC6qJlR0ngiwc0,5094
 edc_adverse_event/pdf_reports/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edc_adverse_event/templates/edc_adverse_event/action_item_column.html,sha256=my5LmIDkfpZp8EwEY55tv0sF1F-d_Gp7-sOfa4H_rYo,376
 edc_adverse_event/templates/edc_adverse_event/admin/app_index.html,sha256=gsIWpsWD0F4H0GMIWYGWbJ2v30ip7CvdJ4AoRY8iyqo,344
@@ -1257,7 +1257,7 @@ edc_lab/auths.py,sha256=GW7AFsmAIwDG5vZ6QDf_sbw0RwfZYjA0NwdWD_ALpMs,1212
 edc_lab/choices.py,sha256=LcewEDxGNwVZ3DzvzVxAgudZfbbDfIhp9kVlaFuLsOw,3922
 edc_lab/constants.py,sha256=FlngFAY_nZRysRKX1JYqLnQZ9Ho_Aqn8eVg62BJBWSs,291
 edc_lab/form_validators/__init__.py,sha256=Dotf8BIc-otg7RpNGAxQeNZmMcPxN_WB7_AgvVA1HDc,224
-edc_lab/form_validators/crf_requisition_form_validator_mixin.py,sha256=ePp5lHXKfF0fL9gkH6qWS4jcDTj4Cs07Mipgpm3FOW4,3044
+edc_lab/form_validators/crf_requisition_form_validator_mixin.py,sha256=mTDq1i7rDmsR6kE_YH9ZuKqvD382h21LcwPn2jXBWH8,3365
 edc_lab/form_validators/requisition_form_validator.py,sha256=YNX7yb8Tt1PpreM_q5ZuJNgARzIxbC_PNqQ7naL-vlE,382
 edc_lab/form_validators/requisition_form_validator_mixin.py,sha256=NK8YEVLVJI3YHhUCt8TP96J3Vuwh8JaTJAFRqEMmzYc,3453
 edc_lab/forms/__init__.py,sha256=JlKa4cci8_yAQNPP3OPMQ6owBjeH2Z-m595sRO7xU6k,292
@@ -2097,7 +2097,7 @@ edc_pdf_reports/admin/__init__.py,sha256=YtpHY3BAzIO1dBr7apC73E63YRbaKS1tAWy89OK
 edc_pdf_reports/admin/actions.py,sha256=m-n4i7RTqvOykKj3ldmcQ6B3Cna0hJXk9L8rf0zkGtw,533
 edc_pdf_reports/admin/modeladmin_mixins.py,sha256=OG3GVzN_Acb86eVeMbUdAEHbJyJO5NVCijEexVj3UwE,885
 edc_pdf_reports/apps.py,sha256=BHgFODyOf_RrElr2DnRQYsM1rDqtdYoQ9AQ18oD_YMM,118
-edc_pdf_reports/crf_pdf_report.py,sha256=nkG3twM83eZVDHLA2iUM1YmoA0R_Rrl3NbqBQHrRVjo,10854
+edc_pdf_reports/crf_pdf_report.py,sha256=4ZoTSrdffKXdO6Y4aKLlS-xTNmdgxVpF2vhx2Tc8VMM,10884
 edc_pdf_reports/flowables/__init__.py,sha256=Tbn-fvpDb0N6nhA3wxGisf5BCuZAVN4eSf152a0AKY0,117
 edc_pdf_reports/flowables/checkbox.py,sha256=tFbq-qNbcvkPoCKRwXX4-nB5Ln31RmhSOsUmMo_xbCo,851
 edc_pdf_reports/flowables/textbox.py,sha256=u_AgwkWDCqNsOeZo-yNToVL27SDgMkzf7BJmTB-F4KI,1502
@@ -3397,7 +3397,7 @@ edc_vitals/models/fields/waist_circumference.py,sha256=fZcHFDdEwWLjIVLktKrFCD9UU
 edc_vitals/models/fields/weight.py,sha256=zo9_9e3Cpu0UqoRbWS-iDkcDo6fK80b1dDQy4x4MyxE,921
 edc_vitals/utils.py,sha256=vXid44KUXxeaSyund_y5MNXc5DFJs052_PwUAjszE2k,1384
 edc_vitals/validators.py,sha256=vNiElWMs0rRnHRNuVoPLRf0rW_C_0xcfUyep1Y_Si5s,156
-clinicedc-2.0.36.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
-clinicedc-2.0.36.dist-info/WHEEL,sha256=n2u5OFBbdZvCiUKAmfnY1Po2j3FB_NWfuUlt5WiAjrk,79
-clinicedc-2.0.36.dist-info/METADATA,sha256=KdM-V232Gmy6qWigAG5Fd3u2JQDlTObM41JAHI1X98k,15786
-clinicedc-2.0.36.dist-info/RECORD,,
+clinicedc-2.0.38.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+clinicedc-2.0.38.dist-info/WHEEL,sha256=n2u5OFBbdZvCiUKAmfnY1Po2j3FB_NWfuUlt5WiAjrk,79
+clinicedc-2.0.38.dist-info/METADATA,sha256=EBx5cUsa4zeby9k1-F14UMMermcXqLgj9dOcNBBu8A0,15786
+clinicedc-2.0.38.dist-info/RECORD,,

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 = []

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 = []

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: (

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),