pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix sorting of filament usage for more than one tool

Browse source
This commit is contained in:
Gina Häußge 2017-07-20 19:23:52 +02:00
parent bb6ea4d81b
commit d0f5592421
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/octoprint/static/js/app/viewmodels/printerstate.js
View file

@ -225,14 +225,16 @@ $(function() {
var result = [];
if (data.filament && typeof(data.filament) == "object" && _.keys(data.filament).length > 0) {
for (var key in data.filament) {
if (!_.startsWith(key, "tool") || !data.filament[key] || !data.filament[key].hasOwnProperty("length") || data.filament[key].length <= 0) continue;
var keys = _.keys(data.filament);
keys.sort();
_.each(keys, function(key) {
if (!_.startsWith(key, "tool") || !data.filament[key] || !data.filament[key].hasOwnProperty("length") || data.filament[key].length <= 0) return;
result.push({
name: ko.observable(gettext("Tool") + " " + key.substr("tool".length)),
data: ko.observable(data.filament[key])
});
}
});
}
self.filament(result);
};