emilevs/label_printer
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reimplement bold, and fix bug that broke adding fields

Browse source
This commit is contained in:
TT-392 2025-10-31 20:54:49 +01:00
parent 9062be9f54
commit fc0b7acc8f
2 changed files with 42 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app.py
View file

@ -119,8 +119,9 @@ def text_form():
"string": request.form["text" + str(i)], "string": request.form["text" + str(i)],
"size": int(request.form["size" + str(i)]), "size": int(request.form["size" + str(i)]),
"pos": int(request.form["y_pos" + str(i)]), "pos": int(request.form["y_pos" + str(i)]),
"bold": False "bold": "bold" + str(i) in request.form
}) })
print(request.form)
# Clear previously saved font # Clear previously saved font
for font in session["fonts"]: for font in session["fonts"]:

61
templates/text.html
View file

@ -60,7 +60,8 @@
Size: <input type="number" value="(size)" name="[size]" min="0" required Size: <input type="number" value="(size)" name="[size]" min="0" required
style="width: 40px"><br> style="width: 40px"><br>
Y position: <input type="number" value="(y_pos)" name="[y_pos]" required Y position: <input type="number" value="(y_pos)" name="[y_pos]" required
style="width: 40px"><br>` style="width: 40px"><br>
Bold: <input type="checkbox" name="[bold]" value="bold" (bold)><br>`
const min_button = `<button type="button" onClick="remove_line()">-</button>` const min_button = `<button type="button" onClick="remove_line()">-</button>`
const plus_button = `<button type="button" onClick="add_line()">+</button>` const plus_button = `<button type="button" onClick="add_line()">+</button>`
@ -83,29 +84,35 @@
["DNH", [{ ["DNH", [{
text: "Do Not Hack", text: "Do Not Hack",
size: 130, size: 130,
y_pos: 0 y_pos: 0,
bold: true
}, { }, {
text: "bottom text", text: "bottom text",
size: 50, size: 50,
y_pos: 130 y_pos: 130,
bold: false
}]], }]],
["Food", [{ ["Food", [{
text: "Nickname", text: "Nickname",
size: 130, size: 130,
y_pos: 0 y_pos: 0,
bold: true
}, { }, {
text: new Date().toISOString().slice(0, 10), text: new Date().toISOString().slice(0, 10),
size: 50, size: 50,
y_pos: 130 y_pos: 130,
bold: false
}]], }]],
["Remove by", [{ ["Remove by", [{
text: "Remove by", text: "Remove by",
size: 130, size: 130,
y_pos: 0 y_pos: 0,
bold: true
}, { }, {
text: new Date(Date.now() + 3 * 7 * 24 * 60 * 60 * 1000).toISOString().slice(0, 10), text: new Date(Date.now() + 3 * 7 * 24 * 60 * 60 * 1000).toISOString().slice(0, 10),
size: 50, size: 50,
y_pos: 130 y_pos: 130,
bold: false
}]], }]],
]); ]);
@ -113,19 +120,22 @@
function generate_and_populate_fields() { function generate_and_populate_fields() {
let html = "" let html = ""
if (localStorage.getItem("text0") == null) {
template = templates.get("DNH");
populate_local_storage_from_template(template);
}
let lineCnt = get_persistent("lineCount", 2); let lineCnt = get_persistent("lineCount", 2);
for (let i = 0; i < lineCnt; i++) { for (let i = 0; i < lineCnt; i++) {
let modified_line_form = line_form; let modified_line_form = line_form;
modified_line_form modified_line_form
template = templates.get("DNH");
modified_line_form = modified_line_form.replace("[title]", "Line " + i); modified_line_form = modified_line_form.replace("[title]", "Line " + i);
modified_line_form = init_field("text", template[i].text, i, modified_line_form); modified_line_form = init_field("text", "Text", i, modified_line_form);
modified_line_form = init_field("size", template[i].size, i, modified_line_form); modified_line_form = init_field("size", 130, i, modified_line_form);
modified_line_form = init_field("y_pos", template[i].y_pos, i, modified_line_form); modified_line_form = init_field("y_pos", 130 * i, i, modified_line_form);
modified_line_form = init_field("bold", false ? "checked" : "", i, modified_line_form);
html += modified_line_form; html += modified_line_form;
console.log(i);
} }
if (lineCnt == 1) { if (lineCnt == 1) {
html += plus_button; html += plus_button;
@ -142,7 +152,11 @@
e.preventDefault(); e.preventDefault();
for (const element of text_form.elements) { for (const element of text_form.elements) {
localStorage.setItem(element.name, element.value); if (element.type == 'checkbox') {
localStorage.setItem(element.name, element.checked ? "checked" : "");
} else {
localStorage.setItem(element.name, element.value);
}
} }
const lineCount = document.createElement('input'); const lineCount = document.createElement('input');
@ -163,19 +177,24 @@
generate_and_populate_fields(); generate_and_populate_fields();
} }
function populate_local_storage_from_template(template) {
for (let i = 0; i < template.length; i++) {
localStorage.setItem("text" + i, template[i].text);
localStorage.setItem("size" + i, template[i].size);
localStorage.setItem("y_pos" + i, template[i].y_pos);
localStorage.setItem("bold" + i, template[i].bold ? "checked" : "");
}
localStorage.setItem("lineCount", template.length);
}
const template_selector = document.getElementById("template") const template_selector = document.getElementById("template")
template_selector.addEventListener('submit', function(e) { template_selector.addEventListener('submit', function(e) {
e.preventDefault(); e.preventDefault();
template = templates.get(template_selector.elements.template.value); template = templates.get(template_selector.elements.template.value);
populate_local_storage_from_template(template);
for (let i = 0; i < template.length; i++) { generate_and_populate_fields();
localStorage.setItem("text" + i, template[i].text);
localStorage.setItem("size" + i, template[i].size);
localStorage.setItem("y_pos" + i, template[i].y_pos);
}
localStorage.setItem("lineCount", template.length);
generate_and_populate_fields()
}); });