clinicedc 2.0.31__tar.gz → 2.0.33__tar.gz

{clinicedc-2.0.31 → clinicedc-2.0.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clinicedc
-Version: 2.0.31
+Version: 2.0.33
 Summary: A clinical trials data management framework built on Django
 Keywords: django,clinicedc,edc,clinical trials,research,data management,esource
 Author: Erik van Widenfelt, Jonathan Willitts

{clinicedc-2.0.31 → clinicedc-2.0.33}/pyproject.toml

@@ -82,7 +82,7 @@ namespace = false
 
 [project]
 name = "clinicedc"
-version = "2.0.31"
+version = "2.0.33"
 description = "A clinical trials data management framework built on Django"
 readme = {file = "README.rst", content-type = "text/x-rst"}
 keywords = ["django", "clinicedc", "edc", "clinical trials", "research", "data management", "esource"]

{clinicedc-2.0.31 → clinicedc-2.0.33}/src/edc_qareports/admin/qa_report_log_admin.py

@@ -29,5 +29,8 @@ class QaReportLogAdmin(
 
     @admin.display(description="Report", ordering="report_model")
     def report(self, obj=None):
-        model_cls = django_apps.get_model(obj.report_model)
+        try:
+            model_cls = django_apps.get_model(obj.report_model)
+        except LookupError:
+            return obj.report_model
         return model_cls._meta.verbose_name

{clinicedc-2.0.31 → clinicedc-2.0.33}/src/edc_qareports/modeladmin_mixins/note_modeladmin_mixin.py

@@ -71,22 +71,31 @@ class NoteModelAdminMixin(
         "user_modified",
     )
 
-    search_fields = ("subject_identifier", "name")
+    search_fields = ("subject_identifier", "report_model")
 
-    @admin.display(description="Report", ordering="report_name")
+    @admin.display(description="Report", ordering="report_model")
     def report(self, obj=None):
-        app_label, model = obj.report_model_cls._meta.label_lower.split(".")
-        changelist_url = "_".join([app_label, model, "changelist"])
         try:
-            # assume admin site naming convention
-            url = reverse(f"{app_label}_admin:{changelist_url}")
-        except NoReverseMatch:
-            # TODO: find the admin site where this model is registered
-            url = "#"
-        return format_html(
-            '<a data-toggle="tooltip" title="go to report" href="{}?q={}">{}</a>',
-            *(url, obj.subject_identifier, obj.report_model_cls._meta.verbose_name),
-        )
+            app_label, model = obj.report_model_cls._meta.label_lower.split(".")
+        except (LookupError, ValueError):
+            pass
+        else:
+            changelist_url = "_".join([app_label, model, "changelist"])
+            try:
+                # assume admin site naming convention
+                url = reverse(f"{app_label}_admin:{changelist_url}")
+            except NoReverseMatch:
+                # TODO: find the admin site where this model is registered
+                pass
+            else:
+                return format_html(
+                    '<a data-toggle="tooltip" title="go to report" href='
+                    '"{url}?q={subject_identifier}">{report_model_cls}</a>',
+                    url=url,
+                    subject_identifier=obj.subject_identifier,
+                    report_model_cls=obj.report_model_cls._meta.verbose_name,
+                )
+        return obj.report_model
 
     @admin.display(description="QA Note", ordering="note")
     def report_note(self, obj=None):

{clinicedc-2.0.31 → clinicedc-2.0.33}/src/edc_qareports/modeladmin_mixins/on_study_missing_values_modeladmin_mixin.py

@@ -64,7 +64,7 @@ class OnStudyMissingValuesModelAdminMixin(
                 f"&appointment={self.related_visit(obj).appointment.id}"
                 f"&requisition={obj.original_id}"
             )
-            title = _("Add {}") % crf_model_cls._meta.verbose_name
+            title = _("Add {}").format(crf_model_cls._meta.verbose_name)
             label = _("Add CRF")
             crf_button = render_to_string(
                 "edc_qareports/columns/add_button.html",
@@ -80,7 +80,7 @@ class OnStudyMissingValuesModelAdminMixin(
                 f"{url}?next={self.admin_site.name}:"
                 f"{self.model._meta.label_lower.replace('.', '_')}_changelist"
             )
-            title = _("Change {}") % crf_model_cls._meta.verbose_name
+            title = _("Change {}").format(crf_model_cls._meta.verbose_name)
             label = _("Change CRF")
             crf_button = render_to_string(
                 "edc_qareports/columns/change_button.html",

{clinicedc-2.0.31 → clinicedc-2.0.33}/src/edc_qareports/modeladmin_mixins/qa_report_modeladmin_mixin.py

@@ -102,7 +102,7 @@ class QaReportModelAdminMixin:
         url = (
             f"{url}?next={next_url_name},subject_identifier,q"
             f"&subject_identifier={obj.subject_identifier}"
-            f"&report_model={obj.report_model}&q={obj.subject_identifier}"
+            f"&report_model={self.model._meta.label_lower}&q={obj.subject_identifier}"
         )
         label = self.get_notes_label(note_model_obj)
         context = dict(title=title, url=url, label=label)

{clinicedc-2.0.31 → clinicedc-2.0.33}/src/edc_qareports/utils.py

@@ -1,6 +1,5 @@
 import contextlib
 import sys
-from pathlib import Path
 from warnings import warn
 
 from django.apps import apps as django_apps
@@ -10,35 +9,6 @@ from django.db import OperationalError, connection
 from edc_auth.get_app_codenames import get_app_codenames
 
 
-def read_unmanaged_model_sql(
-    filename: str | None = None,
-    app_name: str | None = None,
-    fullpath: str | Path | None = None,
-) -> str:
-    """Wait, use DBView instead!!"""
-    uuid_func = "uuid()"
-    if settings.DATABASES["default"]["ENGINE"] == "django.db.backends.postgresql":
-        uuid_func = "gen_random_uuid()"
-
-    if not fullpath:
-        fullpath = Path(settings.BASE_DIR) / app_name / "models" / "unmanaged" / filename
-    else:
-        fullpath = Path(fullpath)
-
-    parsed_sql = []
-    with fullpath.open("r") as f:
-        for line in f:
-            line = line.split("#", maxsplit=1)[0]  # noqa: PLW2901
-            line = line.split("-- ", maxsplit=1)[0]  # noqa: PLW2901
-            line = line.replace("\n", "")  # noqa: PLW2901
-            line = line.strip()  # noqa: PLW2901
-            if line:
-                parsed_sql.append(line)
-
-    sql = " ".join(parsed_sql)
-    return sql.replace("uuid()", uuid_func)
-
-
 def get_qareports_codenames(app_name: str, *note_models: str) -> list[str]:
     warn(
         "This function has been deprecated. Use get_app_codenames.",