clinicedc 2.0.32__py3-none-any.whl → 2.0.33__py3-none-any.whl

{clinicedc-2.0.32.dist-info → clinicedc-2.0.33.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clinicedc
-Version: 2.0.32
+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.32.dist-info → clinicedc-2.0.33.dist-info}/RECORD

@@ -2701,7 +2701,7 @@ edc_pylabels/urls.py,sha256=p8L566pZflE79QYdJUs9YvaOTlvrdzaqvnW9T7PxC44,271
 edc_qareports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edc_qareports/admin/__init__.py,sha256=uMV0BL6QaXUXF8-DCY05Js5IAjWmkyPUsUYEQ6gcvp0,159
 edc_qareports/admin/note_modeladmin.py,sha256=VwQOmbF_guL6GF6jQEx4JeccOfqbIkmOyYGngqQ3ozI,439
-edc_qareports/admin/qa_report_log_admin.py,sha256=904nUFb-Q1YUGMrl_LV0PTMDrGlZ6vRTCsmDzE4pnWE,1086
+edc_qareports/admin/qa_report_log_admin.py,sha256=grjcff_53Ys-w3XSw_-HylrpRDYkdbCDi6b0KFhM2qc,1167
 edc_qareports/admin/qa_report_log_summary_admin.py,sha256=RkUfFt8bPBWNMkM6rLI3Jd7ZqtdzODzZc-kSCh14yWM,1775
 edc_qareports/admin_site.py,sha256=k8Yvg_O20dL__6SiSenzN1zTkNUmqKvUwdhdszC4HPo,171
 edc_qareports/apps.py,sha256=5Zv59kZ9ZSvNDtt2cgKqneZPHFkMPUIXRIaghDrUoco,228
@@ -2739,9 +2739,9 @@ edc_qareports/model_mixins/qa_report_model_mixin.py,sha256=_h3CluFJtUXNtwK9KKWUf
 edc_qareports/model_mixins/qa_reports_permissions.py,sha256=aHJHGBoCZh6BnFbTmAcVVr_KkjlstjN3vIvRYHb-jcc,60
 edc_qareports/modeladmin_mixins/__init__.py,sha256=VAYuotQzLzi1_4LMOGY86fE_QKYrfB4uwOn2V3tkzpA,265
 edc_qareports/modeladmin_mixins/list_filters.py,sha256=xAbbtgLzaCM1sHEtDSMMHIhXp4KmrAIREHcOAloXmnI,2326
-edc_qareports/modeladmin_mixins/note_modeladmin_mixin.py,sha256=MP_o1bJcaeOBvH32DYBpJ-6A05hF8g2h7Fsu0V2JEDI,3099
+edc_qareports/modeladmin_mixins/note_modeladmin_mixin.py,sha256=jCWOdllQHR84rzRoZr01ejt3BSC_Thdz8WZbGACzYuY,3440
 edc_qareports/modeladmin_mixins/on_study_missing_values_modeladmin_mixin.py,sha256=YM-m7mcARIIy5R_jpTXHJvovccRIt6bYW9obrSTVycM,5310
-edc_qareports/modeladmin_mixins/qa_report_modeladmin_mixin.py,sha256=hI22nUr46WDqzZ32xbYHHlRqryzZFd4dQU-HvirkjUg,4443
+edc_qareports/modeladmin_mixins/qa_report_modeladmin_mixin.py,sha256=jCR42WCLfLTCMrGULRsfzXZZuYjc2Ql2zOU5shVfv2Y,4455
 edc_qareports/models/__init__.py,sha256=pRuBhzApuoGnrCRXqxJTMuNoCtb19JeXPGNte8sJXy8,147
 edc_qareports/models/dbviews/__init__.py,sha256=wlvpUL50RQg547kNp3OFu-SKxxn72SVZy90XPm5cx4A,48
 edc_qareports/models/dbviews/unmanaged_model.py,sha256=ZixcNynS8LvTjUMu3jGwE8ZSfClSSbsl3g39jPTcEIM,834
@@ -2762,7 +2762,7 @@ edc_qareports/templates/edc_qareports/columns/notes_column.html,sha256=BdBBOV6sH
 edc_qareports/templates/edc_qareports/columns/subject_identifier_column.html,sha256=wiAU6V44fOu21UNPFo7wUyACVJk-S_or5qNc3V7q5Vc,110
 edc_qareports/templates/edc_qareports/qa_report_note.html,sha256=FnHwiHvucF90gnQZzzpCDQMo2OkaX8eIc4apMOqi3gE,57
 edc_qareports/urls.py,sha256=2QK5ajM8JPflnnp-nPybb9n_SxUZF-tzoW0WpcpFFZs,296
-edc_qareports/utils.py,sha256=W7DCEOl2BQrWHUJAWIJikIMy3vxP-6aYOkaumSCFOY4,4208
+edc_qareports/utils.py,sha256=BB6y79Im6gCLezYTyaoE2Sp5KUgDFFK_dUt87rC6Ubo,3235
 edc_randomization/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edc_randomization/admin.py,sha256=g9x71IyTXgcrg8dNL_kJ1lSU2asfC-GqlMv62jofFuM,5939
 edc_randomization/admin_site.py,sha256=FC1NwilwEAiUkD8ZrXARElDHugMrzmfL_CPrKR8_MP8,185
@@ -3407,7 +3407,7 @@ edc_vitals/models/fields/waist_circumference.py,sha256=fZcHFDdEwWLjIVLktKrFCD9UU
 edc_vitals/models/fields/weight.py,sha256=zo9_9e3Cpu0UqoRbWS-iDkcDo6fK80b1dDQy4x4MyxE,921
 edc_vitals/utils.py,sha256=vXid44KUXxeaSyund_y5MNXc5DFJs052_PwUAjszE2k,1384
 edc_vitals/validators.py,sha256=vNiElWMs0rRnHRNuVoPLRf0rW_C_0xcfUyep1Y_Si5s,156
-clinicedc-2.0.32.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
-clinicedc-2.0.32.dist-info/WHEEL,sha256=-neZj6nU9KAMg2CnCY6T3w8J53nx1kFGw_9HfoSzM60,79
-clinicedc-2.0.32.dist-info/METADATA,sha256=IdewcHEHsn5lr6e5b3iaGZE2G_Muxe_3IXaJ2cIEXMs,15786
-clinicedc-2.0.32.dist-info/RECORD,,
+clinicedc-2.0.33.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+clinicedc-2.0.33.dist-info/WHEEL,sha256=-neZj6nU9KAMg2CnCY6T3w8J53nx1kFGw_9HfoSzM60,79
+clinicedc-2.0.33.dist-info/METADATA,sha256=ml2fbYmxuTi1ozeDplutvnHplki3rLg7XroQiqcxP6A,15786
+clinicedc-2.0.33.dist-info/RECORD,,

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

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):

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)

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.",