meta-edc 1.1.0__py3-none-any.whl → 1.1.1__py3-none-any.whl

meta_edc/settings/debug.py

@@ -7,12 +7,12 @@ from .defaults import *  # noqa
 print(f"Settings file {__file__}")
 
 # TZ Sites:
-# SITE_ID = SiteID(default=20)  # Amana
+SITE_ID = SiteID(default=20)  # Amana
 # SITE_ID = SiteID(default=10)  # Hindu Mandal
 # SITE_ID = SiteID(default=40)  # Mwananyamala
 # SITE_ID = SiteID(default=50)  # Mbagala
 # SITE_ID = SiteID(default=60)  # Mnazi-Moja
-SITE_ID = SiteID(default=30)  # Temeke
+# SITE_ID = SiteID(default=30)  # Temeke
 
 INDEX_PAGE = "http://localhost:8000"
 EDC_SITES_UAT_DOMAIN = False

{meta_edc-1.1.0.dist-info → meta_edc-1.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meta-edc
-Version: 1.1.0
+Version: 1.1.1
 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.rst
-Requires-Dist: edc==1.1.0
+Requires-Dist: edc==1.1.1
 Requires-Dist: edc-microscopy
 Requires-Dist: beautifulsoup4
 Requires-Dist: celery[redis]

{meta_edc-1.1.0.dist-info → meta_edc-1.1.1.dist-info}/RECORD

@@ -81,7 +81,7 @@ meta_ae/tests/holidays.csv,sha256=Ywr5pK_caGUJMgRwLzjMeSEUuyEpUWyJE5aJkfbg3bg,53
 meta_ae/tests/urls.py,sha256=BKiCB7JZCxtZFh6Ym-Y-Hdq92NECIt-GqMDyt6_B7o0,260
 meta_ae/tests/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_ae/tests/tests/test_actions.py,sha256=BrSbtCudm0ZZ8KGHA36exOx9mYfCslPk3JMRlcAOB8s,4879
-meta_analytics/README.rst,sha256=x5KDks1P2bSPdyq3f9CNkynAAgJaXl7AX_3rnmC16HU,357
+meta_analytics/README.rst,sha256=TRjju_9l-FoV6YU9qBwlktJDjiK3yfvrSvMo7Rd4mc8,422
 meta_analytics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_analytics/constants.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_analytics/get_tables.py,sha256=3jFmvLXWHY3FPd1u5OPVpAKWUcruCH0-A0KdKiiFGpc,2219
@@ -110,7 +110,7 @@ meta_analytics/notebooks/hiv_regimens.ipynb,sha256=qqRq5befPPiPQ8sheFhe6iGxPicaj
 meta_analytics/notebooks/incidence.ipynb,sha256=-kd0Mp67dk8ECoNEcKMTn92iBxuNLBIOC6-qLvz-31U,8101
 meta_analytics/notebooks/liver.ipynb,sha256=s19AAV6vmtGqYAfN1cqVIcBeU7ptSGU94uZaeaz32qU,13985
 meta_analytics/notebooks/magreth.ipynb,sha256=u4BWz6swBFLXcrOQDi_iSuFkp9NiISFk5uPahh7iXug,20773
-meta_analytics/notebooks/monitoring_report.ipynb,sha256=skRJrbuLSoQcKRdy-aYV--7lN0QfkCiQ0nOUmFbZWo4,74734
+meta_analytics/notebooks/monitoring_report.ipynb,sha256=BySeKJZ7MQPGQ6vbNNXW5JBJyNmTfvP_c8JGjskUF5U,77415
 meta_analytics/notebooks/pharmacy.ipynb,sha256=rAxMyPDZIyx-Qizgrdueq-rUYyeN3zMYVqDPkbjtnSs,34298
 meta_analytics/notebooks/pharmacy_stock_202410.ipynb,sha256=Kx9QVmiDW-5DWuaoSvLM2vJGHRCam-im9ZVdJsOBFfs,8823
 meta_analytics/notebooks/steering.ipynb,sha256=pqJrH_Zdwp7sPgHwhahKK-XmNMQjk7bHJv7vHJaeTek,1112
@@ -276,7 +276,7 @@ meta_edc/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 meta_edc/management/commands/update_forms_reference.py,sha256=jvCU9YdMtp9wbmjqKQsB9gxNw4DcAP97sZD-kfIxOns,1071
 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=t44__VfifcaagPTcm7lUVcjaIsBuM4IRyWz9xyNubDg,1297
+meta_edc/settings/debug.py,sha256=O_GNmF2yOgs0v6PhctRjiBQK2F0gEoUaUUb7Dum8MJA,1297
 meta_edc/settings/defaults.py,sha256=USh91oF6HKdUXWZ5xf5dDCwAYINSIdOPkgHCxDCsGP4,19633
 meta_edc/settings/live.py,sha256=uLTlsIc3H6gdE_7pkL6vyOVa6V_74hnXFkiojqGFAYY,264
 meta_edc/settings/logging.py,sha256=6qVUE37OMkf5rzwTmMq4krFsZ2jcyCpWdFtGih_Cs4U,1938
@@ -289,8 +289,8 @@ meta_edc/tests/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 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=BXydy77TcdcM0-R3S_uHI4DtfnLMIzPJMyqjFJZFSsA,916
-meta_edc-1.1.0.dist-info/licenses/AUTHORS.rst,sha256=wL4KUOd7FAFThhkLAJxSLQ2BPzd3ikG9q0UVZr3BbLg,244
-meta_edc-1.1.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+meta_edc-1.1.1.dist-info/licenses/AUTHORS.rst,sha256=wL4KUOd7FAFThhkLAJxSLQ2BPzd3ikG9q0UVZr3BbLg,244
+meta_edc-1.1.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
 meta_export/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_export/admin_site.py,sha256=CiKAf0gDFvBKVc-1VM6KwM905ayVZuiY1tgaTeUeCi0,167
 meta_export/apps.py,sha256=3_5LB1MLtzfKekI2vT9Cm6puAx6t6AjtIfTTVdItdKg,226
@@ -395,14 +395,14 @@ meta_prn/admin/off_study_medication_admin.py,sha256=pUc6vXvPuoAwTBxE24ztvqEOVSK4
 meta_prn/admin/offschedule_admin.py,sha256=GzmBaCc09ehWZnE93cuzSqHZxUYvXj_Fg-eLi-1PqF0,1748
 meta_prn/admin/offschedule_dm_referral_admin.py,sha256=wedIc1KtQ6l_NATXHeuuGX4dbyWsunSJ_X6-mX3w92I,1823
 meta_prn/admin/offschedule_postnatal_admin.py,sha256=USGbZIFDuB1Wwu0t-avQg6dcTNiEvpQqvkBEdrZBYk4,1970
-meta_prn/admin/offschedule_pregnancy_admin.py,sha256=aeX8NstvwmW8xG1xBjkGRzftFA9d04tzazh_RI8PRoY,2052
+meta_prn/admin/offschedule_pregnancy_admin.py,sha256=NN9tfWe5uxK8NQr6CQgc9TwXHLfDvAMAz5E3IO1mt9c,2058
 meta_prn/admin/onschedule_admin.py,sha256=GX4_wSqMDtQdB_x3nhodaDZ_E3d8kPPy-Yprpp6BJOk,1440
-meta_prn/admin/onschedule_dm_referral_admin.py,sha256=gfWE-NpHC4ICjKb1Fhb5XZUQ5syTp0s0_9IU1-ZTp0k,1470
+meta_prn/admin/onschedule_dm_referral_admin.py,sha256=9g7YOOYTOrRDHwzIm6uYH_nb3rJJEkEDsK6ZLlA0LHE,1480
 meta_prn/admin/pregnancy_notification_admin.py,sha256=fIAbpU1QEVAGeewxc2xcRu7aipz0srjzRNxPv7ZZrR8,2284
 meta_prn/admin/protocol_incident_admin.py,sha256=fTlYJAxsrPDB8skZc-_2DxKH21k_cG7UH7wCgnviBck,739
 meta_prn/admin/subject_transfer_admin.py,sha256=YKViIZLAaAquiN5RO-V6lRoGP76bYwcb_EA5QTEeI2Y,723
 meta_prn/form_validators/__init__.py,sha256=ROZbWrtQ4dLCwy-aeBcOh0mnYm12qFrvUWzV-BkGvTU,111
-meta_prn/form_validators/end_of_study.py,sha256=BlTjp3LgOpl3bFzNHn3S8OoHNE7mNUQkvJArAnu09x4,13150
+meta_prn/form_validators/end_of_study.py,sha256=Qovfk0MV2CU-J0jAe9hyCfSQVQ3uAIMKa92uTVvwZDY,13128
 meta_prn/form_validators/protocol_incident.py,sha256=g28qDxXpb-RiE4szn-KHFA03GcaAp0VWJ5SD5f3NUp8,1068
 meta_prn/forms/__init__.py,sha256=rQX_sPN77qzktlfH46qQNcZ1yV1WvKThm2c-jzangNQ,565
 meta_prn/forms/dm_referral_form.py,sha256=TvJSzKyVXXCOHRw67_i3BP9yEjAwE2yT5H6Y9bLRddU,1350
@@ -526,7 +526,7 @@ meta_reports/utils.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_reports/admin/__init__.py,sha256=om3lFa4YxsZSNlYIi2sZv8li2irOMoSeBtOpPk4V3lk,488
 meta_reports/admin/endpoints_admin.py,sha256=7wZCdC-D-QHI1bb_ucgyDZYlnYD7mWtcZpcH_LftkLs,514
 meta_reports/admin/endpoints_all_admin.py,sha256=_czdezZf9fSjwZJmO-3HbmdXrXP6nk8-HdiweqUzPRE,476
-meta_reports/admin/last_imp_refill_admin.py,sha256=RKODpodLqQsKx1v4ybqVULo38s2bNXd1nsUpCdPlJ1A,6431
+meta_reports/admin/last_imp_refill_admin.py,sha256=be8BEaUT9Ca5LkCdsPnGPsDeJyKm0brezBf9SDksPVc,6530
 meta_reports/admin/list_filters.py,sha256=pByBzz9-qGwqBfdZFlByxJUZDTJQXOTWfNLjmK8KF00,870
 meta_reports/admin/modeladmin_mixins.py,sha256=tEZYw0xNMfBvo2RLDrYfi_S9lbZU02dwtLxdRDZob4Q,3663
 meta_reports/admin/dbviews/__init__.py,sha256=2yPu0SO7ZX9yjan0OS9izzws14YYoXcGXmZhwJhax1I,675
@@ -793,7 +793,7 @@ meta_stats/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 meta_stats/tests/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_stats/tests/tests/test_incidence.py,sha256=Uxv05_xZ0hZKtTBDow3goRcQrK5644j9NQwyW9d_CX8,313
 meta_subject/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meta_subject/action_items.py,sha256=3wwqxwxYGApbfucy1hmemG6H-HzZNTMkwnOV_8Q4cYk,6869
+meta_subject/action_items.py,sha256=lIEH3G2s9JpbJkxKULB4p2yy2HEg9fhGcde7kK5A108,6870
 meta_subject/admin_site.py,sha256=fxUn5QKgo6wYUG18HW11kVrPqWvmWV2_PzKbgZQM4pU,169
 meta_subject/apps.py,sha256=iAQ8lizUpKa4gJnCGkTsuRQPtGWmSjnshZn8rZUguO8,289
 meta_subject/baker_recipes.py,sha256=C8ag5z5MRczzb3MkYGL37DccQg1FykiLgxepBlitlh0,2741
@@ -849,7 +849,7 @@ meta_subject/admin/health_economics/health_economics_simple_admin.py,sha256=1pmg
 meta_subject/admin/health_economics/health_economics_update_admin.py,sha256=MGGm_mLlU8wd61TCvlMv6HPeNe6EAlDm0Yx5aDtMXc0,3889
 meta_subject/form_validators/__init__.py,sha256=8RXC_zbXN7Q11qxuDP0ZegNSvjsL5UDhO9tao1dbUgc,555
 meta_subject/form_validators/birth_outcomes_form_validator.py,sha256=vujgXKIW4z8bJ536_9uBhETlbChhUvA3Rj5H8zR3UfI,349
-meta_subject/form_validators/delivery_form_validator.py,sha256=b1-B0KHjYoUyJ3WZ6KOz9YthxbPH-DJpQBEVmYnkQbM,3193
+meta_subject/form_validators/delivery_form_validator.py,sha256=tZuTWjzPAIG3qsg_sEHR_qJSmVKY8DwiE0XM5Ba_sUg,3194
 meta_subject/form_validators/dm_endpoint_form_validator.py,sha256=XK7eZikVwBwSAe0cB8TJPSsoljDIEonKwJ4WoESGr58,1513
 meta_subject/form_validators/dm_followup_form_validator.py,sha256=2ssfqmC8eKK0pwvi64dr0zOpioaNmJRtBtkj_YzTZY4,7962
 meta_subject/form_validators/egfr_drop_notification_form_validator.py,sha256=y5MUdRriMo8C2Qj_yzebDWsDkjQsFhcqTGrP8tBuhfA,530
@@ -860,7 +860,7 @@ meta_subject/forms/__init__.py,sha256=LrGBLJ3Se3McgUOdcrDyTM4B7G8ChVCrxDq4DXiYDL
 meta_subject/forms/birth_outcomes_form.py,sha256=qqhZNQKiYk8C8CFebZTQB0hOm4ONrgkTG7hfuK7kW-o,374
 meta_subject/forms/complications_glycemia_form.py,sha256=yTm3qRDJ1wPuukmpf0s0lg-oXi8fZ5Y7D7T9V-CsOXk,375
 meta_subject/forms/concomitant_medication_form.py,sha256=eznM4YOSV0eSsc-qaQgkga76T76Oz6i8svyBaleW-gQ,375
-meta_subject/forms/delivery_form.py,sha256=PrPNGJVJf-YwNTTo1XcjSnup6Rgo6Eq9ADBw9PrI8Ds,447
+meta_subject/forms/delivery_form.py,sha256=L4WZqWbo9gz_BzxSdckh3e0v6DojOSoygD2xEcT4P78,484
 meta_subject/forms/egfr_drop_notification_form.py,sha256=qQ5Q1aeGqzohD5FjBto1ThMP8iS-aNrA7I_OMrtVZFA,507
 meta_subject/forms/eq53d3l_form.py,sha256=EE67-CAIRNKZCKpmQolC8wgL5MMIjXlkn5SXe3XdhN0,508
 meta_subject/forms/followup_examination_form.py,sha256=PATGiGn1AXmK1koXy1QjMvgn43KuZn7yyZIrA_8sPXk,502
@@ -1238,7 +1238,7 @@ 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-1.1.0.dist-info/METADATA,sha256=y4ko2psjFD5hmV78bD3F57hp9ijr8ftfVDLjneZqm5I,43555
-meta_edc-1.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-meta_edc-1.1.0.dist-info/top_level.txt,sha256=RkzjNXwRq2kg_uZ_1bDwPUntijSXoY2YBqtByDwvvrc,244
-meta_edc-1.1.0.dist-info/RECORD,,
+meta_edc-1.1.1.dist-info/METADATA,sha256=NSVmMjmtdVyk7EmWONAf7myJhOYoXrhcCtfsrkm1Q0w,43555
+meta_edc-1.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+meta_edc-1.1.1.dist-info/top_level.txt,sha256=RkzjNXwRq2kg_uZ_1bDwPUntijSXoY2YBqtByDwvvrc,244
+meta_edc-1.1.1.dist-info/RECORD,,

meta_prn/admin/offschedule_pregnancy_admin.py

@@ -48,6 +48,6 @@ class OffSchedulePregnancyAdmin(
         custom_fields = ("offschedule_datetime",)
         return custom_fields + tuple(f for f in list_filter if f not in custom_fields)
 
-    def get_readonly_fields(self, request, obj=None) -> Tuple[str, ...]:
-        custom_fields = ("subject_identifier", "offschedule_datetime")
-        return tuple(set(super().get_readonly_fields(request, obj=obj) + custom_fields))
+    # def get_readonly_fields(self, request, obj=None) -> Tuple[str, ...]:
+    #     custom_fields = ("subject_identifier", "offschedule_datetime")
+    #     return tuple(set(super().get_readonly_fields(request, obj=obj) + custom_fields))

meta_prn/admin/onschedule_dm_referral_admin.py

@@ -29,11 +29,11 @@ class OnScheduleDmReferralAdmin(
         custom_fields = ("onschedule_datetime",)
         return custom_fields + tuple(f for f in list_filter if f not in custom_fields)
 
-    def get_readonly_fields(self, request, obj=None) -> Tuple[str, ...]:
-        return (
-            "subject_identifier",
-            "onschedule_datetime",
-        )
+    # def get_readonly_fields(self, request, obj=None) -> Tuple[str, ...]:
+    #     return (
+    #         "subject_identifier",
+    #         "onschedule_datetime",
+    #     )
 
     def get_search_fields(self, request) -> Tuple[str, ...]:
         return tuple(set(super().get_search_fields(request) + ("subject_identifier",)))

meta_prn/form_validators/end_of_study.py

@@ -304,7 +304,7 @@ class EndOfStudyFormValidator(
             transfer_model_cls = django_apps.get_model("meta_prn.subjecttransfer")
             try:
                 obj = transfer_model_cls.objects.get(
-                    subject_visit__subject_identifier=self.subject_identifier,
+                    subject_identifier=self.subject_identifier,
                 )
             except ObjectDoesNotExist:
                 self.raise_validation_error(
@@ -317,7 +317,7 @@ class EndOfStudyFormValidator(
                     INVALID_ERROR,
                 )
             else:
-                if obj.transfer_date.date() != self.cleaned_data.get("transfer_date"):
+                if obj.transfer_date != self.cleaned_data.get("transfer_date"):
                     dt = formatted_date(obj.transfer_date)
                     self.raise_validation_error(
                         {

meta_reports/admin/last_imp_refill_admin.py

@@ -13,6 +13,7 @@ from edc_qareports.modeladmin_mixins import QaReportModelAdminMixin
 from edc_sites.admin import SiteModelAdminMixin
 from edc_sites.admin.list_filters import SiteListFilter
 from edc_utils import get_utcnow
+from rangefilter.filters import DateRangeFilterBuilder
 
 from meta_analytics.dataframes import get_last_imp_visits_df
 
@@ -101,8 +102,8 @@ class LastImpRefillAdmin(
     ]
 
     list_filter = [
-        ImpVisitDateListFilter,
-        NextApptDateListFilter,
+        ("imp_visit_date", DateRangeFilterBuilder()),
+        ("next_appt_date", DateRangeFilterBuilder()),
         "imp_visit_code",
         "next_visit_code",
         SiteListFilter,

meta_subject/action_items.py

@@ -135,7 +135,7 @@ class DeliveryAction(ActionWithNotification):
     parent_action_names = [PREGNANCY_NOTIFICATION_ACTION]
     reference_model = "meta_subject.delivery"
     show_link_to_changelist = True
-    show_link_to_add = True
+    show_link_to_add = False
     admin_site_name = "meta_subject_admin"
     priority = HIGH_PRIORITY
 

meta_subject/form_validators/delivery_form_validator.py

@@ -10,6 +10,7 @@ from meta_prn.models import PregnancyNotification
 
 
 class DeliveryFormValidator(CrfFormValidator):
+
     def clean(self):
         try:
             pregnancy_notification = PregnancyNotification.objects.get(

meta_subject/forms/delivery_form.py

@@ -7,6 +7,8 @@ from ..models import Delivery
 
 
 class DeliveryForm(CrfModelFormMixin, ActionItemCrfFormMixin, forms.ModelForm):
+    report_datetime_allowance = 364
+
     form_validator_cls = DeliveryFormValidator
 
     class Meta(ActionItemCrfFormMixin.Meta):