From eb4156c02e0158453415ba43a26f5fc5ae373153 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Tue, 10 Feb 2015 10:55:47 +0100 Subject: [PATCH] Directly update color coding for success/failure in file list after finishing a print job --- CHANGELOG.md | 1 + src/octoprint/static/js/app/dataupdater.js | 8 +++++++- src/octoprint/static/js/app/viewmodels/files.js | 4 ++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d130a26d..a125485a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -120,6 +120,7 @@ * GCODE viewer now doesn't stumble over completely extrusionless GCODE files * Do not deliver the API key on settings API unless user has admin rights * Don't hiccup on slic3r filament_diameter comments in GCODE generated for multi extruder setups + * Color code successful or failed print results directly in file list, not just after a reload ([Commits](https://github.com/foosel/OctoPrint/compare/master...devel)) diff --git a/src/octoprint/static/js/app/dataupdater.js b/src/octoprint/static/js/app/dataupdater.js index 69a5491d..2d48f949 100644 --- a/src/octoprint/static/js/app/dataupdater.js +++ b/src/octoprint/static/js/app/dataupdater.js @@ -168,11 +168,17 @@ function DataUpdater(allViewModels) { console.log("Got event " + type + " with payload: " + JSON.stringify(payload)); if (type == "UpdatedFiles") { - _.each(self.allViewModels, function(viewModel) { + _.each(self.allViewModels, function (viewModel) { if (viewModel.hasOwnProperty("onUpdatedFiles")) { viewModel.onUpdatedFiles(payload); } }); + } else if (type == "MetadataStatisticsUpdated") { + _.each(self.allViewModels, function(viewModel) { + if (viewModel.hasOwnProperty("onMetadataStatisticsUpdated")) { + viewModel.onMetadataStatisticsUpdated(payload); + } + }) } else if (type == "MetadataAnalysisFinished") { _.each(self.allViewModels, function(viewModel) { if (viewModel.hasOwnProperty("onMetadataAnalysisFinished")) { diff --git a/src/octoprint/static/js/app/viewmodels/files.js b/src/octoprint/static/js/app/viewmodels/files.js index e187ea70..e9b711d9 100644 --- a/src/octoprint/static/js/app/viewmodels/files.js +++ b/src/octoprint/static/js/app/viewmodels/files.js @@ -337,5 +337,9 @@ function GcodeFilesViewModel(printerStateViewModel, loginStateViewModel, slicing self.onMetadataAnalysisFinished = function(payload) { self.requestData(); }; + + self.onMetadataStatisticsUpdated = function(payload) { + self.requestData(); + }; }