meta-edc 0.3.6__py3-none-any.whl → 0.3.15__py3-none-any.whl

meta_edc/tests/test_settings.py

@@ -0,0 +1,176 @@
+#!/usr/bin/env python
+import sys
+from datetime import datetime
+from os.path import join
+from pathlib import Path
+from zoneinfo import ZoneInfo
+
+from django.conf import locale
+from edc_constants.internationalization import EXTRA_LANG_INFO
+from edc_test_settings.default_test_settings import DefaultTestSettings
+from multisite import SiteID
+
+from meta_edc.meta_version import PHASE_THREE
+
+LANG_INFO = dict(locale.LANG_INFO, **EXTRA_LANG_INFO)
+locale.LANG_INFO = LANG_INFO
+LANGUAGE_LIST = ["sw", "en-gb", "en", "mas"]
+
+app_name = "meta_edc"
+base_dir = Path(__file__).parent.parent
+
+project_settings = DefaultTestSettings(
+    calling_file=__file__,
+    META_PHASE=PHASE_THREE,
+    BASE_DIR=base_dir,
+    APP_NAME=app_name,
+    ETC_DIR=base_dir / "etc",
+    DJANGO_CRYPTO_FIELDS_KEY_PATH=base_dir / "tests" / "etc",
+    GIT_DIR=base_dir.parent,
+    HOLIDAY_FILE=base_dir / "tests" / "holidays.csv",
+    EDC_RANDOMIZATION_LIST_PATH=base_dir / "tests" / "etc",
+    SITE_ID=SiteID(default=10),
+    EDC_SITES_DOMAIN_SUFFIX="meta3.clinicedc.org",
+    EDC_EGFR_DROP_NOTIFICATION_MODEL="meta_subject.egfrdropnotification",
+    EDC_RANDOMIZATION_REGISTER_DEFAULT_RANDOMIZER=False,
+    EDC_MNSI_ABNORMAL_FOOT_APPEARANCE_OBSERVATIONS_MODEL=(
+        "meta_lists.abnormalfootappearanceobservations"
+    ),
+    EDC_QOL_EQ5D3L_MODEL="meta_subject.eq5d3l",
+    ROOT_URLCONF="meta_edc.urls",
+    EDC_AUTH_CODENAMES_WARN_ONLY=True,
+    EDC_DX_REVIEW_LIST_MODEL_APP_LABEL="edc_dx_review",
+    SENTRY_ENABLED=False,
+    INDEX_PAGE="localhost:8000",
+    EXPORT_FOLDER=join(base_dir, "tests", "export"),
+    SUBJECT_APP_LABEL="meta_subject",
+    SUBJECT_SCREENING_MODEL="meta_screening.subjectscreening",
+    SUBJECT_VISIT_MODEL="meta_subject.subjectvisit",
+    SUBJECT_VISIT_MISSED_MODEL="meta_subject.subjectvisitmissed",
+    SUBJECT_CONSENT_MODEL="meta_consent.subjectconsentv1",
+    SUBJECT_REQUISITION_MODEL="meta_subject.subjectrequisition",
+    EDC_BLOOD_RESULTS_MODEL_APP_LABEL="meta_subject",
+    DEFENDER_ENABLED=False,
+    DJANGO_LAB_DASHBOARD_REQUISITION_MODEL="meta_subject.subjectrequisition",
+    ADVERSE_EVENT_ADMIN_SITE="meta_ae_admin",
+    EDC_DX_LABELS=dict(hiv="HIV", dm="Diabetes", htn="Hypertension", chol="High Cholesterol"),
+    ADVERSE_EVENT_APP_LABEL="meta_ae",
+    EDC_NAVBAR_DEFAULT="meta_dashboard",
+    EDC_PROTOCOL_STUDY_OPEN_DATETIME=datetime(2019, 4, 30, 0, 0, 0, tzinfo=ZoneInfo("UTC")),
+    EDC_PROTOCOL_STUDY_CLOSE_DATETIME=datetime(
+        2025, 12, 31, 23, 59, 59, tzinfo=ZoneInfo("UTC")
+    ),
+    LANGUAGE_CODE="en",
+    LANGUAGES=[(code, LANG_INFO[code]["name"]) for code in LANGUAGE_LIST],
+    DASHBOARD_BASE_TEMPLATES=dict(
+        edc_base_template="edc_dashboard/base.html",
+        listboard_base_template="meta_edc/base.html",
+        dashboard_base_template="meta_edc/base.html",
+        screening_listboard_template="meta_dashboard/screening/listboard.html",
+        subject_listboard_template="meta_dashboard/subject/listboard.html",
+        subject_dashboard_template="meta_dashboard/subject/dashboard.html",
+        subject_review_listboard_template="edc_review_dashboard/subject_review_listboard.html",
+    ),
+    EDC_BOOTSTRAP=3,
+    EMAIL_BACKEND="django.core.mail.backends.locmem.EmailBackend",
+    EMAIL_CONTACTS={
+        "ae_reports": "someone@example.com",
+        "data_request": "someone@example.com",
+        "data_manager": "someone@example.com",
+        "tmg": "someone@example.com",
+    },
+    EMAIL_ENABLED=True,
+    LIVE_SYSTEM=False,
+    EDC_SITES_MODULE_NAME="meta_sites",
+    EDC_AUTH_SKIP_SITE_AUTHS=True,
+    EDC_AUTH_SKIP_AUTH_UPDATER=True,
+    EDC_MNSI_MODEL="meta_subject.mnsi",
+    INSTALLED_APPS=[
+        "django.contrib.admin",
+        "django.contrib.auth",
+        "django.contrib.contenttypes",
+        "django.contrib.sessions",
+        "django.contrib.messages",
+        "django.contrib.staticfiles",
+        "django.contrib.sites",
+        "django_crypto_fields.apps.AppConfig",
+        "django_revision.apps.AppConfig",
+        # "debug_toolbar",
+        "django_extensions",
+        "logentry_admin",
+        "simple_history",
+        "storages",
+        "edc_sites.apps.AppConfig",
+        "edc_action_item.apps.AppConfig",
+        "edc_adherence.apps.AppConfig",
+        "edc_adverse_event.apps.AppConfig",
+        "edc_appointment.apps.AppConfig",
+        "edc_auth.apps.AppConfig",
+        "edc_crf.apps.AppConfig",
+        "edc_he.apps.AppConfig",
+        "edc_data_manager.apps.AppConfig",
+        "edc_consent.apps.AppConfig",
+        "edc_device.apps.AppConfig",
+        "edc_dashboard.apps.AppConfig",
+        "edc_egfr.apps.AppConfig",
+        "edc_export.apps.AppConfig",
+        "edc_facility.apps.AppConfig",
+        "edc_fieldsets.apps.AppConfig",
+        "edc_form_runners.apps.AppConfig",
+        "edc_form_validators.apps.AppConfig",
+        "edc_reportable.apps.AppConfig",
+        "edc_lab.apps.AppConfig",
+        "edc_lab_dashboard.apps.AppConfig",
+        "edc_label.apps.AppConfig",
+        "edc_listboard.apps.AppConfig",
+        "edc_locator.apps.AppConfig",
+        "edc_pdf_reports.apps.AppConfig",
+        "edc_identifier.apps.AppConfig",
+        "edc_metadata.apps.AppConfig",
+        "edc_model_admin.apps.AppConfig",
+        "edc_navbar.apps.AppConfig",
+        "edc_notification.apps.AppConfig",
+        "edc_offstudy.apps.AppConfig",
+        "edc_visit_tracking.apps.AppConfig",
+        "edc_visit_schedule.apps.AppConfig",
+        "edc_pdutils.apps.AppConfig",
+        "edc_pharmacy.apps.AppConfig",
+        "edc_protocol.apps.AppConfig",
+        "edc_protocol_incident.apps.AppConfig",
+        "edc_prn.apps.AppConfig",
+        "edc_randomization.apps.AppConfig",
+        "edc_registration.apps.AppConfig",
+        "edc_subject_dashboard.apps.AppConfig",
+        "edc_screening.apps.AppConfig",
+        "edc_timepoint.apps.AppConfig",
+        "edc_list_data.apps.AppConfig",
+        "edc_review_dashboard.apps.AppConfig",
+        "edc_refusal.apps.AppConfig",
+        "edc_mnsi.apps.AppConfig",
+        "edc_unblinding.apps.AppConfig",
+        "edc_qol.apps.AppConfig",
+        "edc_dx_review.apps.AppConfig",
+        "edc_dx.apps.AppConfig",
+        "meta_auth.apps.AppConfig",
+        "meta_consent.apps.AppConfig",
+        "meta_lists.apps.AppConfig",
+        "meta_dashboard.apps.AppConfig",
+        "meta_labs.apps.AppConfig",
+        "meta_rando.apps.AppConfig",
+        "meta_subject.apps.AppConfig",
+        "meta_visit_schedule.apps.AppConfig",
+        "meta_ae.apps.AppConfig",
+        "meta_prn.apps.AppConfig",
+        "meta_export.apps.AppConfig",
+        "meta_sites.apps.AppConfig",
+        "meta_screening.apps.AppConfig",
+        "meta_edc.apps.AppConfig",
+        "edc_appconfig.apps.AppConfig",
+    ],
+    add_dashboard_middleware=True,
+    add_lab_dashboard_middleware=True,
+    add_adverse_event_dashboard_middleware=True,
+).settings
+
+for k, v in project_settings.items():
+    setattr(sys.modules[__name__], k, v)

meta_edc/tests/tests/test_endpoints.py

@@ -12,8 +12,7 @@ from django.apps import apps as django_apps
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.contrib.sites.models import Site
-from django.test import tag
-from django.test.utils import override_settings
+from django.test.utils import override_settings, tag
 from django.urls.base import reverse
 from django.urls.exceptions import NoReverseMatch
 from django_extensions.management.color import color_style
@@ -25,7 +24,7 @@ from edc_auth.auth_updater import AuthUpdater
 from edc_auth.constants import AUDITOR_ROLE, CLINICIAN_ROLE, STAFF_ROLE
 from edc_auth.site_auths import site_auths
 from edc_consent.site_consents import site_consents
-from edc_constants.constants import PENDING, YES
+from edc_constants.constants import YES
 from edc_dashboard.url_names import url_names
 from edc_export.constants import DATA_EXPORTER_ROLE
 from edc_lab.auth_objects import LAB_TECHNICIAN_ROLE
@@ -217,7 +216,7 @@ class AdminSiteTest(MetaTestCaseMixin, WebTest):
             else:
                 self.assertNotIn(label, response)
 
-    @tag("1")
+    @skip
     @time_machine.travel(datetime(2019, 6, 11, 8, 00, tzinfo=ZoneInfo("UTC")))
     def test_screening_form_phase3(self):
         self.login(superuser=False, roles=[STAFF_ROLE, CLINICIAN_ROLE])
@@ -241,18 +240,18 @@ class AdminSiteTest(MetaTestCaseMixin, WebTest):
             add_screening_part_two,
             screening_identifier,
         ) = self.webtest_for_screening_form_part_one(part_one_data)
-        part_two_data = deepcopy(get_part_two_eligible_options())
-        part_two_data["part_two_report_datetime"] = get_utcnow() + relativedelta(minutes=10)
-        part_two_data["appt_datetime"] = part_two_data[
-            "part_two_report_datetime"
-        ] + relativedelta(days=10)
-        if part_two_data["appt_datetime"] < get_utcnow():
-            part_two_data.update(p3_ltfu=PENDING)
-            # part_two_data.update(p3_ltfu_date=get_utcnow().date())
-        # part_two_data.update()
-
-        traveller = time_machine.travel(part_two_data["part_two_report_datetime"])
+
+        # travel 10 min into the future
+        traveller = time_machine.travel(
+            part_one_data["report_datetime"] + relativedelta(minutes=10)
+        )
         traveller.start()
+        part_two_data = deepcopy(
+            get_part_two_eligible_options(
+                report_datetime=get_utcnow() + relativedelta(minutes=1)
+            )
+        )
+        part_two_data["appt_datetime"] = get_utcnow() + relativedelta(days=10)
         part_two_data.update(
             dict(
                 part_two_report_datetime_0=part_two_data["part_two_report_datetime"].strftime(
@@ -272,11 +271,14 @@ class AdminSiteTest(MetaTestCaseMixin, WebTest):
         ) = self.webtest_for_screening_form_part_two(
             home_page, add_screening_part_two, screening_identifier, part_two_data
         )
+        traveller.stop()
 
+        # travel 10 days into the future
         traveller = time_machine.travel(part_two_data["appt_datetime"])
         traveller.start()
-        part_three_data = deepcopy(get_part_three_eligible_options())
-        # report_datetime = part_three_data.get("part_three_report_datetime")
+        part_three_data = deepcopy(
+            get_part_three_eligible_options(report_datetime=get_utcnow())
+        )
 
         traveller = time_machine.travel(part_two_data.get("part_three_report_datetime"))
         traveller.start()
@@ -311,7 +313,6 @@ class AdminSiteTest(MetaTestCaseMixin, WebTest):
         self.assertIn(screening_identifier, screening_listboard_page)
         self.assertIn("Consent", screening_listboard_page)
 
-    @tag("1")
     def webtest_for_screening_form_part_one(self, part_one_data):
         home_page = self.app.get(reverse("home_url"), user=self.user, status=200)
         screening_listboard_page = home_page.click(description="Screening", index=1)
@@ -367,7 +368,7 @@ class AdminSiteTest(MetaTestCaseMixin, WebTest):
         errorlist = soup.find_all("ul", "errorlist")
         self.assertEqual([], errorlist)
         # redirects back to listboard
-        obj = SubjectScreening.objects.all().last()
+        obj = SubjectScreening.objects.get(screening_identifier=screening_identifier)
         url = reverse(screening_listboard_url, args=(obj.screening_identifier,))
         self.assertRedirects(page, url)
         # shows P1 | P2 | P3 | PENDING

meta_edc/urls.py

@@ -1,8 +1,8 @@
 from django.conf import settings
+from django.contrib.auth.views import LogoutView
 from django.urls.conf import include, path, re_path
 from django.views.defaults import page_not_found, server_error  # noqa
 from django.views.generic import RedirectView
-from edc_auth.views import LogoutView
 from edc_dashboard.utils import get_index_page
 from edc_dashboard.views import AdministrationView
 from edc_utils.paths_for_urlpatterns import paths_for_urlpatterns

{meta_edc-0.3.6.dist-info → meta_edc-0.3.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meta-edc
-Version: 0.3.6
+Version: 0.3.15
 Summary: META Trial EDC (http://www.isrctn.com/ISRCTN76157257)
 Home-page: https://github.com/meta-trial/meta-edc
 Author: Erik van Widenfelt
@@ -13,15 +13,16 @@ Classifier: Framework :: Django :: 4.2
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
-Requires-Python: >=3.11
+Requires-Python: >=3.12
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS
-Requires-Dist: edc ==0.5.73
+Requires-Dist: edc ==0.5.90
 Requires-Dist: edc-microscopy
 Requires-Dist: beautifulsoup4
+Requires-Dist: Django ==4.2.11
 
 |pypi| |actions| |codecov| |downloads|