Fix #5188 - move predictions to bundle and don't render chart on pred…

…ictions offset change (#5395)

* Fix #5188 - move predictions to bundle and don't render chart on predictions offset change

* Fix predictions show for day to day

bundle/bundle.reports.source.js

@@ -1,6 +1,7 @@
 import './bundle.source';
 
 window.Nightscout.report_plugins = require('../lib/report_plugins/')();
+window.Nightscout.predictions = require('../lib/report/predictions');
 
 console.info('Nightscout report bundle ready');
 

lib/report/predictions.js

@@ -0,0 +1,33 @@
+var predictions = {
+    offset: 0,
+    backward: function () {
+        this.offset -= 5;
+        this.updateOffsetHtml();
+    },
+    forward: function () {
+        this.offset += 5;
+        this.updateOffsetHtml();
+    },
+    moreBackward: function () {
+        this.offset -= 30;
+        this.updateOffsetHtml();
+    },
+    moreForward: function () {
+        this.offset += 30;
+        this.updateOffsetHtml();
+    },
+    reset: function () {
+        this.offset = 0;
+        this.updateOffsetHtml();
+    },
+    updateOffsetHtml: function () {
+        $('#rp_predictedOffset').html(this.offset);
+    }
+};
+
+$(document).on('change', '#rp_optionspredicted', function() {
+    $('#rp_predictedSettings').toggle(this.checked);
+    predictions.reset();
+});
+
+module.exports = predictions;

lib/report_plugins/daytoday.js

@@ -55,11 +55,11 @@ daytoday.html = function html (client) {
     translate('Predictions offset') + ': ' +
     '<b><label id="rp_predictedOffset"></label> minutes</b>' +
     '&nbsp;&nbsp;&nbsp;&nbsp;' +
-    '<input type="button" onclick="predictMoreBackward();" value="' + translate('-30 min') + '">' +
-    '<input type="button" onclick="predictBackward();" value="' + translate('-5 min') + '">' +
-    '<input type="button" onclick="predictResetToZero();" value="' + translate('Zero') + '">' +
-    '<input type="button" onclick="predictForward();" value="' + translate('+5 min') + '">' +
-    '<input type="button" onclick="predictMoreForward();" value="' + translate('+30 min') + '">' +
+    '<input type="button" onclick="Nightscout.predictions.moreBackward();" value="' + translate('-30 min') + '">' +
+    '<input type="button" onclick="Nightscout.predictions.backward();" value="' + translate('-5 min') + '">' +
+    '<input type="button" onclick="Nightscout.predictions.reset();" value="' + translate('Zero') + '">' +
+    '<input type="button" onclick="Nightscout.predictions.forward();" value="' + translate('+5 min') + '">' +
+    '<input type="button" onclick="Nightscout.predictions.moreForward();" value="' + translate('+30 min') + '">' +
     '</div>' +
     '<br>' +
     '<div id="daytodaycharts">' +
@@ -363,15 +363,15 @@ daytoday.report = function report_daytoday (datastorage, sorteddaystoshow, optio
           var timestamp = treatmentsTimestamps[treatmentsIndex];
           // TODO refactor code so this is set here - now set as global in file loaded by the browser
           // eslint-disable-next-line no-undef
-          var predictedIndex = findPredicted(predictions, timestamp, predictedOffset); // Find predictions offset before or after timestamp
+          var predictedIndex = findPredicted(predictions, timestamp, Nightscout.predictions.offset); // Find predictions offset before or after timestamp
 
           if (predictedIndex != null) {
             entry = predictions[predictedIndex]; // Start entry
             var d = moment(entry.startDate);
             var end = moment().endOf('day');
             if (options.predictedTruncate) {
               // eslint-disable-next-line no-undef
-              if (predictedOffset >= 0) {
+              if (Nightscout.predictions.offset >= 0) {
                 // If we are looking forward we want to stop at the next treatment
                 if (treatmentsIndex < treatmentsTimestamps.length - 1) {
                   end = moment(treatmentsTimestamps[treatmentsIndex + 1]);

views/reportindex.html

@@ -128,7 +128,6 @@
     <script src="/socket.io/socket.io.js?v=<%= locals.cachebuster %>"></script>
     <script src="/report/js/report.js?v=<%= locals.cachebuster %>"></script>
     <script src="/report/js/flotcandle.js?v=<%= locals.cachebuster %>"></script>
-    <script src="/report/js/predictions.js?v=<%= locals.cachebuster %>"></script>
     <script src="/report/js/loopalyzer.js?v=<%= locals.cachebuster %>"></script>
   </main>
 </body>