GChart

tbnobody · May 21, 2023 · de9d471 · de9d471
1 parent 7133a4b
commit de9d471
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/webapp/index.html b/webapp/index.html
@@ -4,7 +4,9 @@
     <meta charset="UTF-8" />
     <link rel="icon" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
+    <script type="text/javascript" src="https://www.gstatic.com/charts/loader.js">
+      google.charts.load('current', { packages: ['corechart', 'bar'] });
+    </script>
     <title>OpenDTU</title>
   </head>
   <body>

diff --git a/webapp/src/components/DatabaseChart.vue b/webapp/src/components/DatabaseChart.vue
@@ -24,13 +24,6 @@ export default defineComponent({
             fetch("/api/database", { headers: authHeader() })
                 .then((response) => handleResponse(response, this.$emitter, this.$router))
                 .then((energy) => {
-                    var end = new Date()
-                    var start = new Date()
-                    var interval = 1
-                    start.setDate(end.getDate() - interval)
-                    start.setHours(start.getHours() - 1)
-                    google.charts.setOnLoadCallback(drawBasic());
-
                     function drawBasic() {
                         var data = new google.visualization.DataTable();
                         data.addColumn('datetime', 'Time');
@@ -67,6 +60,13 @@ export default defineComponent({
                         var chart = new google.visualization.ColumnChart(document.getElementById('chart_div'));
                         chart.draw(data, options);
                     }
+
+                    var end = new Date()
+                    var start = new Date()
+                    var interval = 1    // number of days to show in the chart
+                    start.setDate(end.getDate() - interval)
+                    start.setHours(start.getHours() - 1)
+                    google.charts.setOnLoadCallback(drawBasic());
                 });
         }
     }