From 651c0cb9d88dd11cc07a5e4cdba9232a284c45bd Mon Sep 17 00:00:00 2001
From: RubenPX <rubenmarchante@gmail.com>
Date: Mon, 9 May 2022 13:57:17 +0200
Subject: [PATCH 01/10] Fix text select lots instead devices

---
 ereuse_devicehub/templates/inventory/device_list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html
index ef8f7aef..2b1d5cec 100644
--- a/ereuse_devicehub/templates/inventory/device_list.html
+++ b/ereuse_devicehub/templates/inventory/device_list.html
@@ -84,7 +84,7 @@
                 </button>
                 <span class="d-none" id="activeTradeModal" data-bs-toggle="modal" data-bs-target="#tradeLotModal"></span>
                 <ul class="dropdown-menu" aria-labelledby="btnLots" id="dropDownLotsSelector">
-                  <h6 class="dropdown-header">Select some devices to manage lots</h6>
+                  <h6 class="dropdown-header">Select lots where to store the selected devices</h6>
                   <ul class="mx-3" id="LotsSelector"></ul>
                   <li><hr /></li>
                   <li>

From ec9074ae7cb9e10113f832fc978b5fabb1a12cd9 Mon Sep 17 00:00:00 2001
From: RubenPX <rubenmarchante@gmail.com>
Date: Mon, 9 May 2022 14:03:51 +0200
Subject: [PATCH 02/10] add register user dialog

---
 .../templates/ereuse_devicehub/user_login.html   | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/ereuse_devicehub/templates/ereuse_devicehub/user_login.html b/ereuse_devicehub/templates/ereuse_devicehub/user_login.html
index f010e3d7..f6423759 100644
--- a/ereuse_devicehub/templates/ereuse_devicehub/user_login.html
+++ b/ereuse_devicehub/templates/ereuse_devicehub/user_login.html
@@ -60,7 +60,7 @@
                     <button class="btn btn-primary w-100" type="submit">Login</button>
                   </div>
                   <div class="col-12">
-                    <p class="small mb-0">Don't have account? <a href="#TODO">Create an account</a></p>
+                    <p class="small mb-0">Don't have account? <a href="#TODO" onclick="$('#exampleModal').modal('show')" data-toggle="modal" data-target="#exampleModal">Create an account</a></p>
                   </div>
                 </form>
 
@@ -83,4 +83,18 @@
 
   </div>
 </main><!-- End #main -->
+
+<!-- Modal -->
+<div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+  <div class="modal-dialog  modal-dialog-centered" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="exampleModalLabel">Do you want to try USOdy tools?</h5>
+      </div>
+      <div class="modal-body">
+        Just write an email to <a href="mali:hello@usody.com">hello@usody.com</a>
+      </div>
+    </div>
+  </div>
+</div> <!-- End register modal -->
 {% endblock body %}

From 3da1bdcad17ad68c7635715c95f101607b12319f Mon Sep 17 00:00:00 2001
From: RubenPX <rubenmarchante@gmail.com>
Date: Mon, 9 May 2022 14:40:28 +0200
Subject: [PATCH 03/10] Show selected devices notify instead page select

---
 ereuse_devicehub/static/js/main_inventory.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/ereuse_devicehub/static/js/main_inventory.js b/ereuse_devicehub/static/js/main_inventory.js
index 848c72e4..3d355574 100644
--- a/ereuse_devicehub/static/js/main_inventory.js
+++ b/ereuse_devicehub/static/js/main_inventory.js
@@ -85,24 +85,26 @@ window.addEventListener("DOMContentLoaded", () => {
     function itemListCheckChanged() {
         const listDevices = TableController.getAllDevicesInCurrentPage()
         const isAllChecked = listDevices.map(itm => itm.checked);
+        alertInfoDevices.innerHTML = `Selected devices: ${TableController.getSelectedDevices().length}
+            ${TableController.getAllDevices().length != TableController.getSelectedDevices().length
+                    ? `<a href="#" class="ml-3">Select all devices (${TableController.getAllDevices().length})</a>`
+                    : "<a href=\"#\" class=\"ml-3\">Cancel selection</a>"
+            }`;
+
+        if (TableController.getAllDevices().length > 0) {
+            alertInfoDevices.classList.remove("d-none");
+        } else {
+            alertInfoDevices.classList.add("d-none")
+        }
 
         if (isAllChecked.every(bool => bool == true)) {
             btnSelectAll.checked = true;
             btnSelectAll.indeterminate = false;
-            alertInfoDevices.innerHTML = `Selected devices: ${TableController.getSelectedDevices().length}
-                                            ${
-                                                TableController.getAllDevices().length != TableController.getSelectedDevices().length
-                                                    ? `<a href="#" class="ml-3">Select all devices (${TableController.getAllDevices().length})</a>`
-                                                    : "<a href=\"#\" class=\"ml-3\">Cancel selection</a>"
-                                            }`;
-            alertInfoDevices.classList.remove("d-none");
         } else if (isAllChecked.every(bool => bool == false)) {
             btnSelectAll.checked = false;
             btnSelectAll.indeterminate = false;
-            alertInfoDevices.classList.add("d-none")
         } else {
             btnSelectAll.indeterminate = true;
-            alertInfoDevices.classList.add("d-none")
         }
     }
 

From 881f56e3e479c630837c84773abbad10e2630243 Mon Sep 17 00:00:00 2001
From: RubenPX <rubenmarchante@gmail.com>
Date: Wed, 11 May 2022 10:42:32 +0200
Subject: [PATCH 04/10] Fix devices length comparation

---
 ereuse_devicehub/static/js/main_inventory.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ereuse_devicehub/static/js/main_inventory.js b/ereuse_devicehub/static/js/main_inventory.js
index 3d355574..3bae4ce3 100644
--- a/ereuse_devicehub/static/js/main_inventory.js
+++ b/ereuse_devicehub/static/js/main_inventory.js
@@ -91,10 +91,10 @@ window.addEventListener("DOMContentLoaded", () => {
                     : "<a href=\"#\" class=\"ml-3\">Cancel selection</a>"
             }`;
 
-        if (TableController.getAllDevices().length > 0) {
-            alertInfoDevices.classList.remove("d-none");
-        } else {
+        if (TableController.getSelectedDevices().length <= 0) {
             alertInfoDevices.classList.add("d-none")
+        } else {
+            alertInfoDevices.classList.remove("d-none");
         }
 
         if (isAllChecked.every(bool => bool == true)) {

From d27cc46f64d30f49bd45ac3086cd45e47adf16c0 Mon Sep 17 00:00:00 2001
From: RubenPX <rubenmarchante@gmail.com>
Date: Wed, 11 May 2022 11:09:38 +0200
Subject: [PATCH 05/10] refactor device selection

---
 ereuse_devicehub/static/js/main_inventory.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/ereuse_devicehub/static/js/main_inventory.js b/ereuse_devicehub/static/js/main_inventory.js
index 3bae4ce3..0f1d9b7e 100644
--- a/ereuse_devicehub/static/js/main_inventory.js
+++ b/ereuse_devicehub/static/js/main_inventory.js
@@ -83,8 +83,6 @@ window.addEventListener("DOMContentLoaded", () => {
     const alertInfoDevices = document.getElementById("select-devices-info");
 
     function itemListCheckChanged() {
-        const listDevices = TableController.getAllDevicesInCurrentPage()
-        const isAllChecked = listDevices.map(itm => itm.checked);
         alertInfoDevices.innerHTML = `Selected devices: ${TableController.getSelectedDevices().length}
             ${TableController.getAllDevices().length != TableController.getSelectedDevices().length
                     ? `<a href="#" class="ml-3">Select all devices (${TableController.getAllDevices().length})</a>`
@@ -97,14 +95,14 @@ window.addEventListener("DOMContentLoaded", () => {
             alertInfoDevices.classList.remove("d-none");
         }
 
-        if (isAllChecked.every(bool => bool == true)) {
+        if (TableController.getAllDevices().length == TableController.getSelectedDevices().length) {
             btnSelectAll.checked = true;
             btnSelectAll.indeterminate = false;
-        } else if (isAllChecked.every(bool => bool == false)) {
+        } else if(TableController.getAllDevices().length < TableController.getSelectedDevices().length) {
+            btnSelectAll.indeterminate = true;
+        } else {
             btnSelectAll.checked = false;
             btnSelectAll.indeterminate = false;
-        } else {
-            btnSelectAll.indeterminate = true;
         }
     }
 

From cc7b453c062d052cda8f160524d884235856e859 Mon Sep 17 00:00:00 2001
From: RubenPX <rubenmarchante@gmail.com>
Date: Wed, 11 May 2022 11:19:56 +0200
Subject: [PATCH 06/10] Check initial state on dom loaded & check if has
 devices

---
 ereuse_devicehub/static/js/main_inventory.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ereuse_devicehub/static/js/main_inventory.js b/ereuse_devicehub/static/js/main_inventory.js
index 0f1d9b7e..f48dfe99 100644
--- a/ereuse_devicehub/static/js/main_inventory.js
+++ b/ereuse_devicehub/static/js/main_inventory.js
@@ -104,6 +104,13 @@ window.addEventListener("DOMContentLoaded", () => {
             btnSelectAll.checked = false;
             btnSelectAll.indeterminate = false;
         }
+
+        if (TableController.getAllDevices().length == 0) {
+            btnSelectAll.checked = false;
+            btnSelectAll.disabled = true;
+        } else {
+            btnSelectAll.disabled = false;
+        }
     }
 
     TableController.getAllDevices().forEach(item => {
@@ -126,6 +133,8 @@ window.addEventListener("DOMContentLoaded", () => {
     table.on("datatable.page", () => itemListCheckChanged());
     table.on("datatable.perpage", () => itemListCheckChanged());
     table.on("datatable.update", () => itemListCheckChanged());
+
+    itemListCheckChanged();
 })
 
 function deviceSelect() {

From 411fe85b19df8b218ef9c3b3c594f59c2c466510 Mon Sep 17 00:00:00 2001
From: RubenPX <rubenmarchante@gmail.com>
Date: Wed, 11 May 2022 11:20:25 +0200
Subject: [PATCH 07/10] Check devices in current page

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

diff --git a/ereuse_devicehub/static/js/main_inventory.js b/ereuse_devicehub/static/js/main_inventory.js
index f48dfe99..1b911579 100644
--- a/ereuse_devicehub/static/js/main_inventory.js
+++ b/ereuse_devicehub/static/js/main_inventory.js
@@ -98,7 +98,7 @@ window.addEventListener("DOMContentLoaded", () => {
         if (TableController.getAllDevices().length == TableController.getSelectedDevices().length) {
             btnSelectAll.checked = true;
             btnSelectAll.indeterminate = false;
-        } else if(TableController.getAllDevices().length < TableController.getSelectedDevices().length) {
+        } else if(TableController.getAllSelectedDevicesInCurrentPage().length > 0) {
             btnSelectAll.indeterminate = true;
         } else {
             btnSelectAll.checked = false;

From d218b19dd548125c649bfd1e3fd83f96b508b234 Mon Sep 17 00:00:00 2001
From: Santiago Lamora <santiago@ribaguifi.com>
Date: Wed, 11 May 2022 17:24:59 +0200
Subject: [PATCH 08/10] Release version 2.1.0

---
 CHANGELOG.md                 | 2 ++
 ereuse_devicehub/__init__.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35d175a6..806a01b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@ ml).
 ## master
 
 ## testing
+
+## [2.1.0] - 2022-05-11
 - [added] #219 Add functionality to searchbar (Lots and devices).
 - [added] #222 Allow user to update its password.
 - [added] #233 Filter in out trades from lots selector.
diff --git a/ereuse_devicehub/__init__.py b/ereuse_devicehub/__init__.py
index 4bf535c4..9aa3f903 100644
--- a/ereuse_devicehub/__init__.py
+++ b/ereuse_devicehub/__init__.py
@@ -1 +1 @@
-__version__ = "2.1.0.dev"
+__version__ = "2.1.0"

From ef7e654c2618f35c3d5858bbde965e8e8e3fefac Mon Sep 17 00:00:00 2001
From: Santiago Lamora <santiago@ribaguifi.com>
Date: Wed, 11 May 2022 17:27:53 +0200
Subject: [PATCH 09/10] Bump to version 2.2.0.alpha0

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

diff --git a/ereuse_devicehub/__init__.py b/ereuse_devicehub/__init__.py
index 9aa3f903..28c957cd 100644
--- a/ereuse_devicehub/__init__.py
+++ b/ereuse_devicehub/__init__.py
@@ -1 +1 @@
-__version__ = "2.1.0"
+__version__ = "2.2.0.alpha0"

From bdc04c643c95256234f40cc1a3a9c453b6e9b646 Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Wed, 11 May 2022 18:14:33 +0200
Subject: [PATCH 10/10] fixed url == None

---
 ereuse_devicehub/templates/inventory/device_list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html
index ef8f7aef..58c10a78 100644
--- a/ereuse_devicehub/templates/inventory/device_list.html
+++ b/ereuse_devicehub/templates/inventory/device_list.html
@@ -392,7 +392,7 @@
                     {% for doc in lot.trade.documents %}
                     <tr>
                       <td>
-                        {% if doc.url.to_text() %}
+                        {% if doc.url %}
                           <a href="{{ doc.url.to_text() }}" target="_blank">{{ doc.file_name}}</a>
                         {% else %}
                           {{ doc.file_name}}