Merge pull request #370 from eReuse/bugfix/3859-print-labels

Bugfix/3859 print labels

ereuse_devicehub/labels/views.py

@@ -114,21 +114,35 @@ class PrintLabelsView(View):
 
 
 class LabelDetailView(View):
+    """This View is used to print labels from multiple devices"""
+
+    methods = ['POST', 'GET']
     decorators = [login_required]
-    template_name = 'labels/label_detail.html'
+    template_name = 'labels/print_labels.html'
+    title = 'Design and implementation of labels'
 
     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),
+            'page_title': self.title,
             'version': __version__,
+            'referrer': request.referrer,
         }
+
+        devices = []
+        if tag.device:
+            form = PrintLabelsForm(devices=str(tag.device.id))
+            devices = [tag.device]
+        else:
+            form = PrintLabelsForm()
+
+        form._devices = devices
+        context['form'] = form
+        context['devices'] = devices
         return flask.render_template(self.template_name, **context)
 
 

ereuse_devicehub/templates/labels/print_labels.html

@@ -153,7 +153,7 @@
                     </div>
                     <div class="form-switch">
                       <input class="form-check-input" name="tags" type="checkbox" id="tagsCheck">
-                      <label class="form-check-label" for="tagsCheck">Tags</label>
+                      <label class="form-check-label" for="tagsCheck">Unique Identifiers</label>
                     </div>
                     <div class="form-switch">
                       <input class="form-check-input" name="serial_number" type="checkbox" id="serialNumberCheck">

examples/app.py

@@ -17,7 +17,7 @@ from ereuse_devicehub.workbench.views import workbench
 # from flask_wtf.csrf import CSRFProtect
 
 
-# from werkzeug.contrib.profiler import ProfilerMiddleware
+# from werkzeug.middleware.profiler import ProfilerMiddleware
 
 
 SENTRY_DSN = config('SENTRY_DSN', None)

examples/app_cprofile.py

@@ -1,6 +1,6 @@
-from ereuse_devicehub.devicehub import Devicehub
-from werkzeug.contrib.profiler import ProfilerMiddleware
+from werkzeug.middleware.profiler import ProfilerMiddleware
 
+from ereuse_devicehub.devicehub import Devicehub
 
 app = Devicehub(inventory='dbtest')
 app.config["SQLALCHEMY_RECORD_QUERIES"] = True

tests/test_render_2_0.py

@@ -356,7 +356,6 @@ def test_label_details(user3: UserClientFlask):
     user3.post(uri, data=data)
 
     body, status = user3.get('/labels/tag1/')
-    assert "tag1" in body
     assert "Print Label" in body