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

meta_analytics/__init__.py

@@ -1,2 +0,0 @@
-from .dataframes import get_eos_df, get_glucose_tested_only_df, get_screening_df
-from .get_tables import get_tables

meta_analytics/dataframes/__init__.py

@@ -8,6 +8,7 @@ from .constants import (
     endpoint_columns,
 )
 from .get_eos_df import get_eos_df
+from .get_last_imp_visits_df import get_last_imp_visits_df
 from .glucose_endpoints import EndpointByDate, GlucoseEndpointsByDate
 from .screening import get_glucose_tested_only_df, get_screening_df
 from .utils import (

meta_analytics/dataframes/get_last_imp_visits_df.py

@@ -0,0 +1,101 @@
+import pandas as pd
+from django.apps import apps as django_apps
+from django.core.exceptions import ObjectDoesNotExist
+from django_pandas.io import read_frame
+from edc_pdutils.dataframes import get_appointments, get_crf
+
+
+class InvalidLotNumber(Exception):
+    pass
+
+
+def site_cond(df, site_id):
+    return (0 == 0) if not site_id else df.site_id == site_id
+
+
+def get_last_imp_visits_df(
+    lot_no: str | None = None,
+    site_id: int | None = None,
+) -> pd.DataFrame:
+    """Returns a dataframe of the last IMP visits based on the last
+    StudyMedication refill report.
+
+    `assignment` col defaults to "*****" unless a valid `lot_no` is
+    provided.
+    """
+    lot_obj = None
+    if lot_no:
+        lot_number_model_cls = django_apps.get_model("meta_pharmacy.lotnumber")
+        try:
+            lot_obj = lot_number_model_cls.objects.get(lot_no=lot_no)
+        except ObjectDoesNotExist:
+            raise ObjectDoesNotExist("The lot number given is invalid")
+
+    df_meds = get_crf(
+        "meta_subject.studymedication", subject_visit_model="meta_subject.subjectvisit"
+    )
+    df_meds = (
+        df_meds[(df_meds.refill == "Yes") & (site_cond(df_meds, site_id))]
+        .groupby(by=["subject_identifier", "site_id"])
+        .agg({"last_visit_code": "max", "last_visit_datetime": "max"})
+        .reset_index()
+    )
+    df_meds = df_meds.rename(
+        columns={"last_visit_code": "imp_visit_code", "last_visit_datetime": "imp_visit_date"}
+    )
+    df_meds.reset_index()
+
+    # merge with OffSchedule
+    opts = {} if not site_id else dict(site_id=site_id)
+    offschedule_model_cls = django_apps.get_model("meta_prn.offschedule")
+    df_off = read_frame(
+        offschedule_model_cls.objects.values(
+            "subject_identifier", "offschedule_datetime"
+        ).filter(**opts),
+        verbose=False,
+    )
+    df_off["offschedule_datetime"] = df_off["offschedule_datetime"].dt.tz_localize(None)
+    df_off["offschedule_datetime"] = df_off["offschedule_datetime"].dt.normalize()
+    df_off = df_off.set_index("subject_identifier")
+
+    df_meds = df_meds.set_index("subject_identifier")
+    df_final = pd.merge(
+        df_meds, df_off, left_index=True, right_index=True, how="outer"
+    ).reset_index()
+
+    # merge with RandomizationList if lot_obj
+    # note: slow to decrypt assignment
+    if lot_obj:
+        rando_model_cls = django_apps.get_model("meta_rando.randomizationlist")
+        qs = rando_model_cls.objects.values("subject_identifier", "assignment").filter(
+            assignment=lot_obj.assignment
+        )
+        df_rando = read_frame(qs, verbose=False)
+        df_final = df_final.merge(df_rando, on="subject_identifier", how="left")
+    else:
+        df_final["assignment"] = "*****"
+
+    # merge in appts
+    df_appt = (
+        get_appointments()
+        .groupby(by=["subject_identifier"])
+        .agg({"next_visit_code": "max", "next_appt_datetime": "max"})
+        .reset_index()
+    )
+    df_final = df_final.merge(
+        df_appt[["subject_identifier", "next_visit_code", "next_appt_datetime"]],
+        on="subject_identifier",
+        how="left",
+    )
+    df_final = df_final[(df_final.offschedule_datetime.isna()) & (df_final.assignment.notna())]
+
+    # Filter out subjects off_schedule.
+    # If lot_obj, filter out those with alternative assignment.
+    df_final = df_final[(df_final.offschedule_datetime.isna()) & (df_final.assignment.notna())]
+    df_final = df_final.drop(columns=["offschedule_datetime"])
+
+    # calculate days since the IMP visit
+    df_final["days_since"] = pd.to_datetime("today").normalize() - df_final.imp_visit_date
+    df_final["days_until"] = df_final.next_appt_datetime - pd.to_datetime("today").normalize()
+    df_final = df_final.reset_index()
+    return df_final

meta_auth/auth_objects.py

@@ -14,6 +14,7 @@ reports_codenames = get_app_codenames("meta_reports")
 reports_codenames.remove("meta_reports.view_impsubstitutions")
 
 meta_pharmacy_codenames = get_app_codenames("meta_pharmacy")
+meta_pharmacy_codenames.extend(get_app_codenames("django_pylabels"))
 meta_pharmacy_codenames.append("meta_reports.view_impsubstitutions")
 meta_pharmacy_codenames.append("meta_reports.viewallsites_impsubstitutions")
 excluded_meta_pharmacy_codenames = [

meta_consent/consents.py

@@ -12,6 +12,12 @@ consent_v1 = ConsentDefinition(
     age_is_adult=18,
     age_max=110,
     gender=[MALE, FEMALE],
+    screening_model=[
+        "meta_screening.subjectscreening",
+        "meta_screening.screeningpartone",
+        "meta_screening.screeningparttwo",
+        "meta_screening.screeningpartthree",
+    ],
 )
 
 site_consents.register(consent_v1)

meta_consent/locale/lg/LC_MESSAGES/django.po

@@ -0,0 +1,69 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-11-19 23:35+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: meta_consent/admin/modeladmin_mixins.py:68
+msgid "The following questions are directed to the interviewer."
+msgstr ""
+
+#: meta_consent/admin/modeladmin_mixins.py:118
+msgid "Create missing METFORMIN prescription"
+msgstr ""
+
+#: meta_consent/admin/modeladmin_mixins.py:140
+#, python-format
+msgid ""
+"Created %(created)s/%(total)s missing %(display_name)s prescriptions. Got "
+"%(exist)s/%(total)s prescriptions already exist"
+msgstr ""
+
+#: meta_consent/form_validators/subject_consent_form_validator.py:14
+msgid "Expected 'hospital number'."
+msgstr ""
+
+#: meta_consent/form_validators/subject_consent_form_validator.py:22
+msgid "The hospital identifier does not match that reported at screening."
+msgstr ""
+
+#: meta_consent/forms/subject_consent_form.py:13
+msgid ""
+"Use Country ID Number, Passport number, driver's license number or Country "
+"ID receipt number"
+msgstr ""
+
+#: meta_consent/forms/subject_consent_form.py:19
+msgid ""
+"Required only if participant is illiterate. Format is 'LASTNAME, FIRSTNAME'. "
+"All uppercase separated by a comma."
+msgstr ""
+
+#: meta_consent/forms/subject_consent_form.py:24
+msgid "(read-only)"
+msgstr ""
+
+#: meta_consent/models/subject_consent.py:54
+msgid "Screening identifier"
+msgstr ""
+
+#: meta_consent/models/subject_consent.py:58
+msgid "Screening datetime"
+msgstr ""
+
+#: meta_consent/models/subject_consent.py:63
+msgid "from screening"
+msgstr ""

meta_consent/locale/sw/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-09-07 09:43-0500\n"
+"POT-Creation-Date: 2024-11-19 23:35+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,53 +18,53 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/subject_consent_admin.py:74
+#: meta_consent/admin/modeladmin_mixins.py:68
 msgid "The following questions are directed to the interviewer."
 msgstr ""
 
-#: admin/subject_consent_admin.py:124
+#: meta_consent/admin/modeladmin_mixins.py:118
 msgid "Create missing METFORMIN prescription"
 msgstr ""
 
-#: admin/subject_consent_admin.py:146
+#: meta_consent/admin/modeladmin_mixins.py:140
 #, python-format
 msgid ""
 "Created %(created)s/%(total)s missing %(display_name)s prescriptions. Got "
 "%(exist)s/%(total)s prescriptions already exist"
 msgstr ""
 
-#: forms/subject_consent_form.py:18
+#: meta_consent/form_validators/subject_consent_form_validator.py:14
 msgid "Expected 'hospital number'."
 msgstr ""
 
-#: forms/subject_consent_form.py:26
+#: meta_consent/form_validators/subject_consent_form_validator.py:22
 msgid "The hospital identifier does not match that reported at screening."
 msgstr ""
 
-#: forms/subject_consent_form.py:54
+#: meta_consent/forms/subject_consent_form.py:13
 msgid ""
 "Use Country ID Number, Passport number, driver's license number or Country "
 "ID receipt number"
 msgstr ""
 
-#: forms/subject_consent_form.py:60
+#: meta_consent/forms/subject_consent_form.py:19
 msgid ""
 "Required only if participant is illiterate. Format is 'LASTNAME, FIRSTNAME'. "
 "All uppercase separated by a comma."
 msgstr ""
 
-#: forms/subject_consent_form.py:65
+#: meta_consent/forms/subject_consent_form.py:24
 msgid "(read-only)"
 msgstr ""
 
-#: models/subject_consent.py:63
+#: meta_consent/models/subject_consent.py:54
 msgid "Screening identifier"
 msgstr ""
 
-#: models/subject_consent.py:67
+#: meta_consent/models/subject_consent.py:58
 msgid "Screening datetime"
 msgstr ""
 
-#: models/subject_consent.py:72
+#: meta_consent/models/subject_consent.py:63
 msgid "from screening"
 msgstr ""

meta_dashboard/locale/lg/LC_MESSAGES/django.po

@@ -0,0 +1,30 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-11-19 23:35+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: meta_dashboard/view_utils/subject_screening_button.py:42
+msgid "View"
+msgstr ""
+
+#: meta_dashboard/view_utils/subject_screening_button.py:44
+msgid "Edit"
+msgstr ""
+
+#: meta_dashboard/views/subject/dashboard/dashboard_view.py:17
+msgid "Audit"
+msgstr ""

meta_dashboard/locale/sw/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-09-07 09:35-0500\n"
+"POT-Creation-Date: 2024-11-19 23:35+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: views/subject/dashboard/dashboard_view.py:9
+
+#: meta_dashboard/view_utils/subject_screening_button.py:42
+msgid "View"
+msgstr ""
+
+#: meta_dashboard/view_utils/subject_screening_button.py:44
+msgid "Edit"
+msgstr ""
+
+#: meta_dashboard/views/subject/dashboard/dashboard_view.py:17
 msgid "Audit"
 msgstr ""

meta_dashboard/navbars.py

@@ -1,6 +1,7 @@
 from edc_adverse_event.navbars import ae_navbar_item, tmg_navbar_item
 from edc_data_manager.navbar_item import dm_navbar_item
 from edc_navbar import Navbar, NavbarItem, site_navbars
+from edc_pharmacy.navbars import pharmacy_navbar_item
 from edc_review_dashboard.navbars import navbar_item as review_navbar_item
 
 no_url_namespace = False  # True if settings.APP_NAME == "meta_dashboard" else False
@@ -33,6 +34,7 @@ navbar.register(
 )
 
 
+navbar.register(pharmacy_navbar_item)
 navbar.register(review_navbar_item)
 navbar.register(tmg_navbar_item)
 navbar.register(ae_navbar_item)

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/tests/urls.py

@@ -47,7 +47,6 @@ urlpatterns = [
     path("edc_export/", include("edc_export.urls")),
     path("edc_lab_dashboard/", include("edc_lab_dashboard.urls")),
     path("edc_locator/", include("edc_locator.urls")),
-    path("edc_pharmacy_dashboard/", include("edc_pharmacy_dashboard.urls")),
     path("edc_protocol/", include("edc_protocol.urls")),
     path("edc_subject_dashboard/", include("edc_subject_dashboard.urls")),
     path("edc_visit_schedule/", include("edc_visit_schedule.urls")),

meta_dashboard/view_utils/__init__.py

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

meta_dashboard/view_utils/subject_screening_button.py

@@ -5,10 +5,10 @@ from typing import Type
 
 from django.utils.translation import gettext as _
 from edc_constants.constants import TBD, YES
-from edc_subject_dashboard.view_utils import ADD, CHANGE, VIEW
-from edc_subject_dashboard.view_utils.subject_screening_button import (
+from edc_subject_dashboard.view_utils import (
     SubjectScreeningButton as BaseSubjectScreeningButton,
 )
+from edc_view_utils import ADD, CHANGE, VIEW
 
 from meta_screening.models import ScreeningPartOne, ScreeningPartThree, ScreeningPartTwo
 

meta_edc/__init__.py

@@ -1,16 +1,7 @@
 import os
-import sys
 from importlib.metadata import PackageNotFoundError, version
 
-# celery_app loads settings before Django, so ensure
-# it will load the correct settings module coming from
-# systemd service
-if "meta_edc.celery.live:app" in sys.argv:
-    from .celery.live import app as celery_app
-elif "meta_edc.celery.uat:app" in sys.argv:
-    from .celery.uat import app as celery_app
-else:
-    from .celery.debug import app as celery_app
+from .celery import app as celery_app
 
 try:
     __version__ = version(os.getcwd().split(os.sep)[-1])
@@ -19,3 +10,5 @@ except PackageNotFoundError:
 
 
 __all__ = ["celery_app", "__version__"]
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "meta_edc.settings.debug")

meta_edc/{celery/debug.py → celery.py}

@@ -6,8 +6,8 @@ from celery import Celery
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "meta_edc.settings.debug")
 
 # config celery
-# remember to include additional apps with tasks
-app = Celery("meta_edc", include=["meta_reports"])
+# app = Celery("meta_edc", include=["meta_reports", "edc_pharmacy"])
+app = Celery("meta_edc")
 app.config_from_object("django.conf:settings", namespace="CELERY")
 app.autodiscover_tasks()
 

meta_edc/navbars.py

@@ -5,6 +5,7 @@ from edc_adverse_event.navbars import ae_navbar_item, tmg_navbar_item
 from edc_data_manager.navbar_item import dm_navbar_item
 from edc_lab_dashboard.navbars import navbar as lab_navbar
 from edc_navbar import Navbar, site_navbars
+from edc_pharmacy.navbars import pharmacy_navbar_item
 from edc_review_dashboard.navbars import navbar as review_navbar
 
 from meta_dashboard.navbars import navbar as meta_dashboard_navbar
@@ -29,6 +30,7 @@ navbar.register(
 for navbar_item in review_navbar.navbar_items:
     navbar.register(navbar_item)
 
+navbar.register(pharmacy_navbar_item)
 navbar.register(tmg_navbar_item)
 navbar.register(ae_navbar_item)
 navbar.register(dm_navbar_item)

meta_edc/settings/debug.py

@@ -32,3 +32,11 @@ EDC_MODEL_ADMIN_CSS_THEME = "edc_purple"
 if os.path.exists(BASE_DIR) and not os.path.exists(KEY_PATH):  # noqa
     os.makedirs(KEY_PATH)  # noqa
     AUTO_CREATE_KEYS = True
+
+# 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/settings/defaults.py

@@ -34,19 +34,17 @@ env = environ.Env(
     EDC_SITES_DOMAIN_SUFFIX="meta4.clinicedc.org",
 )
 
-BASE_DIR = str(Path(os.path.dirname(os.path.abspath(__file__))).parent.parent)
-ENV_DIR = str(Path(os.path.dirname(os.path.abspath(__file__))).parent.parent)
+BASE_DIR = Path(__file__).resolve().parent.parent.parent
+ENV_DIR = Path(__file__).resolve().parent.parent.parent
 
 # copy your .env file from .envs/ to BASE_DIR
 if "test" in sys.argv:
-    env.read_env(os.path.join(ENV_DIR, ".env-tests"))
-    print(f"Reading env from {os.path.join(BASE_DIR, '.env-tests')}")
+    env.read_env(ENV_DIR / ".env-tests")
+    print(f"Reading env from {(BASE_DIR /'.env-tests')}")  # noqa
 else:
-    if not os.path.exists(os.path.join(ENV_DIR, ".env")):
-        raise FileExistsError(
-            f"Environment file does not exist. Got `{os.path.join(ENV_DIR, '.env')}`"
-        )
-    env.read_env(os.path.join(ENV_DIR, ".env"))
+    if not (ENV_DIR / ".env").exists():
+        raise FileExistsError(f"Environment file does not exist. Got `{(ENV_DIR / '.env')}`")
+    env.read_env(ENV_DIR / ".env")
 
 
 LOGGING_ENABLED = env("DJANGO_LOGGING_ENABLED")
@@ -67,7 +65,7 @@ LIVE_SYSTEM = env.str("DJANGO_LIVE_SYSTEM")
 
 ETC_DIR = env.str("DJANGO_ETC_FOLDER")
 
-TEST_DIR = os.path.join(BASE_DIR, APP_NAME, "tests")
+TEST_DIR = BASE_DIR / APP_NAME / "tests"
 
 ALLOWED_HOSTS = env.list("DJANGO_ALLOWED_HOSTS")
 
@@ -92,6 +90,7 @@ INSTALLED_APPS = [
     "django.contrib.sites",
     "multisite.apps.AppConfig",
     "defender",
+    "sequences.apps.SequencesConfig",
     # "django_celery_beat",
     # "django_celery_results",
     "django_db_views",
@@ -102,6 +101,8 @@ INSTALLED_APPS = [
     "logentry_admin",
     "simple_history",
     "storages",
+    "django_pylabels.apps.AppConfig",
+    "edc_pylabels.apps.AppConfig",
     "edc_sites.apps.AppConfig",
     "edc_action_item.apps.AppConfig",
     "edc_appointment.apps.AppConfig",
@@ -235,7 +236,7 @@ if env("DATABASE_SQLITE_ENABLED"):
     DATABASES = {
         "default": {
             "ENGINE": "django.db.backends.sqlite3",
-            "NAME": os.path.join(BASE_DIR, "db.sqlite3"),
+            "NAME": BASE_DIR / "db.sqlite3",
         }
     }
 
@@ -307,6 +308,11 @@ LANGUAGE_CODE = "en-gb"
 LANGUAGE_LIST = ["sw", "en-gb", "en", "mas"]
 LANGUAGES = [(code, LANG_INFO[code]["name"]) for code in LANGUAGE_LIST]
 
+# LOCALE_PATHS = [
+#     base_dir / "locale",
+#     base_dir.parent / "edc-pharmacy" / "edc_pharmacy" / "locale",
+# ]
+
 TIME_ZONE = env.str("DJANGO_TIME_ZONE")
 DATE_INPUT_FORMATS = ["%Y-%m-%d", "%d/%m/%Y"]
 DATETIME_INPUT_FORMATS = [
@@ -349,8 +355,8 @@ if not DEBUG:
     SECURE_BROWSER_XSS_FILTER = True
 
 # edc_lab and label
-LABEL_TEMPLATE_FOLDER = env.str("DJANGO_LABEL_TEMPLATE_FOLDER") or os.path.join(
-    BASE_DIR, "label_templates", "2.25x1.25in"
+LABEL_TEMPLATE_FOLDER = env.str("DJANGO_LABEL_TEMPLATE_FOLDER") or (
+    BASE_DIR / "label_templates" / "2.25x1.25in"
 )
 CUPS_SERVERS = env.dict("DJANGO_CUPS_SERVERS")
 
@@ -458,7 +464,7 @@ GIT_DIR = BASE_DIR
 KEY_PATH = env.str("DJANGO_KEY_FOLDER")
 AUTO_CREATE_KEYS = env("DJANGO_AUTO_CREATE_KEYS")
 
-EXPORT_FOLDER = env.str("DJANGO_EXPORT_FOLDER") or os.path.expanduser("~/")
+EXPORT_FOLDER = env.str("DJANGO_EXPORT_FOLDER") or Path("~/").expanduser()
 
 # django_simple_history
 SIMPLE_HISTORY_ENFORCE_HISTORY_MODEL_PERMISSIONS = True
@@ -520,7 +526,7 @@ if env("AWS_ENABLED"):
     STATIC_ROOT = ""
 elif DEBUG:
     STATIC_URL = env.str("DJANGO_STATIC_URL")
-    STATIC_ROOT = os.path.expanduser("~/source/edc_source/meta-edc/static/")
+    STATIC_ROOT = Path("~/source/edc_source/meta-edc/static/").expanduser()
 else:
     # run collectstatic, check nginx LOCATION
     STATIC_URL = env.str("DJANGO_STATIC_URL")
@@ -534,10 +540,17 @@ if CELERY_ENABLED:
         CELERY_BROKER_URL = (
             f"redis://:{quote(env.str('DJANGO_REDIS_PASSWORD'), safe='')}@127.0.0.1:6379/0"
         )
+        CELERY_RESULT_BACKEND = (
+            f"redis://:{quote(env.str('DJANGO_REDIS_PASSWORD'), safe='')}@127.0.0.1:6379/0"
+        )
     else:
         CELERY_BROKER_URL = "redis://127.0.0.1:6379/0"
+        CELERY_RESULT_BACKEND = "redis://localhost:6379/0"
     # CELERY_BEAT_SCHEDULER = "django_celery_beat.schedulers.DatabaseScheduler"
-
+    CELERY_ACCEPT_CONTENT = ["json"]
+    CELERY_TASK_SERIALIZER = "json"
+    CELERY_RESULT_SERIALIZER = "json"
+    CELERY_TIMEZONE = "UTC"
 
 if "test" in sys.argv:
 

meta_edc/templates/meta_edc/bootstrap3/home.html

@@ -59,8 +59,8 @@ 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 %}
-        <a href="{% url edc_randomization_url_name %}" class="list-group-item"><i class="fas fa-medkit fa-lg fa-fw"></i>&nbsp;&nbsp;&nbsp;Pharmacy</a>
+      {% 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 %}
         <a href="{% url 'edc_export:home_url' %}" class="list-group-item"><i class="fas fa-file-export fa-lg fa-fw"></i>&nbsp;&nbsp;&nbsp;Export data</a>

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/urls.py

@@ -22,6 +22,7 @@ urlpatterns = [
     path("accounts/", include("edc_auth.urls_for_accounts", namespace="auth")),
     path("administration/", AdministrationView.as_view(), name="administration_url"),
     path("subject/", include("meta_dashboard.urls")),
+    *paths_for_urlpatterns("edc_pylabels"),
     *paths_for_urlpatterns("edc_auth"),
     *paths_for_urlpatterns("edc_action_item"),
     *paths_for_urlpatterns("edc_adverse_event"),

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

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: meta-edc
-Version: 0.3.38
+Version: 0.3.40
 Summary: META Trial EDC (http://www.isrctn.com/ISRCTN76157257)
 Home-page: https://github.com/meta-trial/meta-edc
-Author: Blair Bonnett
-Author-email: ew2789@gmail.com
-License: GNU GENERAL PUBLIC LICENSE
+Author: Erik van Widenfelt
+Author-email: Erik van Widenfelt <ew2789@gmail.com>, Jonathan Willitts <j.willitts@ucl.ac.uk>
+License:                     GNU GENERAL PUBLIC LICENSE
                                Version 3, 29 June 2007
         
          Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
@@ -693,11 +693,11 @@ 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]
-Requires-Dist: pylabels2
+Requires-Dist: django-pylabels
 
 |pypi| |actions| |codecov| |downloads|