From 925d69c9438ac3d61cd811dcfa4ee00dd24d21bf Mon Sep 17 00:00:00 2001
From: Gertjan van den Burg <gertjanvandenburg@gmail.com>
Date: Fri, 7 Jun 2019 12:50:42 +0100
Subject: merge d3 code for maintainability

---
 app/templates/admin/annotations_by_dataset.html | 2 +-
 app/templates/annotate/index.html               | 2 +-
 app/templates/demo/evaluate.html                | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'app/templates')

diff --git a/app/templates/admin/annotations_by_dataset.html b/app/templates/admin/annotations_by_dataset.html
index 3b72801..2a609bf 100644
--- a/app/templates/admin/annotations_by_dataset.html
+++ b/app/templates/admin/annotations_by_dataset.html
@@ -16,7 +16,7 @@
 {{ super() }}
   <script src="//d3js.org/d3.v5.min.js"></script>
   <script src="{{ url_for('static', filename='js/makeChart.js') }}"></script>
-  <script>makeChartAnnotatedAdmin(
+  <script>adminViewAnnotations(
     '#graph',
     {{ data.chart_data | safe }},
     {{ data.annotations | safe }}
diff --git a/app/templates/annotate/index.html b/app/templates/annotate/index.html
index b26410c..47bc4f0 100644
--- a/app/templates/annotate/index.html
+++ b/app/templates/annotate/index.html
@@ -52,7 +52,7 @@
   <script src="{{ url_for('static', filename='js/makeChart.js') }}"></script>
   <script src="{{ url_for('static', filename='js/updateTable.js') }}"></script>
   <script src="{{ url_for('static', filename='js/buttons.js') }}"></script>
-  <script>makeChart("#graph", {{ data.chart_data | safe }});</script>
+  <script>annotateChart("#graph", {{ data.chart_data | safe }});</script>
   <script>
     // reset button
     var reset = document.getElementById("btn-reset");
diff --git a/app/templates/demo/evaluate.html b/app/templates/demo/evaluate.html
index b148f66..7f63033 100644
--- a/app/templates/demo/evaluate.html
+++ b/app/templates/demo/evaluate.html
@@ -34,13 +34,14 @@
 
 <script src="//d3js.org/d3.v5.min.js"></script>
 <script src="{{ url_for('static', filename='js/makeChart.js') }}"></script>
-<script>makeChartAnnotated(
+<script>viewAnnotations(
 	"#graph_user",
 	{{ data.chart_data | safe }},
 	{{ annotations_user | safe }}
 );
 </script>
-<script>makeChartAnnotated(
+<script>
+  viewAnnotations(
 	"#graph_true",
 	{{ data.chart_data | safe }},
 	{{ annotations_true | safe }}
-- 
cgit v1.2.3