meta-edc 1.1.4__py3-none-any.whl → 1.1.5__py3-none-any.whl

meta_analytics/notebooks/pharmacy.ipynb

@@ -21,10 +21,16 @@
     "plus = activate(dotenv_file=env_file)"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "id": "1",
+   "metadata": {},
+   "source": []
+  },
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "1",
+   "id": "2",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -53,7 +59,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "2",
+   "id": "3",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -70,7 +76,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "3",
+   "id": "4",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -112,7 +118,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "4",
+   "id": "5",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -122,7 +128,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "5",
+   "id": "6",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -165,7 +171,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "6",
+   "id": "7",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -175,7 +181,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "7",
+   "id": "8",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -186,7 +192,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "8",
+   "id": "9",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -198,7 +204,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "9",
+   "id": "10",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -212,7 +218,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "10",
+   "id": "11",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -235,7 +241,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "11",
+   "id": "12",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -252,7 +258,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "12",
+   "id": "13",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -262,7 +268,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "13",
+   "id": "14",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -299,7 +305,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "14",
+   "id": "15",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -309,7 +315,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "15",
+   "id": "16",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -321,7 +327,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "16",
+   "id": "17",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -353,7 +359,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "17",
+   "id": "18",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -374,7 +380,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "18",
+   "id": "19",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -385,7 +391,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "19",
+   "id": "20",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -395,7 +401,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "20",
+   "id": "21",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -408,7 +414,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "21",
+   "id": "22",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -426,7 +432,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "22",
+   "id": "23",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -447,7 +453,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "23",
+   "id": "24",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -463,12 +469,13 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "24",
+   "id": "25",
    "metadata": {},
    "outputs": [],
    "source": [
     "# now lets look at the stock\n",
-    "df_stock = read_frame(Stock.objects.values(\"code\", \"lot_id\", \"container__name\", \"confirmed\", \"allocated\", \"dispensed\", \"qty_in\", \"qty_out\", \"unit_qty_in\", \"unit_qty_out\").all(), verbose=False)\n",
+    "df_stock = read_frame(Stock.objects.values(\"code\", \"lot_id\", \"container__name\", \"confirmation\", \"allocation\", \"dispense\", \"qty_in\", \"qty_out\", \"unit_qty_in\", \"unit_qty_out\").all(), verbose=False)\n",
+    "df_stock = df_stock.fillna(pd.NA)\n",
     "\n",
     "# merge in assignment\n",
     "df_lot = read_frame(Lot.objects.values(\"id\", \"assignment__name\").all(), verbose=False)\n",
@@ -481,7 +488,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "25",
+   "id": "26",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -498,7 +505,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "26",
+   "id": "27",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -511,7 +518,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "27",
+   "id": "28",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -533,7 +540,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "28",
+   "id": "29",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -548,7 +555,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "29",
+   "id": "30",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -563,7 +570,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "30",
+   "id": "31",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -575,7 +582,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "31",
+   "id": "32",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -587,7 +594,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "32",
+   "id": "33",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -598,7 +605,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "33",
+   "id": "34",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -609,7 +616,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "34",
+   "id": "35",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -620,18 +627,18 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "35",
+   "id": "36",
    "metadata": {},
    "outputs": [],
    "source": [
     "# tablets: total bottles available / not yet dispensed BY ASSIGNMENT\n",
     "# the total matches the total above for column \"bal\"\n",
-    "df4 = df_stock[(df_stock.container_type==\"Bottle\") & (df_stock.confirmed==True) & (df_stock.dispensed==True)].groupby(by=[\"assignment\"]).unit_qty_in.sum().reset_index()\n",
+    "df4 = df_stock[(df_stock.container_type==\"Bottle\") & ~(df_stock.confirmation.isna()) & ~(df_stock.dispense.isna())].groupby(by=[\"assignment\"]).unit_qty_in.sum().reset_index()\n",
     "df4[\"subtotal\"] = np.nan\n",
     "df4.loc[len(df4)] = {\"subtotal\": df4.unit_qty_in.sum()}\n",
-    "df4[\"dispensed\"] = True\n",
+    "df[\"dispensed\"] = True\n",
     "\n",
-    "df5 = df_stock[(df_stock.container_type==\"Bottle\") & (df_stock.confirmed==True) & (df_stock.dispensed==False)].groupby(by=[\"assignment\"]).unit_qty_in.sum().reset_index()\n",
+    "df5 = df_stock[(df_stock.container_type==\"Bottle\") & ~(df_stock.confirmation.isna()) & (df_stock.dispense.isna())].groupby(by=[\"assignment\"]).unit_qty_in.sum().reset_index()\n",
     "df5.loc[df5.assignment==\"placebo\", \"unit_qty_in\"] +=  placebo_unlabelled\n",
     "df5.loc[df5.assignment==\"active\", \"unit_qty_in\"] +=  active_unlabelled\n",
     "df5[\"subtotal\"] = np.nan\n",
@@ -646,14 +653,6 @@
     "df6"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "36",
-   "metadata": {},
-   "outputs": [],
-   "source": []
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -668,14 +667,6 @@
    "id": "38",
    "metadata": {},
    "outputs": [],
-   "source": []
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "39",
-   "metadata": {},
-   "outputs": [],
    "source": [
     "from meta_visit_schedule.constants import MONTH36\n",
     "\n",
@@ -685,7 +676,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "40",
+   "id": "39",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -724,7 +715,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "41",
+   "id": "40",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -744,7 +735,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "42",
+   "id": "41",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -755,7 +746,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "43",
+   "id": "42",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -766,7 +757,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "44",
+   "id": "43",
    "metadata": {},
    "outputs": [],
    "source": []
@@ -774,7 +765,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "45",
+   "id": "44",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -800,7 +791,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "46",
+   "id": "45",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -810,7 +801,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "47",
+   "id": "46",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -833,7 +824,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "48",
+   "id": "47",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -843,7 +834,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "49",
+   "id": "48",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -859,7 +850,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "50",
+   "id": "49",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -870,7 +861,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "51",
+   "id": "50",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -890,7 +881,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "52",
+   "id": "51",
    "metadata": {},
    "outputs": [],
    "source": []
@@ -898,7 +889,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "53",
+   "id": "52",
    "metadata": {},
    "outputs": [],
    "source": []
@@ -906,7 +897,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "54",
+   "id": "53",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -916,7 +907,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "55",
+   "id": "54",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -926,7 +917,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "56",
+   "id": "55",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -937,7 +928,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "57",
+   "id": "56",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -950,7 +941,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "58",
+   "id": "57",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -962,7 +953,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "59",
+   "id": "58",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -972,7 +963,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "60",
+   "id": "59",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -983,7 +974,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "61",
+   "id": "60",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -995,7 +986,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "62",
+   "id": "61",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -1008,7 +999,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "63",
+   "id": "62",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -1022,7 +1013,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "64",
+   "id": "63",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -1032,7 +1023,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "65",
+   "id": "64",
    "metadata": {},
    "outputs": [],
    "source": []
@@ -1040,7 +1031,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "66",
+   "id": "65",
    "metadata": {},
    "outputs": [],
    "source": []

meta_analytics/notebooks/qa.ipynb

@@ -10,8 +10,9 @@
     "%%capture\n",
     "import os\n",
     "from pathlib import Path\n",
-    "\n",
+    "import pandas as pd\n",
     "from dj_notebook import activate\n",
+    "import numpy as np\n",
     "\n",
     "env_file = os.environ[\"META_ENV\"]\n",
     "reports_folder = Path(os.environ[\"META_REPORTS_FOLDER\"])\n",
@@ -27,19 +28,19 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from edc_pharmacy.models import StockRequestItem, Stock, StockAdjustment\n",
-    "from django_pandas.io import read_frame\n"
+    "from edc_pharmacy.utils import get_stock_for_location_df\n",
+    "from edc_pharmacy.models import Location, Stock, Dispense, StockRequest\n",
+    "from django.db.models import Count\n",
+    "from edc_pharmacy.utils import get_instock_and_nostock_data\n",
+    "from edc_pharmacy.analytics import get_next_scheduled_visit_for_subjects_df\n",
+    "\n"
    ]
   },
   {
-   "cell_type": "code",
-   "execution_count": null,
+   "cell_type": "markdown",
    "id": "2",
    "metadata": {},
-   "outputs": [],
-   "source": [
-    "Stock.objects.all().order_by(\"created\").last()"
-   ]
+   "source": []
   },
   {
    "cell_type": "code",
@@ -48,8 +49,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "\n",
-    "df = read_frame(StockRequestItem.objects.filter(stock_request__request_identifier=\"000122\"))"
+    "location = Location.objects.all()[2]\n",
+    "get_stock_for_location_df(location)"
    ]
   },
   {
@@ -59,7 +60,17 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "df.query(\"in_stock==False\")"
+    "\n",
+    "qs_stock = (\n",
+    "    Stock.objects.values(\n",
+    "        \"allocation__registered_subject__subject_identifier\",\n",
+    "        \"code\",\n",
+    "        \"dispense__dispense_identifier\",\n",
+    "        \"location__name\",\n",
+    "    )\n",
+    "    .filter(location=location, qty=1)\n",
+    "    .annotate(count=Count(\"allocation__registered_subject__subject_identifier\"))\n",
+    ")\n"
    ]
   },
   {
@@ -69,7 +80,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "StockRequestItem.objects.filter(received=True)"
+    "qs_stock"
    ]
   },
   {
@@ -79,7 +90,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "df = read_frame(Stock.objects.filter(from_stock__code=\"UGNXMR\"))\n"
+    "Dispense.objects.all()[0].__dict__"
    ]
   },
   {
@@ -89,7 +100,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "df[df[\"unit_qty_in\"]==0.0]"
+    "Stock.objects.filter(dispense__isnull=False)"
    ]
   },
   {
@@ -99,7 +110,10 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "df[\"unit_qty_in\"].dtype"
+    "stock_request = StockRequest.objects.get(request_identifier=\"000122\")\n",
+    "df_next_scheduled_visits = get_next_scheduled_visit_for_subjects_df(stock_request)\n",
+    "df_instock, df_nostock = get_instock_and_nostock_data(stock_request, df_next_scheduled_visits)\n",
+    "\n"
    ]
   },
   {
@@ -109,7 +123,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "obj = Stock.objects.get(code=\"UGNXMR\")"
+    "df_instock"
    ]
   },
   {
@@ -119,7 +133,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "obj.__dict__"
+    "df_nostock"
    ]
   },
   {
@@ -128,9 +142,7 @@
    "id": "11",
    "metadata": {},
    "outputs": [],
-   "source": [
-    "obj.unit_qty_in"
-   ]
+   "source": []
   },
   {
    "cell_type": "code",
@@ -138,9 +150,7 @@
    "id": "12",
    "metadata": {},
    "outputs": [],
-   "source": [
-    "obj.unit_qty_out\n"
-   ]
+   "source": []
   },
   {
    "cell_type": "code",
@@ -148,19 +158,7 @@
    "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}\")"
-   ]
+   "source": []
   },
   {
    "cell_type": "code",
@@ -168,9 +166,7 @@
    "id": "14",
    "metadata": {},
    "outputs": [],
-   "source": [
-    "obj"
-   ]
+   "source": []
   },
   {
    "cell_type": "code",
@@ -178,9 +174,7 @@
    "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)"
-   ]
+   "source": []
   },
   {
    "cell_type": "code",
@@ -188,9 +182,7 @@
    "id": "16",
    "metadata": {},
    "outputs": [],
-   "source": [
-    "obj.refresh_from_db()"
-   ]
+   "source": []
   },
   {
    "cell_type": "code",
@@ -199,7 +191,19 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "obj.unit_qty_in"
+    "from edc_pdutils.dataframes import get_appointments\n",
+    "\n",
+    "from edc_utils import get_utcnow\n",
+    "from edc_appointment.constants import NEW_APPT\n",
+    "from dateutil.relativedelta import relativedelta\n",
+    "from datetime import datetime\n",
+    "\n",
+    "df_appt = get_appointments()\n",
+    "\n",
+    "mask1 = (df_appt.visit_code.isin([1240.0, 1360.0, 1480.0]))\n",
+    "mask2 = (df_appt.appt_datetime > datetime(2026, 1, 1)) & (df_appt.appt_datetime < datetime(2026, 8, 1))\n",
+    "df = df_appt[(df_appt.appt_status==NEW_APPT) & mask1 & mask2]\n",
+    "df.subject_identifier.nunique()\n"
    ]
   },
   {
@@ -209,7 +213,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "StockAdjustment.objects.all().delete()"
+    "\n",
+    "df = df_appt[(df_appt.appt_status!=NEW_APPT) & (df_appt.visit_code.isin([1240.0, 1360.0, 1480.0]))].visit_code.value_counts()\n",
+    "df.sum()"
    ]
   },
   {
@@ -219,7 +225,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "obj_adjustment"
+    "from tabulate import tabulate\n",
+    "print(tabulate(df.to_frame(), headers=\"keys\"))"
    ]
   },
   {
@@ -229,7 +236,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "obj_adjustment.__dict__"
+    "\n",
+    "df_appt.appt_datetime < datetime(2025, 12, 1)"
    ]
   },
   {

meta_edc/settings/defaults.py

@@ -397,6 +397,8 @@ EDC_LABEL_BROWSER_PRINT_PAGE_AUTO_BACK = env("EDC_LABEL_BROWSER_PRINT_PAGE_AUTO_
 
 # edc_model_admin
 EDC_MODEL_ADMIN_CSS_THEME = "edc_indigo"
+EDC_MODEL_ADMIN_SAVE_DELAY = 3000
+
 # edc-mnsi
 EDC_MNSI_MODEL = "meta_subject.mnsi"
 

{meta_edc-1.1.4.dist-info → meta_edc-1.1.5.dist-info}/METADATA

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

{meta_edc-1.1.4.dist-info → meta_edc-1.1.5.dist-info}/RECORD

@@ -111,9 +111,9 @@ meta_analytics/notebooks/incidence.ipynb,sha256=-kd0Mp67dk8ECoNEcKMTn92iBxuNLBIO
 meta_analytics/notebooks/liver.ipynb,sha256=s19AAV6vmtGqYAfN1cqVIcBeU7ptSGU94uZaeaz32qU,13985
 meta_analytics/notebooks/magreth.ipynb,sha256=u4BWz6swBFLXcrOQDi_iSuFkp9NiISFk5uPahh7iXug,20773
 meta_analytics/notebooks/monitoring_report.ipynb,sha256=BySeKJZ7MQPGQ6vbNNXW5JBJyNmTfvP_c8JGjskUF5U,77415
-meta_analytics/notebooks/pharmacy.ipynb,sha256=rAxMyPDZIyx-Qizgrdueq-rUYyeN3zMYVqDPkbjtnSs,34298
+meta_analytics/notebooks/pharmacy.ipynb,sha256=LxV425ixFqiZin7wEeTnbPGNhX6jkkeVB3jozF_pir0,34182
 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/qa.ipynb,sha256=W1pbk-CFArP6oyVUU522NVuenPcSKm5-Mj9rf_DCdjo,5983
 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
@@ -278,7 +278,7 @@ meta_edc/management/commands/update_forms_reference.py,sha256=jvCU9YdMtp9wbmjqKQ
 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=4BkeyJuOq3b_TJJr18tgoYSM7LZgnlz7CmJhTFiEt14,1297
-meta_edc/settings/defaults.py,sha256=USh91oF6HKdUXWZ5xf5dDCwAYINSIdOPkgHCxDCsGP4,19633
+meta_edc/settings/defaults.py,sha256=S5y44_9LrFx7BEPMOlrSUpiFDldgsnt-VfgERYAvQBU,19668
 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
@@ -290,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.4.dist-info/licenses/AUTHORS.rst,sha256=wL4KUOd7FAFThhkLAJxSLQ2BPzd3ikG9q0UVZr3BbLg,244
-meta_edc-1.1.4.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+meta_edc-1.1.5.dist-info/licenses/AUTHORS.rst,sha256=wL4KUOd7FAFThhkLAJxSLQ2BPzd3ikG9q0UVZr3BbLg,244
+meta_edc-1.1.5.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
@@ -480,12 +480,14 @@ meta_prn/migrations/0061_auto_20250115_2025.py,sha256=u7F2GsXo-9pIN5z0VM1aXW_KoR
 meta_prn/migrations/0062_alter_endofstudy_offstudy_reason_and_more.py,sha256=L1ZDX1IMS0nIs77lF4QZ0SX-ye4rXvouTLnijob8SAQ,2421
 meta_prn/migrations/0063_historicaloffstudymedication_singleton_field_and_more.py,sha256=l8pNm7G0O_7hWMb7smU5wbbsjE7es-WZfCkET7zyuXw,1081
 meta_prn/migrations/0064_auto_20250602_2143.py,sha256=S8-7kSWfJSFtzKrq5_puYIC0UA32wRZH_-xnQ6mt--w,512
+meta_prn/migrations/0065_alter_historicaloffstudymedication_subject_identifier_and_more.py,sha256=doqlcfQv6n4N89i4wZrXm48ZCpdr_iuV_llrhp8RJDk,626
+meta_prn/migrations/0066_alter_historicallosstofollowup_subject_identifier_and_more.py,sha256=hUTNf3oiIxJODNXXwjTeVZS-xEMBsCn3XyR2aPcfO7o,662
 meta_prn/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_prn/models/__init__.py,sha256=l06P7L2_Aye2h2VmAyb1XRcIbQAOyxws08IMc8sIops,717
 meta_prn/models/dm_referral.py,sha256=XyyB5ylcaMRCumGRFPlh2Op5VvT9ROJ1A9x5q55vUuc,1096
 meta_prn/models/end_of_study.py,sha256=wg2Y8Q_via6GozskaCzqkky_jOrtSLNek77-X2KLJME,5444
-meta_prn/models/loss_to_followup.py,sha256=qo2RrK5cVC1wLE7DdE6rTCCtYn7iAMomov9IbSCFuWg,2397
-meta_prn/models/off_study_medication.py,sha256=7PzUkyrBWTybTWcNMU5EioApbOoiIaUDnCiEcjgX-II,1779
+meta_prn/models/loss_to_followup.py,sha256=FxWMsZmwGaL7SHnjFOUhsbWoG3bauLdEAAT0ZNNUd-g,2391
+meta_prn/models/off_study_medication.py,sha256=K_pzeJ62z-01dWR0JrUVO0Bm0L7T0RCeSzYt9wBk0nE,1773
 meta_prn/models/offschedule.py,sha256=DjQvXteecXJOzN6ijdH36FCxXoR1halzxl9EliqQJk8,1717
 meta_prn/models/onschedule.py,sha256=xAlKzvcM5VzVfzaayjUEvUSL6rsALQQSm9iFCs1rnWc,930
 meta_prn/models/pregnancy_notification.py,sha256=HqRsonJ0F1nxLczVtgPkvGb7kWQOkJDz3w67jOxi5j4,3090
@@ -773,7 +775,7 @@ meta_screening/models/subject_screening.py,sha256=j-0U5zcErwEv0qYEn9ktaPiNfce-CF
 meta_screening/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_screening/tests/holidays.csv,sha256=Ywr5pK_caGUJMgRwLzjMeSEUuyEpUWyJE5aJkfbg3bg,539
 meta_screening/tests/meta_test_case_mixin.py,sha256=dBdYp1U9mW9J7ghrgchXOOWeZPhiVcQ09mV3GHbiors,8949
-meta_screening/tests/options.py,sha256=VpRQWWPwlVUReFi4KHuJdHXTBCsWvR2IlHs4yTDxQVA,4097
+meta_screening/tests/options.py,sha256=7cpbOeyyQIfw9sja94Y7fwI0XRgRustK7VE8rDT9s6I,4125
 meta_screening/tests/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_screening/tests/tests/test_forms.py,sha256=wTR3fe4-v6L5sw_eApdcCn6xnu_I6Q6fpOIZlUVvcXA,16903
 meta_screening/tests/tests/test_screening_part_one.py,sha256=EyG3SRVpR6-bFB0bn9UEA4hL8638e-Kx7K0_AeaBntE,4723
@@ -813,7 +815,7 @@ meta_subject/admin/egfr_drop_notification_admin.py,sha256=xXGHIMmVnFpNClEMX3i6dZ
 meta_subject/admin/eq5d3l_admin.py,sha256=NB_DwtEA4PNnoxXqXdfnMYqUDVjwOaRtNOsIbzZalPg,772
 meta_subject/admin/fields.py,sha256=-be67ToKIOHOmytxR9qsEAucbDEFWyFySmG_VoIrRn4,277
 meta_subject/admin/fieldsets.py,sha256=nds9nLPscsaETET-bxX94AsBGZ6npQk_4POz8oex6jc,1523
-meta_subject/admin/followup_examination_admin.py,sha256=3tcD6dVkAh0bsNkJE1iSmNoiM4G6h0mkAySxlHpN9MA,5153
+meta_subject/admin/followup_examination_admin.py,sha256=_w8Mds3K0JajsMa7stKRKdJM-QidPu_k-ZKWX1805TA,5154
 meta_subject/admin/followup_vitals_admin.py,sha256=dvpU5tR-_5YeB5_HHrP8-DwQ7Z6j9tgCsyP5Bn3yM3M,1585
 meta_subject/admin/glucose_admin.py,sha256=IBKJp-tgeIZUObmanL8UPtZWQHsUiOl3raBqesh0MJU,2981
 meta_subject/admin/glucose_fbg_admin.py,sha256=GsXp5vIzgEt355qyXYr5QhWkGZdOzXzX-ZPOWAHmGlU,2492
@@ -1239,7 +1241,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.4.dist-info/METADATA,sha256=1Hmz3EzYTnUjBxiMeWf4N79io4K92wupe-48_bIrfqM,43587
-meta_edc-1.1.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-meta_edc-1.1.4.dist-info/top_level.txt,sha256=RkzjNXwRq2kg_uZ_1bDwPUntijSXoY2YBqtByDwvvrc,244
-meta_edc-1.1.4.dist-info/RECORD,,
+meta_edc-1.1.5.dist-info/METADATA,sha256=tGv9WuDrOcQPZYvqP1TGT2_RodSMFYL3Vcbtz4Eg2gY,43587
+meta_edc-1.1.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+meta_edc-1.1.5.dist-info/top_level.txt,sha256=RkzjNXwRq2kg_uZ_1bDwPUntijSXoY2YBqtByDwvvrc,244
+meta_edc-1.1.5.dist-info/RECORD,,

meta_prn/migrations/0065_alter_historicaloffstudymedication_subject_identifier_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.2.3 on 2025-07-03 22:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_prn", "0064_auto_20250602_2143"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="historicaloffstudymedication",
+            name="subject_identifier",
+            field=models.CharField(db_index=True, max_length=50),
+        ),
+        migrations.AlterField(
+            model_name="offstudymedication",
+            name="subject_identifier",
+            field=models.CharField(max_length=50, unique=True),
+        ),
+    ]

meta_prn/migrations/0066_alter_historicallosstofollowup_subject_identifier_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.2.3 on 2025-07-03 22:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_prn", "0065_alter_historicaloffstudymedication_subject_identifier_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="historicallosstofollowup",
+            name="subject_identifier",
+            field=models.CharField(db_index=True, max_length=50),
+        ),
+        migrations.AlterField(
+            model_name="losstofollowup",
+            name="subject_identifier",
+            field=models.CharField(max_length=50, unique=True),
+        ),
+    ]

meta_prn/models/loss_to_followup.py

@@ -2,7 +2,7 @@ from django.db import models
 from edc_action_item.models.action_model_mixin import ActionModelMixin
 from edc_constants.choices import YES_NO
 from edc_constants.constants import OTHER
-from edc_identifier.model_mixins import NonUniqueSubjectIdentifierFieldMixin
+from edc_identifier.model_mixins import UniqueSubjectIdentifierFieldMixin
 from edc_ltfu.constants import LTFU_ACTION
 from edc_model.models import BaseUuidModel, OtherCharField
 from edc_sites.model_mixins import SiteModelMixin
@@ -19,7 +19,7 @@ LOSS_CHOICES = (
 class LossToFollowup(
     ActionModelMixin,
     SiteModelMixin,
-    NonUniqueSubjectIdentifierFieldMixin,
+    UniqueSubjectIdentifierFieldMixin,
     BaseUuidModel,
 ):
     action_name = LTFU_ACTION

meta_prn/models/off_study_medication.py

@@ -1,6 +1,6 @@
 from django.db import models
 from edc_action_item.models import ActionModelMixin
-from edc_identifier.model_mixins import NonUniqueSubjectIdentifierFieldMixin
+from edc_identifier.model_mixins import UniqueSubjectIdentifierFieldMixin
 from edc_model.models import BaseUuidModel
 from edc_pharmacy.models import Medication
 from edc_prn.models import SingletonPrnModelMixin
@@ -14,7 +14,7 @@ from ..constants import OFFSTUDY_MEDICATION_ACTION
 
 
 class OffStudyMedication(
-    NonUniqueSubjectIdentifierFieldMixin,
+    UniqueSubjectIdentifierFieldMixin,
     SiteModelMixin,
     ActionModelMixin,
     SingletonPrnModelMixin,

meta_screening/tests/options.py

@@ -34,8 +34,8 @@ def get_part_one_eligible_options():
         ethnicity=BLACK,
         gender=FEMALE,
         hiv_pos=YES,
-        hospital_identifier="".join(map(str, sample(range(0, 10), 10))),
-        initials=f"{choice(ascii_uppercase)}{choice(ascii_uppercase)}",
+        hospital_identifier="".join(map(str, sample(range(0, 10), 10))),  # nosec B311
+        initials=f"{choice(ascii_uppercase)}{choice(ascii_uppercase)}",  # nosec B311
         lives_nearby=YES,
         on_rx_stable=YES,
         pregnant=NOT_APPLICABLE,

meta_subject/admin/followup_examination_admin.py

@@ -36,6 +36,7 @@ class FollowupExaminationAdmin(
     ActionItemModelAdminMixin,
     SimpleHistoryAdmin,
 ):
+
     form = FollowupExaminationForm
 
     autocomplete_fields = ["art_new_regimen"]