trustchain-oc1-orchestral/devicehub-teal
Archived
10
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #321 from eReuse/bugfix/3666-label

Browse source 
Bugfix/3666 label
This commit is contained in:
cayop 2022-07-25 18:06:07 +02:00 committed by GitHub
parent 5d2161c5e4 ac9708c779
commit eea6d5c7e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ereuse_devicehub/static/js/main_inventory.build.js
View file

@ -216,7 +216,7 @@ function removeLot() {
function removeTag() {
const devices = TableController.getSelectedDevices();
const devices_id = devices.map(dev => dev.data);
const devices_id = devices.map(dev => $(dev).attr('data'));
if (devices_id.length == 1) {
const url = "/inventory/tag/devices/".concat(devices_id[0], "/del/");
@ -228,7 +228,7 @@ function removeTag() {
function addTag() {
const devices = TableController.getSelectedDevices();
const devices_id = devices.map(dev => dev.data);
const devices_id = devices.map(dev => $(dev).attr('data'));
if (devices_id.length == 1) {
$("#addingTagModal .pol").hide();

4
ereuse_devicehub/static/js/main_inventory.js
View file

@ -207,7 +207,7 @@ function removeLot() {
function removeTag() {
const devices = TableController.getSelectedDevices();
const devices_id = devices.map(dev => dev.data);
const devices_id = devices.map(dev => $(dev).attr("data"));
if (devices_id.length == 1) {
const url = `/inventory/tag/devices/${devices_id[0]}/del/`;
window.location.href = url;
@ -218,7 +218,7 @@ function removeTag() {
function addTag() {
const devices = TableController.getSelectedDevices();
const devices_id = devices.map(dev => dev.data);
const devices_id = devices.map(dev => $(dev).attr("data"));
if (devices_id.length == 1) {
$("#addingTagModal .pol").hide();
$("#addingTagModal .btn-primary").show();

12
ereuse_devicehub/static/js/print.pdf.js
View file

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