From 1143b22f95041544b513694edc533dfc7a4616f6 Mon Sep 17 00:00:00 2001 From: sanjayk03-dev Date: Mon, 22 Jan 2024 20:33:44 +0530 Subject: [PATCH] loggin everything --- src/js/control-view.js | 5 +++-- src/js/macros.js | 8 ++++---- src/pug/templates/control-view.pug | 4 ++-- src/py/bbctrl/FileHandler.py | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/js/control-view.js b/src/js/control-view.js index b9589a3..196cc0c 100644 --- a/src/js/control-view.js +++ b/src/js/control-view.js @@ -204,9 +204,10 @@ module.exports = { }, gcodeFiles: function () { const filesWithNoMacros=this.state.files.filter(item => !this.config.macrosList.some(compareItem => compareItem.gcode_file_name == item)); + console.log('filesWithNoMacros: ',filesWithNoMacros); const unionSet = new Set([...filesWithNoMacros, ...this.config.gcodeList]); const files = [...unionSet]; - console.log(files); + console.log("files: ",files); return files; } }, @@ -283,7 +284,7 @@ module.exports = { return; } - console.log(file,file_time); + console.log("file: ",file," time: ",file_time); this.last_file = file; this.last_file_time = file_time; diff --git a/src/js/macros.js b/src/js/macros.js index f6a98da..b76d51e 100644 --- a/src/js/macros.js +++ b/src/js/macros.js @@ -65,7 +65,7 @@ module.exports = { } else { this.newGcode[this.tab - 1]=""; } - console.log(this.newGcode[this.tab - 1]); + console.log("newGcode: ",this.newGcode[this.tab - 1]); }, upload:async function (e) { const files = e.target.files || e.dataTransfer.files; @@ -159,8 +159,8 @@ module.exports = { `macros-color-${this.tab - 1}` ).value; - console.log(this.state.selected, this.state.selected_time); - console.log(this.selectedValues[this.tab - 1]); + console.log(" this.state.selected && time: ",this.state.selected, this.state.selected_time); + console.log("selectedValues: ",this.selectedValues[this.tab - 1]); if (this.state.selected == "default") { var file = this.newGcode[this.tab - 1]; @@ -173,7 +173,7 @@ module.exports = { this.state.selected == "default" ? macrosName+'.ngc' : this.state.selected; this.config.macros[this.tab - 1].gcode_file_time = this.state.selected_time; - console.log(this.config.macros[this.tab - 1].gcode_file_name); + console.log("config.macros[this.tab - 1].gcode_file_name",this.config.macros[this.tab - 1].gcode_file_name); this.confirmSave = false; try { await api.put("config/save", this.config); diff --git a/src/pug/templates/control-view.pug b/src/pug/templates/control-view.pug index ba6717e..744f9b6 100644 --- a/src/pug/templates/control-view.pug +++ b/src/pug/templates/control-view.pug @@ -289,10 +289,10 @@ script#control-view-template(type="text/x-template") button.pure-button(@click="deleteGCode = false") Cancel button.pure-button.button-error(@click="delete_all") .fa.fa-trash - |  all + |  All button.pure-button.button-success(@click="delete_current") .fa.fa-trash - |  selected + |  Selected select(title="Select previously uploaded GCode programs.", v-model="state.selected", @change="load", :disabled="!is_ready", diff --git a/src/py/bbctrl/FileHandler.py b/src/py/bbctrl/FileHandler.py index dbd6686..947feef 100644 --- a/src/py/bbctrl/FileHandler.py +++ b/src/py/bbctrl/FileHandler.py @@ -38,7 +38,7 @@ class FileHandler(bbctrl.APIHandler): def delete_ok(self, filename): self.get_log('FileHandler').info('filename ' + filename) - allFiles = self.get_ctrl().state.return_files(filename) + allFiles = self.get_ctrl().state.return_files() for file in allFiles: self.get_log('FileHandler').info('filename ' + file)