From d33a4231fb595c8ed1b167dd8fcfe71e4c6d5cd8 Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Sun, 30 Jan 2022 12:14:26 +0000
Subject: [PATCH] Fix selectpickers showing up slightly wonky

---
 RIGS/admin.py                                |  2 +-
 RIGS/templates/event_form.html               | 10 +++++-----
 assets/templates/partials/parent_form.html   |  2 +-
 package-lock.json                            |  2 +-
 package.json                                 |  2 +-
 training/templates/edit_training_record.html |  4 ++--
 training/views.py                            |  3 ++-
 7 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/RIGS/admin.py b/RIGS/admin.py
index 7dda52e5..6e6fdb71 100644
--- a/RIGS/admin.py
+++ b/RIGS/admin.py
@@ -87,7 +87,7 @@ def merge_model_instances(primary_object, alias_objects):
                             setattr(obj, field_name, primary_object)
                             obj.save()
                     except IntegrityError:
-                            pass  # Skip to avoid integrity error from unique_together
+                        pass  # Skip to avoid integrity error from unique_together
             elif related_field.one_to_one or related_field.many_to_one:
                 alias_varname = related_field.name
                 if hasattr(alias_object, alias_varname):
diff --git a/RIGS/templates/event_form.html b/RIGS/templates/event_form.html
index 38242b1b..4ea9eaa0 100644
--- a/RIGS/templates/event_form.html
+++ b/RIGS/templates/event_form.html
@@ -122,7 +122,7 @@
                         <div class="col-sm-8">
                             <div class="row">
                                 <div class="col-sm-9 col-md-7 col-lg-8">
-                                    <select id="{{ form.person.id_for_label }}" name="{{ form.person.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='person' %}">
+                                    <select id="{{ form.person.id_for_label }}" name="{{ form.person.name }}" class="selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='person' %}">
                                         {% if person %}
                                             <option value="{{form.person.value}}" selected="selected" data-update_url="{% url 'person_update' form.person.value %}">{{ person }}</option>
                                         {% endif %}
@@ -149,7 +149,7 @@
                         <div class="col-sm-8">
                             <div class="row">
                                 <div class="col-sm-9 col-md-7 col-lg-8">
-                                    <select id="{{ form.organisation.id_for_label }}" name="{{ form.organisation.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='organisation' %}" >
+                                    <select id="{{ form.organisation.id_for_label }}" name="{{ form.organisation.name }}" class="px-0 selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='organisation' %}" >
                                         {% if organisation %}
                                             <option value="{{form.organisation.value}}" selected="selected" data-update_url="{% url 'organisation_update' form.organisation.value %}">{{ organisation }}</option>
                                         {% endif %}
@@ -207,7 +207,7 @@
                             <div class="col-sm-8">
                                 <div class="row">
                                     <div class="col-sm-9 col-md-7 col-lg-8">
-                                        <select id="{{ form.venue.id_for_label }}" name="{{ form.venue.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='venue' %}">
+                                        <select id="{{ form.venue.id_for_label }}" name="{{ form.venue.name }}" class="px-0 selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='venue' %}">
                                         {% if venue %}
                                             <option value="{{form.venue.value}}" selected="selected" data-update_url="{% url 'venue_update' form.venue.value %}">{{ venue }}</option>
                                         {% endif %}
@@ -302,7 +302,7 @@
                                        class="col-sm-4 col-form-label">{{ form.mic.label }}</label>
 
                                 <div class="col-sm-8">
-                                    <select id="{{ form.mic.id_for_label }}" name="{{ form.mic.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
+                                    <select id="{{ form.mic.id_for_label }}" name="{{ form.mic.name }}" class="px-0 selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
                                         {% if mic %}
                                             <option value="{{form.mic.value}}" selected="selected" >{{ mic.name }}</option>
                                         {% endif %}
@@ -316,7 +316,7 @@
                                            class="col-sm-4 col-form-label">{{ form.checked_in_by.label }}</label>
 
                                     <div class="col-sm-8">
-                                         <select id="{{ form.checked_in_by.id_for_label }}" name="{{ form.checked_in_by.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
+                                         <select id="{{ form.checked_in_by.id_for_label }}" name="{{ form.checked_in_by.name }}" class="px-0 selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
                                             {% if checked_in_by %}
                                                 <option value="{{form.checked_in_by.value}}" selected="selected" >{{ checked_in_by.name }}</option>
                                             {% endif %}
diff --git a/assets/templates/partials/parent_form.html b/assets/templates/partials/parent_form.html
index b751503e..c5fcbe85 100644
--- a/assets/templates/partials/parent_form.html
+++ b/assets/templates/partials/parent_form.html
@@ -7,7 +7,7 @@
     {% if create or edit or duplicate %}
     <div class="form-group" id="parent-group">
       <label for="selectpicker">Set Parent</label>
-      <select name="parent" id="parent_id" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='asset' %}?fields=asset_id,description">
+      <select name="parent" id="parent_id" class="selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='asset' %}?fields=asset_id,description">
         {% if object.parent %}
         <option value="{{object.parent.pk}}" selected>{{object.parent.description}}</option>
         {% endif %}
diff --git a/package-lock.json b/package-lock.json
index 41da14d2..84655fec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,7 +14,7 @@
         "autocompleter": "^6.1.2",
         "autoprefixer": "^10.4.0",
         "bootstrap": "^4.6.1",
-        "bootstrap-select": "^1.13.17",
+        "bootstrap-select": "^1.13.18",
         "clipboard": "^2.0.8",
         "cssnano": "^5.0.13",
         "easymde": "^2.16.1",
diff --git a/package.json b/package.json
index f8eee687..d62dd444 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "autocompleter": "^6.1.2",
     "autoprefixer": "^10.4.0",
     "bootstrap": "^4.6.1",
-    "bootstrap-select": "^1.13.17",
+    "bootstrap-select": "^1.13.18",
     "clipboard": "^2.0.8",
     "cssnano": "^5.0.13",
     "easymde": "^2.16.1",
diff --git a/training/templates/edit_training_record.html b/training/templates/edit_training_record.html
index 4f4dd34e..ccffa1b8 100644
--- a/training/templates/edit_training_record.html
+++ b/training/templates/edit_training_record.html
@@ -30,7 +30,7 @@
     {% render_field form.trainee|attr:'hidden' value=form.trainee.initial %}
     <div class="form-group form-row">
       <label for="item_id" class="col col-form-label">Item</label>
-      <select name="item" id="item_id" class="form-control selectpicker custom-select col-sm-10" data-live-search="true" data-sourceurl="{% url 'api_secure' model='training_item' %}?fields=display_id,description&filters=active" required>
+      <select name="item" id="item_id" class="selectpicker col-sm-10 px-0" data-live-search="true" data-sourceurl="{% url 'api_secure' model='training_item' %}?fields=display_id,description&filters=active" required>
         {% if object.item %}
         <option value="{{object.item.pk}}" selected>{{object.item}}</option>
         {% endif %}
@@ -42,7 +42,7 @@
     </div>
     <div class="form-group form-row">
       <label for="supervisor" class="col-sm-2 col-form-label">Supervisor</label>
-      <select name="supervisor" id="supervisor_id" class="form-control selectpicker custom-select col-sm-10" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" required>
+      <select name="supervisor" id="supervisor_id" class="selectpicker px-0 col-sm-10" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" required>
         {% if object.supervisor %}
         <option value="{{object.supervisor.pk}}" selected>{{object.supervisor}}</option>
         {% endif %}
diff --git a/training/views.py b/training/views.py
index 48bf17a3..97c92011 100644
--- a/training/views.py
+++ b/training/views.py
@@ -111,7 +111,8 @@ class TraineeList(generic.ListView):
         if self.request.GET.get('is_supervisor', ''):
             filt = filt & Q(is_supervisor=True)
 
-        return self.model.objects.filter(filt).annotate(num_qualifications=Count('qualifications_obtained', filter=Q(qualifications_obtained__depth=models.TrainingItemQualification.PASSED_OUT))).order_by('-num_qualifications').prefetch_related('level_qualifications', 'qualifications_obtained', 'qualifications_obtained__item')
+        return self.model.objects.filter(filt).annotate(num_qualifications=Count('qualifications_obtained', filter=Q(qualifications_obtained__depth=models.TrainingItemQualification.PASSED_OUT))
+                                                        ).order_by('-num_qualifications').prefetch_related('level_qualifications', 'qualifications_obtained', 'qualifications_obtained__item')
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)