From 682b0d5f402214a79707b0ae4cc4d1964e914ec2 Mon Sep 17 00:00:00 2001
From: Danny Peterson <dannypeterson28@gmail.com>
Date: Mon, 30 Oct 2023 13:28:46 -0400
Subject: [PATCH 1/2] added study summary exports

---
 .../assessment/assessment_downloads.html      | 42 +++++++++++++++----
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/hawc/apps/assessment/templates/assessment/assessment_downloads.html b/hawc/apps/assessment/templates/assessment/assessment_downloads.html
index cc875225a6..67f7941b64 100644
--- a/hawc/apps/assessment/templates/assessment/assessment_downloads.html
+++ b/hawc/apps/assessment/templates/assessment/assessment_downloads.html
@@ -76,6 +76,10 @@ <h3 class="card-header">Animal Bioassay</h3>
             {% url 'animal:api:assessment-endpoint-export' assessment.pk as the_url %}
             {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='animal-summary' button_text='Endpoint Summary' help_text="Endpoint-summary animal data." %}
           </li>
+          <li class="list-group-item">
+            {% url 'animal:api:assessment-study-heatmap' assessment.pk as the_url %}
+            {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='animal-study-summary' button_text='Study Summary' help_text="Study-summary animal data." %}
+          </li>
           {% endif %}
         </ul>
       </div>
@@ -89,18 +93,31 @@ <h3 class="card-header">Animal Bioassay</h3>
       <h3 class="card-header">Epidemiology</h3>
       <div class="card-body p-0">
         <ul class="list-group list-group-flush">
+          {% if not assessment.has_epi_data %}
           <li class="list-group-item">
-            {% if not assessment.has_epi_data %}
             <p class="text-muted">No data available.</p>
-            {% else %}
-            {% if assessment.epi_version == EpiVersion.V1 %}
+          </li>
+          {% else %}
+          {% if assessment.epi_version == EpiVersion.V1 %}
+          <li class="list-group-item">
             {% url 'epi:api:assessment-export' assessment.pk as the_url %}
-            {% elif assessment.epi_version == EpiVersion.V2 %}
+            {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='epi-data' button_text='Complete Export' help_text="All epidemiology data." %}
+          </li>
+          <li class="list-group-item">
+            {% url 'epi:api:assessment-study-heatmap' assessment.pk as the_url %}
+            {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='epi-study-design' button_text='Study Design' help_text="Epidemiology study design data." %}
+          </li>
+          {% elif assessment.epi_version == EpiVersion.V2 %}
+          <li class="list-group-item">
             {% url 'epiv2:api:assessment-export' assessment.pk as the_url %}
-            {% endif %}
             {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='epi-data' button_text='Complete Export' help_text="All epidemiology data." %}
-            {% endif %}
           </li>
+          <li class="list-group-item">
+            {% url 'epiv2:api:assessment-study-export' assessment.pk as the_url %}
+            {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='epi-study-design' button_text='Study Design' help_text="Epidemiology study design data." %}
+          </li>
+          {% endif %}
+          {% endif %}
         </ul>
       </div>
     </div>
@@ -147,13 +164,20 @@ <h3 class="card-header">In-vitro</h3>
       <h3 class="card-header">Ecological</h3>
       <div class="card-body p-0">
         <ul class="list-group list-group-flush">
+          {% if not assessment.has_eco_data %}
           <li class="list-group-item">
-            {% if not assessment.has_eco_data %}
             <p class="text-muted">No data available.</p>
-            {% else %}
+          </li>
+          {% else %}
+          <li class="list-group-item">
             {% url 'eco:api:assessment-export' assessment.pk as the_url %}
             {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='eco-data' button_text='Complete Export' help_text="All ecological data." %}
-            {% endif %}
+          </li>
+          <li class="list-group-item">
+            {% url 'eco:api:assessment-study-export' assessment.pk as the_url %}
+            {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='eco-study-summary' button_text='Study Summary' help_text="Ecology study summary data." %}
+          </li>
+          {% endif %}
           </li>
         </ul>
       </div>

From a8cce927aa30c9ebc685303332377426b5756dee Mon Sep 17 00:00:00 2001
From: Andy Shapiro <shapiromatron@gmail.com>
Date: Fri, 17 Nov 2023 13:36:58 -0500
Subject: [PATCH 2/2] minor revisions to help text

---
 .../assessment/assessment_downloads.html      | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/hawc/apps/assessment/templates/assessment/assessment_downloads.html b/hawc/apps/assessment/templates/assessment/assessment_downloads.html
index 67f7941b64..23e7d2dfc2 100644
--- a/hawc/apps/assessment/templates/assessment/assessment_downloads.html
+++ b/hawc/apps/assessment/templates/assessment/assessment_downloads.html
@@ -45,12 +45,12 @@ <h3 class="card-header">{{assessment.get_rob_name_display}}</h3>
           {% else %}
           <li class="list-group-item">
             {% url 'riskofbias:api:assessment-export' assessment.pk as the_url %}
-            {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='rob-final' button_text=assessment.get_rob_name_display|add:' Export' help_text="All final reviews." %}
+            {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='rob-final' button_text=assessment.get_rob_name_display|title|add:' Export' help_text="All final reviews." %}
           </li>
           {% if obj_perms.edit %}
           <li class="list-group-item">
             {% url 'riskofbias:api:assessment-full-export' assessment.pk as the_url %}
-            {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='rob-all' button_text='Complete '|add:assessment.get_rob_name_display|add:' Export' help_text="All reviews, including individual reviews. Team members only." %}
+            {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='rob-all' button_text='Complete '|add:assessment.get_rob_name_display|title|add:' Export' help_text="All reviews, including individual reviews. Team members only." %}
           </li>
           {% endif %}
           {% endif %}
@@ -70,15 +70,15 @@ <h3 class="card-header">Animal Bioassay</h3>
           {% else %}
           <li class="list-group-item">
             {% url 'animal:api:assessment-full-export' assessment.pk as the_url %}
-            {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='animal-data' button_text='Complete Export' help_text="Animal data." %}
+            {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='animal-data' button_text='Complete Export' help_text="Complete animal bioassay data export, where each row is a endpoint-group for all data extracted." %}
           </li>
           <li class="list-group-item">
-            {% url 'animal:api:assessment-endpoint-export' assessment.pk as the_url %}
-            {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='animal-summary' button_text='Endpoint Summary' help_text="Endpoint-summary animal data." %}
+            {% url 'animal:api:assessment-study-heatmap' assessment.pk as the_url %}
+            {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='animal-study-summary' button_text='Study Summary' help_text="Study-level summary of animal bioassy data, where each row is a study. Columns with multiple values are pipe \"|\" delimited." %}
           </li>
           <li class="list-group-item">
-            {% url 'animal:api:assessment-study-heatmap' assessment.pk as the_url %}
-            {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='animal-study-summary' button_text='Study Summary' help_text="Study-summary animal data." %}
+            {% url 'animal:api:assessment-endpoint-export' assessment.pk as the_url %}
+            {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='animal-summary' button_text='Endpoint Summary' help_text="Endpoint summary animal bioassay data, where each row is an extracted endpoint." %}
           </li>
           {% endif %}
         </ul>
@@ -101,20 +101,20 @@ <h3 class="card-header">Epidemiology</h3>
           {% if assessment.epi_version == EpiVersion.V1 %}
           <li class="list-group-item">
             {% url 'epi:api:assessment-export' assessment.pk as the_url %}
-            {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='epi-data' button_text='Complete Export' help_text="All epidemiology data." %}
+            {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='epi-data' button_text='Complete Export' help_text="Complete epidemiology export, where each row is an individual result associated with a health outcome." %}
           </li>
           <li class="list-group-item">
             {% url 'epi:api:assessment-study-heatmap' assessment.pk as the_url %}
-            {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='epi-study-design' button_text='Study Design' help_text="Epidemiology study design data." %}
+            {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='epi-study-design' button_text='Study Summary' help_text="Epidemiology study summary, where each row is a study. Columns with multiple values are pipe \"|\" delimited." %}
           </li>
           {% elif assessment.epi_version == EpiVersion.V2 %}
           <li class="list-group-item">
             {% url 'epiv2:api:assessment-export' assessment.pk as the_url %}
-            {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='epi-data' button_text='Complete Export' help_text="All epidemiology data." %}
+            {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='epi-data' button_text='Complete Export' help_text="Complete epidemiology export, where each row is an individual result associated with a health outcome." %}
           </li>
           <li class="list-group-item">
             {% url 'epiv2:api:assessment-study-export' assessment.pk as the_url %}
-            {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='epi-study-design' button_text='Study Design' help_text="Epidemiology study design data." %}
+            {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='epi-study-design' button_text='Study Summary' help_text="Epidemiology study summary, where each row is a study. Columns with multiple values are pipe \"|\" delimited." %}
           </li>
           {% endif %}
           {% endif %}