From a55944e379433cb2c099a6cede3fc1a7101a648e Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Fri, 4 Feb 2022 13:16:27 +0100
Subject: [PATCH] check the checkbox in a devices list when one form is invalid

---
 ereuse_devicehub/templates/inventory/actions.html          | 2 +-
 ereuse_devicehub/templates/inventory/addDeviceslot.html    | 2 +-
 ereuse_devicehub/templates/inventory/addDevicestag.html    | 2 +-
 ereuse_devicehub/templates/inventory/allocate.html         | 5 +----
 ereuse_devicehub/templates/inventory/device_list.html      | 6 +++++-
 ereuse_devicehub/templates/inventory/removeDeviceslot.html | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ereuse_devicehub/templates/inventory/actions.html b/ereuse_devicehub/templates/inventory/actions.html
index 14230437..f3fc4a7f 100644
--- a/ereuse_devicehub/templates/inventory/actions.html
+++ b/ereuse_devicehub/templates/inventory/actions.html
@@ -16,7 +16,7 @@
           <div class="col-12">
               {{ field.label(class_="form-label") }}: <span class="devices-count"></span>
               {{ field(class_="devicesList") }}
-              <p class="text-danger">
+              <p class="text-danger pol">
                   You need select first some device before to do one action
               </p>
               <p class="enumeration-devices"></p>
diff --git a/ereuse_devicehub/templates/inventory/addDeviceslot.html b/ereuse_devicehub/templates/inventory/addDeviceslot.html
index f489d28c..3a42cf00 100644
--- a/ereuse_devicehub/templates/inventory/addDeviceslot.html
+++ b/ereuse_devicehub/templates/inventory/addDeviceslot.html
@@ -17,7 +17,7 @@
             {% endfor %}
           </select>
           <input class="devicesList" type="hidden" name="devices" />
-          <p class="text-danger">
+          <p class="text-danger pol">
               You need select first some device for adding this in a lot
           </p>
         </div>
diff --git a/ereuse_devicehub/templates/inventory/addDevicestag.html b/ereuse_devicehub/templates/inventory/addDevicestag.html
index 03265569..9c157729 100644
--- a/ereuse_devicehub/templates/inventory/addDevicestag.html
+++ b/ereuse_devicehub/templates/inventory/addDevicestag.html
@@ -17,7 +17,7 @@
             {% endfor %}
           </select>
           <input class="devicesList" type="hidden" name="device" />
-          <p class="text-danger">
+          <p class="text-danger pol">
               You need select first some device for adding this in a tag
           </p>
         </div>
diff --git a/ereuse_devicehub/templates/inventory/allocate.html b/ereuse_devicehub/templates/inventory/allocate.html
index 71bfc0b6..fb16ce86 100644
--- a/ereuse_devicehub/templates/inventory/allocate.html
+++ b/ereuse_devicehub/templates/inventory/allocate.html
@@ -11,16 +11,13 @@
       <form action="{{ url_for('inventory.devices.allocate_add') }}" method="post">
       {{ form_new_allocate.csrf_token }}
         <div class="modal-body">
-          <p class="text-danger" id="pol" style="display: none;">
-              You need select first some device before to do one action
-          </p>
           {% for field in form_new_allocate %}
           {% if field != form_new_allocate.csrf_token %}
           {% if field == form_new_allocate.devices  %}
           <div class="col-12">
               {{ field.label(class_="form-label") }}: <span class="devices-count"></span>
               {{ field(class_="devicesList") }}
-              <p class="text-danger">
+              <p class="text-danger pol" style="display: none;">
                   You need select first some device before to do one action
               </p>
               <p class="enumeration-devices"></p>
diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html
index 0c898246..97291791 100644
--- a/ereuse_devicehub/templates/inventory/device_list.html
+++ b/ereuse_devicehub/templates/inventory/device_list.html
@@ -237,7 +237,11 @@
                       <td>
                           <input type="checkbox" class="deviceSelect" data="{{ dev.id }}"
                                data-device-type="{{ dev.type }}" data-device-manufacturer="{{ dev.manufacturer }}"
-                               data-device-dhid="{{ dev.devicehub_id }}" />
+                               data-device-dhid="{{ dev.devicehub_id }}"
+                               {% if form_new_allocate.type.data and dev.id in list_devices %}
+                                 checked="checked"
+                               {% endif %}
+                               />
                       </td>
                       <td>
                         <a href="{{ url_for('inventory.devices.device_details', id=dev.devicehub_id)}}">
diff --git a/ereuse_devicehub/templates/inventory/removeDeviceslot.html b/ereuse_devicehub/templates/inventory/removeDeviceslot.html
index 31797cf3..1a00dabf 100644
--- a/ereuse_devicehub/templates/inventory/removeDeviceslot.html
+++ b/ereuse_devicehub/templates/inventory/removeDeviceslot.html
@@ -16,7 +16,7 @@
             {% endfor %}
           </select>
           <input class="devicesList" type="hidden" name="devices" />
-          <p class="text-danger">
+          <p class="text-danger pol">
               You need select first some device for remove this from a lot
           </p>
         </div>