Fix display of data from Functions on the Live Page

kizniche · Dec 24, 2023 · 455c55b · 455c55b
1 parent 999ec09
commit 455c55b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
  - Fix inability to properly import settings backup
  - Fix Actions not executing for MQTT, TTN, and Python Code Inputs ([#1336](https://github.com/kizniche/Mycodo/issues/1336))
  - Fix running pylint
+ - Fix display of data from Functions on the Live Page
 
 ### Features
 

diff --git a/mycodo/mycodo_flask/templates/pages/live.html b/mycodo/mycodo_flask/templates/pages/live.html
@@ -13,7 +13,8 @@
       $.ajax(url, {
         success: function(data, responseText, jqXHR) {
           if (jqXHR.status === 204) {
-            document.getElementById(measure_string + "-time").innerHTML = "No Data Last " + period.toString() + " sec";
+            if (period === 0) document.getElementById(measure_string + "-time").innerHTML = "No Data Found";
+            else document.getElementById(measure_string + "-time").innerHTML = "No Data Last " + period.toString() + " sec";
             document.getElementById(measure_string + "-value").innerHTML = "0";
           }
           else {
@@ -31,7 +32,8 @@
           }
         },
         error: function(XMLHttpRequest, textStatus, errorThrown) {
-          document.getElementById(measure_string + "-time").innerHTML = "Error: No Data Last " + period.toString() + " sec";
+          if (period === 0) document.getElementById(measure_string + "-time").innerHTML = "Error: No Data Found";
+          else document.getElementById(measure_string + "-time").innerHTML = "Error: No Data Last " + period.toString() + " sec";
           document.getElementById(measure_string + "-value").innerHTML = "0";
         },
         cache: false
@@ -68,7 +70,7 @@
           {% if function_period %}
           liveTextData('{{each_function.unique_id}}', 'function', '{{each_meas.unique_id}}', {{function_period * 2}}, {{function_period}});
           {% else %}
-          liveTextData('{{each_function.unique_id}}', 'function', '{{each_meas.unique_id}}', 1440, 30);
+          liveTextData('{{each_function.unique_id}}', 'function', '{{each_meas.unique_id}}', 0, 30);
           {% endif %}
         {% endfor %}
       {%- endfor -%}