Merge branch 'release/0.3.43' into main

meta-trial · Nov 27, 2024 · 14e8fc2 · 14e8fc2
2 parents 100a69b + 4367e75
commit 14e8fc2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,6 +1,10 @@
 Changes
 -------
 
+0.3.43
+------
+- watermark settings for labels and reports from env
+
 0.3.42
 -----
 - edc 0.6.17

diff --git a/meta_edc/settings/defaults.py b/meta_edc/settings/defaults.py
@@ -403,6 +403,18 @@
 
 EDC_OFFSTUDY_OFFSTUDY_MODEL = "meta_prn.endofstudy"
 
+# edc-pharmacy
+EDC_PDF_REPORTS_WATERMARK_WORD = env.str("EDC_PDF_REPORTS_WATERMARK_WORD")
+EDC_PDF_REPORTS_WATERMARK_FONT = env.str("EDC_PDF_REPORTS_WATERMARK_FONT")
+EDC_PDF_REPORTS_WATERMARK_FONTSIZE = env.int("EDC_PDF_REPORTS_WATERMARK_FONTSIZE")
+EDC_PHARMACY_LABEL_WATERMARK_WORD = env.str("EDC_PHARMACY_LABEL_WATERMARK_WORD")
+if EDC_PDF_REPORTS_WATERMARK_FONT:
+    EDC_PDF_REPORTS_WATERMARK_FONT = (
+        EDC_PDF_REPORTS_WATERMARK_FONT,
+        EDC_PDF_REPORTS_WATERMARK_FONTSIZE,
+    )
+else:
+    EDC_PDF_REPORTS_WATERMARK_FONT = ()
 # edc-protocol-incident
 EDC_PROTOCOL_VIOLATION_TYPE = PROTOCOL_INCIDENT
 

diff --git a/meta_edc/settings/uat.py b/meta_edc/settings/uat.py
@@ -9,7 +9,3 @@
 EDC_MODEL_ADMIN_CSS_THEME = "edc_purple"
 LIVE_SYSTEM = False
 EDC_CONSENT_BYPASS_CONSENT_DATETIME_VALIDATION = True
-
-EDC_PDF_REPORTS_WATERMARK_WORD = "SAMPLE"
-EDC_PDF_REPORTS_WATERMARK_FONT = ("Helvetica", 100)
-EDC_PHARMACY_LABEL_WATERMARK_WORD = "DO NOT USE"