meta-edc 0.3.28__py3-none-any.whl → 0.3.30__py3-none-any.whl

meta_reports/models/dbviews/unattended_three_in_row/view_definition.py

@@ -1,8 +1,12 @@
-mysql_view = """ # noqa
-    select *, uuid() as id, now() as created, 'meta_reports.unattendedthreeinrow' as `report_model` from (
-        select subject_identifier, site_id, appt_datetime, `first_value`, `second_value`, `third_value`,
-            datediff(third_date, first_date) as `interval_days`,
-            datediff(now(), first_date) as `from_now_days`
+from edc_qareports.sql_generator import SqlViewGenerator
+
+
+def get_view_definition() -> dict:
+    subquery = """
+        select subject_identifier, site_id, appt_datetime, `first_value`,
+        `second_value`, `third_value`,
+        datediff(`third_date`, `first_date`) as `interval_days`,
+        datediff(now(), `first_date`) as `from_now_days`
         from (
             select subject_identifier, site_id, appt_datetime,
             FIRST_VALUE(visit_code) OVER w as `first_value`,
@@ -10,69 +14,18 @@ mysql_view = """ # noqa
             NTH_VALUE(visit_code, 3) OVER w as `third_value`,
             FIRST_VALUE(appt_datetime) OVER w as `first_date`,
             NTH_VALUE(appt_datetime, 3) OVER w as `third_date`
-            from edc_appointment_appointment where visit_code_sequence=0 and appt_status='New'
+            from edc_appointment_appointment where visit_code_sequence=0 and appt_status="New"
             and appt_datetime <= now()
             WINDOW w as (PARTITION BY subject_identifier order by appt_datetime ROWS UNBOUNDED PRECEDING)
-        ) as A
-    where `second_value` is not null and `third_value` is not null
-    ) as B
-    order by site_id, from_now_days desc
-"""
-
-pg_view = """ # noqa
-    select *, gen_random_uuid() as id, now() as created,
-    'meta_reports.unattendedthreeinrow' as report_model
-    from (
-    select subject_identifier, site_id, appt_datetime, first_value, second_value, third_value,
-    EXTRACT(DAY FROM third_date - first_date) as interval_days,
-    EXTRACT(DAY FROM now() - first_date) as from_now_days
-    from (
-    select subject_identifier,site_id,appt_datetime,
-    FIRST_VALUE(visit_code) OVER w as first_value,
-    NTH_VALUE(visit_code, 2) OVER w as second_value,
-    NTH_VALUE(visit_code, 3) OVER w as third_value,
-    FIRST_VALUE(appt_datetime) OVER w as first_date,
-    NTH_VALUE(appt_datetime, 3) OVER w as third_date
-    from edc_appointment_appointment where visit_code_sequence=0 and appt_status='New'
-    and appt_datetime <= now()
-    WINDOW w as (PARTITION BY subject_identifier order by appt_datetime ROWS UNBOUNDED PRECEDING)
-    ) as A
-    where second_value is not null and third_value is not null
-    ) as B
-    order by site_id, from_now_days desc
-"""
-
-sqlite3_view = """ # noqa
-SELECT *, lower(
-    hex(randomblob(4)) || '-' || hex(randomblob(2)) || '-' || '4' ||
-    substr(hex( randomblob(2)), 2) || '-' ||
-    substr('AB89', 1 + (abs(random()) % 4) , 1)  ||
-    substr(hex(randomblob(2)), 2) || '-' ||
-    hex(randomblob(6))
-  ) as id, datetime() as created,'meta_reports.unattendedthreeinrow' as report_model from (
-        select subject_identifier, site_id, appt_datetime, first_value, second_value, third_value,
-            CAST(JulianDay(third_date) - JulianDay(first_date) AS INTEGER) as interval_days,
-            CAST(JulianDay(datetime()) - JulianDay(first_date) AS INTEGER) as from_now_days
-        from (
-            select subject_identifier, site_id, appt_datetime,
-            FIRST_VALUE(visit_code) OVER w as first_value,
-            NTH_VALUE(visit_code, 2) OVER w as second_value,
-            NTH_VALUE(visit_code, 3) OVER w as third_value,
-            FIRST_VALUE(appt_datetime) OVER w as first_date,
-            NTH_VALUE(appt_datetime, 3) OVER w as third_date
-            from edc_appointment_appointment where visit_code_sequence=0 and appt_status='New'
-            and appt_datetime <= datetime()
-            WINDOW w as (PARTITION BY subject_identifier order by appt_datetime ROWS UNBOUNDED PRECEDING)
-        ) as A
-    where second_value is not null and third_value is not null
-    ) as B
-    order by site_id, from_now_days desc
-"""
-
-
-def get_view_definition() -> dict:
+        ) as B
+        where `second_value` is not null and `third_value` is not null
+        """  # noqa
+    sql_view = SqlViewGenerator(
+        report_model="meta_reports.unattendedthreeinrow",
+        ordering=["subject_identifier", "site_id"],
+    )
     return {
-        "django.db.backends.mysql": mysql_view,
-        "django.db.backends.postgresql": pg_view,
-        "django.db.backends.sqlite3": sqlite3_view,
+        "django.db.backends.mysql": sql_view.as_mysql(subquery),
+        "django.db.backends.postgresql": sql_view.as_postgres(subquery),
+        "django.db.backends.sqlite3": sql_view.as_sqlite(subquery),
     }

meta_reports/models/dbviews/unattended_three_in_row2/view_definition.py

@@ -1,134 +1,50 @@
-mysql_view = """ # noqa
-    with appointments as (
-        select subject_identifier, site_id, visit_code, visit_code_sequence, appt_datetime,
-        case when appt_timing='missed' then 'New' else appt_status end as `appt_status`,
-        case when appt_timing='missed' then 1 else 0 end as `missed`
-        from edc_appointment_appointment
-        where visit_code_sequence=0 and appt_datetime<=now()
-        order by subject_identifier, appt_datetime
-        )
-    select *, uuid() as `id`, now() as `created`, 'meta_reports.unattendedthreeinrow2' as `report_model` from (
-        select  distinct subject_identifier, site_id,  `first_value`, `second_value`, `third_value`,
-            datediff(third_date, first_date) as `interval_days`,
-            datediff(now(), first_date) as `from_now_days`,
-            `first_status`, `second_status`, `third_status`, sum(missed) as `missed_count`
-        from (
-            select subject_identifier,site_id,appt_datetime, missed,
-            FIRST_VALUE(appt_status) OVER w as `third_status`,
-            NTH_VALUE(appt_status, 2) OVER w as `second_status`,
-            NTH_VALUE(appt_status, 3) OVER w as `first_status`,
-            FIRST_VALUE(visit_code) OVER w as `third_value`,
-            NTH_VALUE(visit_code, 2) OVER w as `second_value`,
-            NTH_VALUE(visit_code, 3) OVER w as `first_value`,
-            FIRST_VALUE(appt_datetime) OVER w as `third_date`,
-            NTH_VALUE(appt_datetime, 2) OVER w as `second_date`,
-            NTH_VALUE(appt_datetime, 3) OVER w as `first_date`
-            from appointments
-            WINDOW w as (PARTITION BY subject_identifier order by appt_datetime desc ROWS UNBOUNDED PRECEDING)
-        ) as A
-        where `second_value` is not null and `third_value` is not null
-          and `first_status`='New'
-          and `second_status`='New'
-          and `third_status`='New'
-        group by subject_identifier, site_id,  `first_value`, `second_value`, `third_value`,
-                 datediff(`third_date`, `first_date`),
-                 datediff(now(), `first_date`),
-                 `first_status`, `second_status`, `third_status`
-        order by subject_identifier, site_id
-    ) as B
-"""
+from edc_qareports.sql_generator import SqlViewGenerator
 
-pg_view = """ # noqa
-    with appointments as (
-        select subject_identifier, site_id, visit_code, visit_code_sequence, appt_datetime,
-        case when appt_timing='missed' then 'New' else appt_status end as appt_status,
-        case when appt_timing='missed' then 1 else 0 end as missed
-        from edc_appointment_appointment
-        where visit_code_sequence=0 and appt_datetime<=now()
-        order by subject_identifier, appt_datetime
-        )
-    select *, gen_random_uuid() as id, now() as created, 'meta_reports.unattendedthreeinrow2' as report_model
-    from (
-        select  distinct subject_identifier, site_id,  first_value, second_value, third_value,
-            EXTRACT(DAY FROM third_date - first_date) as interval_days,
-            EXTRACT(DAY FROM now() - first_date) as from_now_days,
-            first_status, second_status, third_status, sum(missed) as missed_count
-        from (
-            select subject_identifier,site_id,appt_datetime, missed,
-            FIRST_VALUE(appt_status) OVER w as third_status,
-            NTH_VALUE(appt_status, 2) OVER w as second_status,
-            NTH_VALUE(appt_status, 3) OVER w as first_status,
-            FIRST_VALUE(visit_code) OVER w as third_value,
-            NTH_VALUE(visit_code, 2) OVER w as second_value,
-            NTH_VALUE(visit_code, 3) OVER w as first_value,
-            FIRST_VALUE(appt_datetime) OVER w as third_date,
-            NTH_VALUE(appt_datetime, 2) OVER w as second_date,
-            NTH_VALUE(appt_datetime, 3) OVER w as first_date
-            from appointments
-            WINDOW w as (PARTITION BY subject_identifier order by appt_datetime desc ROWS UNBOUNDED PRECEDING)
-        ) as A
-        where second_value is not null and third_value is not null
-          and first_status='New'
-          and second_status='New'
-          and third_status='New'
-        group by subject_identifier, site_id,  first_value, second_value, third_value,
-                 EXTRACT(DAY FROM third_date - first_date),
-                 EXTRACT(DAY FROM now() - first_date),
-                 first_status, second_status, third_status
-        order by subject_identifier, site_id
-    ) as B
-"""
 
-sqlite3_view = """ # noqa
-    with appointments as (
-        select subject_identifier, site_id, visit_code, visit_code_sequence, appt_datetime,
-        case when appt_timing='missed' then 'New' else appt_status end as `appt_status`,
-        case when appt_timing='missed' then 1 else 0 end as `missed`
-        from edc_appointment_appointment
-        where visit_code_sequence=0 and appt_datetime<=now()
-        order by subject_identifier, appt_datetime
-        )
-    SELECT *, lower(
-            hex(randomblob(4)) || '-' || hex(randomblob(2)) || '-' || '4' ||
-            substr(hex( randomblob(2)), 2) || '-' ||
-            substr('AB89', 1 + (abs(random()) % 4) , 1)  ||
-            substr(hex(randomblob(2)), 2) || '-' ||
-            hex(randomblob(6))
-          ) as id, datetime() as created, 'meta_reports.unattendedthreeinrow2' as report_model from (
-        select  distinct subject_identifier, site_id,  first_value, second_value, third_value,
-            CAST(JulianDay(third_date) - JulianDay(first_date) AS Integer) as interval_days,
-            CAST(JulianDay(datetime()) - JulianDay(first_date) AS Integer) as from_now_days,
-            first_status, second_status, third_status, sum(missed) as missed_count
-        from (
-            select subject_identifier,site_id,appt_datetime, missed,
-            FIRST_VALUE(appt_status) OVER w as third_status,
-            NTH_VALUE(appt_status, 2) OVER w as second_status,
-            NTH_VALUE(appt_status, 3) OVER w as first_status,
-            FIRST_VALUE(visit_code) OVER w as third_value,
-            NTH_VALUE(visit_code, 2) OVER w as second_value,
-            NTH_VALUE(visit_code, 3) OVER w as first_value,
-            FIRST_VALUE(appt_datetime) OVER w as third_date,
-            NTH_VALUE(appt_datetime, 2) OVER w as second_date,
-            NTH_VALUE(appt_datetime, 3) OVER w as first_date
-            from appointments
-            WINDOW w as (PARTITION BY subject_identifier order by appt_datetime desc ROWS UNBOUNDED PRECEDING)
-        ) as A
-        where second_value is not null and third_value is not null
-          and first_status='New'
-          and second_status='New'
-          and third_status='New'
-        group by subject_identifier, site_id,  first_value, second_value, third_value,
-                 CAST(JulianDay(third_date) - JulianDay(first_date) AS Integer),
-                 CAST(JulianDay(datetime()) - JulianDay(first_date) AS Integer),
-                 first_status, second_status, third_status
-        order by subject_identifier, site_id
-    ) as B
-"""
+def get_view_definition() -> dict:
+    subquery = """select distinct subject_identifier, site_id,  `first_value`, `second_value`, `third_value`,
+datediff(`third_date`, `first_date`) as interval_days,
+datediff(now(), `first_date`) as from_now_days,
+`first_status`, `second_status`, `third_status`, sum(missed) as missed_count
+from (
+select subject_identifier,site_id,appt_datetime, `missed`,
+FIRST_VALUE(appt_status) OVER w as `third_status`,
+NTH_VALUE(appt_status, 2) OVER w as `second_status`,
+NTH_VALUE(appt_status, 3) OVER w as `first_status`,
+FIRST_VALUE(visit_code) OVER w as `third_value`,
+NTH_VALUE(visit_code, 2) OVER w as `second_value`,
+NTH_VALUE(visit_code, 3) OVER w as `first_value`,
+FIRST_VALUE(appt_datetime) OVER w as `third_date`,
+NTH_VALUE(appt_datetime, 2) OVER w as `second_date`,
+NTH_VALUE(appt_datetime, 3) OVER w as `first_date`
+from appointments
+WINDOW w as (PARTITION BY subject_identifier order by appt_datetime desc ROWS UNBOUNDED PRECEDING)
+) as B
+where `second_value` is not null and `third_value` is not null
+and `first_status`="New"
+and `second_status`="New"
+and `third_status` ="New"
+group by subject_identifier, site_id, `first_value`, `second_value`, `third_value`,
+datediff(`third_date`, `first_date`),
+datediff(now(), `first_date`),
+`first_status`, `second_status`, `third_status`
+order by subject_identifier, site_id"""  # noqa
 
+    with_stmt = """with appointments as (select subject_identifier, site_id, visit_code, visit_code_sequence,
+appt_datetime, case when appt_timing="missed" then "New" else appt_status end as `appt_status`,
+case when appt_timing="missed" then 1 else 0 end as `missed`
+from edc_appointment_appointment
+where visit_code_sequence=0 and appt_datetime<=now()
+order by subject_identifier, appt_datetime)"""  # noqa
+
+    sql_view = SqlViewGenerator(
+        with_stmt=with_stmt,
+        report_model="meta_reports.unattendedthreeinrow2",
+        ordering=["subject_identifier", "site_id"],
+    )
 
-def get_view_definition() -> dict:
     return {
-        "django.db.backends.mysql": mysql_view,
-        "django.db.backends.postgresql": pg_view,
-        "django.db.backends.sqlite3": sqlite3_view,
+        "django.db.backends.mysql": sql_view.as_mysql(subquery),
+        "django.db.backends.postgresql": sql_view.as_postgres(subquery),
+        "django.db.backends.sqlite3": sql_view.as_sqlite(subquery),
     }

meta_reports/models/dbviews/unattended_two_in_row/view_definition.py

@@ -1,77 +1,30 @@
-mysql_view = """ # noqa
-    select *, uuid() as `id`, now() as `created`, 'meta_reports.unattendedtwoinrow' as report_model from (
-        select subject_identifier, site_id, appt_datetime, `first_value`, `second_value`,
-            datediff(`second_date`, `first_date`) as `interval_days`,
-            datediff(now(), `first_date`) as `from_now_days`
-            from (
-                select subject_identifier ,site_id, appt_datetime,
-                FIRST_VALUE(`visit_code`) OVER w as `first_value`,
-                NTH_VALUE(`visit_code`, 2) OVER w as `second_value`,
-                NTH_VALUE(`visit_code`, 3) OVER w as `third_value`,
-                FIRST_VALUE(`appt_datetime`) OVER w as `first_date`,
-                NTH_VALUE(`appt_datetime`, 2) OVER w as `second_date`
-                from edc_appointment_appointment where visit_code_sequence=0 and appt_status='New'
-                and appt_datetime <= now()
-                WINDOW w as (PARTITION BY subject_identifier order by appt_datetime ROWS UNBOUNDED PRECEDING)
-            ) as A1
-        where `second_value` is not null and `third_value` is null
-    ) as A2
-    order by site_id, `from_now_days` desc
-"""
-
-pg_view = """ # noqa
-    select *, gen_random_uuid() as id, now() as created, 'meta_reports.unattendedtwoinrow' as report_model
-    from (
-        select subject_identifier, site_id, appt_datetime, first_value, second_value,
-            EXTRACT(DAY FROM second_date - first_date) as interval_days,
-            EXTRACT(DAY FROM now() - first_date) as from_now_days
-            from (
-                select subject_identifier, site_id, appt_datetime,
-                FIRST_VALUE(visit_code) OVER w as first_value,
-                NTH_VALUE(visit_code, 2) OVER w as second_value,
-                NTH_VALUE(visit_code, 3) OVER w as third_value,
-                FIRST_VALUE(appt_datetime) OVER w as first_date,
-                NTH_VALUE(appt_datetime, 2) OVER w as second_date
-                from edc_appointment_appointment where visit_code_sequence=0 and appt_status='New'
-                and appt_datetime <= now()
-                WINDOW w as (PARTITION BY subject_identifier order by appt_datetime ROWS UNBOUNDED PRECEDING)
-            ) as A1
-        where second_value is not null and third_value is null
-    ) as A2
-    order by site_id, from_now_days desc
-"""
-
-sqlite3_view = """  # noqa
-SELECT *, lower(
-    hex(randomblob(4)) || '-' || hex(randomblob(2)) || '-' || '4' ||
-    substr(hex( randomblob(2)), 2) || '-' ||
-    substr('AB89', 1 + (abs(random()) % 4) , 1)  ||
-    substr(hex(randomblob(2)), 2) || '-' ||
-    hex(randomblob(6))
-  ) as id, datetime() as created, 'meta_reports.unattendedtwoinrow' as report_model from (
-        select subject_identifier, site_id, appt_datetime, first_value, second_value,
-            CAST(JulianDay(second_date) - JulianDay(first_date) AS Integer) as interval_days,
-            CAST(JulianDay(datetime()) - JulianDay(first_date) AS Integer) as from_now_days
-            from (
-                select subject_identifier ,site_id, appt_datetime,
-                FIRST_VALUE(visit_code) OVER w as first_value,
-                NTH_VALUE(visit_code, 2) OVER w as second_value,
-                NTH_VALUE(visit_code, 3) OVER w as third_value,
-                FIRST_VALUE(appt_datetime) OVER w as first_date,
-                NTH_VALUE(appt_datetime, 2) OVER w as second_date
-                from edc_appointment_appointment where visit_code_sequence=0 and appt_status='New'
-                and appt_datetime <= datetime()
-                WINDOW w as (PARTITION BY subject_identifier order by appt_datetime ROWS UNBOUNDED PRECEDING)
-            ) as A1
-        where second_value is not null and third_value is null
-    ) as A2
-    order by site_id, from_now_days desc
-"""
+from edc_qareports.sql_generator import SqlViewGenerator
 
 
 def get_view_definition() -> dict:
+    subquery = """
+        select subject_identifier, site_id, appt_datetime, `first_value`, `second_value`,
+        datediff(`second_date`, `first_date`) as interval_days,
+        datediff(now(), `first_date`) as from_now_days
+        from (
+        select subject_identifier ,site_id, appt_datetime,
+        FIRST_VALUE(visit_code) OVER w as `first_value`,
+        NTH_VALUE(visit_code, 2) OVER w as `second_value`,
+        NTH_VALUE(visit_code, 3) OVER w as `third_value`,
+        FIRST_VALUE(appt_datetime) OVER w as `first_date`,
+        NTH_VALUE(appt_datetime, 2) OVER w as `second_date`
+        from edc_appointment_appointment where visit_code_sequence=0 and appt_status="New"
+        and appt_datetime <= now()
+        WINDOW w as (PARTITION BY subject_identifier order by appt_datetime ROWS UNBOUNDED PRECEDING)
+        ) as B
+        where `second_value` is not null and `third_value` is null"""  # noqa
+
+    sql_view = SqlViewGenerator(
+        report_model="meta_reports.unattendedtwoinrow",
+        ordering=["site_id", "~from_now_days"],
+    )
     return {
-        "django.db.backends.mysql": mysql_view,
-        "django.db.backends.postgresql": pg_view,
-        "django.db.backends.sqlite3": sqlite3_view,
+        "django.db.backends.mysql": sql_view.as_mysql(subquery),
+        "django.db.backends.postgresql": sql_view.as_postgres(subquery),
+        "django.db.backends.sqlite3": sql_view.as_sqlite(subquery),
     }

meta_reports/tests/test_sql_gen.py

@@ -0,0 +1,5 @@
+from django.test import TestCase
+
+
+class TestSqlGen(TestCase):
+    pass

meta_subject/action_items.py

@@ -8,7 +8,7 @@ from edc_lab_results.action_items import (
     BloodResultsFbcAction,
     BloodResultsHba1cAction,
     BloodResultsLftAction,
-    BloodResultsLipidAction,
+    BloodResultsLipidsAction,
 )
 from edc_lab_results.action_items import (
     BloodResultsRftAction as BaseBloodResultsRftAction,
@@ -175,7 +175,7 @@ class DmFollowAction(ActionWithNotification):
 def register_actions():
     for action_item_cls in [
         BloodResultsFbcAction,
-        BloodResultsLipidAction,
+        BloodResultsLipidsAction,
         BloodResultsLftAction,
         BloodResultsRftAction,
         BloodResultsHba1cAction,

meta_subject/admin/__init__.py

@@ -3,6 +3,7 @@ from .birth_outcome_admin import BirthOutcomesAdmin
 from .blood_results import (
     BloodResultsFbcAdmin,
     BloodResultsLftAdmin,
+    BloodResultsLipidsAdmin,
     BloodResultsRftAdmin,
 )
 from .complications_admin import ComplicationsAdmin

meta_subject/admin/blood_results/__init__.py

@@ -2,5 +2,5 @@ from .blood_results_fbc_admin import BloodResultsFbcAdmin
 from .blood_results_hba1c_admin import BloodResultsHba1cAdmin
 from .blood_results_ins_admin import BloodResultsInsAdmin
 from .blood_results_lft_admin import BloodResultsLftAdmin
-from .blood_results_lipid_admin import BloodResultsLipidAdmin
+from .blood_results_lipids_admin import BloodResultsLipidsAdmin
 from .blood_results_rft_admin import BloodResultsRftAdmin

meta_subject/admin/blood_results/{blood_results_lipid_admin.py → blood_results_lipids_admin.py}

@@ -5,19 +5,19 @@ from edc_lab_results.fieldsets import BloodResultFieldset
 from edc_model_admin.history import SimpleHistoryAdmin
 
 from ...admin_site import meta_subject_admin
-from ...forms import BloodResultsLipidForm
-from ...models import BloodResultsLipid
+from ...forms import BloodResultsLipidsForm
+from ...models import BloodResultsLipids
 from ..modeladmin import CrfModelAdminMixin
 
 
-@admin.register(BloodResultsLipid, site=meta_subject_admin)
-class BloodResultsLipidAdmin(
+@admin.register(BloodResultsLipids, site=meta_subject_admin)
+class BloodResultsLipidsAdmin(
     BloodResultsModelAdminMixin, CrfModelAdminMixin, SimpleHistoryAdmin
 ):
-    form = BloodResultsLipidForm
+    form = BloodResultsLipidsForm
     fieldsets = BloodResultFieldset(
-        BloodResultsLipid.lab_panel,
-        model_cls=BloodResultsLipid,
+        BloodResultsLipids.lab_panel,
+        model_cls=BloodResultsLipids,
         extra_fieldsets=[
             (-1, action_fieldset_tuple),
         ],

meta_subject/forms/__init__.py

@@ -4,7 +4,7 @@ from .blood_results import (
     BloodResultsHba1cForm,
     BloodResultsInsForm,
     BloodResultsLftForm,
-    BloodResultsLipidForm,
+    BloodResultsLipidsForm,
     BloodResultsRftForm,
 )
 from .complications_glycemia_form import ComplicationsGlycemiaForm

meta_subject/forms/blood_results/__init__.py

@@ -2,5 +2,5 @@ from .blood_results_fbc_form import BloodResultsFbcForm
 from .blood_results_hba1c_form import BloodResultsHba1cForm
 from .blood_results_ins_form import BloodResultsInsForm
 from .blood_results_lft_form import BloodResultsLftForm
-from .blood_results_lipid_form import BloodResultsLipidForm
+from .blood_results_lipids_form import BloodResultsLipidsForm
 from .blood_results_rft_form import BloodResultsRftForm

meta_subject/forms/blood_results/{blood_results_lipid_form.py → blood_results_lipids_form.py}

@@ -5,16 +5,16 @@ from edc_crf.modelform_mixins import CrfModelFormMixin
 from edc_lab_panel.panels import lipids_panel
 from edc_lab_results.form_validator_mixins import BloodResultsFormValidatorMixin
 
-from ...models import BloodResultsLipid
+from ...models import BloodResultsLipids
 
 
-class BloodResultsLipidFormValidator(BloodResultsFormValidatorMixin, CrfFormValidator):
+class BloodResultsLipidsFormValidator(BloodResultsFormValidatorMixin, CrfFormValidator):
     panel = lipids_panel
 
 
-class BloodResultsLipidForm(ActionItemCrfFormMixin, CrfModelFormMixin, forms.ModelForm):
-    form_validator_cls = BloodResultsLipidFormValidator
+class BloodResultsLipidsForm(ActionItemCrfFormMixin, CrfModelFormMixin, forms.ModelForm):
+    form_validator_cls = BloodResultsLipidsFormValidator
 
     class Meta(ActionItemCrfFormMixin.Meta):
-        model = BloodResultsLipid
+        model = BloodResultsLipids
         fields = "__all__"

meta_subject/migrations/0212_auto_20240827_2222.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.0.8 on 2024-08-27 19:22
+
+from django.db import migrations
+from django.db.migrations import RunPython
+from edc_constants.constants import NO, YES
+
+
+def update_old_fasting_choices(apps, schema_editor):
+    result = {"fasting": 0, "non_fasting": 0}
+    model_cls = apps.get_model("meta_subject.glucosefbg")
+    result["fasting"] = model_cls.objects.filter(fasting="fasting").update(fasting=YES)
+    result["non_fasting"] = model_cls.objects.filter(fasting="non_fasting").update(fasting=NO)
+    print(f"Updated: results are {result}")
+    print("Done.")
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_subject", "0211_dmendpoint_endpoint_reached_and_more"),
+    ]
+
+    operations = [RunPython(update_old_fasting_choices)]

meta_subject/migrations/0213_rename_bloodresultslipid_bloodresultslipids_and_more.py

@@ -0,0 +1,35 @@
+# Generated by Django 5.0.8 on 2024-08-28 19:54
+
+from django.conf import settings
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("edc_action_item", "0037_remove_actionitem_reference_model_and_more"),
+        ("meta_subject", "0212_auto_20240827_2222"),
+        ("sites", "0002_alter_domain_unique"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name="BloodResultsLipid",
+            new_name="BloodResultsLipids",
+        ),
+        migrations.RenameModel(
+            old_name="HistoricalBloodResultsLipid",
+            new_name="HistoricalBloodResultsLipids",
+        ),
+        migrations.RenameIndex(
+            model_name="bloodresultslipids",
+            new_name="meta_subjec_subject_eff3e6_idx",
+            old_name="meta_subjec_subject_296de9_idx",
+        ),
+        migrations.RenameIndex(
+            model_name="bloodresultslipids",
+            new_name="meta_subjec_subject_49b971_idx",
+            old_name="meta_subjec_subject_9692a2_idx",
+        ),
+    ]

meta_subject/model_mixins/arv_history_model_mixin.py

@@ -44,7 +44,7 @@ class ArvHistoryModelMixin(models.Model):
         ArvRegimens,
         on_delete=models.PROTECT,
         related_name="current_arv_regimen",
-        verbose_name=("Which antiretroviral therapy regimen is the patient currently on?"),
+        verbose_name="Which antiretroviral therapy regimen is the patient currently on?",
         null=True,
         blank=False,
     )
@@ -69,7 +69,7 @@ class ArvHistoryModelMixin(models.Model):
         ArvRegimens,
         on_delete=models.PROTECT,
         related_name="previous_arv_regimen",
-        verbose_name=("Which antiretroviral therapy regimen was the patient previously on?"),
+        verbose_name="Which antiretroviral therapy regimen was the patient previously on?",
         null=True,
         blank=True,
     )
@@ -77,7 +77,7 @@ class ArvHistoryModelMixin(models.Model):
     other_previous_arv_regimen = OtherCharField(null=True, blank=True)
 
     on_oi_prophylaxis = models.CharField(
-        verbose_name=("Is the patient on any prophylaxis against opportunistic infections?"),
+        verbose_name="Is the patient on any prophylaxis against opportunistic infections?",
         max_length=15,
         choices=YES_NO,
     )

meta_subject/models/__init__.py

@@ -4,7 +4,7 @@ from .blood_results import (
     BloodResultsHba1c,
     BloodResultsIns,
     BloodResultsLft,
-    BloodResultsLipid,
+    BloodResultsLipids,
     BloodResultsRft,
 )
 from .complications import Complications

meta_subject/models/blood_results/__init__.py

@@ -2,5 +2,5 @@ from .blood_results_fbc import BloodResultsFbc
 from .blood_results_hba1c import BloodResultsHba1c
 from .blood_results_ins import BloodResultsIns
 from .blood_results_lft import BloodResultsLft
-from .blood_results_lipid import BloodResultsLipid
+from .blood_results_lipids import BloodResultsLipids
 from .blood_results_rft import BloodResultsRft

meta_subject/models/blood_results/{blood_results_lipid.py → blood_results_lipids.py}

@@ -2,7 +2,7 @@ from django.db import models
 from edc_crf.model_mixins import CrfStatusModelMixin
 from edc_lab.model_mixins import CrfWithRequisitionModelMixin, requisition_fk_options
 from edc_lab_panel.panels import lipids_panel
-from edc_lab_results import BLOOD_RESULTS_LIPID_ACTION
+from edc_lab_results import BLOOD_RESULTS_LIPIDS_ACTION
 from edc_lab_results.model_mixins import (
     BloodResultsModelMixin,
     CholModelMixin,
@@ -15,7 +15,7 @@ from edc_model.models import BaseUuidModel
 from ...model_mixins import CrfWithActionModelMixin
 
 
-class BloodResultsLipid(
+class BloodResultsLipids(
     CrfWithActionModelMixin,
     HdlModelMixin,
     LdlModelMixin,
@@ -26,7 +26,7 @@ class BloodResultsLipid(
     CrfStatusModelMixin,
     BaseUuidModel,
 ):
-    action_name = BLOOD_RESULTS_LIPID_ACTION
+    action_name = BLOOD_RESULTS_LIPIDS_ACTION
     tracking_identifier_prefix = "LP"
     lab_panel = lipids_panel