From a3479a963ef0d37ec8068799af76b499c4ecd02f Mon Sep 17 00:00:00 2001
From: Gregory Trullemans <redj@MacBook-Pro-de-Gregory.local>
Date: Sat, 29 Apr 2023 16:40:28 +0200
Subject: [PATCH] Fix login test and minor update

---
 .gitignore                       |  1 +
 jarvis/core/templates/login.html | 44 +++++++++++++++++---------------
 jarvis/profiles/views.py         |  4 ++-
 static/css/nucleo-icons.css      |  2 +-
 4 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index bc12e2b..17576a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ db.sqlite3
 media
 *.yaml
 *.json
+staticfiles/
 
 # Python #
 *.py[cod]
diff --git a/jarvis/core/templates/login.html b/jarvis/core/templates/login.html
index 004b663..18289a9 100644
--- a/jarvis/core/templates/login.html
+++ b/jarvis/core/templates/login.html
@@ -25,9 +25,12 @@
     <link href="{% static "css/nucleo-icons.css" %}" rel="stylesheet" />
     <!-- CSS Files -->
     <link href="{% static "css/black-dashboard.css" %}" rel="stylesheet" />
-    <!-- CSS Just for demo purpose, don't include it in your project -->
-    <!-- <link href="../assets/demo/demo.css" rel="stylesheet" /> -->
-    <!-- <link rel="stylesheet" href="{% static "css/application.css" %}"> -->
+
+    <!-- Chart JS -->
+    <script src="{% static "js/plugins/momentjs/moment_2.29.1.min.js" %}"></script>
+    <script src="{% static "js/plugins/momentjs/moment_locale_en-gb.js" %}"></script>
+    <script src="{% static "js/plugins/chartjs/chartjs_3.9.1.min.js" %}"></script>
+    <script src="{% static "js/plugins/chartjs/chartjs-adapter-moment_1.0.0.js" %}"></script>
 
 </head>
 
@@ -81,44 +84,43 @@
         <div class="footer-content"></div>
     </footer>
 
-    <script src="{% static "js/core/jquery.min.js" %}"></script>
+    <script src="{% static "js/core/jquery-3.6.0.min.js" %}"></script>
     <script src="{% static "js/core/popper.min.js" %}"></script>
     <script src="{% static "js/core/bootstrap.min.js" %}"></script>
-    <script src="{% static "js/plugins/perfect-scrollbar.jquery.min.js" %}"></script>
-    <script src="{% static "js/plugins/moment.min.js" %}"></script>
+    <script src="{% static "js/plugins/perfect-scrollbar.jquery_1.4.0.min.js" %}"></script>
+    <script src="{% static "js/plugins/momentjs/moment_2.29.1.min.js" %}"></script>
     <!--  Plugin for Switches, full documentation here: http://www.jque.re/plugins/version3/bootstrap.switch/ -->
-    <script src="{% static "js/plugins/bootstrap-switch.js" %}"></script>
+    <script src="{% static "js/plugins/bootstrap-switch_3.3.4.js" %}"></script>
     <!--  Plugin for Sweet Alert -->
     <script src="{% static "js/plugins/sweetalert2.min.js" %}"></script>
     <!--  Plugin for Sorting Tables -->
-    <script src="{% static "js/plugins/jquery.tablesorter.js" %}"></script>
+    <script src="{% static "js/plugins/jquery.tablesorter_2.0.5b.js" %}"></script>
     <!-- Forms Validations Plugin -->
-    <script src="{% static "js/plugins/jquery.validate.min.js" %}"></script>
+    <script src="{% static "js/plugins/jquery.validate_1.17.0.min.js" %}"></script>
     <!--  Plugin for the Wizard, full documentation here: https://github.com/VinceG/twitter-bootstrap-wizard -->
-    <script src="{% static "js/plugins/jquery.bootstrap-wizard.js" %}"></script>
+    <script src="{% static "js/plugins/jquery.bootstrap-wizard_1.4.2.js" %}"></script>
     <!--  Plugin for Select, full documentation here: http://silviomoreto.github.io/bootstrap-select -->
-    <script src="{% static "js/plugins/bootstrap-selectpicker.js" %}"></script>
+    <script src="{% static "js/plugins/bootstrap-selectpicker_1.12.4.js" %}"></script>
     <!--  Plugin for the DateTimePicker, full documentation here: https://eonasdan.github.io/bootstrap-datetimepicker/ -->
-    <script src="{% static "js/plugins/bootstrap-datetimepicker.js" %}"></script>
+    <script src="{% static "js/plugins/bootstrap-datetimepicker_4.17.47.js" %}"></script>
     <!--  DataTables.net Plugin, full documentation here: https://datatables.net/    -->
-    <script src="{% static "js/plugins/jquery.dataTables.min.js" %}"></script>
+    <script src="{% static "js/plugins/datatables/datatables_1.12.1.min.js" %}"></script>
     <!--  Plugin for Tags, full documentation here: https://github.com/bootstrap-tagsinput/bootstrap-tagsinputs  -->
-    <script src="{% static "js/plugins/bootstrap-tagsinput.js" %}"></script>
+    <script src="{% static "js/plugins/bootstrap-tagsinput_0.8.0.js" %}"></script>
     <!-- Plugin for Fileupload, full documentation here: http://www.jasny.net/bootstrap/javascript/#fileinput -->
-    <script src="{% static "js/plugins/jasny-bootstrap.min.js" %}"></script>
+    <script src="{% static "js/plugins/jasny-bootstrap_3.1.3.min.js" %}"></script>
     <!--  Full Calendar Plugin, full documentation here: https://github.com/fullcalendar/fullcalendar    -->
-    <script src="{% static "js/plugins/fullcalendar.min.js" %}"></script>
+    <script src="{% static "js/plugins/fullcalendar/main.js" %}"></script>
     <!-- Vector Map plugin, full documentation here: http://jvectormap.com/documentation/ -->
-    <script src="{% static "js/plugins/jquery-jvectormap.js" %}"></script>
+    <script src="{% static "js/plugins/jquery-jvectormap_2.0.4.js" %}"></script>
     <!--  Plugin for the Sliders, full documentation here: http://refreshless.com/nouislider/ -->
-    <script src="{% static "js/plugins/nouislider.min.js" %}"></script>
+    <script src="{% static "js/plugins/nouislider_11.1.0.min.js" %}"></script>
     <!--  Google Maps Plugin    -->
     <!-- Place this tag in your head or just before your close body tag. -->
     <!-- <script src="https://maps.googleapis.com/maps/api/js?key=YOUR_KEY_HERE"></script> -->
-    <!-- Chart JS -->
-    <script src="{% static "js/plugins/chartjs.min.js" %}"></script>
+
     <!--  Notifications Plugin    -->
-    <script src="{% static "js/plugins/bootstrap-notify.js" %}"></script>
+    <script src="{% static "js/plugins/bootstrap-notify_3.1.5.js" %}"></script>
     <!-- Control Center for Black Dashboard: parallax effects, scripts for the example pages etc -->
     <script src="{% static "js/black-dashboard.min.js" %}"></script>
 
diff --git a/jarvis/profiles/views.py b/jarvis/profiles/views.py
index 4e66417..279ed2c 100644
--- a/jarvis/profiles/views.py
+++ b/jarvis/profiles/views.py
@@ -48,7 +48,9 @@ def profile_update(request):
 @login_required
 @require_http_methods(["GET", "POST"])
 def notification_update(request):
-    gymnast_list = Gymnast.objects.filter(is_active=True)
+    gymnast_list = Gymnast.objects.filter(is_active=True).order_by(
+        "first_name", "last_name"
+    )
     functionality_list = ContentType.objects.filter(app_label="followup")
 
     notification_dict = {}
diff --git a/static/css/nucleo-icons.css b/static/css/nucleo-icons.css
index 2efe160..1f41929 100644
--- a/static/css/nucleo-icons.css
+++ b/static/css/nucleo-icons.css
@@ -9,7 +9,7 @@ Created using IcoMoon - icomoon.io
 @font-face {
   font-family: 'Nucleo';
   src: url('../fonts/nucleo.eot');
-  src: url('../fonts/nucleo.eot') format('embedded-opentype'), url('../fonts/nucleo.woff2') format('woff2'), url('../fonts/nucleo.woff') format('woff'), url('../fonts/nucleo.ttf') format('truetype'), url('../fonts/nucleo.svg') format('svg');
+  src: url('../fonts/nucleo.eot') format('embedded-opentype'), url('../fonts/nucleo.woff2') format('woff2'), url('../fonts/nucleo.woff') format('woff'), url('../fonts/nucleo.ttf') format('truetype');
   font-weight: normal;
   font-style: normal;
 }