Merge branch 'update/report-layout-consistency' into develop

Author: JonathanWillitts

effect_reports/admin/baseline_vl_admin.py

@@ -10,8 +10,8 @@
     BaselineVlDiscrepancyDf,
     BaselineVlMissingQuantifierDf,
 )
+from ..modeladmin_mixins.baseline_vl_modeladmin_mixin import BaselineVlModelAdminMixin
 from ..models import BaselineVlAll, BaselineVlMissingQuantifier
-from .modeladmin_mixins import BaselineVlModelAdminMixin
 
 if TYPE_CHECKING:
     from django.db.models import QuerySet

effect_reports/admin/modeladmin_mixins.py

@@ -10,29 +10,31 @@
 
 from ...admin_site import effect_reports_admin
 from ...dataframes import SerumCragDateDf
+from ...modeladmin_mixins import EffectReportModelAdminMixin
 from ...models import SerumCragDate
 from .list_filters import SerumCragDateNoteStatusListFilter
 
 
 @admin.register(SerumCragDate, site=effect_reports_admin)
 class SerumCragDateAdmin(
+    EffectReportModelAdminMixin,
     QaReportModelAdminMixin,
     SiteModelAdminMixin,
     ModelAdminDashboardMixin,
     TemplatesModelAdminMixin,
     admin.ModelAdmin,
 ):
-    qa_report_list_display_insert_pos = 5
+    qa_report_list_display_insert_pos = 4
+    site_list_display_insert_pos = 1
     list_per_page = 25
     note_model = "effect_reports.serumcragdatenote"
     note_status_list_filter = SerumCragDateNoteStatusListFilter
 
     ordering = ("subject_identifier",)
     list_display = [
-        "dashboard",
-        "subject",
-        "screening",
+        "subject_dashboard",
         "site",
+        "screening",
         "serum_crag_date",
         "eligibility_date",
         "serum_crag_value",

effect_reports/admin/serum_crag_date_admin/serum_crag_date_admin.py

@@ -16,11 +16,13 @@
 
 from ...admin_site import effect_reports_admin
 from ...forms import SerumCragDateNoteForm
+from ...modeladmin_mixins import EffectReportModelAdminMixin
 from ...models import SerumCragDateNote
 
 
 @admin.register(SerumCragDateNote, site=effect_reports_admin)
 class SerumCragDateNoteAdmin(
+    EffectReportModelAdminMixin,
     SiteModelAdminMixin,
     ModelAdminDashboardMixin,
     ModelAdminAuditFieldsMixin,
@@ -66,8 +68,8 @@ class SerumCragDateNoteAdmin(
     )
 
     list_display = [
-        "dashboard",
-        "subject_identifier",
+        "subject_dashboard",
+        "site",
         "report",
         "status",
         "serum_crag_date",

effect_reports/admin/serum_crag_date_admin/serum_crag_date_note_admin.py

@@ -1,30 +1,33 @@
 from django.contrib import admin
-from django.core.exceptions import ObjectDoesNotExist
 from django.template.loader import render_to_string
-from django.urls import reverse
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
-from django.utils.translation import gettext_lazy as _
-from edc_appointment.models import Appointment
 from edc_model_admin.dashboard import ModelAdminDashboardMixin
 from edc_model_admin.mixins import TemplatesModelAdminMixin
 from edc_qareports.modeladmin_mixins import QaReportModelAdminMixin
 from edc_sites.admin import SiteModelAdminMixin
 from edc_visit_schedule.admin import ScheduleStatusListFilter
 
 from ...admin_site import effect_reports_admin
+from ...modeladmin_mixins import CrfReportModelAdminMixin, EffectReportModelAdminMixin
 from ...models import Rm792KwInCurrentSxGteG3Other
 
 
 @admin.register(Rm792KwInCurrentSxGteG3Other, site=effect_reports_admin)
 class Rm792KwInCurrentSxGteG3OtherAdmin(
+    CrfReportModelAdminMixin,
+    EffectReportModelAdminMixin,
     QaReportModelAdminMixin,
     SiteModelAdminMixin,
     ModelAdminDashboardMixin,
     TemplatesModelAdminMixin,
     admin.ModelAdmin,
 ):
+    crf_model = "effect_subject.signsandsymptoms"
+    qa_report_list_display_insert_pos = 4
+    site_list_display_insert_pos = 2
     list_per_page = 25
+
     change_list_note = format_html(
         "{html}",
         html=mark_safe(
@@ -37,9 +40,10 @@ class Rm792KwInCurrentSxGteG3OtherAdmin(
     ordering = ["site", "subject_identifier", "visit_code", "visit_code_sequence"]
 
     list_display = [
-        "dashboard",
+        "subject_dashboard",
+        "visit_dashboard",
         "site",
-        "subject_identifier",
+        "update_crf",
         "current_sx_gte_g3_other",
         "user_created",
         "user_modified",
@@ -56,25 +60,3 @@ class Rm792KwInCurrentSxGteG3OtherAdmin(
     ]
 
     search_fields = ["subject_identifier", "current_sx_gte_g3_other"]
-
-    def dashboard(self, obj=None, label=None) -> str:
-        kwargs = self.get_subject_dashboard_url_kwargs(obj)
-        try:
-            kwargs.update(
-                appointment=str(
-                    Appointment.objects.get(
-                        subject_identifier=obj.subject_identifier,
-                        visit_code=obj.visit_code,
-                        visit_code_sequence=obj.visit_code_sequence,
-                    ).id
-                )
-            )
-        except ObjectDoesNotExist:
-            pass
-        url = reverse(self.get_subject_dashboard_url_name(obj=obj), kwargs=kwargs)
-        context = dict(
-            title=_(f"Go to subject's dashboard@{obj.visit_code}.{obj.visit_code_sequence}"),
-            url=url,
-            label=_(f"Visit: {obj.visit_code}.{obj.visit_code_sequence}"),
-        )
-        return render_to_string("edc_subject_dashboard/dashboard_button.html", context=context)

effect_reports/admin/unmanaged/rm792_kw_in_current_sx_gte_g3_other_admin.py

@@ -1,29 +1,31 @@
 from django.contrib import admin
-from django.core.exceptions import ObjectDoesNotExist
 from django.template.loader import render_to_string
-from django.urls import reverse
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
-from django.utils.translation import gettext_lazy as _
-from edc_appointment.models import Appointment
 from edc_model_admin.dashboard import ModelAdminDashboardMixin
 from edc_model_admin.mixins import TemplatesModelAdminMixin
 from edc_qareports.modeladmin_mixins import QaReportModelAdminMixin
 from edc_sites.admin import SiteModelAdminMixin
 from edc_visit_schedule.admin import ScheduleStatusListFilter
 
 from ...admin_site import effect_reports_admin
+from ...modeladmin_mixins import CrfReportModelAdminMixin, EffectReportModelAdminMixin
 from ...models import Rm792KwInCurrentSxOther
 
 
 @admin.register(Rm792KwInCurrentSxOther, site=effect_reports_admin)
 class Rm792KwInCurrentSxOtherAdmin(
+    CrfReportModelAdminMixin,
+    EffectReportModelAdminMixin,
     QaReportModelAdminMixin,
     SiteModelAdminMixin,
     ModelAdminDashboardMixin,
     TemplatesModelAdminMixin,
     admin.ModelAdmin,
 ):
+    crf_model = "effect_subject.signsandsymptoms"
+    qa_report_list_display_insert_pos = 4
+    site_list_display_insert_pos = 2
     list_per_page = 25
 
     change_list_note = format_html(
@@ -36,9 +38,10 @@ class Rm792KwInCurrentSxOtherAdmin(
     ordering = ["site", "subject_identifier", "visit_code", "visit_code_sequence"]
 
     list_display = [
-        "dashboard",
+        "subject_dashboard",
+        "visit_dashboard",
         "site",
-        "subject_identifier",
+        "update_crf",
         "current_sx_other",
         "user_created",
         "user_modified",
@@ -55,25 +58,3 @@ class Rm792KwInCurrentSxOtherAdmin(
     ]
 
     search_fields = ["subject_identifier", "current_sx_other"]
-
-    def dashboard(self, obj=None, label=None) -> str:
-        kwargs = self.get_subject_dashboard_url_kwargs(obj)
-        try:
-            kwargs.update(
-                appointment=str(
-                    Appointment.objects.get(
-                        subject_identifier=obj.subject_identifier,
-                        visit_code=obj.visit_code,
-                        visit_code_sequence=obj.visit_code_sequence,
-                    ).id
-                )
-            )
-        except ObjectDoesNotExist:
-            pass
-        url = reverse(self.get_subject_dashboard_url_name(obj=obj), kwargs=kwargs)
-        context = dict(
-            title=_(f"Go to subject's dashboard@{obj.visit_code}.{obj.visit_code_sequence}"),
-            url=url,
-            label=_(f"Visit: {obj.visit_code}.{obj.visit_code_sequence}"),
-        )
-        return render_to_string("edc_subject_dashboard/dashboard_button.html", context=context)

effect_reports/admin/unmanaged/rm792_kw_in_current_sx_other_admin.py

@@ -21,6 +21,8 @@ def to_dataframe(self) -> pd.DataFrame:
             "id",
             "subject_identifier",
             "site_id",
+            "visit_code_str",
+            "visit_code_sequence",
             "has_viral_load_result",
             "viral_load_result",
             "viral_load_quantifier",
@@ -47,6 +49,8 @@ def to_model(self, model: str | None = None) -> None:
                 crf_id=row["id"],
                 subject_identifier=row["subject_identifier"],
                 site_id=row["site_id"],
+                visit_code=row["visit_code_str"],
+                visit_code_sequence=row["visit_code_sequence"],
                 # data
                 has_viral_load_result=row["has_viral_load_result"],
                 viral_load_result=(

effect_reports/dataframes/dataframe_mixins.py

@@ -0,0 +1,28 @@
+# Generated by Django 5.1.3 on 2025-01-23 11:46
+
+from django.db import migrations
+from edc_qareports.utils import read_unmanaged_model_sql
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("effect_reports", "0011_alter_baselinevldiscrepancy_options_and_more"),
+    ]
+
+    operations = [
+        migrations.RunSQL("drop view if exists rm792_kw_in_current_sx_other"),
+        migrations.RunSQL(
+            read_unmanaged_model_sql(
+                "rm792_kw_in_current_sx_other.sql",
+                app_name="effect_reports",
+            )
+        ),
+        migrations.RunSQL("drop view if exists rm792_kw_in_current_sx_gte_g3_other"),
+        migrations.RunSQL(
+            read_unmanaged_model_sql(
+                "rm792_kw_in_current_sx_gte_g3_other.sql",
+                app_name="effect_reports",
+            )
+        ),
+    ]