Merge pull request #211 from eReuse/feature/server-side-render-labels-2971
Print DHID-QR label for selected devices.
This commit is contained in:
commit
0f5943b13d
|
@ -8,6 +8,7 @@ ml).
|
||||||
## master
|
## master
|
||||||
|
|
||||||
## testing
|
## testing
|
||||||
|
- [changed] #2970 #2971 Print DHID-QR label for selected devices.
|
||||||
|
|
||||||
## [2.0.0] - 2022-03-15
|
## [2.0.0] - 2022-03-15
|
||||||
First server render HTML version. Completely rewrites views of angular JS client on flask.
|
First server render HTML version. Completely rewrites views of angular JS client on flask.
|
||||||
|
|
|
@ -485,46 +485,6 @@ class NewDeviceForm(FlaskForm):
|
||||||
return snapshot
|
return snapshot
|
||||||
|
|
||||||
|
|
||||||
class TagForm(FlaskForm):
|
|
||||||
code = StringField('Code', [validators.length(min=1)])
|
|
||||||
|
|
||||||
def validate(self, extra_validators=None):
|
|
||||||
error = ["This value is being used"]
|
|
||||||
is_valid = super().validate(extra_validators)
|
|
||||||
if not is_valid:
|
|
||||||
return False
|
|
||||||
tag = Tag.query.filter(Tag.id == self.code.data).all()
|
|
||||||
if tag:
|
|
||||||
self.code.errors = error
|
|
||||||
return False
|
|
||||||
|
|
||||||
return True
|
|
||||||
|
|
||||||
def save(self):
|
|
||||||
self.instance = Tag(id=self.code.data)
|
|
||||||
db.session.add(self.instance)
|
|
||||||
db.session.commit()
|
|
||||||
return self.instance
|
|
||||||
|
|
||||||
def remove(self):
|
|
||||||
if not self.instance.device and not self.instance.provider:
|
|
||||||
self.instance.delete()
|
|
||||||
db.session.commit()
|
|
||||||
return self.instance
|
|
||||||
|
|
||||||
|
|
||||||
class TagUnnamedForm(FlaskForm):
|
|
||||||
amount = IntegerField('amount')
|
|
||||||
|
|
||||||
def save(self):
|
|
||||||
num = self.amount.data
|
|
||||||
tags_id, _ = g.tag_provider.post('/', {}, query=[('num', num)])
|
|
||||||
tags = [Tag(id=tag_id, provider=g.inventory.tag_provider) for tag_id in tags_id]
|
|
||||||
db.session.add_all(tags)
|
|
||||||
db.session.commit()
|
|
||||||
return tags
|
|
||||||
|
|
||||||
|
|
||||||
class TagDeviceForm(FlaskForm):
|
class TagDeviceForm(FlaskForm):
|
||||||
tag = SelectField('Tag', choices=[])
|
tag = SelectField('Tag', choices=[])
|
||||||
device = StringField('Device', [validators.Optional()])
|
device = StringField('Device', [validators.Optional()])
|
||||||
|
|
|
@ -7,7 +7,6 @@ import flask_weasyprint
|
||||||
from flask import Blueprint, g, make_response, request, url_for
|
from flask import Blueprint, g, make_response, request, url_for
|
||||||
from flask.views import View
|
from flask.views import View
|
||||||
from flask_login import current_user, login_required
|
from flask_login import current_user, login_required
|
||||||
from requests.exceptions import ConnectionError
|
|
||||||
from sqlalchemy import or_
|
from sqlalchemy import or_
|
||||||
from werkzeug.exceptions import NotFound
|
from werkzeug.exceptions import NotFound
|
||||||
|
|
||||||
|
@ -22,12 +21,11 @@ from ereuse_devicehub.inventory.forms import (
|
||||||
NewActionForm,
|
NewActionForm,
|
||||||
NewDeviceForm,
|
NewDeviceForm,
|
||||||
TagDeviceForm,
|
TagDeviceForm,
|
||||||
TagForm,
|
|
||||||
TagUnnamedForm,
|
|
||||||
TradeDocumentForm,
|
TradeDocumentForm,
|
||||||
TradeForm,
|
TradeForm,
|
||||||
UploadSnapshotForm,
|
UploadSnapshotForm,
|
||||||
)
|
)
|
||||||
|
from ereuse_devicehub.labels.forms import PrintLabelsForm
|
||||||
from ereuse_devicehub.resources.action.models import Trade
|
from ereuse_devicehub.resources.action.models import Trade
|
||||||
from ereuse_devicehub.resources.device.models import Computer, DataStorage, Device
|
from ereuse_devicehub.resources.device.models import Computer, DataStorage, Device
|
||||||
from ereuse_devicehub.resources.documents.device_row import ActionRow, DeviceRow
|
from ereuse_devicehub.resources.documents.device_row import ActionRow, DeviceRow
|
||||||
|
@ -118,6 +116,7 @@ class DeviceListMix(GenericMixView):
|
||||||
'form_new_datawipe': form_new_datawipe,
|
'form_new_datawipe': form_new_datawipe,
|
||||||
'form_new_trade': form_new_trade,
|
'form_new_trade': form_new_trade,
|
||||||
'form_filter': form_filter,
|
'form_filter': form_filter,
|
||||||
|
'form_print_labels': PrintLabelsForm(),
|
||||||
'lot': lot,
|
'lot': lot,
|
||||||
'tags': tags,
|
'tags': tags,
|
||||||
'list_devices': list_devices,
|
'list_devices': list_devices,
|
||||||
|
@ -315,91 +314,6 @@ class DeviceCreateView(GenericMixView):
|
||||||
return flask.render_template(self.template_name, **context)
|
return flask.render_template(self.template_name, **context)
|
||||||
|
|
||||||
|
|
||||||
class TagListView(View):
|
|
||||||
methods = ['GET']
|
|
||||||
decorators = [login_required]
|
|
||||||
template_name = 'inventory/tag_list.html'
|
|
||||||
|
|
||||||
def dispatch_request(self):
|
|
||||||
lots = Lot.query.filter(Lot.owner_id == current_user.id)
|
|
||||||
tags = Tag.query.filter(Tag.owner_id == current_user.id).order_by(Tag.id)
|
|
||||||
context = {
|
|
||||||
'lots': lots,
|
|
||||||
'tags': tags,
|
|
||||||
'page_title': 'Tags Management',
|
|
||||||
'version': __version__,
|
|
||||||
}
|
|
||||||
return flask.render_template(self.template_name, **context)
|
|
||||||
|
|
||||||
|
|
||||||
class TagAddView(View):
|
|
||||||
methods = ['GET', 'POST']
|
|
||||||
decorators = [login_required]
|
|
||||||
template_name = 'inventory/tag_create.html'
|
|
||||||
|
|
||||||
def dispatch_request(self):
|
|
||||||
lots = Lot.query.filter(Lot.owner_id == current_user.id)
|
|
||||||
context = {'page_title': 'New Tag', 'lots': lots, 'version': __version__}
|
|
||||||
form = TagForm()
|
|
||||||
if form.validate_on_submit():
|
|
||||||
form.save()
|
|
||||||
next_url = url_for('inventory.taglist')
|
|
||||||
return flask.redirect(next_url)
|
|
||||||
|
|
||||||
return flask.render_template(self.template_name, form=form, **context)
|
|
||||||
|
|
||||||
|
|
||||||
class TagAddUnnamedView(View):
|
|
||||||
methods = ['GET', 'POST']
|
|
||||||
decorators = [login_required]
|
|
||||||
template_name = 'inventory/tag_create_unnamed.html'
|
|
||||||
|
|
||||||
def dispatch_request(self):
|
|
||||||
lots = Lot.query.filter(Lot.owner_id == current_user.id)
|
|
||||||
context = {
|
|
||||||
'page_title': 'New Unnamed Tag',
|
|
||||||
'lots': lots,
|
|
||||||
'version': __version__,
|
|
||||||
}
|
|
||||||
form = TagUnnamedForm()
|
|
||||||
if form.validate_on_submit():
|
|
||||||
try:
|
|
||||||
form.save()
|
|
||||||
except ConnectionError as e:
|
|
||||||
logger.error(
|
|
||||||
"Error while trying to connect to tag server: {}".format(e)
|
|
||||||
)
|
|
||||||
msg = (
|
|
||||||
"Sorry, we cannot create the unnamed tags requested because "
|
|
||||||
"some error happens while connecting to the tag server!"
|
|
||||||
)
|
|
||||||
messages.error(msg)
|
|
||||||
|
|
||||||
next_url = url_for('inventory.taglist')
|
|
||||||
return flask.redirect(next_url)
|
|
||||||
|
|
||||||
return flask.render_template(self.template_name, form=form, **context)
|
|
||||||
|
|
||||||
|
|
||||||
class TagDetailView(View):
|
|
||||||
decorators = [login_required]
|
|
||||||
template_name = 'inventory/tag_detail.html'
|
|
||||||
|
|
||||||
def dispatch_request(self, id):
|
|
||||||
lots = Lot.query.filter(Lot.owner_id == current_user.id)
|
|
||||||
tag = (
|
|
||||||
Tag.query.filter(Tag.owner_id == current_user.id).filter(Tag.id == id).one()
|
|
||||||
)
|
|
||||||
|
|
||||||
context = {
|
|
||||||
'lots': lots,
|
|
||||||
'tag': tag,
|
|
||||||
'page_title': '{} Tag'.format(tag.code),
|
|
||||||
'version': __version__,
|
|
||||||
}
|
|
||||||
return flask.render_template(self.template_name, **context)
|
|
||||||
|
|
||||||
|
|
||||||
class TagLinkDeviceView(View):
|
class TagLinkDeviceView(View):
|
||||||
methods = ['POST']
|
methods = ['POST']
|
||||||
decorators = [login_required]
|
decorators = [login_required]
|
||||||
|
@ -716,14 +630,6 @@ devices.add_url_rule(
|
||||||
'/lot/<string:lot_id>/device/add/',
|
'/lot/<string:lot_id>/device/add/',
|
||||||
view_func=DeviceCreateView.as_view('lot_device_add'),
|
view_func=DeviceCreateView.as_view('lot_device_add'),
|
||||||
)
|
)
|
||||||
devices.add_url_rule('/tag/', view_func=TagListView.as_view('taglist'))
|
|
||||||
devices.add_url_rule('/tag/add/', view_func=TagAddView.as_view('tag_add'))
|
|
||||||
devices.add_url_rule(
|
|
||||||
'/tag/unnamed/add/', view_func=TagAddUnnamedView.as_view('tag_unnamed_add')
|
|
||||||
)
|
|
||||||
devices.add_url_rule(
|
|
||||||
'/tag/<string:id>/', view_func=TagDetailView.as_view('tag_details')
|
|
||||||
)
|
|
||||||
devices.add_url_rule(
|
devices.add_url_rule(
|
||||||
'/tag/devices/add/', view_func=TagLinkDeviceView.as_view('tag_devices_add')
|
'/tag/devices/add/', view_func=TagLinkDeviceView.as_view('tag_devices_add')
|
||||||
)
|
)
|
||||||
|
|
|
@ -0,0 +1,73 @@
|
||||||
|
from flask import g
|
||||||
|
from flask_wtf import FlaskForm
|
||||||
|
from wtforms import IntegerField, StringField, validators
|
||||||
|
|
||||||
|
from ereuse_devicehub.db import db
|
||||||
|
from ereuse_devicehub.resources.device.models import Device
|
||||||
|
from ereuse_devicehub.resources.tag.model import Tag
|
||||||
|
|
||||||
|
|
||||||
|
class TagForm(FlaskForm):
|
||||||
|
code = StringField('Code', [validators.length(min=1)])
|
||||||
|
|
||||||
|
def validate(self, extra_validators=None):
|
||||||
|
error = ["This value is being used"]
|
||||||
|
is_valid = super().validate(extra_validators)
|
||||||
|
if not is_valid:
|
||||||
|
return False
|
||||||
|
tag = Tag.query.filter(Tag.id == self.code.data).all()
|
||||||
|
if tag:
|
||||||
|
self.code.errors = error
|
||||||
|
return False
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
|
def save(self):
|
||||||
|
self.instance = Tag(id=self.code.data)
|
||||||
|
db.session.add(self.instance)
|
||||||
|
db.session.commit()
|
||||||
|
return self.instance
|
||||||
|
|
||||||
|
def remove(self):
|
||||||
|
if not self.instance.device and not self.instance.provider:
|
||||||
|
self.instance.delete()
|
||||||
|
db.session.commit()
|
||||||
|
return self.instance
|
||||||
|
|
||||||
|
|
||||||
|
class TagUnnamedForm(FlaskForm):
|
||||||
|
amount = IntegerField('amount')
|
||||||
|
|
||||||
|
def save(self):
|
||||||
|
num = self.amount.data
|
||||||
|
tags_id, _ = g.tag_provider.post('/', {}, query=[('num', num)])
|
||||||
|
tags = [Tag(id=tag_id, provider=g.inventory.tag_provider) for tag_id in tags_id]
|
||||||
|
db.session.add_all(tags)
|
||||||
|
db.session.commit()
|
||||||
|
return tags
|
||||||
|
|
||||||
|
|
||||||
|
class PrintLabelsForm(FlaskForm):
|
||||||
|
devices = StringField(render_kw={'class': "devicesList d-none"})
|
||||||
|
|
||||||
|
def validate(self, extra_validators=None):
|
||||||
|
is_valid = super().validate(extra_validators)
|
||||||
|
|
||||||
|
if not self.devices.data:
|
||||||
|
return False
|
||||||
|
|
||||||
|
device_ids = self.devices.data.split(",")
|
||||||
|
self._devices = (
|
||||||
|
Device.query.filter(Device.id.in_(device_ids))
|
||||||
|
.filter(Device.owner_id == g.user.id)
|
||||||
|
.distinct()
|
||||||
|
.all()
|
||||||
|
)
|
||||||
|
|
||||||
|
# print only tags that are DHID
|
||||||
|
dhids = [x.devicehub_id for x in self._devices]
|
||||||
|
self._tags = (
|
||||||
|
Tag.query.filter(Tag.owner_id == g.user.id).filter(Tag.id.in_(dhids)).all()
|
||||||
|
)
|
||||||
|
|
||||||
|
return is_valid
|
|
@ -0,0 +1,142 @@
|
||||||
|
import logging
|
||||||
|
|
||||||
|
import flask
|
||||||
|
from flask import Blueprint, request, url_for
|
||||||
|
from flask.views import View
|
||||||
|
from flask_login import current_user, login_required
|
||||||
|
from requests.exceptions import ConnectionError
|
||||||
|
|
||||||
|
from ereuse_devicehub import __version__, messages
|
||||||
|
from ereuse_devicehub.labels.forms import PrintLabelsForm, TagForm, TagUnnamedForm
|
||||||
|
from ereuse_devicehub.resources.lot.models import Lot
|
||||||
|
from ereuse_devicehub.resources.tag.model import Tag
|
||||||
|
|
||||||
|
labels = Blueprint('labels', __name__, url_prefix='/labels')
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
class TagListView(View):
|
||||||
|
methods = ['GET']
|
||||||
|
decorators = [login_required]
|
||||||
|
template_name = 'labels/label_list.html'
|
||||||
|
|
||||||
|
def dispatch_request(self):
|
||||||
|
lots = Lot.query.filter(Lot.owner_id == current_user.id)
|
||||||
|
tags = Tag.query.filter(Tag.owner_id == current_user.id).order_by(Tag.id)
|
||||||
|
context = {
|
||||||
|
'lots': lots,
|
||||||
|
'tags': tags,
|
||||||
|
'page_title': 'Tags Management',
|
||||||
|
'version': __version__,
|
||||||
|
}
|
||||||
|
return flask.render_template(self.template_name, **context)
|
||||||
|
|
||||||
|
|
||||||
|
class TagAddView(View):
|
||||||
|
methods = ['GET', 'POST']
|
||||||
|
decorators = [login_required]
|
||||||
|
template_name = 'labels/tag_create.html'
|
||||||
|
|
||||||
|
def dispatch_request(self):
|
||||||
|
lots = Lot.query.filter(Lot.owner_id == current_user.id)
|
||||||
|
context = {'page_title': 'New Tag', 'lots': lots, 'version': __version__}
|
||||||
|
form = TagForm()
|
||||||
|
if form.validate_on_submit():
|
||||||
|
form.save()
|
||||||
|
next_url = url_for('labels.label_list')
|
||||||
|
return flask.redirect(next_url)
|
||||||
|
|
||||||
|
return flask.render_template(self.template_name, form=form, **context)
|
||||||
|
|
||||||
|
|
||||||
|
class TagAddUnnamedView(View):
|
||||||
|
methods = ['GET', 'POST']
|
||||||
|
decorators = [login_required]
|
||||||
|
template_name = 'labels/tag_create_unnamed.html'
|
||||||
|
|
||||||
|
def dispatch_request(self):
|
||||||
|
lots = Lot.query.filter(Lot.owner_id == current_user.id)
|
||||||
|
context = {
|
||||||
|
'page_title': 'New Unnamed Tag',
|
||||||
|
'lots': lots,
|
||||||
|
'version': __version__,
|
||||||
|
}
|
||||||
|
form = TagUnnamedForm()
|
||||||
|
if form.validate_on_submit():
|
||||||
|
try:
|
||||||
|
form.save()
|
||||||
|
except ConnectionError as e:
|
||||||
|
logger.error(
|
||||||
|
"Error while trying to connect to tag server: {}".format(e)
|
||||||
|
)
|
||||||
|
msg = (
|
||||||
|
"Sorry, we cannot create the unnamed tags requested because "
|
||||||
|
"some error happens while connecting to the tag server!"
|
||||||
|
)
|
||||||
|
messages.error(msg)
|
||||||
|
|
||||||
|
next_url = url_for('labels.label_list')
|
||||||
|
return flask.redirect(next_url)
|
||||||
|
|
||||||
|
return flask.render_template(self.template_name, form=form, **context)
|
||||||
|
|
||||||
|
|
||||||
|
class PrintLabelsView(View):
|
||||||
|
"""This View is used to print labels from multiple devices"""
|
||||||
|
|
||||||
|
methods = ['POST', 'GET']
|
||||||
|
decorators = [login_required]
|
||||||
|
template_name = 'labels/print_labels.html'
|
||||||
|
title = 'Design and implementation of labels'
|
||||||
|
|
||||||
|
def dispatch_request(self):
|
||||||
|
lots = Lot.query.filter(Lot.owner_id == current_user.id)
|
||||||
|
context = {
|
||||||
|
'lots': lots,
|
||||||
|
'page_title': self.title,
|
||||||
|
'version': __version__,
|
||||||
|
'referrer': request.referrer,
|
||||||
|
}
|
||||||
|
|
||||||
|
form = PrintLabelsForm()
|
||||||
|
if form.validate_on_submit():
|
||||||
|
context['form'] = form
|
||||||
|
context['tags'] = form._tags
|
||||||
|
return flask.render_template(self.template_name, **context)
|
||||||
|
else:
|
||||||
|
messages.error('Error you need select one or more devices')
|
||||||
|
|
||||||
|
next_url = request.referrer or url_for('inventory.devicelist')
|
||||||
|
return flask.redirect(next_url)
|
||||||
|
|
||||||
|
|
||||||
|
class LabelDetailView(View):
|
||||||
|
decorators = [login_required]
|
||||||
|
template_name = 'labels/label_detail.html'
|
||||||
|
|
||||||
|
def dispatch_request(self, id):
|
||||||
|
lots = Lot.query.filter(Lot.owner_id == current_user.id)
|
||||||
|
tag = (
|
||||||
|
Tag.query.filter(Tag.owner_id == current_user.id).filter(Tag.id == id).one()
|
||||||
|
)
|
||||||
|
|
||||||
|
context = {
|
||||||
|
'lots': lots,
|
||||||
|
'tag': tag,
|
||||||
|
'page_title': '{} Tag'.format(tag.code),
|
||||||
|
'version': __version__,
|
||||||
|
}
|
||||||
|
return flask.render_template(self.template_name, **context)
|
||||||
|
|
||||||
|
|
||||||
|
labels.add_url_rule('/', view_func=TagListView.as_view('label_list'))
|
||||||
|
labels.add_url_rule('/add/', view_func=TagAddView.as_view('tag_add'))
|
||||||
|
labels.add_url_rule(
|
||||||
|
'/unnamed/add/', view_func=TagAddUnnamedView.as_view('tag_unnamed_add')
|
||||||
|
)
|
||||||
|
labels.add_url_rule(
|
||||||
|
'/print',
|
||||||
|
view_func=PrintLabelsView.as_view('print_labels'),
|
||||||
|
)
|
||||||
|
labels.add_url_rule('/<string:id>/', view_func=LabelDetailView.as_view('label_details'))
|
|
@ -5,8 +5,8 @@ $(document).ready(function() {
|
||||||
load_size();
|
load_size();
|
||||||
})
|
})
|
||||||
|
|
||||||
function qr_draw(url) {
|
function qr_draw(url, id) {
|
||||||
var qrcode = new QRCode($("#qrcode")[0], {
|
var qrcode = new QRCode($(id)[0], {
|
||||||
text: url,
|
text: url,
|
||||||
width: 128,
|
width: 128,
|
||||||
height: 128,
|
height: 128,
|
||||||
|
@ -54,16 +54,26 @@ function printpdf() {
|
||||||
var border = 2;
|
var border = 2;
|
||||||
var height = parseInt($("#height-tag").val());
|
var height = parseInt($("#height-tag").val());
|
||||||
var width = parseInt($("#width-tag").val());
|
var width = parseInt($("#width-tag").val());
|
||||||
var tag = $("#tag").text();
|
|
||||||
var pdf = new jsPDF('l', 'mm', [width, height]);
|
|
||||||
var imgData = $('#qrcode img').attr("src");
|
|
||||||
img_side = Math.min(height, width) - 2*border;
|
img_side = Math.min(height, width) - 2*border;
|
||||||
max_tag_side = (Math.max(height, width)/2) + border;
|
max_tag_side = (Math.max(height, width)/2) + border;
|
||||||
if (max_tag_side < img_side) {
|
if (max_tag_side < img_side) {
|
||||||
max_tag_side = img_side+ 2*border;
|
max_tag_side = img_side+ 2*border;
|
||||||
};
|
};
|
||||||
min_tag_side = (Math.min(height, width)/2) + border;
|
min_tag_side = (Math.min(height, width)/2) + border;
|
||||||
|
var last_tag_code = '';
|
||||||
|
|
||||||
|
var pdf = new jsPDF('l', 'mm', [width, height]);
|
||||||
|
$(".tag").map(function(x, y) {
|
||||||
|
if (x != 0){
|
||||||
|
pdf.addPage();
|
||||||
|
console.log(x)
|
||||||
|
};
|
||||||
|
var tag = $(y).text();
|
||||||
|
last_tag_code = tag;
|
||||||
|
var imgData = $('#'+tag+' img').attr("src");
|
||||||
pdf.addImage(imgData, 'PNG', border, border, img_side, img_side);
|
pdf.addImage(imgData, 'PNG', border, border, img_side, img_side);
|
||||||
pdf.text(tag, max_tag_side, min_tag_side);
|
pdf.text(tag, max_tag_side, min_tag_side);
|
||||||
pdf.save('Tag_'+tag+'.pdf');
|
});
|
||||||
|
|
||||||
|
pdf.save('Tag_'+last_tag_code+'.pdf');
|
||||||
}
|
}
|
||||||
|
|
|
@ -181,7 +181,7 @@
|
||||||
<li class="nav-heading">Utils</li>
|
<li class="nav-heading">Utils</li>
|
||||||
|
|
||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<a class="nav-link collapsed" href="{{ url_for('inventory.taglist')}}">
|
<a class="nav-link collapsed" href="{{ url_for('labels.label_list')}}">
|
||||||
<i class="bi bi-tags"></i>
|
<i class="bi bi-tags"></i>
|
||||||
<span>Tags</span>
|
<span>Tags</span>
|
||||||
</a>
|
</a>
|
||||||
|
|
|
@ -235,6 +235,17 @@
|
||||||
Remove Tag from selected Device
|
Remove Tag from selected Device
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
<li>
|
||||||
|
<form id="print_labels" method="post" action="{{ url_for('labels.print_labels') }}">
|
||||||
|
{% for f in form_print_labels %}
|
||||||
|
{{ f }}
|
||||||
|
{% endfor %}
|
||||||
|
<a href="javascript:$('#print_labels').submit()" class="dropdown-item">
|
||||||
|
<i class="bi bi-x"></i>
|
||||||
|
Print labels
|
||||||
|
</a>
|
||||||
|
</form>
|
||||||
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -335,7 +346,7 @@
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
{% for t in dev.tags | sort(attribute="id") %}
|
{% for t in dev.tags | sort(attribute="id") %}
|
||||||
<a href="{{ url_for('inventory.tag_details', id=t.id)}}">{{ t.id }}</a>
|
<a href="{{ url_for('labels.label_details', id=t.id)}}">{{ t.id }}</a>
|
||||||
{% if not loop.last %},{% endif %}
|
{% if not loop.last %},{% endif %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</td>
|
</td>
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<h1>Inventory</h1>
|
<h1>Inventory</h1>
|
||||||
<nav>
|
<nav>
|
||||||
<ol class="breadcrumb">
|
<ol class="breadcrumb">
|
||||||
<li class="breadcrumb-item"><a href="{{ url_for('inventory.taglist')}}">Tag management</a></li>
|
<li class="breadcrumb-item"><a href="{{ url_for('labels.label_list')}}">Tag management</a></li>
|
||||||
<li class="breadcrumb-item active">Tag details {{ tag.id }}</li>
|
<li class="breadcrumb-item active">Tag details {{ tag.id }}</li>
|
||||||
</ol>
|
</ol>
|
||||||
</nav>
|
</nav>
|
||||||
|
@ -40,17 +40,17 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<h5 class="card-title">Print details</h5>
|
<h5 class="card-title">Print Label</h5>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-lg-3 col-md-4">
|
<div class="col-lg-3 col-md-4">
|
||||||
<div style="width:256px; height:148px; border: solid 1px; padding: 10px;">
|
<div style="width:256px; height:148px; border: solid 1px; padding: 10px;">
|
||||||
<div id="print">
|
<div id="print">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<div id="qrcode"></div>
|
<div id="{{ tag.id }}"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<div style="padding-top: 55px"><b id="tag">{{ tag.id }}</b></div>
|
<div style="padding-top: 55px"><b class="tag">{{ tag.id }}</b></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -109,6 +109,6 @@
|
||||||
<script src="{{ url_for('static', filename='js/jspdf.min.js') }}"></script>
|
<script src="{{ url_for('static', filename='js/jspdf.min.js') }}"></script>
|
||||||
<script src="{{ url_for('static', filename='js/print.pdf.js') }}"></script>
|
<script src="{{ url_for('static', filename='js/print.pdf.js') }}"></script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
qr_draw("{{url_for('inventory.device_details', id=tag.device.devicehub_id, _external=True)}}");
|
qr_draw("{{url_for('inventory.device_details', id=tag.device.devicehub_id, _external=True)}}", "#{{ tag.id }}");
|
||||||
</script>
|
</script>
|
||||||
{% endblock main %}
|
{% endblock main %}
|
|
@ -20,7 +20,7 @@
|
||||||
<!-- Bordered Tabs -->
|
<!-- Bordered Tabs -->
|
||||||
|
|
||||||
<div class="btn-group dropdown ml-1">
|
<div class="btn-group dropdown ml-1">
|
||||||
<a href="{{ url_for('inventory.tag_add')}}" type="button" class="btn btn-primary">
|
<a href="{{ url_for('labels.tag_add')}}" type="button" class="btn btn-primary">
|
||||||
<i class="bi bi-plus"></i>
|
<i class="bi bi-plus"></i>
|
||||||
Create Named Tag
|
Create Named Tag
|
||||||
<span class="caret"></span>
|
<span class="caret"></span>
|
||||||
|
@ -28,7 +28,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="btn-group dropdown ml-1" uib-dropdown="">
|
<div class="btn-group dropdown ml-1" uib-dropdown="">
|
||||||
<a href="{{ url_for('inventory.tag_unnamed_add')}}" type="button" class="btn btn-primary">
|
<a href="{{ url_for('labels.tag_unnamed_add')}}" type="button" class="btn btn-primary">
|
||||||
<i class="bi bi-plus"></i>
|
<i class="bi bi-plus"></i>
|
||||||
Create UnNamed Tag
|
Create UnNamed Tag
|
||||||
<span class="caret"></span>
|
<span class="caret"></span>
|
||||||
|
@ -52,7 +52,7 @@
|
||||||
<tbody>
|
<tbody>
|
||||||
{% for tag in tags %}
|
{% for tag in tags %}
|
||||||
<tr>
|
<tr>
|
||||||
<td><a href="{{ url_for('inventory.tag_details', id=tag.id) }}">{{ tag.id }}</a></td>
|
<td><a href="{{ url_for('labels.label_details', id=tag.id) }}">{{ tag.id }}</a></td>
|
||||||
<td>{% if tag.provider %}Unnamed tag {% else %}Named tag{% endif %}</td>
|
<td>{% if tag.provider %}Unnamed tag {% else %}Named tag{% endif %}</td>
|
||||||
<td>{{ tag.get_provider }}</td>
|
<td>{{ tag.get_provider }}</td>
|
||||||
<td>
|
<td>
|
|
@ -0,0 +1,103 @@
|
||||||
|
{% extends "ereuse_devicehub/base_site.html" %}
|
||||||
|
{% block main %}
|
||||||
|
|
||||||
|
<div class="pagetitle">
|
||||||
|
<h1>Print Labels</h1>
|
||||||
|
<nav>
|
||||||
|
<ol class="breadcrumb">
|
||||||
|
<li class="breadcrumb-item"><a href="{{ url_for('labels.label_list')}}">Tag management</a></li>
|
||||||
|
<li class="breadcrumb-item active">Print Labels</li>
|
||||||
|
</ol>
|
||||||
|
</nav>
|
||||||
|
</div><!-- End Page Title -->
|
||||||
|
|
||||||
|
<section class="section profile">
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-xl-8">
|
||||||
|
|
||||||
|
<div class="card">
|
||||||
|
<div class="card-body">
|
||||||
|
<div class="pt-4 pb-2">
|
||||||
|
<h5 class="card-title text-center pb-0 fs-4">Print Labels</h5>
|
||||||
|
<p class="text-center small">{{ title }}</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-lg-3 col-md-4">
|
||||||
|
{% for tag in tags %}
|
||||||
|
<div style="width:256px; height:148px; border: solid 1px; padding: 10px;">
|
||||||
|
<div id="print">
|
||||||
|
<div class="row">
|
||||||
|
<div class="col">
|
||||||
|
<div id="{{ tag.id }}"></div>
|
||||||
|
</div>
|
||||||
|
<div class="col">
|
||||||
|
<div style="padding-top: 55px">
|
||||||
|
<b class="tag">{{ tag.id }}</b>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
||||||
|
<div class="col-1">
|
||||||
|
</div>
|
||||||
|
<div class="col label">
|
||||||
|
<label class="col-form-label col-sm-2">Size</label>
|
||||||
|
<div class="col-sm-10">
|
||||||
|
<div class="input-group mb-3">
|
||||||
|
<select class="form-select" id="printerType">
|
||||||
|
<option label="Brother small size (62 x 29)" value="brotherSmall" selected="selected">
|
||||||
|
Brother small size (62 x 29)
|
||||||
|
</option>
|
||||||
|
<option label="Printer tag small (97 x 59)" value="smallTagPrinter">
|
||||||
|
Printer tag small (97 x 59)
|
||||||
|
</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<label class="col-form-label col-sm-2">Width</label>
|
||||||
|
<div class="col-sm-10">
|
||||||
|
<div class="input-group mb-3">
|
||||||
|
<input class="form-control" id="width-tag" name='width-tag' type="number" value="62" min="52" max="300" />
|
||||||
|
<span class="input-group-text">mm</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<label class="col-form-label col-sm-2">Height</label>
|
||||||
|
<div class="col-sm-10">
|
||||||
|
<div class="input-group mb-3">
|
||||||
|
<input class="form-control" id="height-tag" name='height-tag' type="number" value="29" min="28" max="200" />
|
||||||
|
<span class="input-group-text">mm</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row mt-5">
|
||||||
|
<div class="col-lg-3 col-md-4">
|
||||||
|
<a href="javascript:printpdf()" class="btn btn-success">Print</a>
|
||||||
|
</div>
|
||||||
|
<div class="col-lg-3 col-md-4">
|
||||||
|
<a href="javascript:save_size()" class="btn btn-primary">Save</a>
|
||||||
|
</div>
|
||||||
|
<div class="col-lg-3 col-md-4">
|
||||||
|
<a href="javascript:reset_size()" class="btn btn-danger">Reset</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
<script src="{{ url_for('static', filename='js/qrcode.js') }}"></script>
|
||||||
|
<script src="{{ url_for('static', filename='js/jspdf.min.js') }}"></script>
|
||||||
|
<script src="{{ url_for('static', filename='js/print.pdf.js') }}"></script>
|
||||||
|
<script type="text/javascript">
|
||||||
|
{% for tag in tags %}
|
||||||
|
qr_draw("{{ url_for('inventory.device_details', id=tag.device.devicehub_id, _external=True) }}", "#{{ tag.id }}")
|
||||||
|
{% endfor %}
|
||||||
|
</script>
|
||||||
|
{% endblock main %}
|
|
@ -5,7 +5,7 @@
|
||||||
<h1>{{ title }}</h1>
|
<h1>{{ title }}</h1>
|
||||||
<nav>
|
<nav>
|
||||||
<ol class="breadcrumb">
|
<ol class="breadcrumb">
|
||||||
<li class="breadcrumb-item"><a href="{{ url_for('inventory.taglist')}}">Tag management</a></li>
|
<li class="breadcrumb-item"><a href="{{ url_for('labels.label_list')}}">Tag management</a></li>
|
||||||
<li class="breadcrumb-item">{{ page_title }}</li>
|
<li class="breadcrumb-item">{{ page_title }}</li>
|
||||||
</ol>
|
</ol>
|
||||||
</nav>
|
</nav>
|
||||||
|
@ -49,7 +49,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<a href="{{ url_for('inventory.taglist') }}" class="btn btn-danger">Cancel</a>
|
<a href="{{ url_for('labels.label_list') }}" class="btn btn-danger">Cancel</a>
|
||||||
<button class="btn btn-primary" type="submit">Save</button>
|
<button class="btn btn-primary" type="submit">Save</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
|
@ -5,7 +5,7 @@
|
||||||
<h1>{{ title }}</h1>
|
<h1>{{ title }}</h1>
|
||||||
<nav>
|
<nav>
|
||||||
<ol class="breadcrumb">
|
<ol class="breadcrumb">
|
||||||
<li class="breadcrumb-item"><a href="{{ url_for('inventory.taglist')}}">Tag management</a></li>
|
<li class="breadcrumb-item"><a href="{{ url_for('labels.label_list')}}">Tag management</a></li>
|
||||||
<li class="breadcrumb-item">{{ page_title }}</li>
|
<li class="breadcrumb-item">{{ page_title }}</li>
|
||||||
</ol>
|
</ol>
|
||||||
</nav>
|
</nav>
|
||||||
|
@ -49,7 +49,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<a href="{{ url_for('inventory.taglist') }}" class="btn btn-danger">Cancel</a>
|
<a href="{{ url_for('labels.label_list') }}" class="btn btn-danger">Cancel</a>
|
||||||
<button class="btn btn-primary" type="submit">Save</button>
|
<button class="btn btn-primary" type="submit">Save</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
|
@ -8,11 +8,13 @@ from flask_wtf.csrf import CSRFProtect
|
||||||
from ereuse_devicehub.config import DevicehubConfig
|
from ereuse_devicehub.config import DevicehubConfig
|
||||||
from ereuse_devicehub.devicehub import Devicehub
|
from ereuse_devicehub.devicehub import Devicehub
|
||||||
from ereuse_devicehub.inventory.views import devices
|
from ereuse_devicehub.inventory.views import devices
|
||||||
|
from ereuse_devicehub.labels.views import labels
|
||||||
from ereuse_devicehub.views import core
|
from ereuse_devicehub.views import core
|
||||||
|
|
||||||
app = Devicehub(inventory=DevicehubConfig.DB_SCHEMA)
|
app = Devicehub(inventory=DevicehubConfig.DB_SCHEMA)
|
||||||
app.register_blueprint(core)
|
app.register_blueprint(core)
|
||||||
app.register_blueprint(devices)
|
app.register_blueprint(devices)
|
||||||
|
app.register_blueprint(labels)
|
||||||
|
|
||||||
# configure & enable CSRF of Flask-WTF
|
# configure & enable CSRF of Flask-WTF
|
||||||
# NOTE: enable by blueprint to exclude API views
|
# NOTE: enable by blueprint to exclude API views
|
||||||
|
|
|
@ -15,6 +15,9 @@ Flask-WTF==1.0.0
|
||||||
hashids==1.2.0
|
hashids==1.2.0
|
||||||
inflection==0.3.1
|
inflection==0.3.1
|
||||||
itsdangerous==2.0.1
|
itsdangerous==2.0.1
|
||||||
|
# lock Jinja2 version because it's the latest compatible with Flask 1.0.X
|
||||||
|
# see related info on https://github.com/pallets/jinja/issues/1628
|
||||||
|
Jinja2==3.0.3
|
||||||
marshmallow==3.0.0b11
|
marshmallow==3.0.0b11
|
||||||
marshmallow-enum==1.4.1
|
marshmallow-enum==1.4.1
|
||||||
passlib==1.7.1
|
passlib==1.7.1
|
||||||
|
|
Reference in New Issue