Merge branch 'bugfix/3666-label' into testing

This commit is contained in:
Cayo Puigdefabregas 2022-07-25 18:13:52 +02:00
commit d5588bc871
1 changed files with 6 additions and 6 deletions

View File

@ -234,9 +234,9 @@ function printpdf() {
if ($("#qrCheck").prop('checked')) { if ($("#qrCheck").prop('checked')) {
var h = hspace + border - img_side/2; var h = hspace + border - img_side/2;
var w = border*2 + img_side; var w = border*2 + img_side;
pdf.text(tag, w, h); pdf.text(String(tag), w, h);
} else { } else {
pdf.text(tag, border, hspace); pdf.text(String(tag), border, hspace);
} }
hspace += line; hspace += line;
}; };
@ -244,26 +244,26 @@ function printpdf() {
var sn = $(y).data('sid'); var sn = $(y).data('sid');
pdf.setFontSize(12); pdf.setFontSize(12);
if (sn) { if (sn) {
pdf.text(sn, border, hspace); pdf.text(String(sn), border, hspace);
hspace += line; hspace += line;
} }
}; };
if ($("#serialNumberCheck").prop('checked')) { if ($("#serialNumberCheck").prop('checked')) {
var sn = $(y).data('serial-number'); var sn = $(y).data('serial-number');
pdf.setFontSize(12); pdf.setFontSize(12);
pdf.text(sn, border, hspace); pdf.text(String(sn), border, hspace);
hspace += line; hspace += line;
}; };
if ($("#manufacturerCheck").prop('checked')) { if ($("#manufacturerCheck").prop('checked')) {
var sn = $(y).data('manufacturer'); var sn = $(y).data('manufacturer');
pdf.setFontSize(12); pdf.setFontSize(12);
pdf.text(sn, border, hspace); pdf.text(String(sn), border, hspace);
hspace += line; hspace += line;
}; };
if ($("#modelCheck").prop('checked')) { if ($("#modelCheck").prop('checked')) {
var sn = $(y).data('model'); var sn = $(y).data('model');
pdf.setFontSize(8); pdf.setFontSize(8);
pdf.text(sn, border, hspace); pdf.text(String(sn), border, hspace);
hspace += line; hspace += line;
}; };
}); });