meta-edc 1.0.6__py3-none-any.whl → 1.0.7__py3-none-any.whl

meta_subject/form_validators/glucose_form_validator.py

@@ -5,6 +5,8 @@ from edc_crf.crf_form_validator import CrfFormValidator
 from edc_form_validators import INVALID_ERROR
 from edc_glucose.form_validators import FbgOgttFormValidatorMixin
 
+from meta_reports.models import GlucoseSummary
+
 from ..constants import AMENDMENT_DATE
 
 
@@ -79,5 +81,18 @@ class GlucoseFormValidator(FbgOgttFormValidatorMixin, CrfFormValidator):
         elif self.cleaned_data.get("fbg_value") >= Decimal("7.0") and self.cleaned_data.get(
             "ogtt_value"
         ) < Decimal("11.1"):
-            value = PENDING
+            # is there a previous FBG>=7.0 in sequence or do you need to repeat?
+            previous_obj = (
+                GlucoseSummary.objects.filter(
+                    subject_identifier=self.subject_identifier,
+                    fbg_datetime__lt=self.cleaned_data.get("fbg_datetime"),
+                )
+                .order_by("fbg_datetime")
+                .last()
+            )
+            if previous_obj and previous_obj.fbg_value >= Decimal("7.0"):
+                value = YES
+            else:
+                # you need to schedule a repeat
+                value = PENDING
         return value

meta_subject/forms/study_medication_form.py

@@ -38,16 +38,18 @@ class StudyMedicationFormValidator(BaseStudyMedicationFormValidator):
 
     def validate_stock_codes_are_dispensed(self):
         if self.cleaned_data.get("stock_codes"):
-            pattern = re.compile("^([A-Z0-9]{6})(,[A-Z0-9]{6})*$")
+            # pattern = re.compile("^([A-Z0-9]{6})(,[A-Z0-9]{6})*$")
+            pattern = re.compile("^([A-Z0-9]{6})(\r\n[A-Z0-9]{6})*$")
             if not pattern.match(self.cleaned_data.get("stock_codes")):
                 raise forms.ValidationError(
                     {
                         "stock_codes": (
-                            "Invalid format. Enter one or more valid codes separated by comma"
+                            "Invalid format. Enter one or more valid codes. "
+                            "One code per line only. No commas, spaces, etc"
                         )
                     }
                 )
-            for stock_code in self.cleaned_data.get("stock_codes").split(","):
+            for stock_code in self.cleaned_data.get("stock_codes").split("\r\n"):
                 try:
                     Stock.objects.get(
                         code=stock_code,

meta_subject/migrations/0221_auto_20250402_1913.py

@@ -0,0 +1,42 @@
+# Generated by Django 6.0 on 2025-04-02 16:13
+from django.apps import apps as django_apps
+from django.db import migrations
+from django.db.migrations import RunPython
+from edc_appointment.constants import MISSED_APPT
+from edc_pdutils.dataframes import get_crf
+from edc_utils import get_utcnow
+from tqdm import tqdm
+
+
+def update(apps, schema_editor):
+    """Correct missed appointments incorrectly set to
+    appt_timing=ONTIME_APPT.
+    """
+    appointment_model_cls = django_apps.get_model("edc_appointment.appointment")
+    df_missedvisit = get_crf(
+        "meta_subject.subjectvisitmissed",
+        subject_visit_model="meta_subject.subjectvisit",
+    )
+    df_subjects = df_missedvisit[df_missedvisit.appt_timing != MISSED_APPT][
+        ["subject_identifier", "visit_code_str", "visit_code_sequence"]
+    ].copy()
+    for tpl in tqdm(df_subjects.itertuples(), total=len(df_subjects)):
+        obj = appointment_model_cls.objects.get(
+            subject_identifier=tpl.subject_identifier,
+            visit_code=tpl.visit_code_str,
+            visit_code_sequence=tpl.visit_code_sequence,
+        )
+        obj.appt_timing = MISSED_APPT
+        obj.modified = get_utcnow()
+        obj.user_modified = "erikvw"
+
+        obj.save(update_fields=["appt_timing", "user_modified", "modified"])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_subject", "0220_historicalbloodresultsgludummy_bloodresultsgludummy"),
+    ]
+
+    operations = [RunPython(update)]

meta_subject/migrations/0222_alter_historicalstudymedication_stock_codes_and_more.py

@@ -0,0 +1,46 @@
+# Generated by Django 6.0 on 2025-04-15 22:06
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_subject", "0221_auto_20250402_1913"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="historicalstudymedication",
+            name="stock_codes",
+            field=models.TextField(
+                blank=True,
+                help_text="Enter the medication bottle barcode or barcodes. Type one code per line",
+                max_length=30,
+                null=True,
+                validators=[
+                    django.core.validators.RegexValidator(
+                        message="Enter one or more valid codes, one code per line",
+                        regex="^([A-Z0-9]{6})(\r\n[A-Z0-9]{6})*$",
+                    )
+                ],
+            ),
+        ),
+        migrations.AlterField(
+            model_name="studymedication",
+            name="stock_codes",
+            field=models.TextField(
+                blank=True,
+                help_text="Enter the medication bottle barcode or barcodes. Type one code per line",
+                max_length=30,
+                null=True,
+                validators=[
+                    django.core.validators.RegexValidator(
+                        message="Enter one or more valid codes, one code per line",
+                        regex="^([A-Z0-9]{6})(\r\n[A-Z0-9]{6})*$",
+                    )
+                ],
+            ),
+        ),
+    ]

meta_analytics/dataframes/enrolled/get_glucose_df.py

@@ -1,122 +0,0 @@
-import numpy as np
-import pandas as pd
-from django_pandas.io import read_frame
-from edc_pdutils.dataframes import get_eos, get_subject_consent, get_subject_visit
-
-from meta_subject.models import Glucose, GlucoseFbg
-
-
-def get_glucose_df() -> pd.DataFrame:
-    qs_glucose_fbg = GlucoseFbg.objects.all()
-    df_glucose_fbg = read_frame(qs_glucose_fbg)
-    df_glucose_fbg.rename(
-        columns={"fbg_fasting": "fasting", "subject_visit": "subject_visit_id"},
-        inplace=True,
-    )
-
-    df_glucose_fbg.loc[(df_glucose_fbg["fasting"] == "fasting"), "fasting"] = "Yes"
-    df_glucose_fbg.loc[(df_glucose_fbg["fasting"] == "non_fasting"), "fasting"] = "No"
-    df_glucose_fbg["fasting_hrs"] = np.nan
-    df_glucose_fbg["fasting_hrs"] = df_glucose_fbg["fasting_duration_delta"].apply(
-        lambda x: x.total_seconds() / 3600
-    )
-    df_glucose_fbg["fasting_hrs"] = df_glucose_fbg["fasting_hrs"].apply(
-        lambda x: 8.05 if not x else x
-    )
-    # df_glucose_fbg = df_glucose_fbg.loc[df_glucose_fbg["fasting_hrs"] >= 8.0]
-    # df_glucose_fbg.reset_index(drop=True, inplace=True)
-    df_glucose_fbg.loc[
-        :,
-        ["ogtt_value", "ogtt_units", "ogtt_datetime"],
-    ] = [np.nan, None, pd.NaT]
-    df_glucose_fbg["source"] = "meta_subject.glucosefbg"
-
-    qs_glucose = Glucose.objects.all()
-    df_glucose = read_frame(qs_glucose)
-    df_glucose.rename(columns={"subject_visit": "subject_visit_id"}, inplace=True)
-    df_glucose.loc[(df_glucose["fasting"] == "fasting"), "fasting"] = "Yes"
-    df_glucose.loc[(df_glucose["fasting"] == "non_fasting"), "fasting"] = "No"
-    df_glucose["fasting_hrs"] = np.nan
-    df_glucose["fasting_hrs"] = df_glucose[df_glucose["fasting"] == "Yes"][
-        "fasting_duration_delta"
-    ].apply(lambda x: x.total_seconds() / 3600)
-    df_glucose["fasting_hrs"] = df_glucose["fasting_hrs"].apply(lambda x: 8.05 if not x else x)
-    # df_glucose = df_glucose.loc[df_glucose["fasting_hrs"] >= 8.0]
-    # df_glucose.reset_index(drop=True, inplace=True)
-    df_glucose["source"] = "meta_subject.glucose"
-
-    keep_cols = [
-        "subject_visit_id",
-        "fasting",
-        "fasting_hrs",
-        "fbg_value",
-        "fbg_units",
-        "fbg_datetime",
-        "ogtt_value",
-        "ogtt_units",
-        "ogtt_datetime",
-        "source",
-        "revision",
-        "report_datetime",
-    ]
-    df_glucose = df_glucose[keep_cols]
-    df_glucose_fbg = df_glucose_fbg[keep_cols]
-    # df = pd.concat([df_glucose_fbg, df_glucose])
-    df = pd.merge(
-        df_glucose,
-        df_glucose_fbg,
-        on="subject_visit_id",
-        how="outer",
-        indicator=True,
-        suffixes=("", "_2"),
-    )
-
-    for suffix in ["", "_2"]:
-        cols = [f"fasting_hrs{suffix}", f"fbg_value{suffix}", f"ogtt_value{suffix}"]
-        df[cols] = df[cols].apply(pd.to_numeric)
-        cols = [f"fbg_datetime{suffix}", f"ogtt_datetime{suffix}"]
-        df[cols] = df[cols].apply(pd.to_datetime)
-        df.loc[
-            (df[f"fbg_units{suffix}"] != "mmol/L (millimoles/L)")
-            & (df[f"fbg_value{suffix}"] >= 0),
-            f"fbg_units{suffix}",
-        ] = "mmol/L (millimoles/L)"
-        df.loc[
-            (df[f"ogtt_units{suffix}"] != "mmol/L (millimoles/L)")
-            & (df[f"ogtt_value{suffix}"] >= 0),
-            f"ogtt_units{suffix}",
-        ] = "mmol/L (millimoles/L)"
-        # remove values if not fasted
-        # df.loc[(df[f"fasting{suffix}"] != YES), f"fbg_value{suffix}"] = np.nan
-        # df.loc[(df[f"fasting{suffix}"] != YES), f"ogtt_value{suffix}"] = np.nan
-
-    # reconcile all to single column
-    df.loc[(df["fbg_value"].isna()) & (df["fbg_value_2"].notna()), "fbg_value"] = df[
-        "fbg_value_2"
-    ]
-    df.loc[(df["ogtt_value"].isna()) & (df["ogtt_value_2"].notna()), "ogtt_value"] = df[
-        "ogtt_value_2"
-    ]
-    cols = [col for col in list(df.columns) if col.endswith("_2")]
-    df.drop(columns=cols, inplace=True)
-    cols = [col for col in list(df.columns) if col.endswith("_3")]
-    df.drop(columns=cols, inplace=True)
-
-    df_subject_visit = get_subject_visit("meta_subject.subjectvisit")
-    df_consent = get_subject_consent("meta_consent.subjectconsent")
-    df_eos = get_eos("meta_prn.endofstudy")
-
-    df = pd.merge(df_subject_visit, df, on="subject_visit_id", how="left")
-    df = pd.merge(df, df_consent, on="subject_identifier", how="left")
-    df = pd.merge(df, df_eos, on="subject_identifier", how="left")
-
-    df["visit_days"] = df["baseline_datetime"].rsub(df["visit_datetime"]).dt.days
-    df["fgb_days"] = df["baseline_datetime"].rsub(df["fbg_datetime"]).dt.days
-    df["ogtt_days"] = df["baseline_datetime"].rsub(df["ogtt_datetime"]).dt.days
-    df["visit_days"] = pd.to_numeric(df["visit_days"], downcast="integer")
-    df["fgb_days"] = pd.to_numeric(df["fgb_days"], downcast="integer")
-    df["ogtt_days"] = pd.to_numeric(df["ogtt_days"], downcast="integer")
-
-    df = df.sort_values(by=["subject_identifier", "visit_code"])
-    df.reset_index(drop=True, inplace=True)
-    return df