clinicedc 2.0.38__py3-none-any.whl → 2.0.39__py3-none-any.whl

{clinicedc-2.0.38.dist-info → clinicedc-2.0.39.dist-info}/METADATA

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

@@ -267,14 +267,14 @@ edc_adverse_event/templates/edc_adverse_event/tmg/ae_initial_panel.html,sha256=N
 edc_adverse_event/templates/edc_adverse_event/tmg/ae_tmg_panel.html,sha256=7-rLoycLwbTfS_jhtrnaijz-JzXU6Lf770u3-6bhGJY,1324
 edc_adverse_event/templates/edc_adverse_event/tmg/death_report_tmg_panel.html,sha256=c0iStnWnp4cZTgfSTCUXwAArGBcTobOd6DmextuSRDQ,1056
 edc_adverse_event/templates/edc_adverse_event/tmg/tmg_ae_listboard.html,sha256=jZePFCJmw2vyOOhiEsGHajjGsC2bWIXcs1_ZaUvqiU0,1634
-edc_adverse_event/templates/edc_adverse_event/tmg/tmg_ae_listboard_result.html,sha256=xHhwn3eMI2eocCZoEilVC41efUxGpuDLJzX3HxBhsew,7115
+edc_adverse_event/templates/edc_adverse_event/tmg/tmg_ae_listboard_result.html,sha256=oQ-H1tBdeNpL7rITVrDFIjqHT-J1aFWWwipChXdwPuw,7485
 edc_adverse_event/templates/edc_adverse_event/tmg/tmg_button_group.html,sha256=DMNRyZ7Cuw7-vypVgZGwq0turxBB03GNEOScQMfd5J4,611
 edc_adverse_event/templates/edc_adverse_event/tmg/tmg_death_listboard.html,sha256=O_C59xWQXlvEi2_LwS8O9uvpWwWqgACWnrqRG6FcGLs,3897
 edc_adverse_event/templates/edc_adverse_event/tmg/tmg_home.html,sha256=PKWAApGKIAuOie56W2v78iCGxa5RAU9Q0cy2HjHH3_c,2259
 edc_adverse_event/templates/edc_adverse_event/tmg/tmg_summary_listboard.html,sha256=xsYEOKCleUrui-qoSRmc03m5nDSX7Z_GerjFW0qKkHM,2609
 edc_adverse_event/templates/edc_adverse_event/tmg_button.html,sha256=SAmkTofVE_xJUg0uRXb2Yvrektz2Iv9NeQZDkJeLBak,259
 edc_adverse_event/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-edc_adverse_event/templatetags/edc_adverse_event_extras.py,sha256=9TMw955o9Fk3nUQGf6hit6fdP21n54l0IOigMp-_xlc,10942
+edc_adverse_event/templatetags/edc_adverse_event_extras.py,sha256=-2_f6j74JpsXXS82XaoqBjrqrx_XS1ck1e5DD-lNMBA,10712
 edc_adverse_event/urls.py,sha256=Ydl_1J9uwJ9LUrnj-lKcYgqShZ2d-531jApAr92bhjE,1609
 edc_adverse_event/utils.py,sha256=2Vg8QSKUn_8s5PkjdMmpIgrDpzG7-hV7MsseatGNbwk,4393
 edc_adverse_event/view_mixins/__init__.py,sha256=xoe3GWzdDZNyTnio5UG753K6wyz1hYNTvBc3a2y8acw,135
@@ -282,7 +282,7 @@ edc_adverse_event/view_mixins/ae/__init__.py,sha256=xfiZe1ODoybipoE6w63uaSIJ4eRO
 edc_adverse_event/view_mixins/ae/ae_listboard_view_mixin.py,sha256=x7FOH3lWsUrHXFxr7jDBs0tzJmlXXOfbVHIUdUUOHr8,4378
 edc_adverse_event/view_mixins/ae/death_report_listboard_view_mixin.py,sha256=TSl8tGgq5WSfPbm2TeSw0AbqbmGFMUHTqL-mPob_-aY,3985
 edc_adverse_event/view_mixins/tmg/__init__.py,sha256=MsVoPxr6Y6rqPXjCjt-VIBrroufCoxAA_puRNoHs08k,104
-edc_adverse_event/view_mixins/tmg/tmg_ae_listboard_view_mixin.py,sha256=N9k5rOhqRFPoN4nppTkyVHTWkDCH_JtsHiXGs4ju5Ik,3702
+edc_adverse_event/view_mixins/tmg/tmg_ae_listboard_view_mixin.py,sha256=llKQRE-2M41ztZPlNAvMNzPMSA87OyO-n8PPr1pqA2M,3799
 edc_adverse_event/view_utils/__init__.py,sha256=ijpMcBLMkYTNwmvPYH1TVVzMhz2wxBSk4NLCU_Rubwg,34
 edc_adverse_event/view_utils/tmg_button.py,sha256=DlmJLfKWACFkwVmHMwn9e89uABd9-ou0i5g3I0ZmITk,3800
 edc_adverse_event/views/__init__.py,sha256=PY-nkoQmCIlBR9MHq8x3TU_jeXvryx48AM728zkhtYg,207
@@ -3397,7 +3397,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.38.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
-clinicedc-2.0.38.dist-info/WHEEL,sha256=n2u5OFBbdZvCiUKAmfnY1Po2j3FB_NWfuUlt5WiAjrk,79
-clinicedc-2.0.38.dist-info/METADATA,sha256=EBx5cUsa4zeby9k1-F14UMMermcXqLgj9dOcNBBu8A0,15786
-clinicedc-2.0.38.dist-info/RECORD,,
+clinicedc-2.0.39.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+clinicedc-2.0.39.dist-info/WHEEL,sha256=n2u5OFBbdZvCiUKAmfnY1Po2j3FB_NWfuUlt5WiAjrk,79
+clinicedc-2.0.39.dist-info/METADATA,sha256=E4rU_JnaoIL39C_nqa7BaEa3cI1UKCyOrYzvSY2OIUM,15786
+clinicedc-2.0.39.dist-info/RECORD,,

edc_adverse_event/templates/edc_adverse_event/tmg/tmg_ae_listboard_result.html

@@ -13,12 +13,15 @@
       {% has_perms_for_tmg_role as may_access_page %}
       {% if may_access_page %}
         {% for result in results %}
+        {% with results_loop=forloop %}
           <div class="panel panel-default">
             <div class="panel-heading clearfix">
-              <span class="badge">{{ forloop.counter }}</span> <span class="text text-uppercase">{{ result.subject_identifier }}</span> {% copy_string_to_clipboard_button result.subject_identifier %} <span class="text text-muted small">{{ utc_date|timeuntil:result.report_datetime.date }} ago</span>
+              <span class="badge">{{ results_loop.counter }}</span> <span class="text text-uppercase">{{ result.subject_identifier }}</span> {% copy_string_to_clipboard_button result.subject_identifier %} <span class="text text-muted small">{{ utc_date|timeuntil:result.report_datetime.date }} ago</span>
               <span class="pull-right">
                 <div class="btn-group">
-                  <a class="btn btn-sm btn-default" role="button" title="Go to action item" href="{{ result.get_absolute_url }}?next={{ listboard_filter_url }},subject_identifier&subject_identifier={{ result.subject_identifier }}">{{ result.identifier }}</a>
+                    {%  if result.identifier %}
+                        <a class="btn btn-sm btn-default" role="button" title="Go to action item" href="{{ result.get_absolute_url }}?next={{ listboard_filter_url }},subject_identifier&subject_identifier={{ result.subject_identifier }}">{{ result.identifier }}</a>
+                    {%  endif %}
                   <a class="btn btn-sm btn-primary" role="button" title="go to list of reported visits for this subject" href="{% url subject_review_listboard_url|default:"subject_review_listboard_url_cannot_be_none" subject_identifier=result.subject_identifier %}?q={{ result.subject_identifier }}">Subject Review  <i class="fas fa-share fa-fw"></i></a>
                 </div>
               </span>
@@ -30,19 +33,18 @@
                 <div class="list-group">
                   <div class="list-group-item list-group-item-default"><i class="fa-solid fa-folder-tree fa-fw"></i> TMG documents in workflow </div>
 
-                {# {% render_tmg_panel action_item=result by_user_created_only=True counter=forloop.counter report_status=result.reference_obj.report_status next_url_name=listboard_filter_url %} #}
+                {# {% render_tmg_panel action_item=result by_user_created_only=True counter=results_loop.counter report_status=result.reference_obj.report_status next_url_name=listboard_filter_url %} #}
 
                 {# AE TMG #}
-                {% ae_tmg_queryset subject_identifier=result.subject_identifier as qs %}
-                {% if qs.count == 0 %}
-                  {% ae_tmg_action_item subject_identifier=result.subject_identifier as tmg_action_item %}
-                  {% if tmg_action_item %}
-                    {% render_tmg_panel action_item=tmg_action_item by_user_created_only=True counter=forloop.counter report_status=result.reference_obj.report_status next_url_name=listboard_filter_url %}
-                  {% endif %}
-                {% else %}
-                  {% for ae_tmg in qs %}
-                    {% render_tmg_panel reference_obj=ae_tmg by_user_created_only=True counter=forloop.counter next_url_name=listboard_filter_url %}
-                  {% endfor %}
+                {% ae_tmg_action_item_queryset result.subject_identifier status as ae_tmg_action_item_qs %}
+                {% for ae_tmg_action_item in ae_tmg_action_item_qs %}
+                  {% render_tmg_panel action_item=ae_tmg_action_item by_user_created_only=True counter=results_loop.counter report_status=result.reference_obj.report_status next_url_name=listboard_filter_url %}
+                {% endfor %}
+                {% if status != NEW %}
+                {% ae_tmg_queryset subject_identifier=result.subject_identifier as ae_tmg_qs %}
+                {% for ae_tmg in ae_tmg_qs %}
+                  {% render_tmg_panel reference_obj=ae_tmg by_user_created_only=True counter=results_loop.counter next_url_name=listboard_filter_url %}
+                {% endfor %}
                 {% endif %}
 
                 {# DEATH REPORT TMG #}
@@ -50,11 +52,11 @@
                 {% if qs.count == 0 %}
                   {% death_report_tmg_action_item subject_identifier=result.subject_identifier as tmg_action_item %}
                   {% if tmg_action_item %}
-                    {% render_tmg_panel action_item=tmg_action_item by_user_created_only=True counter=forloop.counter report_status=result.reference_obj.report_status next_url_name=listboard_filter_url %}
+                    {% render_tmg_panel action_item=tmg_action_item by_user_created_only=True counter=results_loop.counter report_status=result.reference_obj.report_status next_url_name=listboard_filter_url %}
                   {% endif %}
                 {% else %}
                   {% for death_report_tmg in qs %}
-                    {% render_tmg_panel reference_obj=death_report_tmg by_user_created_only=True counter=forloop.counter next_url_name=listboard_filter_url %}
+                    {% render_tmg_panel reference_obj=death_report_tmg by_user_created_only=True counter=results_loop.counter next_url_name=listboard_filter_url %}
                   {% endfor %}
                 {% endif %}
 
@@ -63,11 +65,11 @@
                 {% if qs.count == 0 %}
                   {% death_report_tmg_second_action_item subject_identifier=result.subject_identifier as tmg_action_item %}
                   {% if tmg_action_item %}
-                    {% render_tmg_panel action_item=tmg_action_item by_user_created_only=True counter=forloop.counter report_status=result.reference_obj.report_status next_url_name=listboard_filter_url %}
+                    {% render_tmg_panel action_item=tmg_action_item by_user_created_only=True counter=results_loop.counter report_status=result.reference_obj.report_status next_url_name=listboard_filter_url %}
                   {% endif %}
                 {% else %}
                   {% for death_report_tmg in qs %}
-                    {% render_tmg_panel reference_obj=death_report_tmg by_user_created_only=True counter=forloop.counter next_url_name=listboard_filter_url %}
+                    {% render_tmg_panel reference_obj=death_report_tmg by_user_created_only=True counter=results_loop.counter next_url_name=listboard_filter_url %}
                   {% endfor %}
                 {% endif %}
 
@@ -80,12 +82,13 @@
                 <div class="list-group">
                   {# AE INTIAL #}
                   <div class="list-group-item"><i class="fa-regular fa-file fa-fw"></i> First document in workflow</div>
-                  {% if result.parent_action_item %}
-                    {% render_tmg_panel action_item=result.parent_action_item counter=forloop.counter next_url_name=listboard_filter_url %}
+                    {% ae_tmg_action_item_queryset result.subject_identifier status as ae_tmg_action_item_qs %}
+                    {% for ae_tmg_action_item in ae_tmg_action_item_qs %}
+                        {% render_tmg_panel action_item=ae_tmg_action_item.parent_action_item counter=results_loop.counter next_url_name=listboard_filter_url %}
+                    {% endfor %}
                     {% if result.related_action_item and result.parent_action_item.reference_obj.action_identifier != result.related_action_item.reference_obj.action_identifier %}
-                      {% render_tmg_panel action_item=result.related_action_item counter=forloop.counter next_url_name=listboard_filter_url %}
+                      {% render_tmg_panel action_item=result.related_action_item counter=results_loop.counter next_url_name=listboard_filter_url %}
                     {% endif %}
-                  {% endif %}
                 </div>
               </div>
 
@@ -97,12 +100,12 @@
                 {% ae_followup_queryset ae_initial=result.parent_action_item.reference_obj as qs %}
                 {% if qs.count == 0 %}<div class="list-group-item">There are no follow-ups to this AE</div>{% endif  %}
                 {% for ae_followup in qs %}
-                  {% render_tmg_panel reference_obj=ae_followup counter=forloop.counter next_url_name=listboard_filter_url %}
+                  {% render_tmg_panel reference_obj=ae_followup counter=results_loop.counter next_url_name=listboard_filter_url %}
                 {% endfor %}
 
                 {% death_report_queryset subject_identifier=result.subject_identifier as qs %}
                 {% for death_report in qs %}
-                  {% render_tmg_panel reference_obj=death_report counter=forloop.counter next_url_name=listboard_filter_url %}
+                  {% render_tmg_panel reference_obj=death_report counter=results_loop.counter next_url_name=listboard_filter_url %}
                 {% endfor %}
                 </div>
 
@@ -110,6 +113,7 @@
             </div>
             </div>
           </div>
+        {% endwith %}
         {% endfor %}
       {% else %}
         <div class="alert alert-danger">

edc_adverse_event/templatetags/edc_adverse_event_extras.py

@@ -88,15 +88,13 @@ def format_ae_description(context, ae_initial, wrap_length):
     context["YES"] = YES
     context["ae_initial"] = ae_initial
     try:
-        context["sae_reason"] = format_html(
-            "{}",
-            mark_safe(wrapx(escape_braces(ae_initial.sae_reason.name), wrap_length)),  # nosec B703, B308
+        context["sae_reason"] = mark_safe(  # noqa: S308
+            wrapx(escape_braces(ae_initial.sae_reason.name), wrap_length)
         )
     except AttributeError:
         context["sae_reason"] = ""
-    context["ae_description"] = format_html(
-        "{}",
-        mark_safe(wrapx(escape_braces(ae_initial.ae_description), wrap_length)),  # nosec B703, B308
+    context["ae_description"] = mark_safe(
+        wrapx(escape_braces(ae_initial.ae_description), wrap_length)
     )
     return context
 
@@ -111,11 +109,8 @@ def format_ae_followup_description(context, ae_followup, wrap_length):
     context["ae_followup"] = ae_followup
     context["ae_initial"] = ae_followup.ae_initial
     try:
-        context["sae_reason"] = format_html(
-            "{}",
-            mark_safe(
-                wrapx(escape_braces(ae_followup.ae_initial.sae_reason.name), wrap_length)
-            ),  # nosec B703, B308
+        context["sae_reason"] = mark_safe(  # noqa: S308
+            wrapx(escape_braces(ae_followup.ae_initial.sae_reason.name), wrap_length)
         )
     except AttributeError:
         context["sae_reason"] = ""
@@ -177,55 +172,47 @@ def render_death_report_tmg_panel(context, action_item: ActionItem = None):
 
 
 @register.simple_tag
-def ae_tmg_queryset(subject_identifier: str = None) -> QuerySet[DeathReportTmgModel]:
+def ae_tmg_queryset(subject_identifier) -> QuerySet[DeathReportTmgModel]:
     return get_ae_model("aetmg").objects.filter(subject_identifier=subject_identifier)
 
 
 @register.simple_tag
-def death_report_tmg_queryset(
-    subject_identifier: str = None,
-) -> QuerySet[DeathReportTmgModel]:
+def death_report_tmg_queryset(subject_identifier: str) -> QuerySet[DeathReportTmgModel]:
     return get_ae_model("deathreporttmg").objects.filter(subject_identifier=subject_identifier)
 
 
 @register.simple_tag
-def death_report_tmg2_queryset(
-    subject_identifier: str = None,
-) -> QuerySet[DeathReportTmgSecondModel]:
+def death_report_tmg2_queryset(subject_identifier: str) -> QuerySet[DeathReportTmgSecondModel]:
     return get_ae_model("deathreporttmgsecond").objects.filter(
         subject_identifier=subject_identifier
     )
 
 
 @register.simple_tag
-def death_report_queryset(
-    subject_identifier: str = None,
-) -> QuerySet[DeathReportTmgSecondModel]:
+def death_report_queryset(subject_identifier: str) -> QuerySet[DeathReportTmgSecondModel]:
     return get_ae_model("deathreport").objects.filter(subject_identifier=subject_identifier)
 
 
 @register.simple_tag
 def ae_followup_queryset(
     ae_initial: AeInitialModel = None,
-) -> QuerySet[AeFollowupModel] | None:
+) -> QuerySet[AeFollowupModel]:
     if ae_initial:
         return get_ae_model("aefollowup").objects.filter(ae_initial_id=ae_initial.id)
-    return None
+    return get_ae_model("aefollowup").objects.none()
 
 
 @register.simple_tag
-def ae_tmg_action_item(subject_identifier: str = None) -> ActionItem:
-    try:
-        obj = django_apps.get_model("edc_action_item.actionitem").objects.get(
-            subject_identifier=subject_identifier, action_type__name=AE_TMG_ACTION
-        )
-    except ObjectDoesNotExist:
-        obj = None
-    return obj
+def ae_tmg_action_item_queryset(subject_identifier: str, *status) -> QuerySet[ActionItem]:
+    return django_apps.get_model("edc_action_item.actionitem").objects.filter(
+        subject_identifier=subject_identifier,
+        action_type__name=AE_TMG_ACTION,
+        status__in=status,
+    )
 
 
 @register.simple_tag
-def death_report_tmg_action_item(subject_identifier: str = None) -> ActionItem:
+def death_report_tmg_action_item(subject_identifier: str) -> ActionItem:
     try:
         obj = django_apps.get_model("edc_action_item.actionitem").objects.get(
             subject_identifier=subject_identifier,
@@ -237,7 +224,7 @@ def death_report_tmg_action_item(subject_identifier: str = None) -> ActionItem:
 
 
 @register.simple_tag
-def death_report_tmg_second_action_item(subject_identifier: str = None) -> ActionItem:
+def death_report_tmg_second_action_item(subject_identifier: str) -> ActionItem:
     try:
         obj = django_apps.get_model("edc_action_item.actionitem").objects.get(
             subject_identifier=subject_identifier,
@@ -265,7 +252,7 @@ def render_tmg_panel(
     reference_obj = reference_obj or get_reference_obj(action_item)
     if not action_item and reference_obj:
         action_item = reference_obj.action_item
-    disable_all = True if not has_valid_tmg_perms(request=context["request"]) else False
+    disable_all = bool(not has_valid_tmg_perms(request=context["request"]))
     if action_item:
         params = dict(
             user=context["request"].user,

edc_adverse_event/view_mixins/tmg/tmg_ae_listboard_view_mixin.py

@@ -7,6 +7,7 @@ from django.utils import timezone
 
 from edc_constants.constants import CLOSED, NEW, OPEN
 from edc_dashboard.view_mixins import EdcViewMixin
+from edc_export.constants import CANCELLED
 from edc_listboard.view_mixins import ListboardFilterViewMixin, SearchFormViewMixin
 from edc_listboard.views import ListboardView as BaseListboardView
 from edc_navbar import NavbarViewMixin
@@ -51,24 +52,26 @@ class TmgAeListboardViewMixin(
     ordering = "-report_datetime"
     paginate_by = 10
     search_form_url = "tmg_ae_listboard_url"
-    action_type_names = [
+    action_type_names = (
         AE_TMG_ACTION,
         DEATH_REPORT_TMG_ACTION,
         DEATH_REPORT_TMG_SECOND_ACTION,
-    ]
+    )
 
-    search_fields = [
+    search_fields = (
         "subject_identifier",
         "action_identifier",
         "parent_action_item__action_identifier",
         "related_action_item__action_identifier",
         "user_created",
         "user_modified",
-    ]
+    )
 
     def get_context_data(self, **kwargs) -> dict[str, Any]:
         kwargs.update(
             AE_TMG_ACTION=AE_TMG_ACTION,
+            NEW=NEW,
+            CANCELLED=CANCELLED,
             utc_date=timezone.now().date(),
             subject_identifier=self.kwargs.get("subject_identifier"),
         )