From a45fd815a27c88e5d73df27576cbc60412a84e72 Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Mon, 28 Feb 2022 11:46:31 +0100
Subject: [PATCH 01/24] task #2741 fix Handle error message, provider
 connection when we are creating an unnamed tag

---
 ereuse_devicehub/inventory/forms.py | 7 ++++++-
 ereuse_devicehub/inventory/views.py | 5 ++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py
index 8959ae93..d551bb0d 100644
--- a/ereuse_devicehub/inventory/forms.py
+++ b/ereuse_devicehub/inventory/forms.py
@@ -1,6 +1,7 @@
 import copy
 import json
 from json.decoder import JSONDecodeError
+from requests.exceptions import ConnectionError
 
 from boltons.urlutils import URL
 from ereuse_devicehub.db import db
@@ -411,7 +412,11 @@ class TagUnnamedForm(FlaskForm):
 
     def save(self):
         num = self.amount.data
-        tags_id, _ = g.tag_provider.post('/', {}, query=[('num', num)])
+        try:
+            tags_id, _ = g.tag_provider.post('/', {}, query=[('num', num)])
+        except ConnectionError:
+            pass
+            return []
         tags = [Tag(id=tag_id, provider=g.inventory.tag_provider) for tag_id in tags_id]
         db.session.add_all(tags)
         db.session.commit()
diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py
index cb80b895..40764189 100644
--- a/ereuse_devicehub/inventory/views.py
+++ b/ereuse_devicehub/inventory/views.py
@@ -256,7 +256,10 @@ class TagAddUnnamedView(View):
         context = {'page_title': 'New Unnamed Tag', 'lots': lots}
         form = TagUnnamedForm()
         if form.validate_on_submit():
-            form.save()
+            tags = form.save()
+            if not tags:
+                msg = 'Sorry, the communication with the tag server is not possible now!'
+                messages.error(msg)
             next_url = url_for('inventory.devices.taglist')
             return flask.redirect(next_url)
 

From c6538333f7dd75402fb41a2d4d0bb5be6a8df417 Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Mon, 28 Feb 2022 12:02:56 +0100
Subject: [PATCH 02/24] task #2739 Manufacter and Model empty instead of None

---
 ereuse_devicehub/templates/inventory/device_list.html | 2 +-
 ereuse_devicehub/templates/inventory/tag_detail.html  | 2 +-
 ereuse_devicehub/templates/inventory/tag_list.html    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html
index a165e387..249d3d17 100644
--- a/ereuse_devicehub/templates/inventory/device_list.html
+++ b/ereuse_devicehub/templates/inventory/device_list.html
@@ -246,7 +246,7 @@
                       </td>
                       <td>
                         <a href="{{ url_for('inventory.devices.device_details', id=dev.devicehub_id)}}">
-                          {{ dev.type }} {{ dev.manufacturer }} {{ dev.model }}
+                          {{ dev.type }} {{ dev.manufacturer|d('', true) }} {{ dev.model|d('', true) }}
                         </a>
                       </td>
                       <td>
diff --git a/ereuse_devicehub/templates/inventory/tag_detail.html b/ereuse_devicehub/templates/inventory/tag_detail.html
index 331ae80c..15197118 100644
--- a/ereuse_devicehub/templates/inventory/tag_detail.html
+++ b/ereuse_devicehub/templates/inventory/tag_detail.html
@@ -35,7 +35,7 @@
                 <div class="col-lg-9 col-md-8">
                     {% if tag.device %}
                       <a href="{{url_for('inventory.devices.device_details', id=tag.device.devicehub_id)}}">
-                          {{ tag.device.manufacturer }} {{ tag.device.model }}
+                          {{ tag.device.type }} {{ tag.device.manufacturer|d('', true) }} {{ tag.device.model|d('', true) }}
                       </a>
                     {% endif %}
                 </div>
diff --git a/ereuse_devicehub/templates/inventory/tag_list.html b/ereuse_devicehub/templates/inventory/tag_list.html
index 8653605d..b2e31d11 100644
--- a/ereuse_devicehub/templates/inventory/tag_list.html
+++ b/ereuse_devicehub/templates/inventory/tag_list.html
@@ -59,7 +59,7 @@
                       <td>
                         {% if tag.device %}
                         <a href={{ url_for('inventory.devices.device_details', id=tag.device.devicehub_id)}}>
-                          {{ tag.device.type }} {{ tag.device.manufacturer }} {{ tag.device.model }}
+                          {{ tag.device.type }} {{ tag.device.manufacturer|d('', true) }} {{ tag.device.model|d('', true) }}
                         </a>
                         {% endif %}
                       </td>

From 560d9fae051e92b61c4c7874c288ab47c13fc8a8 Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Mon, 28 Feb 2022 12:16:33 +0100
Subject: [PATCH 03/24] task #2740 add tag code in name of pdf file

---
 ereuse_devicehub/static/js/print.pdf.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ereuse_devicehub/static/js/print.pdf.js b/ereuse_devicehub/static/js/print.pdf.js
index d7d9833a..5316e1ef 100644
--- a/ereuse_devicehub/static/js/print.pdf.js
+++ b/ereuse_devicehub/static/js/print.pdf.js
@@ -65,5 +65,5 @@ function printpdf() {
     min_tag_side = (Math.min(height, width)/2) + border;
     pdf.addImage(imgData, 'PNG', border, border, img_side, img_side);
     pdf.text(tag, max_tag_side, min_tag_side);
-    pdf.save('Tags.pdf');
+    pdf.save('Tag_'+tag+'.pdf');
 }

From 9a95587cf3d1d126115968bddbe04fd96d2f3c7c Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Mon, 28 Feb 2022 13:05:36 +0100
Subject: [PATCH 04/24] remove lot in top

---
 .../templates/inventory/device_list.html      | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html
index 249d3d17..8b5f030f 100644
--- a/ereuse_devicehub/templates/inventory/device_list.html
+++ b/ereuse_devicehub/templates/inventory/device_list.html
@@ -33,8 +33,34 @@
         <div class="card-body pt-3">
           <!-- Bordered Tabs -->
 
-            <div class="col-12">
-                <h3><a href="{{ url_for('inventory.devices.lot_edit', id=lot.id) }}">{{ lot.name }}</a></h3>
+            <div class="row">
+              <div class="col-6">
+                  <h3><a href="{{ url_for('inventory.devices.lot_edit', id=lot.id) }}">{{ lot.name }}</a></h3>
+              </div>
+              <div class="col">
+                  {% if lot and lot.is_temporary and not lot.devices %}
+                    <a href="javascript:void()" class="" data-bs-toggle="modal" data-bs-target="#btnRemoveLots">
+                      <i class="bi bi-trash"></i>
+                      Remove Lot
+                    </a>
+                  {% endif %}
+              </div>
+              <div class="col">
+                  {% if lot and lot.is_temporary %}
+                  <a href="javascript:void()" class="dropdown-item" data-bs-toggle="modal" data-bs-target="#addingLotModal">
+                    <i class="bi bi-plus"></i>
+                    Add selected Devices to a lot
+                  </a>
+                  {% endif %}
+              </div>
+              <div class="col">
+                  {% if lot and lot.is_temporary %}
+                  <a href="javascript:void()" class="dropdown-item" data-bs-toggle="modal" data-bs-target="#removeLotModal">
+                    <i class="bi bi-x"></i>
+                    Remove selected devices from a lot
+                  </a>
+                  {% endif %}
+              </div>
             </div>
         </div>
       </div>

From 823594dce45ba03f1ab76ddca745d0b6f404a498 Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Mon, 28 Feb 2022 13:27:12 +0100
Subject: [PATCH 05/24] add tab documents

---
 .../templates/inventory/device_list.html      | 71 ++++++++-----------
 1 file changed, 28 insertions(+), 43 deletions(-)

diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html
index 124241f8..9b160df4 100644
--- a/ereuse_devicehub/templates/inventory/device_list.html
+++ b/ereuse_devicehub/templates/inventory/device_list.html
@@ -39,7 +39,7 @@
               </div>
               <div class="col">
                   {% if lot and lot.is_temporary and not lot.devices %}
-                    <a href="javascript:void()" class="" data-bs-toggle="modal" data-bs-target="#btnRemoveLots">
+                    <a href="javascript:void()" data-bs-toggle="modal" data-bs-target="#btnRemoveLots">
                       <i class="bi bi-trash"></i>
                       Remove Lot
                     </a>
@@ -47,18 +47,18 @@
               </div>
               <div class="col">
                   {% if lot and lot.is_temporary %}
-                  <a href="javascript:void()" class="dropdown-item" data-bs-toggle="modal" data-bs-target="#addingLotModal">
-                    <i class="bi bi-plus"></i>
-                    Add selected Devices to a lot
-                  </a>
+                    <a href="javascript:newTrade('user_from')">
+                      <i class="bi bi-plus"></i>
+                      Add supplier
+                    </a>
                   {% endif %}
               </div>
               <div class="col">
                   {% if lot and lot.is_temporary %}
-                  <a href="javascript:void()" class="dropdown-item" data-bs-toggle="modal" data-bs-target="#removeLotModal">
-                    <i class="bi bi-x"></i>
-                    Remove selected devices from a lot
-                  </a>
+                    <a href="javascript:newTrade('user_to')">
+                      <i class="bi bi-plus"></i>
+                      Add receiver
+                    </a>
                   {% endif %}
               </div>
             </div>
@@ -92,16 +92,6 @@
                 </button>
                 <span class="d-none" id="activeTradeModal" data-bs-toggle="modal" data-bs-target="#tradeLotModal"></span>
                 <ul class="dropdown-menu" aria-labelledby="btnLots">
-                {% if lot and lot.is_temporary and not lot.devices %}
-                  <li>
-                    <a href="javascript:newAction('Use')" class="dropdown-item"
-                        data-bs-toggle="modal" data-bs-target="#btnRemoveLots">
-                      <i class="bi bi-trash"></i>
-                      Remove Lot
-                      <span class="caret"></span>
-                    </a>
-                  </li>
-                {% endif %}
                   <li>
                     <a href="javascript:void()" class="dropdown-item" data-bs-toggle="modal" data-bs-target="#addingLotModal">
                       <i class="bi bi-plus"></i>
@@ -114,29 +104,6 @@
                       Remove selected devices from a lot
                     </a>
                   </li>
-                  {% if lot.is_temporary %}
-                  <li>
-                    <a href="javascript:newTrade('user_from')" class="dropdown-item">
-                      <i class="bi bi-plus"></i>
-                      Add supplier
-                    </a>
-                  </li>
-                  <li>
-                    <a href="javascript:newTrade('user_to')" class="dropdown-item">
-                      <i class="bi bi-plus"></i>
-                      Add receiver
-                    </a>
-                  </li>
-                  {% endif %}
-                  {% if lot and not lot.is_temporary %}
-                  <li>
-                    <a href="{{ url_for('inventory.devices.trade_document_add', lot_id=lot.id)}}" class="dropdown-item">
-                      <i class="bi bi-plus"></i>
-                      Add new document
-                      <span class="caret"></span>
-                    </a>
-                  </li>
-                  {% endif %}
                 </ul>
               </div>
               <div class="btn-group dropdown ml-1" uib-dropdown="">
@@ -283,7 +250,7 @@
 
               <div class="btn-group dropdown ml-1" uib-dropdown="">
                 <button id="btnSnapshot" type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
-                    <i class="bi bi-tag"></i>
+                    <i class="bi bi-laptop"></i>
                     New Device
                 </button>
                 <ul class="dropdown-menu" aria-labelledby="btnSnapshot">
@@ -302,6 +269,24 @@
                 </ul>
               </div>
 
+              {% if lot and not lot.is_temporary %}
+              <div class="btn-group dropdown ml-1" uib-dropdown="">
+                <button id="btnSnapshot" type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
+                    <i class="bi bi-book"></i>
+                    Documents
+                </button>
+                <ul class="dropdown-menu" aria-labelledby="btnSnapshot">
+                  <li>
+                    <a href="{{ url_for('inventory.devices.trade_document_add', lot_id=lot.id)}}" class="dropdown-item">
+                      <i class="bi bi-plus"></i>
+                      Add new document
+                      <span class="caret"></span>
+                    </a>
+                  </li>
+                </ul>
+              </div>
+              {% endif %}
+
               <div class="tab-content pt-2">
 
                 <h5 class="card-title">Computers</h5>

From f9840e9f2ba811a7933b97ca913973ce47bc4a72 Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Mon, 28 Feb 2022 13:33:03 +0100
Subject: [PATCH 06/24] fix buttons of form of upload trade document

---
 ereuse_devicehub/templates/inventory/trade_document.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ereuse_devicehub/templates/inventory/trade_document.html b/ereuse_devicehub/templates/inventory/trade_document.html
index 01d0d3ed..4d19b095 100644
--- a/ereuse_devicehub/templates/inventory/trade_document.html
+++ b/ereuse_devicehub/templates/inventory/trade_document.html
@@ -39,15 +39,15 @@
                 {{ field.label(class_="form-label") }}
                 {{ field }}
                 <small class="text-muted">{{ field.description }}</small>
-              {% endif %}
-              {% if field.errors %}
+                {% if field.errors %}
                 <p class="text-danger">
                   {% for error in field.errors %}
                     {{ error }}<br/>
                   {% endfor %}
                 </p>
-              {% endif %}
+                {% endif %}
               </div>
+              {% endif %}
             {% endfor %}
 
             <div class="col-12">

From 3886076f50a92f567dcadc1ecea3b7d0ae85f228 Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Tue, 1 Mar 2022 10:07:05 +0100
Subject: [PATCH 07/24] #2736 Move jquery to base

---
 ereuse_devicehub/templates/ereuse_devicehub/base.html   | 3 +++
 ereuse_devicehub/templates/inventory/device_create.html | 1 -
 ereuse_devicehub/templates/inventory/device_list.html   | 1 -
 ereuse_devicehub/templates/inventory/tag_detail.html    | 1 -
 ereuse_devicehub/templates/inventory/tag_list.html      | 1 -
 5 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ereuse_devicehub/templates/ereuse_devicehub/base.html b/ereuse_devicehub/templates/ereuse_devicehub/base.html
index 5ca885f7..32ee90cb 100644
--- a/ereuse_devicehub/templates/ereuse_devicehub/base.html
+++ b/ereuse_devicehub/templates/ereuse_devicehub/base.html
@@ -17,6 +17,9 @@
   <link href="https://fonts.gstatic.com" rel="preconnect">
   <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i,700,700i|Nunito:300,300i,400,400i,600,600i,700,700i|Poppins:300,300i,400,400i,500,500i,600,600i,700,700i" rel="stylesheet">
 
+  <!-- JS Files -->
+  <script src="{{ url_for('static', filename='js/jquery-3.6.0.min.js') }}"></script>
+
   <!-- Vendor CSS Files -->
   <link href="{{ url_for('static', filename='vendor/bootstrap/css/bootstrap.min.css') }}" rel="stylesheet">
   <link href="{{ url_for('static', filename='vendor/bootstrap-icons/bootstrap-icons.css') }}" rel="stylesheet">
diff --git a/ereuse_devicehub/templates/inventory/device_create.html b/ereuse_devicehub/templates/inventory/device_create.html
index 1296531f..7ba7c794 100644
--- a/ereuse_devicehub/templates/inventory/device_create.html
+++ b/ereuse_devicehub/templates/inventory/device_create.html
@@ -385,6 +385,5 @@
     </div>
   </div>
 </section>
-<script src="{{ url_for('static', filename='js/jquery-3.6.0.min.js') }}"></script>
 <script src="{{ url_for('static', filename='js/create_device.js') }}"></script>
 {% endblock main %}
diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html
index 9b160df4..bbb1a14d 100644
--- a/ereuse_devicehub/templates/inventory/device_list.html
+++ b/ereuse_devicehub/templates/inventory/device_list.html
@@ -395,6 +395,5 @@
 <script>
 
 </script>
-<script src="{{ url_for('static', filename='js/jquery-3.6.0.min.js') }}"></script>
 <script src="{{ url_for('static', filename='js/main_inventory.js') }}"></script>
 {% endblock main %}
diff --git a/ereuse_devicehub/templates/inventory/tag_detail.html b/ereuse_devicehub/templates/inventory/tag_detail.html
index 15197118..88ca8681 100644
--- a/ereuse_devicehub/templates/inventory/tag_detail.html
+++ b/ereuse_devicehub/templates/inventory/tag_detail.html
@@ -106,7 +106,6 @@
     </div>
   </div>
 </section>
-<script src="{{ url_for('static', filename='js/jquery-3.6.0.min.js') }}"></script>
 <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>
diff --git a/ereuse_devicehub/templates/inventory/tag_list.html b/ereuse_devicehub/templates/inventory/tag_list.html
index b2e31d11..1401ff62 100644
--- a/ereuse_devicehub/templates/inventory/tag_list.html
+++ b/ereuse_devicehub/templates/inventory/tag_list.html
@@ -86,5 +86,4 @@
 <script>
 
 </script>
-<script src="{{ url_for('static', filename='js/jquery-3.6.0.min.js') }}"></script>
 {% endblock main %}

From ab89b7eff05718f2c65c3459ef0d50ff8e412eac Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Tue, 1 Mar 2022 10:30:47 +0100
Subject: [PATCH 08/24] #2736 Move simple-datatables to base

---
 ereuse_devicehub/templates/ereuse_devicehub/base.html   | 2 ++
 ereuse_devicehub/templates/inventory/device_detail.html | 1 -
 ereuse_devicehub/templates/inventory/device_list.html   | 6 ------
 ereuse_devicehub/templates/inventory/tag_detail.html    | 1 -
 ereuse_devicehub/templates/inventory/tag_list.html      | 6 ------
 5 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/ereuse_devicehub/templates/ereuse_devicehub/base.html b/ereuse_devicehub/templates/ereuse_devicehub/base.html
index 32ee90cb..7b56a1ec 100644
--- a/ereuse_devicehub/templates/ereuse_devicehub/base.html
+++ b/ereuse_devicehub/templates/ereuse_devicehub/base.html
@@ -19,10 +19,12 @@
 
   <!-- JS Files -->
   <script src="{{ url_for('static', filename='js/jquery-3.6.0.min.js') }}"></script>
+  <script src="https://cdn.jsdelivr.net/npm/simple-datatables@latest"></script>
 
   <!-- Vendor CSS Files -->
   <link href="{{ url_for('static', filename='vendor/bootstrap/css/bootstrap.min.css') }}" rel="stylesheet">
   <link href="{{ url_for('static', filename='vendor/bootstrap-icons/bootstrap-icons.css') }}" rel="stylesheet">
+  <link href="https://cdn.jsdelivr.net/npm/simple-datatables@latest/dist/style.css" rel="stylesheet" type="text/css">
 
 
   <!-- Template Main CSS File -->
diff --git a/ereuse_devicehub/templates/inventory/device_detail.html b/ereuse_devicehub/templates/inventory/device_detail.html
index 5112efb9..98b04fb9 100644
--- a/ereuse_devicehub/templates/inventory/device_detail.html
+++ b/ereuse_devicehub/templates/inventory/device_detail.html
@@ -1,6 +1,5 @@
 {% extends "ereuse_devicehub/base_site.html" %}
 {% block main %}
-<link href="https://cdn.jsdelivr.net/npm/simple-datatables@latest/dist/style.css" rel="stylesheet" type="text/css">
 
 <div class="pagetitle">
   <h1>Inventory</h1>
diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html
index bbb1a14d..7f31a60a 100644
--- a/ereuse_devicehub/templates/inventory/device_list.html
+++ b/ereuse_devicehub/templates/inventory/device_list.html
@@ -1,6 +1,5 @@
 {% extends "ereuse_devicehub/base_site.html" %}
 {% block main %}
-<link href="https://cdn.jsdelivr.net/npm/simple-datatables@latest/dist/style.css" rel="stylesheet" type="text/css">
 
 <div class="pagetitle">
   <h1>Inventory</h1>
@@ -386,14 +385,9 @@
 {% include "inventory/trade.html" %}
 {% include "inventory/alert_export_error.html" %}
 
-<!-- CDN -->
-<script src="https://cdn.jsdelivr.net/npm/simple-datatables@latest"></script>
 <!-- Custom Code -->
 <script>
   const table = new simpleDatatables.DataTable("table")
-</script>
-<script>
-
 </script>
 <script src="{{ url_for('static', filename='js/main_inventory.js') }}"></script>
 {% endblock main %}
diff --git a/ereuse_devicehub/templates/inventory/tag_detail.html b/ereuse_devicehub/templates/inventory/tag_detail.html
index 88ca8681..356220d5 100644
--- a/ereuse_devicehub/templates/inventory/tag_detail.html
+++ b/ereuse_devicehub/templates/inventory/tag_detail.html
@@ -1,6 +1,5 @@
 {% extends "ereuse_devicehub/base_site.html" %}
 {% block main %}
-<link href="https://cdn.jsdelivr.net/npm/simple-datatables@latest/dist/style.css" rel="stylesheet" type="text/css">
 
 <div class="pagetitle">
   <h1>Inventory</h1>
diff --git a/ereuse_devicehub/templates/inventory/tag_list.html b/ereuse_devicehub/templates/inventory/tag_list.html
index 1401ff62..519debab 100644
--- a/ereuse_devicehub/templates/inventory/tag_list.html
+++ b/ereuse_devicehub/templates/inventory/tag_list.html
@@ -1,6 +1,5 @@
 {% extends "ereuse_devicehub/base_site.html" %}
 {% block main %}
-<link href="https://cdn.jsdelivr.net/npm/simple-datatables@latest/dist/style.css" rel="stylesheet" type="text/css">
 
 <div class="pagetitle">
   <h1>Inventory</h1>
@@ -77,13 +76,8 @@
   </div>
 </section>
 
-<!-- CDN -->
-<script src="https://cdn.jsdelivr.net/npm/simple-datatables@latest"></script>
 <!-- Custom Code -->
 <script>
   const table = new simpleDatatables.DataTable("table")
-</script>
-<script>
-
 </script>
 {% endblock main %}

From ad09d298a08b223607cbf1692ab951134ce98902 Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Wed, 2 Mar 2022 13:07:04 +0100
Subject: [PATCH 09/24] add order by code in tags lists and select

---
 ereuse_devicehub/inventory/forms.py | 4 ++--
 ereuse_devicehub/inventory/views.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py
index 62f295d0..da035520 100644
--- a/ereuse_devicehub/inventory/forms.py
+++ b/ereuse_devicehub/inventory/forms.py
@@ -464,9 +464,9 @@ class TagDeviceForm(FlaskForm):
         if self.delete:
             tags = Tag.query.filter(Tag.owner_id == g.user.id).filter_by(
                 device_id=self.device_id
-            )
+            ).order_by(Tag.id)
         else:
-            tags = Tag.query.filter(Tag.owner_id == g.user.id).filter_by(device_id=None)
+            tags = Tag.query.filter(Tag.owner_id == g.user.id).filter_by(device_id=None).order_by(Tag.id)
 
         self.tag.choices = [(tag.id, tag.id) for tag in tags]
 
diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py
index 5df42ac3..8bb9633b 100644
--- a/ereuse_devicehub/inventory/views.py
+++ b/ereuse_devicehub/inventory/views.py
@@ -47,7 +47,7 @@ class DeviceListMix(View):
         tags = (
             Tag.query.filter(Tag.owner_id == current_user.id)
             .filter(Tag.device_id.is_(None))
-            .order_by(Tag.created.desc())
+            .order_by(Tag.id.asc())
         )
 
         if lot_id:
@@ -236,7 +236,7 @@ class TagListView(View):
 
     def dispatch_request(self):
         lots = Lot.query.filter(Lot.owner_id == current_user.id)
-        tags = Tag.query.filter(Tag.owner_id == current_user.id)
+        tags = Tag.query.filter(Tag.owner_id == current_user.id).order_by(Tag.id)
         context = {
             'lots': lots,
             'tags': tags,

From c52480231bc1aaf90528e0bc4a5474b379960be8 Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Wed, 2 Mar 2022 13:08:23 +0100
Subject: [PATCH 10/24] add error msg when there are more than one device
 selected for add or remove one tag

---
 ereuse_devicehub/static/js/main_inventory.js  | 17 ++++++++++++---
 .../templates/inventory/addDevicestag.html    |  2 +-
 .../inventory/alert_unlink_tag_error.html     | 21 +++++++++++++++++++
 .../templates/inventory/device_list.html      |  9 +++++---
 .../inventory/tag_unlink_device.html          |  2 +-
 5 files changed, 43 insertions(+), 8 deletions(-)
 create mode 100644 ereuse_devicehub/templates/inventory/alert_unlink_tag_error.html

diff --git a/ereuse_devicehub/static/js/main_inventory.js b/ereuse_devicehub/static/js/main_inventory.js
index d790af81..333bf049 100644
--- a/ereuse_devicehub/static/js/main_inventory.js
+++ b/ereuse_devicehub/static/js/main_inventory.js
@@ -62,15 +62,26 @@ function deviceSelect() {
 function removeTag() {
     var devices = $(".deviceSelect").filter(':checked');
     var devices_id = $.map(devices, function(x) { return $(x).attr('data')});
-    if (devices_id.length > 0) {
+    if (devices_id.length == 1) {
         var url = "/inventory/tag/devices/"+devices_id[0]+"/del/";
         window.location.href = url;
+    } else {
+        $("#unlinkTagAlertModal").click();
     }
 }
 
 function addTag() {
-    deviceSelect();
-    $("#addingTagModal").click();
+    var devices = $(".deviceSelect").filter(':checked');
+    var devices_id = $.map(devices, function(x) { return $(x).attr('data')});
+    if (devices_id.length == 1) {
+        $("#addingTagModal .pol").hide();
+        $("#addingTagModal .btn-primary").show();
+    } else {
+        $("#addingTagModal .pol").show();
+        $("#addingTagModal .btn-primary").hide();
+    }
+
+    $("#addTagAlertModal").click();
 }
 
 function newTrade(action) {
diff --git a/ereuse_devicehub/templates/inventory/addDevicestag.html b/ereuse_devicehub/templates/inventory/addDevicestag.html
index cb929d37..5170b454 100644
--- a/ereuse_devicehub/templates/inventory/addDevicestag.html
+++ b/ereuse_devicehub/templates/inventory/addDevicestag.html
@@ -18,7 +18,7 @@
           </select>
           <input class="devicesList" type="hidden" name="device" />
           <p class="text-danger pol">
-              You need select first some device for adding this in a tag
+              You need select first one device and only one for add this in a tag
           </p>
         </div>
 
diff --git a/ereuse_devicehub/templates/inventory/alert_unlink_tag_error.html b/ereuse_devicehub/templates/inventory/alert_unlink_tag_error.html
new file mode 100644
index 00000000..b05fb40f
--- /dev/null
+++ b/ereuse_devicehub/templates/inventory/alert_unlink_tag_error.html
@@ -0,0 +1,21 @@
+<div class="modal fade" id="unlinkTagErrorModal" tabindex="-1" style="display: none;" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title">Error Unlink Tag</h5>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+
+        <div class="modal-body">
+          <p class="text-danger pol">
+              You need select first one device and only one for Unlink one Tag
+          </p>
+        </div>
+
+        <div class="modal-footer">
+          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+        </div>
+
+    </div>
+  </div>
+</div>
diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html
index 7f31a60a..3cf54939 100644
--- a/ereuse_devicehub/templates/inventory/device_list.html
+++ b/ereuse_devicehub/templates/inventory/device_list.html
@@ -231,17 +231,19 @@
                     <i class="bi bi-tag"></i>
                     Tags
                 </button>
+                <span class="d-none" id="unlinkTagAlertModal" data-bs-toggle="modal" data-bs-target="#unlinkTagErrorModal"></span>
+                <span class="d-none" id="addTagAlertModal" data-bs-toggle="modal" data-bs-target="#addingTagModal"></span>
                 <ul class="dropdown-menu" aria-labelledby="btnTags">
                   <li>
-                    <a href="javascript:addTag()" class="dropdown-item" data-bs-toggle="modal" data-bs-target="#addingTagModal">
+                    <a href="javascript:addTag()" class="dropdown-item">
                       <i class="bi bi-plus"></i>
-                      Add Tag to selected Devices
+                      Add Tag to selected Device
                     </a>
                   </li>
                   <li>
                     <a href="javascript:removeTag()" class="dropdown-item">
                       <i class="bi bi-x"></i>
-                      Remove Tag from selected Devices
+                      Remove Tag from selected Device
                     </a>
                   </li>
                 </ul>
@@ -384,6 +386,7 @@
 {% include "inventory/data_wipe.html" %}
 {% include "inventory/trade.html" %}
 {% include "inventory/alert_export_error.html" %}
+{% include "inventory/alert_unlink_tag_error.html" %}
 
 <!-- Custom Code -->
 <script>
diff --git a/ereuse_devicehub/templates/inventory/tag_unlink_device.html b/ereuse_devicehub/templates/inventory/tag_unlink_device.html
index fb123244..9f8043de 100644
--- a/ereuse_devicehub/templates/inventory/tag_unlink_device.html
+++ b/ereuse_devicehub/templates/inventory/tag_unlink_device.html
@@ -50,7 +50,7 @@
 
                   <div class="col-12">
                     <a href="{{ referrer }}" class="btn btn-danger">Cancel</a>
-                    <button class="btn btn-primary" type="submit">Save</button>
+                    <button class="btn btn-primary" type="submit">Unlink</button>
                   </div>
                 </form>
 

From e45a4982c6bbb70d18e8e6f1a13505cb83b2b0d9 Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Wed, 2 Mar 2022 13:31:21 +0100
Subject: [PATCH 11/24] ignoring warnings of too complex function

---
 ereuse_devicehub/inventory/forms.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py
index da035520..1032b3e7 100644
--- a/ereuse_devicehub/inventory/forms.py
+++ b/ereuse_devicehub/inventory/forms.py
@@ -180,7 +180,7 @@ class UploadSnapshotForm(FlaskForm):
         db.session.commit()
         return response
 
-    def build(self, snapshot_json):
+    def build(self, snapshot_json):  # noqa: C901
         # this is a copy adaptated from ereuse_devicehub.resources.action.views.snapshot
         device = snapshot_json.pop('device')  # type: Computer
         components = None
@@ -294,7 +294,7 @@ class NewDeviceForm(FlaskForm):
         if not self.depth.data:
             self.depth.data = 0.1
 
-    def validate(self, extra_validators=None):
+    def validate(self, extra_validators=None):  # noqa: C901
         error = ["Not a correct value"]
         is_valid = super().validate(extra_validators)
 
@@ -489,7 +489,7 @@ class TagDeviceForm(FlaskForm):
         if self.device.data:
             try:
                 self.device.data = int(self.device.data.split(',')[-1])
-            except:
+            except:  # noqa: E722
                 self.device.data = None
 
         if self.device_id or self.device.data:

From 7f0167f688b5b1d4d3530077f8abef95be099da5 Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Wed, 2 Mar 2022 13:39:15 +0100
Subject: [PATCH 12/24] remove imported but unused

---
 ereuse_devicehub/cli.py       | 2 +-
 ereuse_devicehub/devicehub.py | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/ereuse_devicehub/cli.py b/ereuse_devicehub/cli.py
index 4c253235..47cece32 100644
--- a/ereuse_devicehub/cli.py
+++ b/ereuse_devicehub/cli.py
@@ -11,7 +11,7 @@ import sys
 sys.ps1 = '\001\033[92m\002>>> \001\033[0m\002'
 sys.ps2= '\001\033[94m\002... \001\033[0m\002'
 
-import os, readline, rlcompleter, atexit
+import os, readline, atexit
 history_file = os.path.join(os.environ['HOME'], '.python_history')
 try:
   readline.read_history_file(history_file)
diff --git a/ereuse_devicehub/devicehub.py b/ereuse_devicehub/devicehub.py
index 1051c951..7163173d 100644
--- a/ereuse_devicehub/devicehub.py
+++ b/ereuse_devicehub/devicehub.py
@@ -10,7 +10,6 @@ from ereuse_utils.session import DevicehubClient
 from flask import _app_ctx_stack, g
 from flask_login import LoginManager, current_user
 from flask_sqlalchemy import SQLAlchemy
-from flask_wtf.csrf import CSRFProtect
 from teal.db import SchemaSQLAlchemy
 from teal.teal import Teal
 

From fc4ba2041e2581e709f6c124dd67c277ed46928b Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Wed, 2 Mar 2022 13:45:52 +0100
Subject: [PATCH 13/24] remove imported but unused

---
 ereuse_devicehub/cli.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ereuse_devicehub/cli.py b/ereuse_devicehub/cli.py
index 47cece32..67054095 100644
--- a/ereuse_devicehub/cli.py
+++ b/ereuse_devicehub/cli.py
@@ -1,8 +1,8 @@
 import os
 
 import click.testing
-import ereuse_utils
 import flask.cli
+import ereuse_utils
 
 from ereuse_devicehub.config import DevicehubConfig
 from ereuse_devicehub.devicehub import Devicehub

From b737aaf50a9ff34d5840b240a9c58ad1d8cfda29 Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Fri, 4 Mar 2022 13:31:33 +0100
Subject: [PATCH 14/24] add verbose_name in device.model instead of use
 template system

---
 ereuse_devicehub/resources/device/models.py           | 7 +++++++
 ereuse_devicehub/templates/inventory/device_list.html | 2 +-
 ereuse_devicehub/templates/inventory/tag_detail.html  | 2 +-
 ereuse_devicehub/templates/inventory/tag_list.html    | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ereuse_devicehub/resources/device/models.py b/ereuse_devicehub/resources/device/models.py
index 16b9df5b..89ddc846 100644
--- a/ereuse_devicehub/resources/device/models.py
+++ b/ereuse_devicehub/resources/device/models.py
@@ -474,6 +474,13 @@ class Device(Thing):
                                         key=attrgetter('type'))  # last test of each type
         return self._warning_actions(current_tests)
 
+    @property
+    def verbose_name(self):
+        type = self.type or ''
+        manufacturer = self.manufacturer or ''
+        model = self.model or ''
+        return f'{type} {manufacturer} {model}'
+
     @declared_attr
     def __mapper_args__(cls):
         """Defines inheritance.
diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html
index 3cf54939..80384cb1 100644
--- a/ereuse_devicehub/templates/inventory/device_list.html
+++ b/ereuse_devicehub/templates/inventory/device_list.html
@@ -316,7 +316,7 @@
                       </td>
                       <td>
                         <a href="{{ url_for('inventory.devices.device_details', id=dev.devicehub_id)}}">
-                          {{ dev.type }} {{ dev.manufacturer|d('', true) }} {{ dev.model|d('', true) }}
+                          {{ dev.verbose_name }}
                         </a>
                       </td>
                       <td>
diff --git a/ereuse_devicehub/templates/inventory/tag_detail.html b/ereuse_devicehub/templates/inventory/tag_detail.html
index 356220d5..3e63ff50 100644
--- a/ereuse_devicehub/templates/inventory/tag_detail.html
+++ b/ereuse_devicehub/templates/inventory/tag_detail.html
@@ -34,7 +34,7 @@
                 <div class="col-lg-9 col-md-8">
                     {% if tag.device %}
                       <a href="{{url_for('inventory.devices.device_details', id=tag.device.devicehub_id)}}">
-                          {{ tag.device.type }} {{ tag.device.manufacturer|d('', true) }} {{ tag.device.model|d('', true) }}
+                          {{ tag.device.verbose_name }}
                       </a>
                     {% endif %}
                 </div>
diff --git a/ereuse_devicehub/templates/inventory/tag_list.html b/ereuse_devicehub/templates/inventory/tag_list.html
index 519debab..b385dfc8 100644
--- a/ereuse_devicehub/templates/inventory/tag_list.html
+++ b/ereuse_devicehub/templates/inventory/tag_list.html
@@ -58,7 +58,7 @@
                       <td>
                         {% if tag.device %}
                         <a href={{ url_for('inventory.devices.device_details', id=tag.device.devicehub_id)}}>
-                          {{ tag.device.type }} {{ tag.device.manufacturer|d('', true) }} {{ tag.device.model|d('', true) }}
+                          {{ tag.device.verbose_name }}
                         </a>
                         {% endif %}
                       </td>

From d98d09cc7ddf6089f7932b843997e4017d09293a Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Fri, 4 Mar 2022 13:32:37 +0100
Subject: [PATCH 15/24] propagate error of connection with the tag server to
 the view

---
 ereuse_devicehub/inventory/forms.py |  8 +-------
 ereuse_devicehub/inventory/views.py | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py
index d028495e..841dcb15 100644
--- a/ereuse_devicehub/inventory/forms.py
+++ b/ereuse_devicehub/inventory/forms.py
@@ -1,8 +1,6 @@
 import copy
 import json
 from json.decoder import JSONDecodeError
-from requests.exceptions import ConnectionError
-
 from boltons.urlutils import URL
 from flask import g, request
 from flask_wtf import FlaskForm
@@ -446,11 +444,7 @@ class TagUnnamedForm(FlaskForm):
 
     def save(self):
         num = self.amount.data
-        try:
-            tags_id, _ = g.tag_provider.post('/', {}, query=[('num', num)])
-        except ConnectionError:
-            pass
-            return []
+        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()
diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py
index 2b5c6161..c0ac0117 100644
--- a/ereuse_devicehub/inventory/views.py
+++ b/ereuse_devicehub/inventory/views.py
@@ -1,13 +1,15 @@
 import csv
+import logging
 from io import StringIO
 
 import flask
 import flask_weasyprint
-from flask import Blueprint, g, make_response, request, url_for
+from flask import Blueprint, g, make_response, request, url_for, app
 from flask.views import View
 from flask_login import current_user, login_required
 from werkzeug.exceptions import NotFound
 from sqlalchemy import or_
+from requests.exceptions import ConnectionError
 
 from ereuse_devicehub import messages
 from ereuse_devicehub.inventory.forms import (
@@ -34,6 +36,8 @@ from ereuse_devicehub.resources.tag.model import Tag
 # TODO(@slamora): rename base 'inventory.devices' --> 'inventory'
 devices = Blueprint('inventory.devices', __name__, url_prefix='/inventory')
 
+logger = logging.getLogger(__name__)
+
 
 class DeviceListMix(View):
     decorators = [login_required]
@@ -287,10 +291,14 @@ class TagAddUnnamedView(View):
         context = {'page_title': 'New Unnamed Tag', 'lots': lots}
         form = TagUnnamedForm()
         if form.validate_on_submit():
-            tags = form.save()
-            if not tags:
-                msg = 'Sorry, the communication with the tag server is not possible now!'
+            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.devices.taglist')
             return flask.redirect(next_url)
 

From 6b3ccee58f42ca307164123f6e34935f90f5264f Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Fri, 4 Mar 2022 13:51:05 +0100
Subject: [PATCH 16/24] #2890 Go back to lot detail when cancel lot edit

---
 ereuse_devicehub/templates/inventory/lot.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ereuse_devicehub/templates/inventory/lot.html b/ereuse_devicehub/templates/inventory/lot.html
index 3d0d78d2..1bf3c58c 100644
--- a/ereuse_devicehub/templates/inventory/lot.html
+++ b/ereuse_devicehub/templates/inventory/lot.html
@@ -43,7 +43,11 @@
                   </div>
 
                   <div class="col-12">
-                    <a href="{{ url_for('inventory.devices.devicelist') }}" class="btn btn-danger">Cancel</a>
+                    {% if form.id %}
+                      <a href="{{ url_for('inventory.devices.lotdevicelist', lot_id=form.id) }}" class="btn btn-danger">Cancel</a>
+                    {% else %}
+                      <a href="{{ url_for('inventory.devices.devicelist') }}" class="btn btn-danger">Cancel</a>
+                    {% endif %}
                     <button class="btn btn-primary" type="submit">Save</button>
                   </div>
                 </form>

From 496763473e8d5ec1d5183248a300d256964b39ae Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Fri, 4 Mar 2022 18:30:14 +0100
Subject: [PATCH 17/24] always show the button to delete a lot and show an
 error message if you try to delete a lot with devices

---
 ereuse_devicehub/inventory/views.py                   | 7 +++++++
 ereuse_devicehub/templates/inventory/device_list.html | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py
index c0ac0117..42e0f67f 100644
--- a/ereuse_devicehub/inventory/views.py
+++ b/ereuse_devicehub/inventory/views.py
@@ -211,6 +211,13 @@ class LotDeleteView(View):
 
     def dispatch_request(self, id):
         form = LotForm(id=id)
+        if form.instance.devices:
+            msg = ("Sorry, the lot cannot be deleted because it still "
+                "has associated devices. Only empty lots can be deleted")
+            messages.error(msg)
+            next_url = url_for('inventory.devices.lotdevicelist', lot_id=id)
+            return flask.redirect(next_url)
+
         form.remove()
         next_url = url_for('inventory.devices.devicelist')
         return flask.redirect(next_url)
diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html
index 80384cb1..bb01f389 100644
--- a/ereuse_devicehub/templates/inventory/device_list.html
+++ b/ereuse_devicehub/templates/inventory/device_list.html
@@ -37,7 +37,7 @@
                   <h3><a href="{{ url_for('inventory.devices.lot_edit', id=lot.id) }}">{{ lot.name }}</a></h3>
               </div>
               <div class="col">
-                  {% if lot and lot.is_temporary and not lot.devices %}
+                  {% if lot and lot.is_temporary %}
                     <a href="javascript:void()" data-bs-toggle="modal" data-bs-target="#btnRemoveLots">
                       <i class="bi bi-trash"></i>
                       Remove Lot

From 4fbed3c5ef101929160159bccbf71358c6163999 Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Fri, 4 Mar 2022 18:50:47 +0100
Subject: [PATCH 18/24] drop class col in forms when is not neccesary

---
 ereuse_devicehub/templates/inventory/device_create.html      | 4 ++--
 ereuse_devicehub/templates/inventory/lot.html                | 4 ++--
 ereuse_devicehub/templates/inventory/tag_create.html         | 4 ++--
 ereuse_devicehub/templates/inventory/tag_create_unnamed.html | 4 ++--
 ereuse_devicehub/templates/inventory/tag_unlink_device.html  | 4 ++--
 ereuse_devicehub/templates/inventory/trade_document.html     | 4 ++--
 ereuse_devicehub/templates/inventory/upload_snapshot.html    | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ereuse_devicehub/templates/inventory/device_create.html b/ereuse_devicehub/templates/inventory/device_create.html
index 7ba7c794..8bcb5fae 100644
--- a/ereuse_devicehub/templates/inventory/device_create.html
+++ b/ereuse_devicehub/templates/inventory/device_create.html
@@ -31,7 +31,7 @@
                 <form method="post" class="row g-3 needs-validation" novalidate>
                   {{ form.csrf_token }}
 
-                  <div class="col-12">
+                  <div>
                     <div class="form-group has-validation mb-2">
                       <label for="name" class="form-label">Type *</label>
                       <select id="type" class="form-control" name="type" required="">
@@ -369,7 +369,7 @@
 
                   </div>
 
-                  <div class="col-12">
+                  <div>
                     <a href="{{ url_for('inventory.devices.devicelist') }}" class="btn btn-danger">Cancel</a>
                     <button class="btn btn-primary" type="submit">Save</button>
                   </div>
diff --git a/ereuse_devicehub/templates/inventory/lot.html b/ereuse_devicehub/templates/inventory/lot.html
index 1bf3c58c..dfad3241 100644
--- a/ereuse_devicehub/templates/inventory/lot.html
+++ b/ereuse_devicehub/templates/inventory/lot.html
@@ -34,7 +34,7 @@
                 <form method="post" class="row g-3 needs-validation" novalidate>
                   {{ form.csrf_token }}
 
-                  <div class="col-12">
+                  <div>
                     <label for="name" class="form-label">Name</label>
                     <div class="input-group has-validation">
                       <input type="text" name="name" class="form-control" required value="{{ form.name.data|default('', true) }}">
@@ -42,7 +42,7 @@
                     </div>
                   </div>
 
-                  <div class="col-12">
+                  <div>
                     {% if form.id %}
                       <a href="{{ url_for('inventory.devices.lotdevicelist', lot_id=form.id) }}" class="btn btn-danger">Cancel</a>
                     {% else %}
diff --git a/ereuse_devicehub/templates/inventory/tag_create.html b/ereuse_devicehub/templates/inventory/tag_create.html
index 9740ddee..23422ebd 100644
--- a/ereuse_devicehub/templates/inventory/tag_create.html
+++ b/ereuse_devicehub/templates/inventory/tag_create.html
@@ -33,7 +33,7 @@
                 <form method="post" class="row g-3 needs-validation" novalidate>
                   {{ form.csrf_token }}
 
-                  <div class="col-12">
+                  <div>
                     <label for="code" class="form-label">code</label>
                     <div class="input-group has-validation">
                       <input type="text" name="code" class="form-control" required value="{{ form.code.data|default('', true) }}">
@@ -48,7 +48,7 @@
                     {% endif %}
                   </div>
 
-                  <div class="col-12">
+                  <div>
                     <a href="{{ url_for('inventory.devices.taglist') }}" class="btn btn-danger">Cancel</a>
                     <button class="btn btn-primary" type="submit">Save</button>
                   </div>
diff --git a/ereuse_devicehub/templates/inventory/tag_create_unnamed.html b/ereuse_devicehub/templates/inventory/tag_create_unnamed.html
index 96ec073d..a72099d4 100644
--- a/ereuse_devicehub/templates/inventory/tag_create_unnamed.html
+++ b/ereuse_devicehub/templates/inventory/tag_create_unnamed.html
@@ -33,7 +33,7 @@
                 <form method="post" class="row g-3 needs-validation" novalidate>
                   {{ form.csrf_token }}
 
-                  <div class="col-12">
+                  <div>
                     <label for="code" class="form-label">Amount</label>
                     <div class="input-group has-validation">
                       {{ form.amount(class_="form-control") }}
@@ -48,7 +48,7 @@
                     {% endif %}
                   </div>
 
-                  <div class="col-12">
+                  <div>
                     <a href="{{ url_for('inventory.devices.taglist') }}" class="btn btn-danger">Cancel</a>
                     <button class="btn btn-primary" type="submit">Save</button>
                   </div>
diff --git a/ereuse_devicehub/templates/inventory/tag_unlink_device.html b/ereuse_devicehub/templates/inventory/tag_unlink_device.html
index 9f8043de..fc6d49d6 100644
--- a/ereuse_devicehub/templates/inventory/tag_unlink_device.html
+++ b/ereuse_devicehub/templates/inventory/tag_unlink_device.html
@@ -32,7 +32,7 @@
                 <form method="post" class="row g-3 needs-validation" novalidate>
                   {{ form.csrf_token }}
 
-                  <div class="col-12">
+                  <div>
                     <label for="tag" class="form-label">Tag</label>
                     <div class="input-group has-validation">
                       {{ form.tag(class_="form-control") }}
@@ -48,7 +48,7 @@
                   </div>
                   <input class="devicesList" type="hidden" name="device" />
 
-                  <div class="col-12">
+                  <div>
                     <a href="{{ referrer }}" class="btn btn-danger">Cancel</a>
                     <button class="btn btn-primary" type="submit">Unlink</button>
                   </div>
diff --git a/ereuse_devicehub/templates/inventory/trade_document.html b/ereuse_devicehub/templates/inventory/trade_document.html
index 4d19b095..0fa2fcc6 100644
--- a/ereuse_devicehub/templates/inventory/trade_document.html
+++ b/ereuse_devicehub/templates/inventory/trade_document.html
@@ -35,7 +35,7 @@
             {{ form.csrf_token }}
             {% for field in form %}
               {% if field != form.csrf_token %}
-              <div class="col-12">
+              <div>
                 {{ field.label(class_="form-label") }}
                 {{ field }}
                 <small class="text-muted">{{ field.description }}</small>
@@ -50,7 +50,7 @@
               {% endif %}
             {% endfor %}
 
-            <div class="col-12">
+            <div>
               <a href="{{ url_for('inventory.devices.lotdevicelist', lot_id=form._lot.id) }}" class="btn btn-danger">Cancel</a>
               <button class="btn btn-primary" type="submit">Save</button>
             </div>
diff --git a/ereuse_devicehub/templates/inventory/upload_snapshot.html b/ereuse_devicehub/templates/inventory/upload_snapshot.html
index 966cb000..5eb68eb3 100644
--- a/ereuse_devicehub/templates/inventory/upload_snapshot.html
+++ b/ereuse_devicehub/templates/inventory/upload_snapshot.html
@@ -33,7 +33,7 @@
                 <form method="post" enctype="multipart/form-data" class="row g-3 needs-validation" novalidate>
                   {{ form.csrf_token }}
 
-                  <div class="col-12">
+                  <div>
                     <label for="name" class="form-label">Select a Snapshot file</label>
                     <div class="input-group has-validation">
                       {{ form.snapshot }}
@@ -54,7 +54,7 @@
                     {% endif %}
                   </div>
 
-                  <div class="col-12">
+                  <div>
                     <a href="{{ url_for('inventory.devices.devicelist') }}" class="btn btn-danger">Cancel</a>
                     <button class="btn btn-primary" type="submit">Send</button>
                   </div>

From 9d432995929711aaacda902e3c41b61c6eef9156 Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Mon, 7 Mar 2022 10:20:18 +0100
Subject: [PATCH 19/24] now is possible delete a temporary lot when this lot
 have one or more devices

---
 ereuse_devicehub/inventory/forms.py | 2 +-
 ereuse_devicehub/inventory/views.py | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py
index 841dcb15..b65079fa 100644
--- a/ereuse_devicehub/inventory/forms.py
+++ b/ereuse_devicehub/inventory/forms.py
@@ -113,7 +113,7 @@ class LotForm(FlaskForm):
         return self.id
 
     def remove(self):
-        if self.instance and not self.instance.devices:
+        if self.instance and not self.instance.trade:
             self.instance.delete()
             db.session.commit()
         return self.instance
diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py
index 42e0f67f..089a1920 100644
--- a/ereuse_devicehub/inventory/views.py
+++ b/ereuse_devicehub/inventory/views.py
@@ -211,9 +211,8 @@ class LotDeleteView(View):
 
     def dispatch_request(self, id):
         form = LotForm(id=id)
-        if form.instance.devices:
-            msg = ("Sorry, the lot cannot be deleted because it still "
-                "has associated devices. Only empty lots can be deleted")
+        if form.instance.trade:
+            msg = "Sorry, the lot cannot be deleted because have a trade action "
             messages.error(msg)
             next_url = url_for('inventory.devices.lotdevicelist', lot_id=id)
             return flask.redirect(next_url)

From 5df74d77424ea67fb3a5ffeb41ae3c689849be9c Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Mon, 7 Mar 2022 11:24:02 +0100
Subject: [PATCH 20/24] extra message confirm when you want delete one lot with
 devices

---
 ereuse_devicehub/static/js/main_inventory.js          | 10 ++++++++++
 ereuse_devicehub/templates/inventory/device_list.html |  3 ++-
 ereuse_devicehub/templates/inventory/removelot.html   |  5 ++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ereuse_devicehub/static/js/main_inventory.js b/ereuse_devicehub/static/js/main_inventory.js
index 333bf049..86c25a82 100644
--- a/ereuse_devicehub/static/js/main_inventory.js
+++ b/ereuse_devicehub/static/js/main_inventory.js
@@ -59,6 +59,16 @@ function deviceSelect() {
     }
 }
 
+function removeLot() {
+    var devices = $(".deviceSelect");
+    if (devices.length > 0) {
+        $("#btnRemoveLots .text-danger").show();
+    } else {
+        $("#btnRemoveLots .text-danger").hide();
+    }
+    $("#activeRemoveLotModal").click();
+}
+
 function removeTag() {
     var devices = $(".deviceSelect").filter(':checked');
     var devices_id = $.map(devices, function(x) { return $(x).attr('data')});
diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html
index bb01f389..4736f1a1 100644
--- a/ereuse_devicehub/templates/inventory/device_list.html
+++ b/ereuse_devicehub/templates/inventory/device_list.html
@@ -38,7 +38,8 @@
               </div>
               <div class="col">
                   {% if lot and lot.is_temporary %}
-                    <a href="javascript:void()" data-bs-toggle="modal" data-bs-target="#btnRemoveLots">
+                    <span class="d-none" id="activeRemoveLotModal" data-bs-toggle="modal" data-bs-target="#btnRemoveLots"></span>
+                    <a href="javascript:removeLot()">
                       <i class="bi bi-trash"></i>
                       Remove Lot
                     </a>
diff --git a/ereuse_devicehub/templates/inventory/removelot.html b/ereuse_devicehub/templates/inventory/removelot.html
index 125d97d3..8e8cfb8f 100644
--- a/ereuse_devicehub/templates/inventory/removelot.html
+++ b/ereuse_devicehub/templates/inventory/removelot.html
@@ -9,12 +9,15 @@
 
         <div class="modal-body">
             Are you sure that you want to remove lot <strong>{{ lot.name }}</strong>?
+            <p class="text-danger">
+               There are devices in this lot, are you sure you want to delete it?
+            </p>
         </div>
 
         <div class="modal-footer">
           <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
           <a href="{{ url_for('inventory.devices.lot_del', id=lot.id)}}" type="button" class="btn btn-primary">
-            Save changes
+            Confirm
           </a>
         </div>
 

From 54a938071bd97ac052509bf26ef4b815e456d42e Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Mon, 7 Mar 2022 11:31:38 +0100
Subject: [PATCH 21/24] fix bug when add or delete one device of a lot. For fix
 this we use the pattern of flask doing the commit in the view

---
 ereuse_devicehub/inventory/forms.py | 2 --
 ereuse_devicehub/inventory/views.py | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py
index b65079fa..173e1562 100644
--- a/ereuse_devicehub/inventory/forms.py
+++ b/ereuse_devicehub/inventory/forms.py
@@ -72,13 +72,11 @@ class LotDeviceForm(FlaskForm):
         if self._devices:
             self._lot.devices.update(self._devices)
             db.session.add(self._lot)
-            db.session.commit()
 
     def remove(self):
         if self._devices:
             self._lot.devices.difference_update(self._devices)
             db.session.add(self._lot)
-            db.session.commit()
 
 
 class LotForm(FlaskForm):
diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py
index 089a1920..2e666f39 100644
--- a/ereuse_devicehub/inventory/views.py
+++ b/ereuse_devicehub/inventory/views.py
@@ -32,6 +32,7 @@ from ereuse_devicehub.resources.documents.device_row import ActionRow, DeviceRow
 from ereuse_devicehub.resources.hash_reports import insert_hash
 from ereuse_devicehub.resources.lot.models import Lot
 from ereuse_devicehub.resources.tag.model import Tag
+from ereuse_devicehub.db import db
 
 # TODO(@slamora): rename base 'inventory.devices' --> 'inventory'
 devices = Blueprint('inventory.devices', __name__, url_prefix='/inventory')
@@ -142,6 +143,7 @@ class LotDeviceAddView(View):
             messages.success(
                 'Add devices to lot "{}" successfully!'.format(form._lot.name)
             )
+            db.session.commit()
         else:
             messages.error('Error adding devices to lot!')
 
@@ -161,6 +163,7 @@ class LotDeviceDeleteView(View):
             messages.success(
                 'Remove devices from lot "{}" successfully!'.format(form._lot.name)
             )
+            db.session.commit()
         else:
             messages.error('Error removing devices from lot!')
 

From e90ac224c102b0f15d35aeacff0a558e46d546d4 Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Mon, 7 Mar 2022 11:37:32 +0100
Subject: [PATCH 22/24] use commit=True for default as django pattern, when we
 save or remove one model

---
 ereuse_devicehub/inventory/forms.py | 10 ++++++++--
 ereuse_devicehub/inventory/views.py |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py
index 173e1562..260218fe 100644
--- a/ereuse_devicehub/inventory/forms.py
+++ b/ereuse_devicehub/inventory/forms.py
@@ -62,7 +62,7 @@ class LotDeviceForm(FlaskForm):
 
         return bool(self._devices)
 
-    def save(self):
+    def save(self, commit=True):
         trade = self._lot.trade
         if trade:
             for dev in self._devices:
@@ -73,11 +73,17 @@ class LotDeviceForm(FlaskForm):
             self._lot.devices.update(self._devices)
             db.session.add(self._lot)
 
-    def remove(self):
+        if commit:
+            db.session.commit()
+
+    def remove(self, commit=True):
         if self._devices:
             self._lot.devices.difference_update(self._devices)
             db.session.add(self._lot)
 
+        if commit:
+            db.session.commit()
+
 
 class LotForm(FlaskForm):
     name = StringField('Name', [validators.length(min=1)])
diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py
index 2e666f39..84af2d9b 100644
--- a/ereuse_devicehub/inventory/views.py
+++ b/ereuse_devicehub/inventory/views.py
@@ -139,7 +139,7 @@ class LotDeviceAddView(View):
     def dispatch_request(self):
         form = LotDeviceForm()
         if form.validate_on_submit():
-            form.save()
+            form.save(commit=False)
             messages.success(
                 'Add devices to lot "{}" successfully!'.format(form._lot.name)
             )
@@ -159,7 +159,7 @@ class LotDeviceDeleteView(View):
     def dispatch_request(self):
         form = LotDeviceForm()
         if form.validate_on_submit():
-            form.remove()
+            form.remove(commit=False)
             messages.success(
                 'Remove devices from lot "{}" successfully!'.format(form._lot.name)
             )

From bb588b10d2492c5b97275a01b62ae8ef91945e4a Mon Sep 17 00:00:00 2001
From: Santiago Lamora <santiago@ribaguifi.com>
Date: Mon, 7 Mar 2022 18:28:45 +0100
Subject: [PATCH 23/24] Refactor HTML: use d-flex

---
 .../templates/inventory/device_list.html      | 46 +++++++------------
 1 file changed, 17 insertions(+), 29 deletions(-)

diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html
index 4736f1a1..7575cf0f 100644
--- a/ereuse_devicehub/templates/inventory/device_list.html
+++ b/ereuse_devicehub/templates/inventory/device_list.html
@@ -32,36 +32,24 @@
         <div class="card-body pt-3">
           <!-- Bordered Tabs -->
 
-            <div class="row">
-              <div class="col-6">
-                  <h3><a href="{{ url_for('inventory.devices.lot_edit', id=lot.id) }}">{{ lot.name }}</a></h3>
-              </div>
-              <div class="col">
-                  {% if lot and lot.is_temporary %}
-                    <span class="d-none" id="activeRemoveLotModal" data-bs-toggle="modal" data-bs-target="#btnRemoveLots"></span>
-                    <a href="javascript:removeLot()">
-                      <i class="bi bi-trash"></i>
-                      Remove Lot
-                    </a>
-                  {% endif %}
-              </div>
-              <div class="col">
-                  {% if lot and lot.is_temporary %}
-                    <a href="javascript:newTrade('user_from')">
-                      <i class="bi bi-plus"></i>
-                      Add supplier
-                    </a>
-                  {% endif %}
-              </div>
-              <div class="col">
-                  {% if lot and lot.is_temporary %}
-                    <a href="javascript:newTrade('user_to')">
-                      <i class="bi bi-plus"></i>
-                      Add receiver
-                    </a>
-                  {% endif %}
-              </div>
+          <div class="d-flex align-items-center justify-content-between">
+            <h3><a href="{{ url_for('inventory.devices.lot_edit', id=lot.id) }}">{{ lot.name }}</a></h3>
+
+            <div><!-- lot actions -->
+              {% if lot.is_temporary %}
+                <span class="d-none" id="activeRemoveLotModal" data-bs-toggle="modal" data-bs-target="#btnRemoveLots"></span>
+                <a class="me-2" href="javascript:removeLot()">
+                  <i class="bi bi-trash"></i> Remove Lot
+                </a>
+                <a class="me-2" href="javascript:newTrade('user_from')">
+                  <i class="bi bi-plus"></i> Add supplier
+                </a>
+                <a href="javascript:newTrade('user_to')">
+                  <i class="bi bi-plus"></i> Add receiver
+                </a>
+              {% endif %}
             </div>
+          </div>
         </div>
       </div>
       {% endif %}

From 46a3fc57dd7cfdb228c08520cf518c74ccbc02ae Mon Sep 17 00:00:00 2001
From: Santiago Lamora <santiago@ribaguifi.com>
Date: Mon, 7 Mar 2022 18:30:32 +0100
Subject: [PATCH 24/24] Replace add supplier & add receiver pictograms

Create visual relation between:
a) Supplier and incoming lot
b) Receiver and outgoing lot
---
 ereuse_devicehub/templates/inventory/device_list.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html
index 7575cf0f..4335a5b5 100644
--- a/ereuse_devicehub/templates/inventory/device_list.html
+++ b/ereuse_devicehub/templates/inventory/device_list.html
@@ -42,10 +42,10 @@
                   <i class="bi bi-trash"></i> Remove Lot
                 </a>
                 <a class="me-2" href="javascript:newTrade('user_from')">
-                  <i class="bi bi-plus"></i> Add supplier
+                  <i class="bi bi-arrow-down-right"></i> Add supplier
                 </a>
                 <a href="javascript:newTrade('user_to')">
-                  <i class="bi bi-plus"></i> Add receiver
+                  <i class="bi bi-arrow-up-right"></i> Add receiver
                 </a>
               {% endif %}
             </div>