meta-edc 0.3.39__py3-none-any.whl → 0.3.40__py3-none-any.whl

meta_dashboard/templatetags/meta_dashboard_extras.py

@@ -9,7 +9,7 @@ from edc_dashboard.url_names import url_names
 from edc_dashboard.utils import get_bootstrap_version
 
 from meta_consent.models import SubjectConsent
-from meta_dashboard.view_utils.subject_screening_button import (
+from meta_dashboard.view_utils import (
     SubjectScreeningPartOneButton,
     SubjectScreeningPartThreeButton,
     SubjectScreeningPartTwoButton,

meta_dashboard/view_utils/__init__.py

@@ -0,0 +1,6 @@
+from .subject_screening_button import (
+    SubjectScreeningButton,
+    SubjectScreeningPartOneButton,
+    SubjectScreeningPartThreeButton,
+    SubjectScreeningPartTwoButton,
+)

meta_edc/settings/debug.py

@@ -36,3 +36,7 @@ if os.path.exists(BASE_DIR) and not os.path.exists(KEY_PATH):  # noqa
 # if debugging, run `export DJANGO_DEBUG=True` before running runserver
 # CELERY_TASK_ALWAYS_EAGER = os.getenv("DJANGO_DEBUG", "False") == "True"
 # CELERY_TASK_EAGER_PROPAGATES = CELERY_TASK_ALWAYS_EAGER
+
+EDC_PDF_REPORTS_WATERMARK_WORD = "SAMPLE"
+EDC_PDF_REPORTS_WATERMARK_FONT = ("Helvetica", 100)
+EDC_PHARMACY_LABEL_WATERMARK_WORD = "DO NOT USE"

meta_edc/templates/meta_edc/bootstrap3/home.html

@@ -59,7 +59,7 @@ a { cursor: pointer; }
       {% if perms.meta_reports %}
         <a href="{% url 'meta_reports:home_url' %}" class="list-group-item"><i class="fa-solid fa-stroopwafel fa-lg fa-fw"></i></i>&nbsp;&nbsp;&nbsp;QA Reports</a>
       {% endif %}
-      {% if perms.edc_navbar.nav_pharmacy_section %}
+      {% if perms.edc_pharmacy.nav_pharmacy_section %}
         <a href="{% url 'edc_pharmacy:home_url' %}" class="list-group-item"><i class="fas fa-prescription fa-lg fa-fw"></i>&nbsp;&nbsp;&nbsp;Pharmacy</a>
       {% endif %}
       {% if perms.edc_export %}

meta_edc/tests/tests/test_endpoints.py

@@ -85,6 +85,7 @@ class AdminSiteTest(MetaTestCaseMixin, WebTest):
         import_module("edc_adverse_event.auths")
         import_module("edc_appointment.auths")
         import_module("edc_consent.auths")
+        import_module("edc_pylabels.auths")
         import_module("edc_dashboard.auths")
         import_module("edc_data_manager.auths")
         import_module("edc_qareports.auths")

{meta_edc-0.3.39.dist-info → meta_edc-0.3.40.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meta-edc
-Version: 0.3.39
+Version: 0.3.40
 Summary: META Trial EDC (http://www.isrctn.com/ISRCTN76157257)
 Home-page: https://github.com/meta-trial/meta-edc
 Author: Erik van Widenfelt
@@ -693,7 +693,7 @@ Requires-Python: >=3.12
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS
-Requires-Dist: edc==0.6.14
+Requires-Dist: edc==0.6.15
 Requires-Dist: edc-microscopy
 Requires-Dist: beautifulsoup4
 Requires-Dist: celery[redis]

{meta_edc-0.3.39.dist-info → meta_edc-0.3.40.dist-info}/RECORD

@@ -191,13 +191,13 @@ meta_dashboard/templates/meta_dashboard/bootstrap3/subject/dashboard.html,sha256
 meta_dashboard/templates/meta_dashboard/bootstrap3/subject/listboard.html,sha256=AyVcossXTf7grSrbWaz7Wek12YRixEdddxEQWatSXgs,1398
 meta_dashboard/templates/meta_dashboard/bootstrap3/subject/dashboard/top_bar.html,sha256=5u2ySYTBEwsKKLmQaEmPoObvtx1vduwIcy9DvkS4AO0,230
 meta_dashboard/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meta_dashboard/templatetags/meta_dashboard_extras.py,sha256=d_jtyuxSbIhSpKkA5uI5ffCPei4dABo6kOMpb2G73C4,3947
+meta_dashboard/templatetags/meta_dashboard_extras.py,sha256=aVUypkmzt4ih7zFcqTak26jmFyxZUeO6yxIN_OUycBw,3922
 meta_dashboard/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_dashboard/tests/admin.py,sha256=4k_kM3YURLIInujRNpPRql3rLxODOZQhCXueoUdU064,716
 meta_dashboard/tests/holidays.csv,sha256=LIEIm79wHRzbfXcFW_2ogFOYEZaWEGF1hwgOzZy2y34,538
 meta_dashboard/tests/urls.py,sha256=FJlQvMLAMbR7UBW2Kl6VQXW9XmYOvqXnZJ4SeQh535E,2674
 meta_dashboard/tests/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meta_dashboard/view_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+meta_dashboard/view_utils/__init__.py,sha256=qkoHOxLcwAr53q1e_aR5mx0ZSEX6kAC8bShg82UOJ40,177
 meta_dashboard/view_utils/subject_screening_button.py,sha256=NEDMydqrz7FoYMXViOpnvGpFzcRer_I_cfBkt3Mx-84,3327
 meta_dashboard/views/__init__.py,sha256=TWsNFphAI57Bw2d-X-fy7yayR8AlbtWJ5Wx3YjZPntQ,222
 meta_dashboard/views/ae/__init__.py,sha256=YjsScDD8GqpXOwZGMgAWZfo64JSc117no6pCt3uGDBo,113
@@ -233,17 +233,17 @@ meta_edc/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 meta_edc/management/commands/update_forms_reference.py,sha256=_DiCqhHUk8lGhDGlsjOA069EE-g7UBDlZQCH6L1xiHo,1003
 meta_edc/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_edc/settings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meta_edc/settings/debug.py,sha256=BAM92tixl3zuBypdK2aiBrAnQJTXH_X1HbxLj1m-jZI,1152
+meta_edc/settings/debug.py,sha256=ys60bSDcEMbWewoTdE4HRIp2woOwy3RPjIgXMUCEJpQ,1296
 meta_edc/settings/defaults.py,sha256=pUyhSJdaYlvpoEPuU0mAWB3XFUL8xjblhald4DjZ3gs,19165
 meta_edc/settings/live.py,sha256=uLTlsIc3H6gdE_7pkL6vyOVa6V_74hnXFkiojqGFAYY,264
 meta_edc/settings/logging.py,sha256=6qVUE37OMkf5rzwTmMq4krFsZ2jcyCpWdFtGih_Cs4U,1938
 meta_edc/settings/minimal.py,sha256=3z-7GBluflnUkuSotKZlYvpL34NZ6tfFNuQNJLCyflo,592
 meta_edc/settings/uat.py,sha256=P1hovGPgCnuyiVZ-RuZfoEskAEz39hkMAVGjEeP7RDM,270
 meta_edc/templates/meta_edc/bootstrap3/base.html,sha256=8Agovk1eTpW-2oAgVGsYwL_DAD6zB3DNwGGpPJ2bx-g,165
-meta_edc/templates/meta_edc/bootstrap3/home.html,sha256=7dZi4nPEslUm6WwAmE_ow-BT9sOyxRefMmk1PU_4Ez0,4588
+meta_edc/templates/meta_edc/bootstrap3/home.html,sha256=JjNhNaLXUUCMwTmUm7F5fdNOj6GdXJspfsXx3-0OV6U,4590
 meta_edc/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_edc/tests/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meta_edc/tests/tests/test_endpoints.py,sha256=Vo7rOuBUqCwVWBLSPgwRBqiyU6o4Wc-7Em84PBwFJw0,23497
+meta_edc/tests/tests/test_endpoints.py,sha256=5FdIHTd1xhUIgQLBzMV-Ml3VoFrlBrLLUbNarme5raw,23541
 meta_edc/views/__init__.py,sha256=TBXTih4Mpsg5Oh2jbyXqL9kH7bu3vWNRgVe93hvLCl8,32
 meta_edc/views/home_view.py,sha256=a3A0DMoqCWQuLkb2MSIR-I0Su-mVU5D82FwAIC21low,1006
 meta_export/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -299,13 +299,12 @@ meta_pharmacy/list_data.py,sha256=HB_TuRUEq01tG-KB1gGzT1V84m4JGYiMT9IoqJInEVc,21
 meta_pharmacy/prepare_meta_pharmacy.py,sha256=5gNiPkmOzWwCW-_q6hgIzj_0tnPuN4Tl1lVI6FygNgs,2945
 meta_pharmacy/urls.py,sha256=jncXssL_SeRhb_OJVXLdGFvPT3BqtrkSPdq-eyJnGfY,207
 meta_pharmacy/admin/__init__.py,sha256=ZnYHFOt9xatSSEhPoGtWC6zCvsaygIJX3qJy7iZ9qWk,82
-meta_pharmacy/admin/actions.py,sha256=wRVN7mmZDT0w8FpBLPPZhkTc72WFFd-xGxzsFpcm5Fs,1314
 meta_pharmacy/admin/rx_admin.py,sha256=SQGsugSnhbU3YUk_ssSTMmCH6no8ZkHoqLLkbZbBbk0,1851
 meta_pharmacy/admin/substitutions_admin.py,sha256=N2WcuC4REAEX0zrNqQHsPbZI82I4T5UM7EP-ohDOSSI,1934
 meta_pharmacy/forms/__init__.py,sha256=5d28GOPegzZ9ptI-tVx_E19yPTrJ_wQh16xr9ivmS6M,78
 meta_pharmacy/forms/rx_form.py,sha256=zqt45XGAv2Zj4p7k-CDGUHF0LKoeYnncHJBZ3MmN4qI,319
 meta_pharmacy/forms/substitutions_form.py,sha256=f37xagh6D00w3iu6zvh45UWX_L9oD0FsW_0fTsB7540,1894
-meta_pharmacy/labels/__init__.py,sha256=2HgWs6k0cwsAEbwazzorAW-T00238zNBJ111TxM5Gso,223
+meta_pharmacy/labels/__init__.py,sha256=k1LKzruteQ1jUmPkh0vzzzmi4kjOANJhborPRLc8Mcw,228
 meta_pharmacy/labels/draw_label_for_subject_with_barcode.py,sha256=RWJDIoiHZQp8e5N2LEW2Mu8qwI6qAkxfOPALf52TlZI,2155
 meta_pharmacy/labels/draw_label_for_subject_with_code128.py,sha256=dK1F_N91Fhw8rtKi3GWRjbYw5V-XfOjzpF2UDBsE65M,459
 meta_pharmacy/labels/draw_label_with_test_data.py,sha256=KQeQZEka3-2FL1hLIr7Sn9XQX6eXLOOJUlbS612AORA,1188
@@ -1127,11 +1126,11 @@ meta_subject/tests/tests/test_fixes.py,sha256=2jOB0lcEonJft5rWEbrDEtGCuGLaaUN8zA
 meta_subject/tests/tests/test_followup.py,sha256=rembohm-ecEp9rGFdjc2CkvXGfYZ8A8BOX0MdBBZSF0,1871
 meta_subject/tests/tests/test_manager_order.py,sha256=wmVxMd85mJ6HGAL_3Z_mSp_mqeNQvK7MW_6mvQPDeO8,454
 meta_subject/tests/tests/test_medication_adherence.py,sha256=o-4vTFx4GdYBS_lWiKpycA8IOce9nTB1_7vAl4HAKhI,2517
-meta_subject/tests/tests/test_metadata_rules.py,sha256=LUBYByb9t9dClj_LKzHA-WpHQba56KwRqpr7BaCVbNI,5717
+meta_subject/tests/tests/test_metadata_rules.py,sha256=4mSQVXf4EteDUUjrRkpKhOzDukEBC1M9IXkyg0MEAOA,5712
 meta_subject/tests/tests/test_mnsi.py,sha256=wAXHGupWJh-7vSNyeYyT1F4n6JNZFCIfDKs-M_XuPzQ,13585
 meta_subject/tests/tests/test_patient_history_form.py,sha256=JzqCx_-g2jeknngGl94FhZNVCl0CfnWIAZ9R11y7-wY,2827
 meta_subject/tests/tests/test_physical_exam.py,sha256=U3TKOPWTVu8iXxsS8LGgJJEY8e2sKJ5iTBcIWIHKCAo,2947
-meta_subject/tests/tests/test_sf12.py,sha256=8FMdZGG-boyu3zs37kLR8M2Wf7Xf0MevHYlQLX5Odgs,7330
+meta_subject/tests/tests/test_sf12.py,sha256=5Daf-R4EeLjfDpsC5PZELfPIqY--joGzrj8nPVUiatI,6837
 meta_subject/tests/tests/test_study_medication.py,sha256=EFvAvjxJ1c0Bk-vi6S8ejf9Q5UsQ8c0PSTw9l-1iHvo,10161
 meta_visit_schedule/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_visit_schedule/apps.py,sha256=Uy3glJJ3-yCcXZ_MvhDEzxVxQbBuCTsZxLNmd5p1DHw,164
@@ -1164,9 +1163,9 @@ tests/etc/user-rsa-restricted-private.pem,sha256=CUcHW9bznWdmmASN00hCzvxFPAFl4N2
 tests/etc/user-rsa-restricted-public.pem,sha256=mt84djoL-uHw6Wc5SJh0zml6VzXulnf8eQSFg7-fheg,450
 tests/etc/user-salt-local.key,sha256=x5anBw9fvbHurczouT3CjrkWb_xs7Ypm1htIJsgiuiw,256
 tests/etc/user-salt-restricted.key,sha256=pxmpcfBRNB-4C6wTvHXz-9fOfJgKIFOjaAF8ZFfa4q4,256
-meta_edc-0.3.39.dist-info/AUTHORS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meta_edc-0.3.39.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-meta_edc-0.3.39.dist-info/METADATA,sha256=j3D64wRKMMzgZj04aExF7BIiYqchhoPycYjV0xhPaJI,43529
-meta_edc-0.3.39.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-meta_edc-0.3.39.dist-info/top_level.txt,sha256=RkzjNXwRq2kg_uZ_1bDwPUntijSXoY2YBqtByDwvvrc,244
-meta_edc-0.3.39.dist-info/RECORD,,
+meta_edc-0.3.40.dist-info/AUTHORS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+meta_edc-0.3.40.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+meta_edc-0.3.40.dist-info/METADATA,sha256=VQe8G_-Y-Iy0xli87MoKXUZxDcROe4qyFGljtnm0Ooo,43529
+meta_edc-0.3.40.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+meta_edc-0.3.40.dist-info/top_level.txt,sha256=RkzjNXwRq2kg_uZ_1bDwPUntijSXoY2YBqtByDwvvrc,244
+meta_edc-0.3.40.dist-info/RECORD,,

meta_pharmacy/labels/__init__.py

@@ -1,4 +1,5 @@
 from .draw_label_for_subject_with_code128 import draw_label_for_subject_with_code128
 from .draw_label_with_test_data import draw_label_with_test_data
-from .label_data import LabelData
-from .print_sheets import print_sheets
+
+# from .label_data import LabelData
+# from .print_sheets import print_sheets

meta_subject/tests/tests/test_metadata_rules.py

@@ -99,8 +99,8 @@ class TestMetadataRules(MetaTestCaseMixin, TestCase):
             subject_screening=subject_screening,
             subject_consent=subject_consent,
         )
-        self.assertEqual(
-            ["meta_subject.delivery"],
+        self.assertIn(
+            "meta_subject.delivery",
             [obj.model for obj in self.get_crf_metadata(subject_visit)],
         )
 

meta_subject/tests/tests/test_sf12.py

@@ -9,7 +9,6 @@ from django.test import TestCase
 from edc_constants.constants import COMPLETE, YES
 from edc_metadata import KEYED, NOT_REQUIRED, REQUIRED
 from edc_metadata.metadata import CrfMetadataGetter
-from edc_metadata.metadata_handler import MetadataHandlerError
 from edc_qol.constants import ALL_OF_THE_TIME, NONE_OF_THE_TIME, SOME_OF_THE_TIME
 from edc_visit_schedule.constants import MONTH1, MONTH3, WEEK2
 
@@ -42,17 +41,6 @@ class TestSf12(MetaTestCaseMixin, TestCase):
             site=Site.objects.get(id=settings.SITE_ID),
         )
 
-    def test_baseline_not_required(self):
-        form = Sf12Form(data=self.data)
-        form.is_valid()
-        self.assertEqual({}, form._errors)
-        self.assertRaises(MetadataHandlerError, form.save)
-
-        crf_metadata_getter = CrfMetadataGetter(appointment=self.subject_visit.appointment)
-        self.assertFalse(
-            crf_metadata_getter.metadata_objects.filter(model="meta_subject.sf12").exists()
-        )
-
     def test_1005_required(self):
         subject_visit = self.get_next_subject_visit(self.subject_visit)
         self.assertEqual(subject_visit.visit_code, WEEK2)

meta_pharmacy/admin/actions.py

@@ -1,38 +0,0 @@
-import random
-
-from django.contrib import messages
-from django.http import FileResponse
-from django.utils.translation import gettext as _
-from django_pylabels.models import LabelSpecification
-from edc_utils import get_utcnow
-from pylabels import Sheet, Specification
-
-from ..labels import draw_label_with_code39
-from ..models import LabelData
-
-random.seed(7825541)
-
-
-def print_label_sheet(modeladmin, request, queryset):
-    label_data = [obj for obj in queryset]
-    obj = LabelSpecification.objects.get(name="meta3")
-    specs = Specification(**obj.as_dict)
-    sheet = Sheet(specs, draw_label_with_code39, border=obj.border)
-    sheet.add_labels(label_data)
-    buffer = sheet.save_to_buffer()
-    now = get_utcnow()
-    queryset.update(printed=True, printed_datetime=now)
-    return FileResponse(
-        buffer, as_attachment=True, filename=f"{obj.name}_{now.strftime("%Y-%m-%d %H:%M")}.pdf"
-    )
-
-
-def print_label_sheet_from_batch(modeladmin, request, queryset):
-    if queryset.count() > 1 or queryset.count() == 0:
-        messages.add_message(
-            request,
-            messages.ERROR,
-            _("Select one and only one existing label specification"),
-        )
-    queryset = LabelData.objects.filter(label_batch=queryset.first())
-    return print_label_sheet(modeladmin, request, queryset)