From 252c5285d834a77e10902a8eb5bc55dc8c9cd971 Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Mon, 9 May 2022 11:12:34 +0200
Subject: [PATCH 01/15] refactorice

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

diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py
index d58fcaf9..1132b4ba 100644
--- a/ereuse_devicehub/inventory/forms.py
+++ b/ereuse_devicehub/inventory/forms.py
@@ -52,7 +52,7 @@ from ereuse_devicehub.resources.user.exceptions import InsufficientPermission
 from ereuse_devicehub.resources.user.models import User
 
 DEVICES = {
-    "All": ["All"],
+    "All": ["Devices", "Components"],
     "Computer": [
         "Desktop",
         "Laptop",
diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py
index 2df8fd69..ab93902a 100644
--- a/ereuse_devicehub/inventory/views.py
+++ b/ereuse_devicehub/inventory/views.py
@@ -40,32 +40,13 @@ logger = logging.getLogger(__name__)
 class DeviceListMix(GenericMixView):
     template_name = 'inventory/device_list.html'
 
-    def get_context(self, lot_id):
-        super().get_context()
-        lots = self.context['lots']
-        form_filter = FilterForm()
-        filter_types = form_filter.search()
-        lot = None
-        tags = (
-            Tag.query.filter(Tag.owner_id == current_user.id)
-            .filter(Tag.device_id.is_(None))
-            .order_by(Tag.id.asc())
-        )
-
+    def _get_devices(self, lots, lot):
         if lot_id:
             lot = lots.filter(Lot.id == lot_id).one()
             devices = lot.devices
             if "All" not in filter_types:
                 devices = [dev for dev in lot.devices if dev.type in filter_types]
             devices = sorted(devices, key=lambda x: x.updated, reverse=True)
-            form_new_action = NewActionForm(lot=lot.id)
-            form_new_allocate = AllocateForm(lot=lot.id)
-            form_new_datawipe = DataWipeForm(lot=lot.id)
-            form_new_trade = TradeForm(
-                lot=lot.id,
-                user_to=g.user.email,
-                user_from=g.user.email,
-            )
         else:
             if "All" in filter_types:
                 devices = (
@@ -81,6 +62,31 @@ class DeviceListMix(GenericMixView):
                     .order_by(Device.updated.desc())
                 )
 
+        return devices
+
+    def get_context(self, lot_id):
+        super().get_context()
+        lots = self.context['lots']
+        form_filter = FilterForm()
+        filter_types = form_filter.search()
+        lot = None
+        tags = (
+            Tag.query.filter(Tag.owner_id == current_user.id)
+            .filter(Tag.device_id.is_(None))
+            .order_by(Tag.id.asc())
+        )
+
+        if lot_id:
+            lot = lots.filter(Lot.id == lot_id).one()
+            form_new_action = NewActionForm(lot=lot.id)
+            form_new_allocate = AllocateForm(lot=lot.id)
+            form_new_datawipe = DataWipeForm(lot=lot.id)
+            form_new_trade = TradeForm(
+                lot=lot.id,
+                user_to=g.user.email,
+                user_from=g.user.email,
+            )
+        else:
             form_new_action = NewActionForm()
             form_new_allocate = AllocateForm()
             form_new_datawipe = DataWipeForm()
@@ -92,7 +98,7 @@ class DeviceListMix(GenericMixView):
 
         self.context.update(
             {
-                'devices': devices,
+                'devices': self._get_devices(lots, lot),
                 'form_tag_device': TagDeviceForm(),
                 'form_new_action': form_new_action,
                 'form_new_allocate': form_new_allocate,

From 04e4f4ff74ec460c83ebb5b0fcbc00e1f35a1c12 Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Mon, 9 May 2022 13:43:02 +0200
Subject: [PATCH 02/15] add generics filters

---
 ereuse_devicehub/inventory/forms.py | 113 +++++++++++++++++++++++++---
 ereuse_devicehub/inventory/views.py |  30 +-------
 2 files changed, 104 insertions(+), 39 deletions(-)

diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py
index 1132b4ba..8ef0835a 100644
--- a/ereuse_devicehub/inventory/forms.py
+++ b/ereuse_devicehub/inventory/forms.py
@@ -52,16 +52,30 @@ from ereuse_devicehub.resources.user.exceptions import InsufficientPermission
 from ereuse_devicehub.resources.user.models import User
 
 DEVICES = {
-    "All": ["Devices", "Components"],
+    "All": ["All Devices", "All Components"],
     "Computer": [
+        "All Computers",
         "Desktop",
         "Laptop",
         "Server",
     ],
-    "Monitor": ["ComputerMonitor", "Monitor", "TelevisionSet", "Projector"],
-    "Mobile, tablet & smartphone": ["Mobile", "Tablet", "Smartphone", "Cellphone"],
-    "DataStorage": ["HardDrive", "SolidStateDrive"],
+    "Monitor": [
+        "All Monitors",
+        "ComputerMonitor",
+        "Monitor",
+        "TelevisionSet",
+        "Projector",
+    ],
+    "Mobile, tablet & smartphone": [
+        "All Mobile",
+        "Mobile",
+        "Tablet",
+        "Smartphone",
+        "Cellphone",
+    ],
+    "DataStorage": ["All DataStorage", "HardDrive", "SolidStateDrive"],
     "Accessories & Peripherals": [
+        "All Peripherals",
         "GraphicCard",
         "Motherboard",
         "NetworkAdapter",
@@ -75,26 +89,101 @@ DEVICES = {
     ],
 }
 
+COMPUTERS = ['Desktop', 'Laptop', 'Server']
+
+COMPONENTS = [
+    'GraphicCard',
+    'DataStorage',
+    'HardDrive',
+    'DataStorage',
+    'SolidStateDrive',
+    'Motherboard',
+    'NetworkAdapter',
+    'Processor',
+    'RamModule',
+    'SoundCard',
+    'Display',
+    'Battery',
+    'Camera',
+]
+
+MONITORS = ["ComputerMonitor", "Monitor", "TelevisionSet", "Projector"]
+MOBILE = ["Mobile", "Tablet", "Smartphone", "Cellphone"]
+DATASTORAGE = ["HardDrive", "SolidStateDrive"]
+PERIPHERALS = [
+    "GraphicCard",
+    "Motherboard",
+    "NetworkAdapter",
+    "Processor",
+    "RamModule",
+    "SoundCard",
+    "Battery",
+    "Keyboard",
+    "Mouse",
+    "MemoryCardReader",
+]
+
 
 class FilterForm(FlaskForm):
     filter = SelectField(
-        '', choices=DEVICES, default="Computer", render_kw={'class': "form-select"}
+        '', choices=DEVICES, default="All Computers", render_kw={'class': "form-select"}
     )
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, lots, lot_id, *args, **kwargs):
         super().__init__(*args, **kwargs)
+        self.lots = lots
+        self.lot_id = lot_id
+        self._get_types()
+
+    def _get_types(self):
         types_of_devices = [item for sublist in DEVICES.values() for item in sublist]
         dev = request.args.get('filter')
-        self.device = dev if dev in types_of_devices else None
-        if self.device:
-            self.filter.data = self.device
+        self.device_type = dev if dev in types_of_devices else None
+        if self.device_type:
+            self.filter.data = self.device_type
 
     def search(self):
 
-        if self.device:
-            return [self.device]
+        # Filter from lots
+        if self.lot_id:
+            self.lot = self.lots.filter(Lot.id == self.lot_id).one()
+            device_ids = (d.id for d in self.lot.devices)
+            self.devices = Device.query.filter(Device.id.in_(device_ids))
+        else:
+            self.devices = Device.query.filter(Device.owner_id == g.user.id).filter_by(
+                lots=None
+            )
 
-        return ['Desktop', 'Laptop', 'Server']
+        filter_type = None
+        if self.device_type:
+            filter_type = [self.device_type]
+        else:
+            # Case without Filter
+            filter_type = COMPUTERS
+
+        # Generic Filters
+        if "All Devices" == self.device_type:
+            filter_type = None
+
+        if "All Components" == self.device_type:
+            filter_type = COMPONENTS
+
+        elif "All Monitors" == self.device_type:
+            filter_type = MONITORS
+
+        elif "All Mobile" == self.device_type:
+            filter_type = MOBILE
+
+        elif "All DataStorage" == self.device_type:
+            filter_type = DATASTORAGE
+
+        elif "All Peripherals" == self.device_type:
+            filter_type = PERIPHERALS
+
+        if filter_type:
+            self.devices = self.devices.filter(Device.type.in_(filter_type))
+
+        return self.devices.order_by(Device.updated.desc())
 
 
 class LotForm(FlaskForm):
diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py
index ab93902a..a09f4f5b 100644
--- a/ereuse_devicehub/inventory/views.py
+++ b/ereuse_devicehub/inventory/views.py
@@ -40,35 +40,11 @@ logger = logging.getLogger(__name__)
 class DeviceListMix(GenericMixView):
     template_name = 'inventory/device_list.html'
 
-    def _get_devices(self, lots, lot):
-        if lot_id:
-            lot = lots.filter(Lot.id == lot_id).one()
-            devices = lot.devices
-            if "All" not in filter_types:
-                devices = [dev for dev in lot.devices if dev.type in filter_types]
-            devices = sorted(devices, key=lambda x: x.updated, reverse=True)
-        else:
-            if "All" in filter_types:
-                devices = (
-                    Device.query.filter(Device.owner_id == current_user.id)
-                    .filter_by(lots=None)
-                    .order_by(Device.updated.desc())
-                )
-            else:
-                devices = (
-                    Device.query.filter(Device.owner_id == current_user.id)
-                    .filter_by(lots=None)
-                    .filter(Device.type.in_(filter_types))
-                    .order_by(Device.updated.desc())
-                )
-
-        return devices
-
     def get_context(self, lot_id):
         super().get_context()
         lots = self.context['lots']
-        form_filter = FilterForm()
-        filter_types = form_filter.search()
+        form_filter = FilterForm(lots, lot_id)
+        devices = form_filter.search()
         lot = None
         tags = (
             Tag.query.filter(Tag.owner_id == current_user.id)
@@ -98,7 +74,7 @@ class DeviceListMix(GenericMixView):
 
         self.context.update(
             {
-                'devices': self._get_devices(lots, lot),
+                'devices': devices,
                 'form_tag_device': TagDeviceForm(),
                 'form_new_action': form_new_action,
                 'form_new_allocate': form_new_allocate,

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 03/15] 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 04/15] 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 05/15] 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 d800c6950c2c56550090a544aa621ecfd2e879d2 Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Mon, 9 May 2022 16:48:34 +0200
Subject: [PATCH 06/15] fixed bug

---
 ereuse_devicehub/inventory/forms.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py
index 8ef0835a..a04b5e75 100644
--- a/ereuse_devicehub/inventory/forms.py
+++ b/ereuse_devicehub/inventory/forms.py
@@ -142,9 +142,7 @@ class FilterForm(FlaskForm):
         if self.device_type:
             self.filter.data = self.device_type
 
-    def search(self):
-
-        # Filter from lots
+    def filter_from_lots(self):
         if self.lot_id:
             self.lot = self.lots.filter(Lot.id == self.lot_id).one()
             device_ids = (d.id for d in self.lot.devices)
@@ -154,6 +152,8 @@ class FilterForm(FlaskForm):
                 lots=None
             )
 
+    def search(self):
+        self.filter_from_lots()
         filter_type = None
         if self.device_type:
             filter_type = [self.device_type]
@@ -165,9 +165,12 @@ class FilterForm(FlaskForm):
         if "All Devices" == self.device_type:
             filter_type = None
 
-        if "All Components" == self.device_type:
+        elif "All Components" == self.device_type:
             filter_type = COMPONENTS
 
+        elif "All Computers" == self.device_type:
+            filter_type = COMPUTERS
+
         elif "All Monitors" == self.device_type:
             filter_type = MONITORS
 

From f83163040cbda84f7846871bf65fbcffa3f2fdba Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Mon, 9 May 2022 17:53:53 +0200
Subject: [PATCH 07/15] update CHANGELOG

---
 CHANGELOG.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf4a03f1..42d9f3db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,17 @@ ml).
 ## master
 
 ## testing
+- [added] #257 Add functionality to search generic categories like all components.
+- [fixed] #255 Fix status column on device list.
+- [fixed] #254 Fix minor types in frontend.
+- [changed] #253 Drop download public links.
+
+- [fixed] #224 fix clickable lots selector not working when click in text.
+- [fixed] #223 fix trade lots modal.
+- [added] #222 Allow user to update its password.
+- [fixed] #221 Fix responsive issues on frontend.
+- [changed] #220 Add reactive lots list.
+
 - [added] #219 Add functionality to searchbar (Lots and devices).
 - [changed] #211 Print DHID-QR label for selected devices.
 - [changed] #218 Add reactivity to device lots.

From ae95e7c57ab6536dbb643b71d95d5b9b056e7e2f Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Tue, 10 May 2022 10:04:22 +0200
Subject: [PATCH 08/15] update CHANGELOG

---
 CHANGELOG.md | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42d9f3db..35d175a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,21 +8,31 @@ ml).
 ## master
 
 ## testing
-- [added] #257 Add functionality to search generic categories like all components.
-- [fixed] #255 Fix status column on device list.
-- [fixed] #254 Fix minor types in frontend.
-- [changed] #253 Drop download public links.
-
-- [fixed] #224 fix clickable lots selector not working when click in text.
-- [fixed] #223 fix trade lots modal.
-- [added] #222 Allow user to update its password.
-- [fixed] #221 Fix responsive issues on frontend.
-- [changed] #220 Add reactive lots list.
-
 - [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.
+- [added] #236 Allow select multiple devices in multiple pages.
+- [added] #237 Confirmation dialog on apply lots changes.
+- [added] #238 Customize labels.
+- [added] #242 Add icons in list of devices.
+- [added] #244 Select full devices.
+- [added] #257 Add functionality to search generic categories like all components.
+- [added] #252 new tabs lots and public link in details of one device.
 - [changed] #211 Print DHID-QR label for selected devices.
 - [changed] #218 Add reactivity to device lots.
+- [changed] #220 Add reactive lots list.
+- [changed] #232 Set max lots list to 20.
+- [changed] #235 Hide trade buttons.
+- [changed] #239 Change Tags for Unique Identifier.
+- [changed] #247 Change colors.
+- [changed] #253 Drop download public links.
 - [fixed] #214 Login workflow
+- [fixed] #221 Fix responsive issues on frontend.
+- [fixed] #223 fix trade lots modal.
+- [fixed] #224 fix clickable lots selector not working when click in text.
+- [fixed] #254 Fix minor types in frontend.
+- [fixed] #255 Fix status column on device list.
+
 
 ## [2.0.0] - 2022-03-15
 First server render HTML version. Completely rewrites views of angular JS client on flask.

From a54d57f4ab6fd40ecb2871a1509e96e2d2d0a5cc Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Tue, 10 May 2022 10:22:22 +0200
Subject: [PATCH 09/15] fix the All devices option

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

diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py
index a04b5e75..062d185c 100644
--- a/ereuse_devicehub/inventory/forms.py
+++ b/ereuse_devicehub/inventory/forms.py
@@ -163,7 +163,7 @@ class FilterForm(FlaskForm):
 
         # Generic Filters
         if "All Devices" == self.device_type:
-            filter_type = None
+            filter_type = COMPUTERS + ["Monitor"] + MOBILE
 
         elif "All Components" == self.device_type:
             filter_type = COMPONENTS

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 10/15] 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 11/15] 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 12/15] 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 13/15] 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 14/15] 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 15/15] 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"