From bff17dd2a0a92eed88606c6bdac2e555d25e1ce5 Mon Sep 17 00:00:00 2001
From: "Christopher C. Wells" <chris@chrxs.net>
Date: Wed, 29 May 2019 09:47:21 -0700
Subject: [PATCH] Support two output formats from plotly.plot.

---
 reports/templates/reports/report_base.html |  3 +--
 reports/utils.py                           | 13 +++++++++----
 reports/views.py                           | 16 ++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/reports/templates/reports/report_base.html b/reports/templates/reports/report_base.html
index 8f584516..b31f62b8 100644
--- a/reports/templates/reports/report_base.html
+++ b/reports/templates/reports/report_base.html
@@ -25,6 +25,5 @@
 
 {% block javascript %}
     <script src="{% static "babybuddy/js/graph.js" %}"></script>
-    {{ js_graph|safe }}
-    {{ js_listener|safe }}
+    {{ js|safe }}
 {% endblock %}
\ No newline at end of file
diff --git a/reports/utils.py b/reports/utils.py
index 44ac2136..18f8c60c 100644
--- a/reports/utils.py
+++ b/reports/utils.py
@@ -79,10 +79,15 @@ def rangeselector_date():
 def split_graph_output(output):
     """
     Split out of a Plotly graph in to html and javascript.
+    This function accounts for two output formats from different Plotly
+    versions: one with a single <script> tag and one with two <script> tags.
     :param output: a string of html and javascript comprising the graph.
     :returns: a tuple of the the graph's html and javascript.
     """
-    html, js_graph, js_listener = output.split('<script')
-    js_graph = '<script' + js_graph
-    js_listener = '<script' + js_listener
-    return html, js_graph, js_listener
+    try:
+        html, js_graph, js_listener = output.split('<script')
+        js = js_graph + js_listener
+    except ValueError:
+        html, js = output.split('<script')
+    js = '<script' + js
+    return html, js
diff --git a/reports/views.py b/reports/views.py
index ebb8333e..cf5e92be 100644
--- a/reports/views.py
+++ b/reports/views.py
@@ -21,7 +21,7 @@ class DiaperChangeLifetimesChildReport(PermissionRequired403Mixin, DetailView):
         child = context['object']
         changes = models.DiaperChange.objects.filter(child=child)
         if changes and changes.count() > 1:
-            context['html'], context['js_graph'], context['js_listener'] = \
+            context['html'], context['js'] = \
                 graphs.diaperchange_lifetimes(changes)
         return context
 
@@ -40,7 +40,7 @@ class DiaperChangeTypesChildReport(PermissionRequired403Mixin, DetailView):
         child = context['object']
         changes = models.DiaperChange.objects.filter(child=child)
         if changes:
-            context['html'], context['js_graph'], context['js_listener'] = \
+            context['html'], context['js'] = \
                 graphs.diaperchange_types(changes)
         return context
 
@@ -64,8 +64,7 @@ class FeedingDurationChildReport(PermissionRequired403Mixin, DetailView):
         child = context['object']
         instances = models.Feeding.objects.filter(child=child)
         if instances:
-            context['html'], context['js_graph'], context['js_listener'] = \
-                graphs.feeding_duration(instances)
+            context['html'], context['js'] = graphs.feeding_duration(instances)
         return context
 
 
@@ -88,8 +87,7 @@ class SleepPatternChildReport(PermissionRequired403Mixin, DetailView):
         child = context['object']
         instances = models.Sleep.objects.filter(child=child).order_by('start')
         if instances:
-            context['html'], context['js_graph'], context['js_listener'] = \
-                graphs.sleep_pattern(instances)
+            context['html'], context['js'] = graphs.sleep_pattern(instances)
         return context
 
 
@@ -112,8 +110,7 @@ class SleepTotalsChildReport(PermissionRequired403Mixin, DetailView):
         child = context['object']
         instances = models.Sleep.objects.filter(child=child).order_by('start')
         if instances:
-            context['html'], context['js_graph'], context['js_listener'] = \
-                graphs.sleep_totals(instances)
+            context['html'], context['js'] = graphs.sleep_totals(instances)
         return context
 
 
@@ -131,6 +128,5 @@ class WeightWeightChildReport(PermissionRequired403Mixin, DetailView):
         child = context['object']
         objects = models.Weight.objects.filter(child=child)
         if objects:
-            context['html'], context['js_graph'], context['js_listener'] = \
-                graphs.weight_weight(objects)
+            context['html'], context['js'] = graphs.weight_weight(objects)
         return context