Bug fixes

j7126 · Mar 4, 2020 · 9a4a13c · 9a4a13c
1 parent dfdace2
commit 9a4a13c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/octoprint_dashboard/__init__.py b/octoprint_dashboard/__init__.py
@@ -63,7 +63,7 @@ def on_event(self, event, payload):
             self._plugin_manager.send_plugin_message(self._identifier, dict(totalLayer=payload.get('totalLayer'),
                                                                             currentLayer=payload.get('currentLayer'),
                                                                             currentHeight=payload.get('currentHeight'), 
-                                                                            totalHeightWithExtrusion=payload.get('totalHeightWithExtrusion'), 
+                                                                            totalHeight=payload.get('totalHeight'), 
                                                                             feedrate=payload.get('feedrate'), 
                                                                             feedrateG0=payload.get('feedrateG0'), 
                                                                             feedrateG1=payload.get('feedrateG1'), 

diff --git a/octoprint_dashboard/static/js/dashboard.js b/octoprint_dashboard/static/js/dashboard.js
@@ -23,7 +23,7 @@ $(function () {
         self.totalLayer = ko.observable("-");
         self.currentLayer = ko.observable("-");
         self.currentHeight = ko.observable("-");
-        self.totalHeightWithExtrusion = ko.observable("-");
+        self.totalHeight = ko.observable("-");
         self.feedrate = ko.observable("-");
         self.feedrateG0 = ko.observable("-");
         self.feedrateG1 = ko.observable("-");
@@ -407,7 +407,7 @@ $(function () {
                 if (data.totalLayer) { self.totalLayer(data.totalLayer); }
                 if (data.currentLayer) { self.currentLayer(data.currentLayer); }
                 if (data.currentHeight) { self.currentHeight(data.currentHeight); }
-                if (data.totalHeightWithExtrusion) { self.totalHeightWithExtrusion(data.totalHeightWithExtrusion); }
+                if (data.totalHeight) { self.totalHeight(data.totalHeight); }
                 if (data.feedrate) { self.feedrate(data.feedrate); }
                 if (data.feedrateG0) { self.feedrateG0(data.feedrateG0); }
                 if (data.feedrateG1) { self.feedrateG1(data.feedrateG1); }

diff --git a/octoprint_dashboard/templates/dashboard_tab.jinja2 b/octoprint_dashboard/templates/dashboard_tab.jinja2
@@ -234,7 +234,7 @@
       <div class="dashboardGridItem" data-bind="visible: printerStateModel.isPrinting()">
         <img class="dashboardIcon" title="Current height" src="plugin/dashboard/static/img/height-icon.png">
         <span id="currentHeight" data-bind="attr: { title: 'Current Height' }, html: currentHeight"></span>
-        <span class="dashboardSmall" id="totalHeightWithExtrusion" data-bind="attr: { title: 'Total Height' }, html: '/' + totalHeightWithExtrusion() + 'mm'"></span>
+        <span class="dashboardSmall" id="totalHeight" data-bind="attr: { title: 'Total Height' }, html: '/' + totalHeight() + 'mm'"></span>
       </div>
       <div class="dashboardGridItem" data-bind="visible: printerStateModel.isPrinting()">
         <img class="dashboardIcon" title="Layer Time" src="plugin/dashboard/static/img/layer-time-average-icon.png">