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

meta_dashboard/views/subject/dashboard/dashboard_view.py

@@ -17,6 +17,7 @@ class DashboardView(SubjectDashboardView):
     history_button_label = _("Audit")
 
     def get_context_data(self, **kwargs) -> dict[str, Any]:
+        """Add message if subject reaches DM Endpoint."""
         context = super().get_context_data(**kwargs)
         try:
             Endpoints.objects.get(subject_identifier=self.subject_identifier)

{meta_edc-0.3.26.dist-info → meta_edc-0.3.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meta-edc
-Version: 0.3.26
+Version: 0.3.28
 Summary: META Trial EDC (http://www.isrctn.com/ISRCTN76157257)
 Home-page: https://github.com/meta-trial/meta-edc
 Author: Erik van Widenfelt
@@ -10,6 +10,7 @@ Keywords: django edc META EDC,clinicedc,clinical trials
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
 Classifier: Framework :: Django :: 4.2
+Classifier: Framework :: Django :: 5.1
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
 Classifier: Operating System :: OS Independent
@@ -19,7 +20,7 @@ Requires-Python: >=3.12
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS
-Requires-Dist: edc ==0.6.3
+Requires-Dist: edc ==0.6.5
 Requires-Dist: edc-microscopy
 Requires-Dist: beautifulsoup4
 Requires-Dist: edc-analytics

{meta_edc-0.3.26.dist-info → meta_edc-0.3.28.dist-info}/RECORD

@@ -204,7 +204,7 @@ meta_dashboard/views/screening/__init__.py,sha256=bjnvZdqdonOW_DPFs1MR2GQv2x4oqA
 meta_dashboard/views/screening/listboard_view.py,sha256=DF42XR3ftCHO4vd3cuxtq5ir2NqOmQHGQV6cGObr7is,578
 meta_dashboard/views/subject/__init__.py,sha256=s7l0halOqlqscWdMD_r98V4VKeEsgchhY3eAgs0EI3k,81
 meta_dashboard/views/subject/dashboard/__init__.py,sha256=1961drFBW7OVhglUAL4OGFxLOU0tN3jOGMvO7Oone8U,42
-meta_dashboard/views/subject/dashboard/dashboard_view.py,sha256=FBgOQpZAkTOSeZtUnKRc_CayACOTMeeH6lmwNvEG9vQ,1330
+meta_dashboard/views/subject/dashboard/dashboard_view.py,sha256=inFSVxZDnNghGJlEYIVK0Xy3mtSmPUEoJWj4D6yYU3o,1388
 meta_dashboard/views/subject/listboard/__init__.py,sha256=WHtaM6dXPN7vtnROBOutMO9zEBVIkx3T0RPJdbq4sq4,49
 meta_dashboard/views/subject/listboard/listboard_view.py,sha256=bQ5fPqbbkVvPNrmNvIGNZ_GoRIkqUFHk6T7p1dkjr_Y,601
 meta_data_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -433,18 +433,22 @@ meta_reports/death_report.py,sha256=mJw08jMxOWIAtsKQN8zCP64HIrxW1fb48D9OXqEMpM0,
 meta_reports/pdf_report.py,sha256=9lWnRc_BNieDFXC4VgA0QHK6g_ct58u8tupPRsbRvV0,2395
 meta_reports/tasks.py,sha256=wPzfm99Hox1AIvt1KxYg1r6g9v8ta2AHOHesoN6AxEk,370
 meta_reports/urls.py,sha256=_c6AMrK4U5MsyFSU2JSPNfiZlbhuw24C7CyPNYpqGd0,206
-meta_reports/admin/__init__.py,sha256=dpLUWcQsAUP-Mfx-eehY9Zegia9qp0uF82iwIdJCego,313
+meta_reports/admin/__init__.py,sha256=OOVq30qqC5s7SVkWGO-AVHVOeyIrCXcfBGcpahAOrIo,344
 meta_reports/admin/endpoints_admin.py,sha256=L4mDLNIkR6203RI3ImBYel2kevaH_Nwa6KMYuoDwyNU,518
 meta_reports/admin/endpoints_all_admin.py,sha256=_czdezZf9fSjwZJmO-3HbmdXrXP6nk8-HdiweqUzPRE,476
 meta_reports/admin/list_filters.py,sha256=pByBzz9-qGwqBfdZFlByxJUZDTJQXOTWfNLjmK8KF00,870
 meta_reports/admin/modeladmin_mixins.py,sha256=YgzUjGlzG5S3i8daVaexBpZ8WAEPBjlhktsRIvOkyo4,3752
-meta_reports/admin/unmanaged/__init__.py,sha256=df6FzJNWtCS7KxPqxZ5cYWImRS3wUuXujJ9Tch57hr4,431
+meta_reports/admin/unmanaged/__init__.py,sha256=56wDkwrBBt-50mQNHK9UiIRZAOBpsKk4Ui5PwWvb-Nk,471
 meta_reports/admin/unmanaged/glucose_summary_admin.py,sha256=NqnDKx5l0Q-2xxRGdnf50DaRX1Sn8-DC0jHSk96LkRo,4005
-meta_reports/admin/unmanaged/missing_screening_ogtt_admin.py,sha256=rpT5j4DsIB_475B2joeDwCd3kOtgiMR0eJBroVwIFGA,1836
 meta_reports/admin/unmanaged/patient_history_missing_baseline_cd4_admin.py,sha256=XyroEqxlX816xrdi0IVSelNPxPBWi96niKa-MQVGkck,2058
 meta_reports/admin/unmanaged/unattended_three_in_row2_admin.py,sha256=0r13KRr0gsH2osmSlffRV11SpSBpWM612AYl-GOoYm0,1347
 meta_reports/admin/unmanaged/unattended_three_in_row_admin.py,sha256=i_-H3pMXRjssf8jFw8gJ8_b0FaM4tX2AI4xfHQDyssU,1121
 meta_reports/admin/unmanaged/unattended_two_in_row_admin.py,sha256=tbnga05uTMgdK8ULsKYV7IuyhyPe0e-JpbMm6etU6Pk,1062
+meta_reports/admin/unmanaged/missing_screening_ogtt_admin/__init__.py,sha256=UZMypicuUuZ2jD2Rf0hcDUi-oBUf7_3fgyV5KacIJtE,117
+meta_reports/admin/unmanaged/missing_screening_ogtt_admin/note_model_admin.py,sha256=RcksbJ9HinK71iN9Pr_xMp-voj17pBqjLZpfMTJ7300,1357
+meta_reports/admin/unmanaged/missing_screening_ogtt_admin/unmanaged_model_admin.py,sha256=1pWmmqk6LADkPWqyxcS8nwC-KwMjuN8O7fmG_AbcA3g,2644
+meta_reports/forms/__init__.py,sha256=F5AIupgum2dWL1_HqQCjLkrpMzjQ2dbo065hlkXBTNY,56
+meta_reports/forms/missing_ogtt_note_form.py,sha256=nUG5uNqE-U6KtY9m-S48bricyERKHd95GkWn364oT1Q,1445
 meta_reports/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_reports/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_reports/management/commands/generate_endpoints.py,sha256=LcQyLb5cinYUq9kmUTZOin08-sP_hzM7ve8chEq9M1I,348
@@ -481,18 +485,24 @@ meta_reports/migrations/0030_auto_20240822_1637.py,sha256=StGg7ifQj7fF18BC0j_lGl
 meta_reports/migrations/0031_endpointsproxy.py,sha256=8yeRLRF6j0nWpNZxlsDc-V7qlUubOz7z9fSqQm6XBQM,629
 meta_reports/migrations/0032_alter_endpointsproxy_options.py,sha256=07lWYABDDwKtd3rmPmNoRhu3y7Q-J74HUTq9kLx-jV4,539
 meta_reports/migrations/0033_auto_20240823_0012.py,sha256=4N1fvwzjt2EWaXrqjt3vL47OvfuHxC7G9pPzR2OKiJo,8777
+meta_reports/migrations/0034_auto_20240823_1642.py,sha256=XcuAbFJ8tokZSE6o_iXBxvqAncFehCQE7s_afJjl3Qo,6601
+meta_reports/migrations/0035_historicalmissingogttnote_missingogttnote.py,sha256=Pv2J7K9Auw1Y_gFKvkdL05i-hO_8xMT3xa-6K5aA6do,18235
+meta_reports/migrations/0036_historicalmissingogttnote_fasting_and_more.py,sha256=sr0xr1MslT-jXD_mNr59IY3R1QPcq5Bpa6vc67VHBY4,3167
+meta_reports/migrations/0037_historicalmissingogttnote_result_status_and_more.py,sha256=FdGYLdu4zTxoDO9PCI2wlDS43fxfNGtynCKYABs5cAg,1600
+meta_reports/migrations/0038_alter_historicalmissingogttnote_fasting_and_more.py,sha256=-HljbT033-M0XZanZfcEA8jXmW3vhLoigdEC3hE5jOs,1010
 meta_reports/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meta_reports/models/__init__.py,sha256=8GgaeJKDmpAmG2oaEdKgVk6afynblRFT3zzpw9_9nTM,263
+meta_reports/models/__init__.py,sha256=mdSLwykOHh_Y9QSS9HeTes8SDie_Y4aRU8yYXehTjpA,303
 meta_reports/models/endpoints.py,sha256=HfxQuKkzu883xbTeVfIEktN-ARoGe1qC6KgEAzRtV5E,925
 meta_reports/models/endpoints_proxy.py,sha256=3h3JGaPmnJedFPVWGrk4idV4YtdihqiCI5W7QomwG4E,318
 meta_reports/models/dbviews/README,sha256=GdeboB7Xqb-Qo_rE1ondcxP8Ps93MIjLzCePQCePig0,686
-meta_reports/models/dbviews/__init__.py,sha256=ZbOD_j45lHNKJG7HZ7G3BL4hPLNbKVOsc8PhFQoxT9g,356
+meta_reports/models/dbviews/__init__.py,sha256=tE_j0PeMl-r97-KNATY9tdQYiw0sNH39s8E2PAyk2Q4,388
 meta_reports/models/dbviews/glucose_summary/__init__.py,sha256=Tfgjso4TpxMCidAdRJp8g1Ykqqa43yWlQSotzAaORAo,93
 meta_reports/models/dbviews/glucose_summary/unmanaged_model.py,sha256=uqhD5JLXtyQ94zpG5Puxodjzli3quE4GgiFi7en6EeM,1055
 meta_reports/models/dbviews/glucose_summary/view_definition.py,sha256=f_lUpaKRMa1Z0y8Y7DPB2qbHEPeEXBDXr2FnM5yD55s,4029
-meta_reports/models/dbviews/missing_screening_ogtt/__init__.py,sha256=_-Sn6ArPFRyzYLA6WfGGzvq5UpYWExgTo2ELPVA_OGc,50
-meta_reports/models/dbviews/missing_screening_ogtt/unmanaged_model.py,sha256=68erN-uo085xBYekgPncNO-ZffGJ7gefdsh15Mk_yCM,1406
-meta_reports/models/dbviews/missing_screening_ogtt/view_definition.py,sha256=YBadEjekt58qKdLAQbDxPS9d6QPAIpcj6bAvKo-ERFA,2584
+meta_reports/models/dbviews/missing_screening_ogtt/__init__.py,sha256=7uX_2HfVU-3G1O_xecfGnE5_pcX5eceiRaapeDQtzIw,105
+meta_reports/models/dbviews/missing_screening_ogtt/note_model.py,sha256=JHItVS11WDFg3lTe7ayH9T7Epd-VvXXD_79FssrmAwc,1813
+meta_reports/models/dbviews/missing_screening_ogtt/unmanaged_model.py,sha256=_XFzpOiMoxr-F0ebKNEnyXqS6dnb3P5tBRnZlbrQ2x8,1346
+meta_reports/models/dbviews/missing_screening_ogtt/view_definition.py,sha256=2f7A0VLcb5ZGee8Us3SPLeExayCTXrGlCHt3j7072HY,2638
 meta_reports/models/dbviews/patient_history_missing_baseline_cd4/__init__.py,sha256=eIyKY9mdIE3-J2vtQtY7MOg_RQkwKj7aserwO5PBNQQ,62
 meta_reports/models/dbviews/patient_history_missing_baseline_cd4/unmanaged_model.py,sha256=7TbSZJLdprIO8FvVq5a_MUXgiEvqAZ5NrirQVfH8Fnk,957
 meta_reports/models/dbviews/patient_history_missing_baseline_cd4/view_definition.py,sha256=AlraPbMyJ_bdfb2sBPbNT-CP_dUK8nSFh9bH1j3DTmw,2066
@@ -1089,9 +1099,9 @@ 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-0.3.26.dist-info/AUTHORS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meta_edc-0.3.26.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-meta_edc-0.3.26.dist-info/METADATA,sha256=G4yeTPysQ4wOftmA6bRMObIYXwqjSanz2r6NCLcOAs0,2771
-meta_edc-0.3.26.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-meta_edc-0.3.26.dist-info/top_level.txt,sha256=RkzjNXwRq2kg_uZ_1bDwPUntijSXoY2YBqtByDwvvrc,244
-meta_edc-0.3.26.dist-info/RECORD,,
+meta_edc-0.3.28.dist-info/AUTHORS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+meta_edc-0.3.28.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+meta_edc-0.3.28.dist-info/METADATA,sha256=01QtxWazwkpcrqvp_W9kznFwV9OEdJQyfrztvCcVGUI,2810
+meta_edc-0.3.28.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+meta_edc-0.3.28.dist-info/top_level.txt,sha256=RkzjNXwRq2kg_uZ_1bDwPUntijSXoY2YBqtByDwvvrc,244
+meta_edc-0.3.28.dist-info/RECORD,,

meta_reports/admin/__init__.py

@@ -2,6 +2,7 @@ from .endpoints_admin import EndpointsAdmin
 from .endpoints_all_admin import EndpointsAllAdmin
 from .unmanaged import (
     GlucoseSummaryAdmin,
+    MissingOgttNoteModelAdmin,
     MissingScreeningOgttAdmin,
     PatientHistoryMissingBaselineCd4Admin,
     UnattendedThreeInRow2Admin,

meta_reports/admin/unmanaged/__init__.py

@@ -1,5 +1,8 @@
 from .glucose_summary_admin import GlucoseSummaryAdmin
-from .missing_screening_ogtt_admin import MissingScreeningOgttAdmin
+from .missing_screening_ogtt_admin import (
+    MissingOgttNoteModelAdmin,
+    MissingScreeningOgttAdmin,
+)
 from .patient_history_missing_baseline_cd4_admin import (
     PatientHistoryMissingBaselineCd4Admin,
 )

meta_reports/admin/unmanaged/missing_screening_ogtt_admin/__init__.py

@@ -0,0 +1,2 @@
+from .note_model_admin import MissingOgttNoteModelAdmin
+from .unmanaged_model_admin import MissingScreeningOgttAdmin

meta_reports/admin/unmanaged/missing_screening_ogtt_admin/note_model_admin.py

@@ -0,0 +1,53 @@
+from django.contrib import admin
+from django_audit_fields import audit_fieldset_tuple
+from edc_qareports.modeladmin_mixins import NoteModelAdminMixin
+
+from ....admin_site import meta_reports_admin
+from ....forms import MissingOgttNoteForm
+from ....models import MissingOgttNote
+
+
+@admin.register(MissingOgttNote, site=meta_reports_admin)
+class MissingOgttNoteModelAdmin(
+    NoteModelAdminMixin,
+    admin.ModelAdmin,
+):
+    """A modeladmin class for the Note model."""
+
+    form = MissingOgttNoteForm
+    note_template_name = "edc_qareports/qa_report_note.html"
+
+    fieldsets = (
+        (
+            None,
+            {"fields": ("subject_identifier", "report_datetime", "result_status")},
+        ),
+        (
+            "OGTT",
+            {
+                "fields": (
+                    "fasting",
+                    "ogtt_base_datetime",
+                    "ogtt_datetime",
+                    "ogtt_value",
+                    "ogtt_units",
+                )
+            },
+        ),
+        (
+            "Note",
+            {
+                "fields": (
+                    "note",
+                    "report_model",
+                )
+            },
+        ),
+        audit_fieldset_tuple,
+    )
+
+    radio_fields = {
+        "ogtt_units": admin.VERTICAL,
+        "result_status": admin.VERTICAL,
+        "fasting": admin.VERTICAL,
+    }

meta_reports/admin/unmanaged/{missing_screening_ogtt_admin.py → missing_screening_ogtt_admin/unmanaged_model_admin.py}

@@ -4,12 +4,19 @@ from django.urls import reverse
 from django.utils.translation import gettext as _
 from edc_model_admin.dashboard import ModelAdminDashboardMixin
 from edc_model_admin.mixins import TemplatesModelAdminMixin
+from edc_qareports.modeladmin_mixins import (
+    NoteStatusListFilter as BaseNoteStatusListFilter,
+)
 from edc_qareports.modeladmin_mixins import QaReportModelAdminMixin
 from edc_sites.admin import SiteModelAdminMixin
 from edc_visit_schedule.admin import ScheduleStatusListFilter
 
-from ...admin_site import meta_reports_admin
-from ...models import MissingScreeningOgtt
+from ....admin_site import meta_reports_admin
+from ....models import NOTE_STATUSES, MissingScreeningOgtt
+
+
+class NoteStatusListFilter(BaseNoteStatusListFilter):
+    note_model_status_choices = NOTE_STATUSES
 
 
 @admin.register(MissingScreeningOgtt, site=meta_reports_admin)
@@ -20,13 +27,19 @@ class MissingScreeningOgttAdmin(
     TemplatesModelAdminMixin,
     admin.ModelAdmin,
 ):
-    ordering = ["site", "screening_identifier"]
+    note_model = "meta_reports.missingogttnote"
+    note_status_list_filter = NoteStatusListFilter
+    note_template = "edc_qareports/columns/notes_column.html"
+    include_note_column = True
+
+    ordering = ["site", "subject_identifier"]
+
     list_display = [
         "dashboard",
-        "screening_identifier",
+        "subject_identifier",
         "site",
-        "screening_datetime",
-        "fbg_datetime",
+        "screening_date",
+        "fbg_date",
         "fbg_value",
         "ogtt_value",
         "repeated",
@@ -46,7 +59,7 @@ class MissingScreeningOgttAdmin(
         "p3_ltfu",
     ]
 
-    search_fields = ["screening_identifier"]
+    search_fields = ["subject_identifier"]
 
     def dashboard(self, obj=None, label=None) -> str:
         url = self.get_subject_dashboard_url(obj=obj)
@@ -57,3 +70,15 @@ class MissingScreeningOgttAdmin(
             )
         context = dict(title=_("Go to subject screening"), url=url, label=label)
         return render_to_string("dashboard_button.html", context=context)
+
+    @admin.display(description="Screen date", ordering="screening_datetime")
+    def screening_date(self, obj):
+        if obj.screening_datetime:
+            return obj.screening_datetime.date()
+        return None
+
+    @admin.display(description="Fbg date", ordering="fbg_datetime")
+    def fbg_date(self, obj):
+        if obj.fbg_datetime:
+            return obj.fbg_datetime.date()
+        return None

meta_reports/forms/__init__.py

@@ -0,0 +1 @@
+from .missing_ogtt_note_form import MissingOgttNoteForm

meta_reports/forms/missing_ogtt_note_form.py

@@ -0,0 +1,33 @@
+from django import forms
+from edc_constants.constants import NO, YES
+from edc_form_validators import FormValidator, FormValidatorMixin
+from edc_glucose.form_validators import OgttFormValidatorMixin
+from edc_glucose.utils import validate_glucose_as_millimoles_per_liter
+
+from ..models import MissingOgttNote
+
+
+class MissingOgttNoteFormValidator(OgttFormValidatorMixin, FormValidator):
+
+    def clean(self):
+        self.applicable_if(YES, field="result_status", field_applicable="fasting")
+        self.required_if(YES, NO, field="fasting", field_required="ogtt_base_datetime")
+        self.required_if(YES, NO, field="fasting", field_required="ogtt_datetime")
+        self.required_if(YES, NO, field="fasting", field_required="ogtt_value")
+        self.applicable_if(YES, NO, field="fasting", field_applicable="ogtt_units")
+        validate_glucose_as_millimoles_per_liter("ogtt", self.cleaned_data)
+        self.validate_ogtt_dates()
+        self.validate_ogtt_time_interval()
+
+
+class MissingOgttNoteForm(FormValidatorMixin, forms.ModelForm):
+    form_validator_cls = MissingOgttNoteFormValidator
+
+    class Meta:
+        model = MissingOgttNote
+        fields = "__all__"
+        help_text = {"subject_identifier": "(read-only)", "name": "(read-only)"}
+        widgets = {
+            "report_model": forms.TextInput(attrs={"readonly": "readonly"}),
+            "subject_identifier": forms.TextInput(attrs={"readonly": "readonly"}),
+        }

meta_reports/migrations/0034_auto_20240823_1642.py

@@ -0,0 +1,54 @@
+# Generated by Django 5.0.8 on 2024-08-23 13:42
+
+import django_db_views.migration_functions
+import django_db_views.operations
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_reports", "0033_auto_20240823_0012"),
+    ]
+
+    operations = [
+        django_db_views.operations.ViewRunPython(
+            code=django_db_views.migration_functions.ForwardViewMigration(
+                "# noqa\n    select *, uuid() as id, now() as created,\n    'meta_reports.missing_screening_ogtt_view' as report_model\n      from (\n        select screening_identifier, site_id, report_datetime as 'screening_datetime', fbg_datetime,\n        converted_fbg_value as fbg_value,  converted_ogtt_value as ogtt_value, repeat_glucose_performed as repeated,\n        p3_ltfu, fbg2_value, ogtt2_value, fbg2_datetime, ogtt2_datetime, consented,\n        screening_identifier as subject_identifier, id as original_id\n        from meta_screening_subjectscreening\n        where converted_fbg_value is not null and converted_ogtt_value is null and unsuitable_agreed != \"Yes\"\n    ) as A\n    order by screening_identifier",
+                "missing_screening_ogtt_view",
+                engine="django.db.backends.mysql",
+            ),
+            reverse_code=django_db_views.migration_functions.BackwardViewMigration(
+                "# noqa\n    select *, uuid() as id, now() as created,\n    'meta_reports.missing_screening_ogtt_view' as report_model\n      from (\n        select screening_identifier, site_id, report_datetime as 'screening_datetime', fbg_datetime,\n        converted_fbg_value as fbg_value,  converted_ogtt_value as ogtt_value, repeat_glucose_performed as repeated,\n        p3_ltfu, fbg2_value, ogtt2_value, fbg2_datetime, ogtt2_datetime, consented, \"\" as subject_identifier,\n        id as original_id\n        from meta_screening_subjectscreening\n        where converted_fbg_value is not null and converted_ogtt_value is null and unsuitable_agreed != \"Yes\"\n    ) as A\n    order by screening_identifier",
+                "missing_screening_ogtt_view",
+                engine="django.db.backends.mysql",
+            ),
+            atomic=False,
+        ),
+        django_db_views.operations.ViewRunPython(
+            code=django_db_views.migration_functions.ForwardViewMigration(
+                "# noqa\n    select *, get_random_uuid() as id, now() as created,\n    'meta_reports.missing_screening_ogtt_view' as report_model\n      from (\n        select screening_identifier, site_id, report_datetime as 'screening_datetime', fbg_datetime,\n        converted_fbg_value as fbg_value,  converted_ogtt_value as ogtt_value, repeat_glucose_performed as repeated,\n        p3_ltfu, fbg2_value, ogtt2_value, fbg2_datetime, ogtt2_datetime, consented,\n        screening_identifier as subject_identifier, id as original_id\n        from meta_screening_subjectscreening\n        where converted_fbg_value is not null and converted_ogtt_value is null and unsuitable_agreed != \"Yes\"\n    ) as A\n    order by screening_identifier",
+                "missing_screening_ogtt_view",
+                engine="django.db.backends.postgresql",
+            ),
+            reverse_code=django_db_views.migration_functions.BackwardViewMigration(
+                "# noqa\n    select *, get_random_uuid() as id, now() as created,\n    'meta_reports.missing_screening_ogtt_view' as report_model\n      from (\n        select screening_identifier, site_id, report_datetime as 'screening_datetime', fbg_datetime,\n        converted_fbg_value as fbg_value,  converted_ogtt_value as ogtt_value, repeat_glucose_performed as repeated,\n        p3_ltfu, fbg2_value, ogtt2_value, fbg2_datetime, ogtt2_datetime, consented, \"\" as subject_identifier,\n        id as original_id\n        from meta_screening_subjectscreening\n        where converted_fbg_value is not null and converted_ogtt_value is null and unsuitable_agreed != \"Yes\"\n    ) as A\n    order by screening_identifier",
+                "missing_screening_ogtt_view",
+                engine="django.db.backends.postgresql",
+            ),
+            atomic=False,
+        ),
+        django_db_views.operations.ViewRunPython(
+            code=django_db_views.migration_functions.ForwardViewMigration(
+                "# noqa\nSELECT *, lower(\n    hex(randomblob(4)) || '-' || hex(randomblob(2)) || '-' || '4' ||\n    substr(hex( randomblob(2)), 2) || '-' ||\n    substr('AB89', 1 + (abs(random()) % 4) , 1)  ||\n    substr(hex(randomblob(2)), 2) || '-' ||\n    hex(randomblob(6))\n  ) as id, datetime() as `created`,\n    'meta_reports.missing_screening_ogtt_view' as report_model\n      from (\n        select screening_identifier, site_id, report_datetime as 'screening_datetime', fbg_datetime,\n        converted_fbg_value as fbg_value,  converted_ogtt_value as ogtt_value, fbg2_value, ogtt2_value,\n        repeat_glucose_performed as repeated, p3_ltfu, fbg2_datetime, ogtt2_datetime, consented,\n        screening_identifier as subject_identifier, id as original_id\n        from meta_screening_subjectscreening\n        where converted_fbg_value is not null and converted_ogtt_value is null and unsuitable_agreed != \"Yes\"\n    ) as A\n    order by screening_identifier",
+                "missing_screening_ogtt_view",
+                engine="django.db.backends.sqlite3",
+            ),
+            reverse_code=django_db_views.migration_functions.BackwardViewMigration(
+                "# noqa\nSELECT *, lower(\n    hex(randomblob(4)) || '-' || hex(randomblob(2)) || '-' || '4' ||\n    substr(hex( randomblob(2)), 2) || '-' ||\n    substr('AB89', 1 + (abs(random()) % 4) , 1)  ||\n    substr(hex(randomblob(2)), 2) || '-' ||\n    hex(randomblob(6))\n  ) as id, datetime() as `created`,\n    'meta_reports.missing_screening_ogtt_view' as report_model\n      from (\n        select screening_identifier, site_id, report_datetime as 'screening_datetime', fbg_datetime,\n        converted_fbg_value as fbg_value,  converted_ogtt_value as ogtt_value, fbg2_value, ogtt2_value,\n        repeat_glucose_performed as repeated, p3_ltfu, fbg2_datetime, ogtt2_datetime, consented, \"\" as subject_identifier,\n        id as original_id\n        from meta_screening_subjectscreening\n        where converted_fbg_value is not null and converted_ogtt_value is null and unsuitable_agreed != \"Yes\"\n    ) as A\n    order by screening_identifier",
+                "missing_screening_ogtt_view",
+                engine="django.db.backends.sqlite3",
+            ),
+            atomic=False,
+        ),
+    ]

meta_reports/migrations/0035_historicalmissingogttnote_missingogttnote.py

@@ -0,0 +1,457 @@
+# Generated by Django 5.0.8 on 2024-08-23 13:59
+
+import _socket
+import django.db.models.deletion
+import django.db.models.manager
+import django_audit_fields.fields.hostname_modification_field
+import django_audit_fields.fields.userfield
+import django_audit_fields.fields.uuid_auto_field
+import django_audit_fields.models.audit_model_mixin
+import django_revision.revision_field
+import edc_model.validators.date
+import edc_sites.managers
+import edc_utils.date
+import simple_history.models
+import uuid
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_reports", "0034_auto_20240823_1642"),
+        ("sites", "0002_alter_domain_unique"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="HistoricalMissingOgttNote",
+            fields=[
+                (
+                    "revision",
+                    django_revision.revision_field.RevisionField(
+                        blank=True,
+                        editable=False,
+                        help_text="System field. Git repository tag:branch:commit.",
+                        max_length=75,
+                        null=True,
+                        verbose_name="Revision",
+                    ),
+                ),
+                (
+                    "created",
+                    models.DateTimeField(
+                        blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
+                    ),
+                ),
+                (
+                    "modified",
+                    models.DateTimeField(
+                        blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
+                    ),
+                ),
+                (
+                    "user_created",
+                    django_audit_fields.fields.userfield.UserField(
+                        blank=True,
+                        help_text="Updated by admin.save_model",
+                        max_length=50,
+                        verbose_name="user created",
+                    ),
+                ),
+                (
+                    "user_modified",
+                    django_audit_fields.fields.userfield.UserField(
+                        blank=True,
+                        help_text="Updated by admin.save_model",
+                        max_length=50,
+                        verbose_name="user modified",
+                    ),
+                ),
+                (
+                    "hostname_created",
+                    models.CharField(
+                        blank=True,
+                        default=_socket.gethostname,
+                        help_text="System field. (modified on create only)",
+                        max_length=60,
+                        verbose_name="Hostname created",
+                    ),
+                ),
+                (
+                    "hostname_modified",
+                    django_audit_fields.fields.hostname_modification_field.HostnameModificationField(
+                        blank=True,
+                        help_text="System field. (modified on every save)",
+                        max_length=50,
+                        verbose_name="Hostname modified",
+                    ),
+                ),
+                (
+                    "device_created",
+                    models.CharField(blank=True, max_length=10, verbose_name="Device created"),
+                ),
+                (
+                    "device_modified",
+                    models.CharField(
+                        blank=True, max_length=10, verbose_name="Device modified"
+                    ),
+                ),
+                (
+                    "locale_created",
+                    models.CharField(
+                        blank=True,
+                        help_text="Auto-updated by Modeladmin",
+                        max_length=10,
+                        null=True,
+                        verbose_name="Locale created",
+                    ),
+                ),
+                (
+                    "locale_modified",
+                    models.CharField(
+                        blank=True,
+                        help_text="Auto-updated by Modeladmin",
+                        max_length=10,
+                        null=True,
+                        verbose_name="Locale modified",
+                    ),
+                ),
+                (
+                    "id",
+                    django_audit_fields.fields.uuid_auto_field.UUIDAutoField(
+                        blank=True,
+                        db_index=True,
+                        editable=False,
+                        help_text="System auto field. UUID primary key.",
+                    ),
+                ),
+                ("subject_identifier", models.CharField(db_index=True, max_length=50)),
+                ("report_model", models.CharField(max_length=150)),
+                ("report_datetime", models.DateTimeField(default=edc_utils.date.get_utcnow)),
+                ("note", models.TextField(blank=True, null=True)),
+                (
+                    "ogtt_base_datetime",
+                    models.DateTimeField(
+                        blank=True,
+                        help_text="(glucose solution given)",
+                        null=True,
+                        validators=[edc_model.validators.date.datetime_not_future],
+                        verbose_name="Date/time oral glucose solution given",
+                    ),
+                ),
+                (
+                    "ogtt_value",
+                    models.DecimalField(
+                        blank=True,
+                        decimal_places=2,
+                        help_text="A `HIGH` reading may be entered as 9999.99",
+                        max_digits=8,
+                        null=True,
+                        verbose_name="Blood glucose measure 2hrs <u>after</u> oral glucose solution given",
+                    ),
+                ),
+                (
+                    "ogtt_quantifier",
+                    models.CharField(
+                        choices=[
+                            ("=", "="),
+                            (">", ">"),
+                            (">=", ">="),
+                            ("<", "<"),
+                            ("<=", "<="),
+                        ],
+                        default="=",
+                        max_length=10,
+                    ),
+                ),
+                (
+                    "ogtt_units",
+                    models.CharField(
+                        choices=[
+                            ("mg/dL", "mg/dL"),
+                            ("mmol/L", "mmol/L (millimoles/L)"),
+                            ("N/A", "Not applicable"),
+                        ],
+                        default="N/A",
+                        max_length=15,
+                        verbose_name="Units (Blood glucose 2hrs after...)",
+                    ),
+                ),
+                (
+                    "ogtt_datetime",
+                    models.DateTimeField(
+                        blank=True,
+                        help_text="(2 hours after glucose solution given)",
+                        null=True,
+                        validators=[edc_model.validators.date.datetime_not_future],
+                        verbose_name="Date/time blood glucose measured 2hrs <u>after</u> oral glucose solution given",
+                    ),
+                ),
+                (
+                    "status",
+                    models.CharField(
+                        choices=[
+                            ("done", "Done"),
+                            ("PENDING", "Data is pending"),
+                            ("not_available", "Data not available"),
+                        ],
+                        default="done",
+                        max_length=25,
+                    ),
+                ),
+                (
+                    "history_id",
+                    models.UUIDField(
+                        default=uuid.uuid4, editable=False, primary_key=True, serialize=False
+                    ),
+                ),
+                ("history_date", models.DateTimeField(db_index=True)),
+                ("history_change_reason", models.CharField(max_length=100, null=True)),
+                (
+                    "history_type",
+                    models.CharField(
+                        choices=[("+", "Created"), ("~", "Changed"), ("-", "Deleted")],
+                        max_length=1,
+                    ),
+                ),
+                (
+                    "history_user",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="+",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    "site",
+                    models.ForeignKey(
+                        blank=True,
+                        db_constraint=False,
+                        null=True,
+                        on_delete=django.db.models.deletion.DO_NOTHING,
+                        related_name="+",
+                        to="sites.site",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "historical Screening: Missing OGTT Note",
+                "verbose_name_plural": "historical Screening: Missing OGTT Notes",
+                "ordering": ("-history_date", "-history_id"),
+                "get_latest_by": ("history_date", "history_id"),
+            },
+            bases=(simple_history.models.HistoricalChanges, models.Model),
+        ),
+        migrations.CreateModel(
+            name="MissingOgttNote",
+            fields=[
+                (
+                    "revision",
+                    django_revision.revision_field.RevisionField(
+                        blank=True,
+                        editable=False,
+                        help_text="System field. Git repository tag:branch:commit.",
+                        max_length=75,
+                        null=True,
+                        verbose_name="Revision",
+                    ),
+                ),
+                (
+                    "created",
+                    models.DateTimeField(
+                        blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
+                    ),
+                ),
+                (
+                    "modified",
+                    models.DateTimeField(
+                        blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
+                    ),
+                ),
+                (
+                    "user_created",
+                    django_audit_fields.fields.userfield.UserField(
+                        blank=True,
+                        help_text="Updated by admin.save_model",
+                        max_length=50,
+                        verbose_name="user created",
+                    ),
+                ),
+                (
+                    "user_modified",
+                    django_audit_fields.fields.userfield.UserField(
+                        blank=True,
+                        help_text="Updated by admin.save_model",
+                        max_length=50,
+                        verbose_name="user modified",
+                    ),
+                ),
+                (
+                    "hostname_created",
+                    models.CharField(
+                        blank=True,
+                        default=_socket.gethostname,
+                        help_text="System field. (modified on create only)",
+                        max_length=60,
+                        verbose_name="Hostname created",
+                    ),
+                ),
+                (
+                    "hostname_modified",
+                    django_audit_fields.fields.hostname_modification_field.HostnameModificationField(
+                        blank=True,
+                        help_text="System field. (modified on every save)",
+                        max_length=50,
+                        verbose_name="Hostname modified",
+                    ),
+                ),
+                (
+                    "device_created",
+                    models.CharField(blank=True, max_length=10, verbose_name="Device created"),
+                ),
+                (
+                    "device_modified",
+                    models.CharField(
+                        blank=True, max_length=10, verbose_name="Device modified"
+                    ),
+                ),
+                (
+                    "locale_created",
+                    models.CharField(
+                        blank=True,
+                        help_text="Auto-updated by Modeladmin",
+                        max_length=10,
+                        null=True,
+                        verbose_name="Locale created",
+                    ),
+                ),
+                (
+                    "locale_modified",
+                    models.CharField(
+                        blank=True,
+                        help_text="Auto-updated by Modeladmin",
+                        max_length=10,
+                        null=True,
+                        verbose_name="Locale modified",
+                    ),
+                ),
+                (
+                    "id",
+                    django_audit_fields.fields.uuid_auto_field.UUIDAutoField(
+                        blank=True,
+                        editable=False,
+                        help_text="System auto field. UUID primary key.",
+                        primary_key=True,
+                        serialize=False,
+                    ),
+                ),
+                ("subject_identifier", models.CharField(max_length=50, unique=True)),
+                ("report_model", models.CharField(max_length=150)),
+                ("report_datetime", models.DateTimeField(default=edc_utils.date.get_utcnow)),
+                ("note", models.TextField(blank=True, null=True)),
+                (
+                    "ogtt_base_datetime",
+                    models.DateTimeField(
+                        blank=True,
+                        help_text="(glucose solution given)",
+                        null=True,
+                        validators=[edc_model.validators.date.datetime_not_future],
+                        verbose_name="Date/time oral glucose solution given",
+                    ),
+                ),
+                (
+                    "ogtt_value",
+                    models.DecimalField(
+                        blank=True,
+                        decimal_places=2,
+                        help_text="A `HIGH` reading may be entered as 9999.99",
+                        max_digits=8,
+                        null=True,
+                        verbose_name="Blood glucose measure 2hrs <u>after</u> oral glucose solution given",
+                    ),
+                ),
+                (
+                    "ogtt_quantifier",
+                    models.CharField(
+                        choices=[
+                            ("=", "="),
+                            (">", ">"),
+                            (">=", ">="),
+                            ("<", "<"),
+                            ("<=", "<="),
+                        ],
+                        default="=",
+                        max_length=10,
+                    ),
+                ),
+                (
+                    "ogtt_units",
+                    models.CharField(
+                        choices=[
+                            ("mg/dL", "mg/dL"),
+                            ("mmol/L", "mmol/L (millimoles/L)"),
+                            ("N/A", "Not applicable"),
+                        ],
+                        default="N/A",
+                        max_length=15,
+                        verbose_name="Units (Blood glucose 2hrs after...)",
+                    ),
+                ),
+                (
+                    "ogtt_datetime",
+                    models.DateTimeField(
+                        blank=True,
+                        help_text="(2 hours after glucose solution given)",
+                        null=True,
+                        validators=[edc_model.validators.date.datetime_not_future],
+                        verbose_name="Date/time blood glucose measured 2hrs <u>after</u> oral glucose solution given",
+                    ),
+                ),
+                (
+                    "status",
+                    models.CharField(
+                        choices=[
+                            ("done", "Done"),
+                            ("PENDING", "Data is pending"),
+                            ("not_available", "Data not available"),
+                        ],
+                        default="done",
+                        max_length=25,
+                    ),
+                ),
+                (
+                    "site",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.PROTECT,
+                        related_name="+",
+                        to="sites.site",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "Screening: Missing OGTT Note",
+                "verbose_name_plural": "Screening: Missing OGTT Notes",
+                "abstract": False,
+                "default_permissions": ("add", "change", "delete", "view", "export", "import"),
+                "default_manager_name": "objects",
+                "indexes": [
+                    models.Index(
+                        fields=["modified", "created"], name="meta_report_modifie_4a4894_idx"
+                    ),
+                    models.Index(
+                        fields=["user_modified", "user_created"],
+                        name="meta_report_user_mo_5b8129_idx",
+                    ),
+                ],
+            },
+            managers=[
+                ("on_site", edc_sites.managers.CurrentSiteManager()),
+                ("objects", django.db.models.manager.Manager()),
+            ],
+        ),
+    ]

meta_reports/migrations/0036_historicalmissingogttnote_fasting_and_more.py

@@ -0,0 +1,86 @@
+# Generated by Django 5.0.8 on 2024-08-23 14:26
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_reports", "0035_historicalmissingogttnote_missingogttnote"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="historicalmissingogttnote",
+            name="fasting",
+            field=models.CharField(
+                choices=[("Yes", "Yes"), ("No", "No")],
+                max_length=15,
+                null=True,
+                verbose_name="Did the participant fast?",
+            ),
+        ),
+        migrations.AddField(
+            model_name="historicalmissingogttnote",
+            name="fasting_duration_delta",
+            field=models.DurationField(
+                blank=True,
+                help_text="system calculated to microseconds. (hours=microseconds/3.6e+9)",
+                null=True,
+            ),
+        ),
+        migrations.AddField(
+            model_name="historicalmissingogttnote",
+            name="fasting_duration_str",
+            field=models.CharField(
+                blank=True,
+                help_text="As reported by patient. Duration of fast. Format is `HHhMMm`. For example 1h23m, 12h7m, etc",
+                max_length=8,
+                null=True,
+                validators=[
+                    django.core.validators.RegexValidator(
+                        "^([0-9]{1,3}h([0-5]?[0-9]m)?)$",
+                        message="Invalid format. Expected something like 1h20m, 11h5m, etc. No spaces allowed.",
+                    )
+                ],
+                verbose_name="How long have they fasted in hours and/or minutes?",
+            ),
+        ),
+        migrations.AddField(
+            model_name="missingogttnote",
+            name="fasting",
+            field=models.CharField(
+                choices=[("Yes", "Yes"), ("No", "No")],
+                max_length=15,
+                null=True,
+                verbose_name="Did the participant fast?",
+            ),
+        ),
+        migrations.AddField(
+            model_name="missingogttnote",
+            name="fasting_duration_delta",
+            field=models.DurationField(
+                blank=True,
+                help_text="system calculated to microseconds. (hours=microseconds/3.6e+9)",
+                null=True,
+            ),
+        ),
+        migrations.AddField(
+            model_name="missingogttnote",
+            name="fasting_duration_str",
+            field=models.CharField(
+                blank=True,
+                help_text="As reported by patient. Duration of fast. Format is `HHhMMm`. For example 1h23m, 12h7m, etc",
+                max_length=8,
+                null=True,
+                validators=[
+                    django.core.validators.RegexValidator(
+                        "^([0-9]{1,3}h([0-5]?[0-9]m)?)$",
+                        message="Invalid format. Expected something like 1h20m, 11h5m, etc. No spaces allowed.",
+                    )
+                ],
+                verbose_name="How long have they fasted in hours and/or minutes?",
+            ),
+        ),
+    ]

meta_reports/migrations/0037_historicalmissingogttnote_result_status_and_more.py

@@ -0,0 +1,51 @@
+# Generated by Django 5.0.8 on 2024-08-23 14:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_reports", "0036_historicalmissingogttnote_fasting_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="historicalmissingogttnote",
+            name="result_status",
+            field=models.CharField(
+                choices=[("Yes", "Yes"), ("No", "No")],
+                default="Yes",
+                max_length=25,
+                verbose_name="Is the OGTT result available",
+            ),
+        ),
+        migrations.AddField(
+            model_name="missingogttnote",
+            name="result_status",
+            field=models.CharField(
+                choices=[("Yes", "Yes"), ("No", "No")],
+                default="Yes",
+                max_length=25,
+                verbose_name="Is the OGTT result available",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalmissingogttnote",
+            name="status",
+            field=models.CharField(
+                choices=[("COMPLETE", "Complete"), ("not_available", "Not available")],
+                default="done",
+                max_length=25,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="missingogttnote",
+            name="status",
+            field=models.CharField(
+                choices=[("COMPLETE", "Complete"), ("not_available", "Not available")],
+                default="done",
+                max_length=25,
+            ),
+        ),
+    ]

meta_reports/migrations/0038_alter_historicalmissingogttnote_fasting_and_more.py

@@ -0,0 +1,33 @@
+# Generated by Django 5.0.8 on 2024-08-23 15:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_reports", "0037_historicalmissingogttnote_result_status_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="historicalmissingogttnote",
+            name="fasting",
+            field=models.CharField(
+                choices=[("Yes", "Yes"), ("No", "No"), ("N/A", "Not applicable")],
+                default="N/A",
+                max_length=15,
+                verbose_name="Did the participant fast?",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="missingogttnote",
+            name="fasting",
+            field=models.CharField(
+                choices=[("Yes", "Yes"), ("No", "No"), ("N/A", "Not applicable")],
+                default="N/A",
+                max_length=15,
+                verbose_name="Did the participant fast?",
+            ),
+        ),
+    ]

meta_reports/models/__init__.py

@@ -1,5 +1,7 @@
 from .dbviews import (
+    NOTE_STATUSES,
     GlucoseSummary,
+    MissingOgttNote,
     MissingScreeningOgtt,
     PatientHistoryMissingBaselineCd4,
     UnattendedThreeInRow,

meta_reports/models/dbviews/__init__.py

@@ -1,5 +1,5 @@
 from .glucose_summary import GlucoseSummary
-from .missing_screening_ogtt import MissingScreeningOgtt
+from .missing_screening_ogtt import NOTE_STATUSES, MissingOgttNote, MissingScreeningOgtt
 from .patient_history_missing_baseline_cd4 import PatientHistoryMissingBaselineCd4
 from .unattended_three_in_row import UnattendedThreeInRow
 from .unattended_three_in_row2 import UnattendedThreeInRow2

meta_reports/models/dbviews/missing_screening_ogtt/__init__.py

@@ -1 +1,2 @@
+from .note_model import NOTE_STATUSES, MissingOgttNote
 from .unmanaged_model import MissingScreeningOgtt

meta_reports/models/dbviews/missing_screening_ogtt/note_model.py

@@ -0,0 +1,57 @@
+from django.db import models
+from edc_constants.choices import YES_NO, YES_NO_NA
+from edc_constants.constants import COMPLETE, DONE, NOT_APPLICABLE, NOT_AVAILABLE, YES
+from edc_glucose.model_mixins import (
+    fasting_model_mixin_factory,
+    ogtt_model_mixin_factory,
+)
+from edc_identifier.model_mixins import UniqueSubjectIdentifierFieldMixin
+from edc_model.models import BaseUuidModel, HistoricalRecords
+from edc_qareports.model_mixins import NoteModelMixin
+
+NOTE_STATUSES = (
+    (COMPLETE, "Complete"),
+    (NOT_AVAILABLE, "Not available"),
+)
+
+
+class MissingOgttNote(
+    fasting_model_mixin_factory(
+        None,
+        fasting=models.CharField(
+            verbose_name="Did the participant fast?",
+            max_length=15,
+            choices=YES_NO_NA,
+            default=NOT_APPLICABLE,
+            blank=False,
+        ),
+    ),
+    ogtt_model_mixin_factory("ogtt"),
+    UniqueSubjectIdentifierFieldMixin,
+    NoteModelMixin,
+):
+    """Model class to replace default `Note` model used with
+    QA Report 'Screening: Missing OGTT'.
+    """
+
+    result_status = models.CharField(
+        verbose_name="Is the OGTT result available", max_length=25, default=YES, choices=YES_NO
+    )
+
+    status = models.CharField(max_length=25, default=DONE, choices=NOTE_STATUSES)
+
+    history = HistoricalRecords()
+
+    def __str__(self) -> str:
+        return f"{self._meta.verbose_name}: {self.subject_identifier}"
+
+    def save(self, *args, **kwargs):
+        if self.result_status == YES:
+            self.status = COMPLETE
+        else:
+            self.status = NOT_AVAILABLE
+        super().save(*args, **kwargs)
+
+    class Meta(UniqueSubjectIdentifierFieldMixin.Meta, BaseUuidModel.Meta):
+        verbose_name = "Screening: Missing OGTT Note"
+        verbose_name_plural = "Screening: Missing OGTT Notes"

meta_reports/models/dbviews/missing_screening_ogtt/unmanaged_model.py

@@ -7,8 +7,6 @@ from .view_definition import get_view_definition
 
 class MissingScreeningOgtt(QaReportModelMixin, DBView):
 
-    screening_identifier = models.CharField(max_length=25)
-
     screening_datetime = models.DateTimeField(null=True)
 
     fbg_datetime = models.DateTimeField(null=True)

meta_reports/models/dbviews/missing_screening_ogtt/view_definition.py

@@ -4,8 +4,8 @@ mysql_view: str = """ # noqa
       from (
         select screening_identifier, site_id, report_datetime as 'screening_datetime', fbg_datetime,
         converted_fbg_value as fbg_value,  converted_ogtt_value as ogtt_value, repeat_glucose_performed as repeated,
-        p3_ltfu, fbg2_value, ogtt2_value, fbg2_datetime, ogtt2_datetime, consented, "" as subject_identifier,
-        id as original_id
+        p3_ltfu, fbg2_value, ogtt2_value, fbg2_datetime, ogtt2_datetime, consented,
+        screening_identifier as subject_identifier, id as original_id
         from meta_screening_subjectscreening
         where converted_fbg_value is not null and converted_ogtt_value is null and unsuitable_agreed != "Yes"
     ) as A
@@ -18,8 +18,8 @@ pg_view: str = """ # noqa
       from (
         select screening_identifier, site_id, report_datetime as 'screening_datetime', fbg_datetime,
         converted_fbg_value as fbg_value,  converted_ogtt_value as ogtt_value, repeat_glucose_performed as repeated,
-        p3_ltfu, fbg2_value, ogtt2_value, fbg2_datetime, ogtt2_datetime, consented, "" as subject_identifier,
-        id as original_id
+        p3_ltfu, fbg2_value, ogtt2_value, fbg2_datetime, ogtt2_datetime, consented,
+        screening_identifier as subject_identifier, id as original_id
         from meta_screening_subjectscreening
         where converted_fbg_value is not null and converted_ogtt_value is null and unsuitable_agreed != "Yes"
     ) as A
@@ -38,8 +38,8 @@ SELECT *, lower(
       from (
         select screening_identifier, site_id, report_datetime as 'screening_datetime', fbg_datetime,
         converted_fbg_value as fbg_value,  converted_ogtt_value as ogtt_value, fbg2_value, ogtt2_value,
-        repeat_glucose_performed as repeated, p3_ltfu, fbg2_datetime, ogtt2_datetime, consented, "" as subject_identifier,
-        id as original_id
+        repeat_glucose_performed as repeated, p3_ltfu, fbg2_datetime, ogtt2_datetime, consented,
+        screening_identifier as subject_identifier, id as original_id
         from meta_screening_subjectscreening
         where converted_fbg_value is not null and converted_ogtt_value is null and unsuitable_agreed != "Yes"
     ) as A