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

fix

Browse Source
This commit is contained in:
sanjayk03-dev
2024-03-29 00:04:37 +05:30
parent 3e067d15c8
commit e0af22ef5b
1 changed files with 25 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -276,6 +276,15 @@ module.exports = {
}, },
methods: { methods: {
save_config: async function (config) {
try {
await api.put("config/save", config);
this.$dispatch("update");
} catch (error) {
console.error("Restore Failed: ", error);
alert("Restore failed");
}
},
getJogIncrStyle(value) { getJogIncrStyle(value) {
const weight = `font-weight:${this.jog_incr === value ? "bold" : "normal"}`; const weight = `font-weight:${this.jog_incr === value ? "bold" : "normal"}`;
const color = this.jog_incr === value ? "color:#0078e7" : ""; const color = this.jog_incr === value ? "color:#0078e7" : "";
@@ -428,13 +437,7 @@ module.exports = {
); );
folder_to_add.files.push({ file_name: file.name }); folder_to_add.files.push({ file_name: file.name });
} }
try { this.save_config(this.config);
await api.put("config/save", this.config);
this.$dispatch("update");
} catch (error) {
console.error("Restore Failed: ", error);
alert("Restore failed");
}
SvelteComponents.showDialog("Upload", { SvelteComponents.showDialog("Upload", {
file, file,
@@ -469,14 +472,7 @@ module.exports = {
this.edited = false; this.edited = false;
this.create_folder = false; this.create_folder = false;
this.folder_name = ""; this.folder_name = "";
try { this.save_config(this.config);
await api.put("config/save", this.config);
this.state.folder = this.folder_name;
this.$dispatch("update");
} catch (error) {
console.error("Restore Failed: ", error);
alert("Restore failed");
}
} }
}, },
@@ -508,9 +504,12 @@ module.exports = {
} }
const folder = this.config.gcode_list.find(item => item.type == "folder" && item.name == folderName); const folder = this.config.gcode_list.find(item => item.type == "folder" && item.name == folderName);
console.log(folder);
if (folder) { if (folder) {
console.log("513", file.name);
folder.files.push({ file_name: file.name }); folder.files.push({ file_name: file.name });
} else { } else {
console.log("516", file.name);
this.config.gcode_list.push({ this.config.gcode_list.push({
name: folderName, name: folderName,
type: "folder", type: "folder",
@@ -521,11 +520,12 @@ module.exports = {
], ],
}); });
} }
console.log("523", this.config.gcode_list);
SvelteComponents.showDialog("Upload", { SvelteComponents.showDialog("Upload", {
file, file,
onComplete: () => { onComplete: () => {
this.last_file_time = undefined; // Force reload this.last_file_time = undefined; // Force reload
this.$broadcast("gcode-reload", file.name); // this.$broadcast("gcode-reload", file.name);
const remaining_files = this.modify_files(files); const remaining_files = this.modify_files(files);
const updated_event = { ...e }; const updated_event = { ...e };
if (updated_event.target) { if (updated_event.target) {
@@ -539,13 +539,7 @@ module.exports = {
}, },
}); });
try { this.save_config(this.config);
await api.put("config/save", this.config);
this.$dispatch("update");
} catch (error) {
console.error("Restore Failed: ", error);
alert("Restore failed");
}
}, },
delete_current: async function () { delete_current: async function () {
@@ -558,13 +552,7 @@ module.exports = {
if (!this.config.macros_list.find(item => item.file_name == this.state.selected)) { if (!this.config.macros_list.find(item => item.file_name == this.state.selected)) {
api.delete(`file/${this.state.selected}`); api.delete(`file/${this.state.selected}`);
} }
try { this.save_config(this.config);
await api.put("config/save", this.config);
this.$dispatch("update");
} catch (error) {
console.error("Restore Failed: ", error);
alert("Restore failed");
}
this.deleteGCode = false; this.deleteGCode = false;
}, },
@@ -579,24 +567,18 @@ module.exports = {
this.config.non_macros_list = []; this.config.non_macros_list = [];
this.state.folder = "Unorganized files"; this.state.folder = "Unorganized files";
this.config.gcode_list = []; this.config.gcode_list = [];
try { this.save_config(this.config);
await api.put("config/save", this.config);
this.$dispatch("update");
} catch (error) {
console.error("Restore Failed: ", error);
alert("Restore failed");
}
this.deleteGCode = false; this.deleteGCode = false;
}, },
delete_folder: async function () { delete_folder: async function () {
if (!this.state.folder) { if (this.state.folder) {
console.log("595"); console.log("595");
const files_to_move = this.config.gcode_list.find( const files_to_move = this.config.gcode_list.find(
item => item.type == "folder" && item.name == this.state.folder, item => item.type == "folder" && item.name == this.state.folder,
); );
console.log(files_to_move); console.log(files_to_move);
if (!files_to_move) { if (files_to_move) {
files_to_move.files.forEach(item => { files_to_move.files.forEach(item => {
this.config.gcode_list.push({ this.config.gcode_list.push({
name: item.file_name, name: item.file_name,
@@ -611,24 +593,18 @@ module.exports = {
return true; return true;
}); });
console.log(this.config.gcode_list); console.log(this.config.gcode_list);
try { this.save_config(this.config);
await api.put("config/save", this.config);
this.$dispatch("update");
} catch (error) {
console.error("Restore Failed: ", error);
alert("Restore failed");
}
} }
} }
this.confirmDelete = false; this.confirmDelete = false;
}, },
delete_folder_and_files: async function () { delete_folder_and_files: async function () {
if (!this.state.folder) { if (this.state.folder) {
const selected_folder = this.config.gcode_list.find( const selected_folder = this.config.gcode_list.find(
item => (item.type = "folder" && item.name == this.state.folder), item => (item.type = "folder" && item.name == this.state.folder),
); );
console.log(selected_folder); console.log(selected_folder);
if (!selected_folder) { if (selected_folder) {
const files_to_delete = selected_folder.files.map(item => item.file_name).toString(); const files_to_delete = selected_folder.files.map(item => item.file_name).toString();
console.log(files_to_delete); console.log(files_to_delete);
await api.delete(`file/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE${files_to_delete}`); await api.delete(`file/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE${files_to_delete}`);
@@ -639,13 +615,7 @@ module.exports = {
return true; return true;
}); });
console.log(this.config.gcode_list); console.log(this.config.gcode_list);
try { this.save_config(this.config);
await api.put("config/save", this.config);
this.$dispatch("update");
} catch (error) {
console.error("Restore Failed: ", error);
alert("Restore failed");
}
} }
} }
this.confirmDelete = false; this.confirmDelete = false;