From 9375541362b44378a5e93864873badbfa80253bc Mon Sep 17 00:00:00 2001
From: sanjayk03-dev <imsanjay003@gmail.com>
Date: Sun, 28 Jan 2024 22:58:32 +0530
Subject: [PATCH] logging cancel macros

---
 src/js/macros.js             | 16 +++++++++++-----
 src/pug/templates/macros.pug |  6 +++---
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/js/macros.js b/src/js/macros.js
index 9b64e5d..4e4a36c 100644
--- a/src/js/macros.js
+++ b/src/js/macros.js
@@ -65,9 +65,13 @@ module.exports = {
           cache: "no-cache",
         });
         console.log("response status: ", response.status);
-        const text = (await response.text()).split(" ").join("\n");
-        console.log("text: ", text);
-        this.$set("newGcode[this.tab-1]", text);
+        if (response.status == 200) {
+          const text = (await response.text()).split(" ").join("\n");
+          console.log("text: ", text);
+          this.$set("newGcode[this.tab-1]", text);
+        } else {
+          console.log("error loading");
+        }
       } else {
         this.$set("newGcode[this.tab-1]", "");
       }
@@ -220,12 +224,14 @@ module.exports = {
       this.config.macrosList = [];
     },
     cancelMacros: async function () {
-      console.log("this.tab", this.tab);
+      console.log("this.tab", this.tab - 1);
+      console.log(document.getElementById(`macros-name-${this.tab - 1}`).value);
       const defaultValue = this.config.macros[this.tab - 1];
+      console.log(defaultValue);
       document.getElementById(`macros-name-${this.tab - 1}`).value = defaultValue.name;
       document.getElementById(`macros-color-${this.tab - 1}`).value = defaultValue.color;
       document.getElementById("gcode-field").value = "";
-      this.$set("newGcode[this.tab]", "");
+      this.$set("newGcode[this.tab-1]", "");
       this.config.macros[this.tab - 1].file_name = "default";
     },
     deleteAllMacros: async function () {
diff --git a/src/pug/templates/macros.pug b/src/pug/templates/macros.pug
index 3719ae8..ea23804 100644
--- a/src/pug/templates/macros.pug
+++ b/src/pug/templates/macros.pug
@@ -7,7 +7,7 @@ script#macros-template(type="text/x-template")
 
       div(slot="footer")
         button.pure-button(@click="confirmReset=false") Cancel
-        button.pure-button.pure-button-primary(@click="deleteAllMacros")
+        button.pure-button.button-error(@click="deleteAllMacros")
           | Delete All
 
     message(:show.sync="confirmSave")
@@ -24,7 +24,7 @@ script#macros-template(type="text/x-template")
         p(slot="body")
         div(slot="footer")
           button.pure-button(@click="deleteGCode = false") Cancel
-          button.pure-button.button-success(@click="delete_current")
+          button.pure-button.button-error(@click="delete_current")
             .fa.fa-trash
             | &nbsp;Selected
 
@@ -33,7 +33,7 @@ script#macros-template(type="text/x-template")
         p(slot="body")
         div(slot="footer")
           button.pure-button(@click="deleteSelected = false") Cancel
-          button.pure-button.button-success(@click="deleteSelectedMacros")
+          button.pure-button.button-error(@click="deleteSelectedMacros")
             .fa.fa-trash
             | &nbsp;Yes