Merge pull request #8 from edilytics/web_report_refactor

Cup script and if htmls statement
edilytics · Aug 3, 2023 · 69cb5e2 · 69cb5e2
2 parents ab74bc6 + d66ed48
commit 69cb5e2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/templates/layout.html b/templates/layout.html
@@ -23,6 +23,7 @@
 
     <script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
     <script src="https://cdn.plot.ly/plotly-2.11.1.min.js"></script>
+    <script src="/static/js/htmx-1.9.1.min.js"></script>
     <style>
       body {
         font-family: 'Montserrat', sans-serif !important;

diff --git a/templates/shared/partials/fig_summaries.html b/templates/shared/partials/fig_summaries.html
@@ -1,11 +1,11 @@
-<div id="fig_summary_{{plot_name}}">
-    {% if report_data['htmls'][plot_name] %}
-        {{report_data['htmls'][plot_name]|safe}}
-    {% else %}
-        <a href="{{report_data['crispresso_data_path']}}{{plot_name}}.pdf"><img src="{{report_data['crispresso_data_path']}}{{plot_name}}.png" width='70%'></a>
-    {% endif %}
-    <label class="labelpadding">{{report_data['labels'][plot_name]}}</label>
-    {% for (data_label,data_path) in report_data['datas'][plot_name] %}
-        <p class="m-0"><small>Data: <a href="{{report_data['crispresso_data_path']}}{{data_path}}">{{data_label}}</a></small></p>
-    {% endfor %}
-</div>
+<div id="fig_summary_{{plot_name}}">
+    {% if report_data['htmls'] and report_data['htmls'][plot_name]%}
+        {{report_data['htmls'][plot_name]|safe}}
+    {% else %}
+        <a href="{{report_data['crispresso_data_path']}}{{plot_name}}.pdf"><img src="{{report_data['crispresso_data_path']}}{{plot_name}}.png" width='70%'></a>
+    {% endif %}
+    <label class="labelpadding">{{report_data['labels'][plot_name]}}</label>
+    {% for (data_label,data_path) in report_data['datas'][plot_name] %}
+        <p class="m-0"><small>Data: <a href="{{report_data['crispresso_data_path']}}{{data_path}}">{{data_label}}</a></small></p>
+    {% endfor %}
+</div>