New Verison 1.8.1

- PR #67, #62 G2/G3 movement is now tracked. Thx @ldursw - E #8 output of current selecetd spool in confirm dialog
OllisGit · Jun 5, 2021 · ab5311b · ab5311b
1 parent 4e271a3
commit ab5311b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/octoprint_filamentmanager/static/js/filamentmanager.bundled.js b/octoprint_filamentmanager/static/js/filamentmanager.bundled.js
@@ -316,10 +316,17 @@ FilamentManager.prototype.viewModels.confirmation = function spoolSelectionConfi
     };
 
     var showDialog = function showSpoolConfirmationDialog() {
+        var allCurrentSelections = selections.selectedSpools != null ? selections.selectedSpools() : null;
         var s = [];
         printerStateViewModel.filament().forEach(function (value) {
             var toolID = Utils.extractToolIDFromName(value.name());
-            s.push({ spool: undefined, tool: toolID });
+
+            var currentSelectionForTool = allCurrentSelections?.[toolID]?.name;
+
+            s.push({ spool: undefined,
+                     tool: toolID,
+                     currentSpoolName: currentSelectionForTool
+            });
         });
         self.selections(s);
         button.attr('disabled', true);
@@ -710,7 +717,6 @@ FilamentManager.prototype.viewModels.spools = function spoolsViewModel() {
 
     self.overUsedUsage = ko.observable(false);
     self.overUsedUsage.subscribe(function(newValue){
-        debugger
         // self.allSpools.updateItems(self.allSpools.items)
         self.allSpools.toggleFilter("overUsedUsage");
     });
@@ -719,7 +725,6 @@ FilamentManager.prototype.viewModels.spools = function spoolsViewModel() {
 
     var myListHelperFilters = {
         overUsedUsage: function (data){
-            debugger
             console.error(data);
             var result = data.used < data.weight;
             return result;

diff --git a/octoprint_filamentmanager/templates/spool_confirmation.jinja2 b/octoprint_filamentmanager/templates/spool_confirmation.jinja2
@@ -15,7 +15,7 @@
             <!-- ko foreach: viewModels.confirmation.selections -->
             <div class="control-group">
                <div class="controls form-inline">
-                   <label class="control-label">{{ _('Tool') }} <span data-bind="text: $data.tool"></span></label>&nbsp;
+                   <label class="control-label">{{ _('Tool') }} <span data-bind="text: $data.tool"></span>:&nbsp;&nbsp;<span data-bind="text: $data.currentSpoolName"></span></label>&nbsp;
                    <select data-bind="enable: !$root.core.bridge.allViewModels.printerStateViewModel.isPrinting() && $root.core.bridge.allViewModels.loginStateViewModel.isUser(), options: $root.viewModels.spools.allSpools.items, optionsText: function(item) { return item.name + ' ' + (item.weight - item.used).toFixed(0) + 'g - ' + item.profile.material + ' (' + item.profile.vendor + ')'; }, optionsValue: function(item) { return item.id; }, optionsCaption: '{{ _('--- Select Spool ---') }}', value: $root.viewModels.confirmation.selections()[$index()].spool, event: { change: function() { $root.viewModels.confirmation.checkSelection(); } }"></select>
                </div>
             </div>

diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 plugin_identifier = "filamentmanager"
 plugin_package = "octoprint_filamentmanager"
 plugin_name = "OctoPrint-FilamentManager"
-plugin_version = "1.8.0"
+plugin_version = "1.8.1"
 plugin_description = "Manage your spools and keep track of remaining filament on them"
 plugin_author = "Sven Lohrmann, Olli"
 plugin_author_email = "ollisgit@gmail.com, malnvenshorn@gmail.com"