muehe/onefinity-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

solving error in control-view, dynamic input, added 6 tabs,

Browse Source
This commit is contained in:
sanjayk03-dev
2024-01-02 16:12:17 +05:30
parent fa299693c6
commit 6feca58a81
5 changed files with 102 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/js/control-view.js
View File

@@ -203,7 +203,13 @@ module.exports = {
return Math.min(1, p);
},
isMacrosPresent: function(val){
return this.config.macros[val].name!="" || this.config.macros[val].gcode!="";
try{
const res = this.config.macros[val].name!="" || this.config.macros[val].gcode!="";
console.log("result: ",val," : res");
return res;
}catch(err){
console.log("Error for macros present: ",err);
}
},
},

42
src/js/macros.js
View File

@@ -82,25 +82,29 @@ module.exports = {
});
},
saveMacros: async function(id){
var macrosName = document.getElementById("macros-name").value;
var macrosColor = document.getElementById("macros-color").value;
if(this.config.macros == undefined) {
console.log("macros is undefined");
this.config.macros=[];
}else{
this.config.macros[id].name=macrosName;
this.config.macros[id].color=macrosColor;
this.config.macros[id].gcode=this.state.selected;
}
console.log(this.config.macros);
try {
await api.put("config/save",this.config);
console.log("Successfully saved");
this.$dispatch("update");
} catch (error) {
console.error("Restore Failed: ",error);
alert("Restore failed");
}
console.log(typeof(id)," type");
var macrosName = document.getElementById(`macros-name-${id}`).value;
var macrosColor = document.getElementById(`macros-color-${id}`).value;
console.log(macrosName);
console.log(macrosColor);
// if(this.config.macros == undefined) {
// console.log("macros is undefined");
// this.config.macros=[];
// }else{
// this.config.macros[id].name=macrosName;
// this.config.macros[id].color=macrosColor;
// this.config.macros[id].gcode=this.state.selected;
// }
// console.log(this.config.macros);
// try {
// await api.put("config/save",this.config);
// console.log("Successfully saved");
// this.$dispatch("update");
// } catch (error) {
// console.error("Restore Failed: ",error);
// alert("Restore failed");
// }
},
printConfig: function(){
console.log(this.config);