Fix for #130 - Average Layer Time shows time in seconds

j7126 · Mar 6, 2020 · b285ddb · b285ddb
1 parent 68e45d2
commit b285ddb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/octoprint_dashboard/static/js/dashboard.js b/octoprint_dashboard/static/js/dashboard.js
@@ -31,7 +31,7 @@ $(function () {
         self.lastLayerDuration = ko.observable("-");
         self.lastLayerDurationInSeconds = ko.observable("-");
         self.averageLayerDuration = ko.observable("-");
-        self.averageLayerDuration = ko.observable("-");
+        self.averageLayerDurationInSeconds = ko.observable("-");
         self.changeFilamentTimeLeftInSeconds = ko.observable("-");
         self.changeFilamentCount = ko.observable("-");
 
@@ -70,6 +70,7 @@ $(function () {
             }
         };
 
+
         self.toggleFullBrowserWindow = function () {
             if (!dashboardIsFull) {
                 //location.href="/#tab_plugin_dashboard/?dashboard=full";
@@ -419,7 +420,7 @@ $(function () {
                 if (data.lastLayerDuration) { self.lastLayerDuration(data.lastLayerDuration); }
                 if (data.lastLayerDurationInSeconds) { self.lastLayerDurationInSeconds(data.lastLayerDurationInSeconds); }
                 if (data.averageLayerDuration) { self.averageLayerDuration(data.averageLayerDuration); }
-                if (data.averageLayerDurationInSeconds) { self.averageLayerDuration(data.averageLayerDurationInSeconds); }
+                if (data.averageLayerDurationInSeconds) { self.averageLayerDurationInSeconds(data.averageLayerDurationInSeconds); }
                 if (data.changeFilamentTimeLeftInSeconds) { self.changeFilamentTimeLeftInSeconds(data.changeFilamentTimeLeftInSeconds); }
                 if (data.changeFilamentCount) { self.changeFilamentCount(data.changeFilamentCount); }
                 if (data.cpuPercent) { self.cpuPercent(data.cpuPercent); }

diff --git a/setup.py b/setup.py
@@ -16,7 +16,7 @@
 plugin_name = "OctoPrint-Dashboard"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "1.11.3"
+plugin_version = "1.11.4"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module