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

meta_analytics/dataframes/glucose_endpoints/glucose_endpoints_by_date.py

@@ -304,6 +304,14 @@ class GlucoseEndpointsByDate:
         model_cls = django_apps.get_model(model)
         if self.subject_identifiers:
             model_cls.objects.filter(subject_identifier__in=self.subject_identifiers).delete()
+            df = (
+                self.endpoint_only_df[
+                    self.endpoint_only_df["subject_identifier"].isin(self.subject_identifiers)
+                ]
+                .copy()
+                .sort_values(by=["subject_identifier"])
+                .reset_index(drop=True)
+            )
         else:
             model_cls.objects.all().delete()
         created = 0

meta_analytics/notebooks/endpoints/meta_endpoints_by_date.ipynb

@@ -10,8 +10,10 @@
     "%%capture\n",
     "import os\n",
     "from pathlib import Path\n",
+    "\n",
     "import pandas as pd\n",
     "from dj_notebook import activate\n",
+    "\n",
     "env_file = os.environ[\"META_ENV\"]\n",
     "reports_folder = Path(os.environ[\"META_REPORTS_FOLDER\"])\n",
     "analysis_folder = Path(os.environ[\"META_ANALYSIS_FOLDER\"])\n",
@@ -29,13 +31,13 @@
    "source": [
     "import numpy as np\n",
     "import io\n",
-    "import msoffcrypto\n",
+    "# import msoffcrypto\n",
     "import mempass\n",
     "\n",
     "from datetime import datetime\n",
     "from edc_appointment.constants import ONTIME_APPT, NEW_APPT, CANCELLED_APPT, MISSED_APPT\n",
     "from edc_pdutils.dataframes import get_crf, get_subject_visit\n",
-    "from tabulate import tabulate\n",
+    "# from tabulate import tabulate\n",
     "from meta_analytics.dataframes import get_glucose_fbg_ogtt_df, get_glucose_fbg_df\n",
     "from meta_analytics.dataframes import GlucoseEndpointsByDate\n",
     "from meta_analytics.dataframes import get_glucose_df\n",
@@ -78,16 +80,6 @@
    "id": "5",
    "metadata": {},
    "outputs": [],
-   "source": [
-    "cls.endpoint_only_df"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "6",
-   "metadata": {},
-   "outputs": [],
    "source": [
     "df_glu = get_glucose_df()\n",
     "df_glu.query(\"subject_identifier=='105-40-0379-1'\")\n",
@@ -100,7 +92,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "7",
+   "id": "6",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -110,7 +102,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "8",
+   "id": "7",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -120,7 +112,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "9",
+   "id": "8",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -130,7 +122,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "10",
+   "id": "9",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -140,7 +132,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "11",
+   "id": "10",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -151,7 +143,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "12",
+   "id": "11",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -161,7 +153,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "13",
+   "id": "12",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -180,7 +172,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "14",
+   "id": "13",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -218,7 +210,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "15",
+   "id": "14",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -229,7 +221,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "16",
+   "id": "15",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -289,7 +281,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "17",
+   "id": "16",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -333,7 +325,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "18",
+   "id": "17",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -345,7 +337,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "19",
+   "id": "18",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -357,7 +349,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "20",
+   "id": "19",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -369,7 +361,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "21",
+   "id": "20",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -381,7 +373,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "22",
+   "id": "21",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -392,7 +384,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "23",
+   "id": "22",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -405,7 +397,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "24",
+   "id": "23",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -429,7 +421,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "25",
+   "id": "24",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -470,7 +462,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "26",
+   "id": "25",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -483,7 +475,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "27",
+   "id": "26",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -497,13 +489,13 @@
     "df['Total'] = df[['10', '20', '30', '40', '60']].sum(axis=1)\n",
     "df.fillna(0, inplace=True)\n",
     "df\n",
-    "print(tabulate(df[['label', '10', '20', '30', '40', '60', 'Total']], showindex=False, headers=\"keys\", tablefmt=\"simple_grid\"))\n"
+    "# print(tabulate(df[['label', '10', '20', '30', '40', '60', 'Total']], showindex=False, headers=\"keys\", tablefmt=\"simple_grid\"))\n"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "28",
+   "id": "27",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -513,7 +505,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "29",
+   "id": "28",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -523,7 +515,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "30",
+   "id": "29",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -533,7 +525,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "31",
+   "id": "30",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -543,7 +535,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "32",
+   "id": "31",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -553,7 +545,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "33",
+   "id": "32",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -563,7 +555,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "34",
+   "id": "33",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -573,7 +565,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "35",
+   "id": "34",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -586,7 +578,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "36",
+   "id": "35",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -598,7 +590,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "37",
+   "id": "36",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -609,7 +601,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "38",
+   "id": "37",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -621,7 +613,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "39",
+   "id": "38",
    "metadata": {},
    "outputs": [],
    "source": [

meta_analytics/notebooks/qa.ipynb

@@ -0,0 +1,265 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "0",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "%%capture\n",
+    "import os\n",
+    "from pathlib import Path\n",
+    "\n",
+    "from dj_notebook import activate\n",
+    "\n",
+    "env_file = os.environ[\"META_ENV\"]\n",
+    "reports_folder = Path(os.environ[\"META_REPORTS_FOLDER\"])\n",
+    "analysis_folder = Path(os.environ[\"META_ANALYSIS_FOLDER\"])\n",
+    "pharmacy_folder = Path(os.environ[\"META_PHARMACY_FOLDER\"])\n",
+    "plus = activate(dotenv_file=env_file)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "1",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "from edc_pharmacy.models import StockRequestItem, Stock, StockAdjustment\n",
+    "from django_pandas.io import read_frame\n"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "2",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "Stock.objects.all().order_by(\"created\").last()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "3",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "\n",
+    "df = read_frame(StockRequestItem.objects.filter(stock_request__request_identifier=\"000122\"))"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "4",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "df.query(\"in_stock==False\")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "5",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "StockRequestItem.objects.filter(received=True)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "6",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "df = read_frame(Stock.objects.filter(from_stock__code=\"UGNXMR\"))\n"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "7",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "df[df[\"unit_qty_in\"]==0.0]"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "8",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "df[\"unit_qty_in\"].dtype"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "9",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "obj = Stock.objects.get(code=\"UGNXMR\")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "10",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "obj.__dict__"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "11",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "obj.unit_qty_in"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "12",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "obj.unit_qty_out\n"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "13",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "for obj in Stock.objects.filter(container__container_type__name=\"bucket\"):\n",
+    "    obj.save()\n",
+    "    stock_code = obj.code\n",
+    "    stock_unit_qty_in = obj.unit_qty_in\n",
+    "    stock_unit_qty_out = obj.unit_qty_out\n",
+    "    from_stock_count = Stock.objects.filter(from_stock__code=obj.code).count() * 128\n",
+    "    \n",
+    "    \n",
+    "    if not stock_unit_qty_in >= stock_unit_qty_out:\n",
+    "        print(stock_code, stock_unit_qty_in, stock_unit_qty_out, from_stock_count)\n",
+    "        print(f\"**Error stock_code={stock_code}\")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "14",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "obj"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "15",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "obj_adjustment = StockAdjustment.objects.create(stock=obj, unit_qty_in_old=obj.unit_qty_in, unit_qty_in_new=24576.00)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "16",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "obj.refresh_from_db()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "17",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "obj.unit_qty_in"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "18",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "StockAdjustment.objects.all().delete()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "19",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "obj_adjustment"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "20",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "obj_adjustment.__dict__"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "21",
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 2
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython2",
+   "version": "2.7.6"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}

meta_consent/admin/actions/create_missing_prescriptions.py

@@ -24,7 +24,7 @@ def create_missing_metformin_rx(modeladmin, request, queryset):
                 subject_identifier=instance.subject_identifier,
                 report_datetime=instance.consent_datetime,
                 randomizer_name=get_meta_version(),
-                medications=[medication],
+                medication_names=[medication.name],
                 site_id=instance.site.id,
             )
         except PrescriptionAlreadyExists:

meta_consent/admin/modeladmin_mixins.py

@@ -127,7 +127,7 @@ class SubjectConsentModelAdminMixin:
                     subject_identifier=instance.subject_identifier,
                     report_datetime=instance.consent_datetime,
                     randomizer_name=get_meta_version(),
-                    medications=[medication],
+                    medication_names=[medication.name],
                     site_id=instance.site.id,
                 )
             except PrescriptionAlreadyExists:

meta_consent/management/commands/create_missing_prescriptions.py

@@ -25,7 +25,7 @@ class Command(BaseCommand):
                     subject_identifier=instance.subject_identifier,
                     report_datetime=instance.consent_datetime,
                     randomizer_name=get_meta_version(),
-                    medications=[medication],
+                    medication_names=[medication.name],
                     site_id=instance.site.id,
                 )
             except PrescriptionAlreadyExists:

meta_consent/models/signals.py

@@ -66,7 +66,7 @@ def subject_consent_on_post_save(sender, instance, raw, created, **kwargs):
                     create_prescription(
                         subject_identifier=instance.subject_identifier,
                         report_datetime=instance.consent_datetime,
-                        medications=[instance.study_medication_name],
+                        medication_names=[instance.study_medication_name],
                         randomizer_name=get_meta_version(),
                         site=instance.site,
                     )

meta_edc/settings/debug.py

@@ -7,8 +7,8 @@ from .defaults import *  # noqa
 print(f"Settings file {__file__}")
 
 # TZ Sites:
-SITE_ID = SiteID(default=20)  # Amana
-# SITE_ID = SiteID(default=10)  # Hindu Mandal
+# 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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meta-edc
-Version: 1.1.1
+Version: 1.1.2
 Summary: META Trial EDC (http://www.isrctn.com/ISRCTN76157257)
 Home-page: https://github.com/meta-trial/meta-edc
 Author: Erik van Widenfelt
@@ -680,7 +680,7 @@ License:                     GNU GENERAL PUBLIC LICENSE
         Public License instead of this License.  But first, please read
         <https://www.gnu.org/licenses/why-not-lgpl.html>.
         
-Keywords: django,clinicedc,META EDC,EDC,clinical trials
+Keywords: django,clinicedc,META EDC,EDC,clinical trials,META Trial
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
 Classifier: Framework :: Django :: 5.2
@@ -688,13 +688,13 @@ Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Requires-Python: >=3.12
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS.rst
-Requires-Dist: edc==1.1.1
-Requires-Dist: edc-microscopy
+Requires-Dist: edc==1.1.2
 Requires-Dist: beautifulsoup4
 Requires-Dist: celery[redis]
 Requires-Dist: django-pylabels

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

@@ -96,7 +96,7 @@ meta_analytics/dataframes/get_last_imp_visits_df.py,sha256=cScwy_nBGHg04_AYpjz_p
 meta_analytics/dataframes/utils.py,sha256=NNJ2EZmpSXJqa7jCoNgqd4F3irQ_93ZsNnv6PPIm7S8,2383
 meta_analytics/dataframes/glucose_endpoints/__init__.py,sha256=a9RlAnFM0Z4AKw-WztBvnGMo3tLLe1dx3292A2n_CnA,107
 meta_analytics/dataframes/glucose_endpoints/endpoint_by_date.py,sha256=4Qd3i9hfSSkn_El7QAjuJDUbzQ1LBpkmFw0rHSlBfG0,6531
-meta_analytics/dataframes/glucose_endpoints/glucose_endpoints_by_date.py,sha256=Nr92PmfmaS_OPPp6hmK1OWZsOr3eQ5FMD5u_oDF8Ylk,13682
+meta_analytics/dataframes/glucose_endpoints/glucose_endpoints_by_date.py,sha256=6zl4rskh3I99zXOwpCX1qTuyn-5uciO_lo41ondFutI,13987
 meta_analytics/dataframes/glucose_endpoints/utils.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_analytics/dataframes/screening/__init__.py,sha256=onGpmB4474gu_JcyRGdRy09YQyP2Np-mX-rYZTFdJoA,114
 meta_analytics/dataframes/screening/get_glucose_tested_only_df.py,sha256=0oMJIsIJRjurfpPONuJ4Aoab1UJikezGe3lQNWRoOo4,660
@@ -113,6 +113,7 @@ meta_analytics/notebooks/magreth.ipynb,sha256=u4BWz6swBFLXcrOQDi_iSuFkp9NiISFk5u
 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/qa.ipynb,sha256=QuAoepwpC1nQLYC-HWM6khNIsPDU_s13gk1Iz2RjETk,5282
 meta_analytics/notebooks/steering.ipynb,sha256=pqJrH_Zdwp7sPgHwhahKK-XmNMQjk7bHJv7vHJaeTek,1112
 meta_analytics/notebooks/ven.ipynb,sha256=JR1_BW2QGqsqteCSORS7Zz7yD3u8JeU9r4H7KJ6nRN4,5182
 meta_analytics/notebooks/vitals.ipynb,sha256=mHlO6QbhD28aGUhVI0tF06MJm_JjUsKLdSpnz5NhbQI,5787
@@ -120,7 +121,7 @@ meta_analytics/notebooks/cleaning/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 meta_analytics/notebooks/cleaning/consent_v1_ext.ipynb,sha256=HIo8lKtyAs3blx-UXEJful5iXT-0fGQcb5vAT-o7umk,6403
 meta_analytics/notebooks/cleaning/offschedule_eos.ipynb,sha256=U5KS7GzWKsWkJWIN4pXhKN9GJMCpkGVxrIEBaRoaah8,10620
 meta_analytics/notebooks/dsmc/renal_dysfunction.ipynb,sha256=vy40GuSA2HH3OoCBLaHx5fxYzS3mOV5C2L7BqSUGemM,11116
-meta_analytics/notebooks/endpoints/meta_endpoints_by_date.ipynb,sha256=4UxnO4ijILwKlRvYd2D7_XE5fqBj3puQqYbggu4Ouf0,22526
+meta_analytics/notebooks/endpoints/meta_endpoints_by_date.ipynb,sha256=0B4Jm7xnNeUxDdNN1dQ2GwgHE61esHpsZo0SWvPrM0U,22392
 meta_analytics/notebooks/undiagnosed/meta3_screening_consort_chart.ipynb,sha256=B79ZyqWzsxhrBJZhajyqjJ3vP10eNzX2C3_ojc3jOIY,34653
 meta_analytics/notebooks/undiagnosed/meta3_screening_undiagnosed.ipynb,sha256=MmyQzBCR63GAQlKsQ1CPxmPtgMlJYWggfEBDI81me64,11912
 meta_analytics/notebooks/undiagnosed/meta_screening_table2.ipynb,sha256=bRoJbboAnkfXo6MeKmedP4j6eAVHdH4q62o35p9--No,36421
@@ -150,12 +151,12 @@ meta_consent/constants.py,sha256=w5n3B4jwUDDZEc4gMpkKeffsHqi724GnoABFtjmvbQk,78
 meta_consent/urls.py,sha256=YXQLoyH5tFMPUK9PTk33Yve_HCWw-rhUrlXegbadxlw,206
 meta_consent/admin/__init__.py,sha256=8r1_xNoP3ZdrIB9naPRDTLENYdwBIxZvqO9CCH20aNc,182
 meta_consent/admin/list_filters.py,sha256=rEz1xfr3WnG6UsJoq6hk1OLMjaa5VTKSGuI5CJl_pP4,743
-meta_consent/admin/modeladmin_mixins.py,sha256=hMwrkwI7BrjpozvhxRtG1JiyLUWqs5_QNPluN_3Zous,5362
+meta_consent/admin/modeladmin_mixins.py,sha256=-46oE_9wyv7mx09lTb8WeTi-Pa5CFnY7pSaZD0KQJJo,5372
 meta_consent/admin/subject_consent_admin.py,sha256=IfGANb9TFvVs9yga8WOTxHxy2yRHP--KgsVUWEg30MQ,647
 meta_consent/admin/subject_consent_v1_admin.py,sha256=nmssuWL7eomQfXi3mVrszs3Ghufhz46JAwr9wFU3gkI,657
 meta_consent/admin/subject_consent_v1_ext_admin.py,sha256=HUqBp67_IpIW3L8VSf6UbgNqqLBWobZyLKj65HTDXEc,2817
 meta_consent/admin/actions/__init__.py,sha256=ipklkCOCQY9z9oqij2--MMNlczc-1MdzsRhMHEDDkQY,70
-meta_consent/admin/actions/create_missing_prescriptions.py,sha256=xx1HeLkJlB-QAa_a9GtZD74d39SkExzwg97U7Gq_86U,1474
+meta_consent/admin/actions/create_missing_prescriptions.py,sha256=_2ikpDg07irOQboRwna4-nYvESJwi6Nb6yFHBwNcPc0,1484
 meta_consent/form_validators/__init__.py,sha256=MFB5Vz9rFKxJaS2uW6jtdfg5G6vA0nyzwNcKGLa--Y0,72
 meta_consent/form_validators/subject_consent_form_validator.py,sha256=2f4FY1VZ1qU4u35LSoRtBIhmRhrflOhs0Zal8z1Ogo8,1258
 meta_consent/forms/__init__.py,sha256=fLrim2NPwpbo0Y7PCGbeDk6ryS-4W0ju7nYNF4fZWaY,233
@@ -167,7 +168,7 @@ meta_consent/locale/lg/LC_MESSAGES/django.po,sha256=qWq1GuH-sIg05d2vydpYIxS71-fj
 meta_consent/locale/sw/LC_MESSAGES/django.po,sha256=2xMMhgncC2222wfCMuVBZVi69asNlVq5Z0Z6XtCrVpw,2016
 meta_consent/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_consent/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meta_consent/management/commands/create_missing_prescriptions.py,sha256=h1dMyxfnuVGAQd0mdpzXmdMuvpxK5d7Gnxgd0pumd7U,1438
+meta_consent/management/commands/create_missing_prescriptions.py,sha256=T9qg3eOAIzjqQLSMaEa52kf4lGKW7P_2ar-F_e1WkeM,1448
 meta_consent/migrations/0001_initial.py,sha256=Hglxgdj4D5K5SPonff4Tbv5Z7mhMR0Kwzno7-vgr4UA,66732
 meta_consent/migrations/0002_auto_20191024_1000.py,sha256=w3QfjMQc525bhhcM9PR657ic3LIZLklehDop4uXl704,590
 meta_consent/migrations/0003_auto_20200325_0901.py,sha256=fp3htdDsrKOQorDyzwzC1GnvfwjL2XC6oMyuBVMpvnI,1610
@@ -202,7 +203,7 @@ meta_consent/migrations/0031_alter_historicalsubjectconsent_guardian_name_and_mo
 meta_consent/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_consent/models/__init__.py,sha256=ugL8eQybOHAEFgOtGKxVHLZ3ibAnRCNSaf9wup6J_uI,279
 meta_consent/models/model_mixins.py,sha256=r5KmTykU0qV4JymMMKP2IBwAP8Z5hDnVJix-rO2PvME,296
-meta_consent/models/signals.py,sha256=WHaCDREbWOnUfmT01U_Nxiu5x4OIyV3wKRLd98vbfeQ,5152
+meta_consent/models/signals.py,sha256=9E6Vdj7OGdRS7g8tig0K1VsbyzpFlYfPoMSYHXQLS68,5157
 meta_consent/models/subject_consent.py,sha256=bI17d15K7A8UzyKCAoKL8Xe2E4jlhNY1Axwftuo2n4Y,3803
 meta_consent/models/subject_consent_v1.py,sha256=xJPGTTVfne5KBdeNZm5dXheWcGQ2bFTxjOxm_4sjfVk,458
 meta_consent/models/subject_consent_v1_ext.py,sha256=MpK5TlUqf2JuYRpmRLzYBClOFstC_6pIGwDRUckIztU,1033
@@ -276,7 +277,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=O_GNmF2yOgs0v6PhctRjiBQK2F0gEoUaUUb7Dum8MJA,1297
+meta_edc/settings/debug.py,sha256=4BkeyJuOq3b_TJJr18tgoYSM7LZgnlz7CmJhTFiEt14,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 +290,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.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_edc-1.1.2.dist-info/licenses/AUTHORS.rst,sha256=wL4KUOd7FAFThhkLAJxSLQ2BPzd3ikG9q0UVZr3BbLg,244
+meta_edc-1.1.2.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
@@ -305,7 +306,7 @@ meta_labs/processing_profiles.py,sha256=fRX72FOl2rsnOJYhgup5QacfGSXKtWqn2gD3Giz2
 meta_labs/reportables.py,sha256=OX1rxiWKmsi7_ODxH1O8yBGgOq56HAaiG1XTEDGaOhM,586
 meta_labs/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_labs/tests/test_labs.py,sha256=49COK2X8F5kvwsIuuPaxBSzDo665J2ctd1DZzo-O4Cs,967
-meta_labs/tests/test_reportables.py,sha256=nmNR7wumpkI84BqE3pCRqz7TuvprJXv9Kbtxs8P8U90,1302
+meta_labs/tests/test_reportables.py,sha256=VxTQDScHxaQP1PNut7i4ATr4hTqVpmYUjDK7HQJ7vOI,1302
 meta_labs/tests/urls.py,sha256=_sVCnQeiAFRYKhxga3_DjoKj_4bgs1s2gjcynDiapvA,111
 meta_lists/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_lists/admin.py,sha256=g05vpXfVIEBVG03aiPD8Vn-AnR7gL60MbPJAfzsO6R8,2157
@@ -520,7 +521,7 @@ meta_reports/ae_report.py,sha256=K0DCdfVBOCqqWWvCsl-Tf8rRCnNv3W2xbUI10VCuEhI,154
 meta_reports/apps.py,sha256=uQb4mBQ94Ij0luH5yzMF-a5t2N418JHcovYovislwS4,194
 meta_reports/death_report.py,sha256=mJw08jMxOWIAtsKQN8zCP64HIrxW1fb48D9OXqEMpM0,4713
 meta_reports/pdf_report.py,sha256=9lWnRc_BNieDFXC4VgA0QHK6g_ct58u8tupPRsbRvV0,2395
-meta_reports/tasks.py,sha256=wPzfm99Hox1AIvt1KxYg1r6g9v8ta2AHOHesoN6AxEk,370
+meta_reports/tasks.py,sha256=F4sqOGjRo6-XbGi2nDPDGb7XirzJAx-pWExNkzxCoDo,390
 meta_reports/urls.py,sha256=_c6AMrK4U5MsyFSU2JSPNfiZlbhuw24C7CyPNYpqGd0,206
 meta_reports/utils.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_reports/admin/__init__.py,sha256=om3lFa4YxsZSNlYIi2sZv8li2irOMoSeBtOpPk4V3lk,488
@@ -608,7 +609,7 @@ meta_reports/migrations/0057_auto_20250422_2224.py,sha256=pGj-5Cr__ScaNtb8ROzm_4
 meta_reports/migrations/0058_auto_20250422_2232.py,sha256=SZ2RS5jUVhgnirgU2XAU-EIDtsbUWD1GDl5jg_hMTrc,9743
 meta_reports/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_reports/models/__init__.py,sha256=2F-4CS39Pu2LijF8ZkSn2nE3Lps3YEC9ZcBtNnmNXjI,423
-meta_reports/models/endpoints.py,sha256=iMx8QIi_hLANIwZmAw1OJ_jPuDdml8s181Skh8UF9bM,901
+meta_reports/models/endpoints.py,sha256=Y0AAQGWSqv60i2nQxUX1p5GlBG8fvRAuDVr_svGJZPM,1009
 meta_reports/models/endpoints_proxy.py,sha256=3h3JGaPmnJedFPVWGrk4idV4YtdihqiCI5W7QomwG4E,318
 meta_reports/models/last_imp_refill.py,sha256=LkJtsZU7fhem5O-OqsyN-qgGQm_IUGAYEpP3ESqdm88,988
 meta_reports/models/dbviews/README,sha256=GdeboB7Xqb-Qo_rE1ondcxP8Ps93MIjLzCePQCePig0,686
@@ -902,7 +903,7 @@ meta_subject/forms/health_economics/health_economics_update_form.py,sha256=gpdBc
 meta_subject/locale/lg/LC_MESSAGES/django.po,sha256=rENk0A-EfLRxdK5GR05BBr7reDnp7bNy5Ton7PCtX48,11016
 meta_subject/locale/sw/LC_MESSAGES/django.po,sha256=kLgzLiTOTu6Rf8J5kmFH_R9MlPWvpVSwz4g9Rl2CdOw,11063
 meta_subject/management/commands/create_missing_refills.py,sha256=IkxEOV2AHl2FYhLDtiWmiK0SoAcGFz24pLUXjNpFAAA,2432
-meta_subject/management/commands/create_missing_rx.py,sha256=jAqgz9yxhaEL1XBN9FqM-5cPv1TpNtL4XdltLPArOEA,1463
+meta_subject/management/commands/create_missing_rx.py,sha256=YIIvPHQMk9jWd9BG-Jn1vMKfdS-l4LUHWFsAojpMQiA,1468
 meta_subject/management/commands/missed.py,sha256=qTHggBxlJWcEF_V4cGtxe93UJXlaW-ON6m1SOpJzmgg,8209
 meta_subject/metadata_rules/__init__.py,sha256=U8fKGiHsbSWW27dWbTp2A2pCmdcFgybbJDhazP591cE,53
 meta_subject/metadata_rules/metadata_rules.py,sha256=CeZKXkr_sFsMlZK3CoU8buF51hqSH5hyxTWS92ZfBGk,4323
@@ -1013,7 +1014,7 @@ meta_subject/migrations/0103_auto_20220324_0326.py,sha256=gBiNh4-CElPRQcGqb04t4Y
 meta_subject/migrations/0104_auto_20220412_2151.py,sha256=lruwZFW9lyRzAJ-13bJZh19ZhFYMKX6k-TUjuXWIZAY,966
 meta_subject/migrations/0105_auto_20220412_2310.py,sha256=wEJsJDk_cwh-JW8ZPxg9HGE3YKKtOPRQJTo6xywX5nk,1290
 meta_subject/migrations/0106_auto_20220414_1741.py,sha256=tUQQG1JgKa_XrTL2Paz83YaEs8LhIl9gph5OyiV22nk,772
-meta_subject/migrations/0107_auto_20220415_0043.py,sha256=PWxsJHxonC9L0nTWJnNF-oc3dcZfzkJPNvI38DYDbD8,1718
+meta_subject/migrations/0107_auto_20220415_0043.py,sha256=I-NrKxsgQBzdzY5G_fRaB4Qh_Nwa5JMv3YyYOV73c4k,1723
 meta_subject/migrations/0108_auto_20220415_1747.py,sha256=4HHVMatXiqavoutbzbZY7TlTHxg32uQYP7gHWg27DX8,688
 meta_subject/migrations/0109_auto_20220415_1758.py,sha256=FNBIWr0sCmXCvzI0yNVeMSrPup7vMQJhnYxrzHu9DSA,556
 meta_subject/migrations/0110_auto_20220512_1811.py,sha256=iKRSR0qkKbgOGQUT3zyz7SWN7kyrfJtFH98c1QTu8gM,2516
@@ -1164,7 +1165,7 @@ meta_subject/models/patient_history.py,sha256=q1GFQYoH0rYowBFUDUYebYthKSdTHNuDnz
 meta_subject/models/physical_exam.py,sha256=SlDJJQrCEouTMaETYGjjVzFYONVx6AdtalPioUCN9yg,1991
 meta_subject/models/pregnancy_update.py,sha256=Cs5bZAslR7jtDS_dJE_btHN8Jw21KdqKCHA-Ll9ISO0,949
 meta_subject/models/sf12.py,sha256=1f6cAMtBUXy7jMaacAU8RJFFv73r9c3rJjBbNl-bSM4,283
-meta_subject/models/signals.py,sha256=N-Y-QmwSiiJnridHMrAm08YttRorjB9hzo9XTCdMzWk,4557
+meta_subject/models/signals.py,sha256=QzvOapE7d8H0qVabqR9Cyn9W6NSEv0-oscGWM1NeSpE,4562
 meta_subject/models/study_medication.py,sha256=1kA_w4pYT1gcunfiQ46KdM01pd1jrQqLt4JEPLvfTTo,461
 meta_subject/models/subject_requisition.py,sha256=bSDwD-hpXeioH3xA7E6eGMu4hxWLDDSxhznfjrpXTjw,341
 meta_subject/models/subject_visit.py,sha256=f49M7ywCQqdYdiT5dUhlWXTTXs5K6aKlxkMgzWyj3VE,2152
@@ -1206,7 +1207,7 @@ meta_subject/tests/tests/test_next_appointment.py,sha256=OVe6Jf6uaR5ch28skkNrr4h
 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=5Daf-R4EeLjfDpsC5PZELfPIqY--joGzrj8nPVUiatI,6837
-meta_subject/tests/tests/test_study_medication.py,sha256=EFvAvjxJ1c0Bk-vi6S8ejf9Q5UsQ8c0PSTw9l-1iHvo,10161
+meta_subject/tests/tests/test_study_medication.py,sha256=W84r5wneEHj6edTh5olLm1gKH87EPDkd2FsL1tdkFBQ,10105
 meta_visit_schedule/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_visit_schedule/apps.py,sha256=Uy3glJJ3-yCcXZ_MvhDEzxVxQbBuCTsZxLNmd5p1DHw,164
 meta_visit_schedule/constants.py,sha256=912H945Ae35K2z0DmJUMnkhacRFO4-Rg_y0HDOX861s,560
@@ -1238,7 +1239,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.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_edc-1.1.2.dist-info/METADATA,sha256=LM6BQiFagSs5kCluCm8FI2iK3jlneg4-Ncq3wQWBO9A,43587
+meta_edc-1.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+meta_edc-1.1.2.dist-info/top_level.txt,sha256=RkzjNXwRq2kg_uZ_1bDwPUntijSXoY2YBqtByDwvvrc,244
+meta_edc-1.1.2.dist-info/RECORD,,

meta_labs/tests/test_reportables.py

@@ -33,5 +33,5 @@ class TestReportables(TestCase):
             GradingData.objects.filter(
                 reference_range_collection=reference_range_collection
             ).count(),
-            172,
+            174,
         )

meta_reports/models/endpoints.py

@@ -25,6 +25,9 @@ class Endpoints(QaReportModelMixin, models.Model):
 
     offstudy_reason = models.CharField(max_length=250, null=True)
 
+    def __str__(self):
+        return f"{self.subject_identifier} {self.visit_code} {self.endpoint_label}"
+
     class Meta(QaReportModelMixin.Meta):
         verbose_name = "Endpoints (DM)"
         verbose_name_plural = "Endpoints (DM)"

meta_reports/tasks.py

@@ -6,7 +6,8 @@ def update_endpoints_table(subject_identifiers: list[str] | None = None):
     from meta_analytics.dataframes import GlucoseEndpointsByDate
 
     if len(subject_identifiers) > 5:
-        subject_identifiers = []
-    cls = GlucoseEndpointsByDate(subject_identifiers=subject_identifiers)
+        cls = GlucoseEndpointsByDate()
+    else:
+        cls = GlucoseEndpointsByDate(subject_identifiers=subject_identifiers)
     cls.run()
     return cls.to_model()

meta_subject/management/commands/create_missing_rx.py

@@ -27,7 +27,7 @@ def create_missing_rx():
                 subject_identifier=subject_consent.subject_identifier,
                 report_datetime=subject_consent.consent_datetime,
                 randomizer_name=get_meta_version(),
-                medications=[METFORMIN],
+                medication_names=[METFORMIN],
                 site=subject_consent.site,
             )
         except PrescriptionAlreadyExists:

meta_subject/migrations/0107_auto_20220415_0043.py

@@ -32,7 +32,7 @@ def func(apps, schema_editor):
                 subject_identifier=subject_consent.subject_identifier,
                 report_datetime=subject_consent.consent_datetime,
                 randomizer_name=get_meta_version(),
-                medications=[METFORMIN],
+                medication_names=[METFORMIN],
                 site_id=site.id,
             )
         for obj in apps.get_model("edc_pharmacy.rx")._default_manager.all():

meta_subject/models/signals.py

@@ -40,7 +40,7 @@ def study_medication_on_pre_save(sender, instance, raw, **kwargs):
                 subject_identifier=subject_consent.subject_identifier,
                 report_datetime=subject_consent.consent_datetime,
                 randomizer_name=get_meta_version(),
-                medications=[METFORMIN],
+                medication_names=[METFORMIN],
                 site=subject_consent.site,
             )
         except PrescriptionAlreadyExists:

meta_subject/tests/tests/test_study_medication.py

@@ -21,13 +21,12 @@ class TestStudyMedication(MetaTestCaseMixin, TestCase):
         )
 
     def test_rx_exists(self):
-        medication = Medication.objects.get(name=METFORMIN)
         self.assertRaises(
             PrescriptionAlreadyExists,
             create_prescription,
             subject_identifier=self.registered_subject.subject_identifier,
             report_datetime=self.registered_subject.registration_datetime,
-            medications=[medication],
+            medication_names=[METFORMIN],
             site=self.registered_subject.site,
         )