From 50c03271c53d051b020eacd52c213b648190c1da Mon Sep 17 00:00:00 2001
From: Gregory Trullemans <redj@MacBook-Pro-de-Gregory.local>
Date: Sun, 5 May 2024 12:58:50 +0200
Subject: [PATCH] Bug fix on date for tablesorter

---
 jarvis/core/templates/base.html               | 60 +++++++++----------
 jarvis/core/templates/search/results.html     |  6 +-
 jarvis/followup/templates/chronos/list.html   |  2 +-
 .../followup/templates/heightweight/list.html |  2 +-
 jarvis/followup/templates/injuries/list.html  |  2 +-
 .../followup/templates/intensities/list.html  |  2 +-
 jarvis/followup/templates/notes/list.html     |  2 +-
 .../followup/templates/routinedone/list.html  |  2 +-
 jarvis/followup/templates/scores/list.html    |  2 +-
 .../templates/seasoninformations/list.html    |  2 +-
 jarvis/followup/templates/wellbeing/list.html |  2 +-
 jarvis/location/templates/clubs/list.html     |  2 +-
 jarvis/location/templates/places/list.html    |  2 +-
 .../templates/gymnasts/list_accident.html     |  1 -
 .../gymnasts/list_events_and_notes.html       |  6 +-
 .../templates/gymnasts/list_mindstate.html    |  2 +-
 .../tab_height_weight_wellbeing_injury.html   |  2 +-
 .../gymnasts/tabs/tab_notes_events.html       |  6 +-
 .../gymnasts/tabs/tab_routines_scores.html    |  4 +-
 .../tabs/tab_season_informations.html         |  2 +-
 .../templates/gymnasts/tabs/tab_skills.html   |  2 -
 jarvis/people/views.py                        |  2 +-
 jarvis/planning/templates/events/list.html    |  2 +-
 23 files changed, 56 insertions(+), 61 deletions(-)

diff --git a/jarvis/core/templates/base.html b/jarvis/core/templates/base.html
index c63f942..ed2b195 100644
--- a/jarvis/core/templates/base.html
+++ b/jarvis/core/templates/base.html
@@ -40,7 +40,7 @@
 
     <!--   Core JS Files   -->
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js" integrity="sha512-v2CJ7UaYy4JwqLDIrZUI/4hqeoQieOmAZNXBeQyjo21dadnwR+8ZaIJVT8EE2iyI61OV8e6M8PP2/4hpQINQ/g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-    <!-- Popper.js - necessaire pour les SELECT -->
+    <!-- Popper.js - necessaire pour les SELECT, DATEPICKER, … -->
     <script src="{% static "js/core/popper.min.js" %}"></script>
     <script src="{% static "js/core/bootstrap.min.js" %}"></script>
 
@@ -220,42 +220,40 @@
 
     <script type="text/javascript">
         $(document).ready(function() {
-            $().ready(function() {
-                $sidebar = $('.sidebar');
-                $navbar = $('.navbar');
-                $main_panel = $('.main-panel');
-                $full_page = $('.full-page');
-                $sidebar_responsive = $('body > .navbar-collapse');
+            $sidebar = $('.sidebar');
+            $navbar = $('.navbar');
+            $main_panel = $('.main-panel');
+            $full_page = $('.full-page');
+            $sidebar_responsive = $('body > .navbar-collapse');
 
-                {% if request.session.is_sidebar_minified %}sidebar_mini_active = true;
-                {% else %}sidebar_mini_active = false;
-                {% endif %}
+            {% if request.session.is_sidebar_minified %}sidebar_mini_active = true;
+            {% else %}sidebar_mini_active = false;
+            {% endif %}
 
-		        {% if request.session.template == 0 %}white_color = false;
-                {% else %}white_color = true;
-                {% endif %}
+            {% if request.session.template == 0 %}white_color = false;
+            {% else %}white_color = true;
+            {% endif %}
 
-                window_width = $(window).width();
-                fixed_plugin_open = $('.sidebar .sidebar-wrapper .nav li.active a p').html();
+            window_width = $(window).width();
+            fixed_plugin_open = $('.sidebar .sidebar-wrapper .nav li.active a p').html();
 
-                {% if request.session.sidebar == 1 %}color = 'blue';
-                {% elif request.session.sidebar == 2 %}color = 'green';
-                {% elif request.session.sidebar == 3 %}color = 'orange';
-                {% elif request.session.sidebar == 4 %}color = 'red';
-                {% else %}color = 'purple'
-                {% endif %}
-                $sidebar.attr('data', color);
-                $main_panel.attr('data', color);
-                $full_page.attr('filter-color', color);
-                $sidebar_responsive.attr('data', color);
+            {% if request.session.sidebar == 1 %}color = 'blue';
+            {% elif request.session.sidebar == 2 %}color = 'green';
+            {% elif request.session.sidebar == 3 %}color = 'orange';
+            {% elif request.session.sidebar == 4 %}color = 'red';
+            {% else %}color = 'purple'
+            {% endif %}
+            $sidebar.attr('data', color);
+            $main_panel.attr('data', color);
+            $full_page.attr('filter-color', color);
+            $sidebar_responsive.attr('data', color);
 
-                $('.light-badge').click(function() {
-                    $('body').addClass('white-content');
-                });
+            $('.light-badge').click(function() {
+                $('body').addClass('white-content');
+            });
 
-                $('.dark-badge').click(function() {
-                    $('body').removeClass('white-content');
-                });
+            $('.dark-badge').click(function() {
+                $('body').removeClass('white-content');
             });
         });
     </script>
diff --git a/jarvis/core/templates/search/results.html b/jarvis/core/templates/search/results.html
index 864b7cb..3831f45 100644
--- a/jarvis/core/templates/search/results.html
+++ b/jarvis/core/templates/search/results.html
@@ -190,7 +190,7 @@
             headers: {
                 0: { sorter: false },      // disable first column
             },
-            dateFormat: "uk",
+            dateFormat : "ddmmyyyy",
             sortList: [[1,0], [2,0]]
         })
 
@@ -219,7 +219,7 @@
             headers: {
                 0: { sorter: false },      // disable first column
             },
-            dateFormat: "uk",
+            dateFormat : "ddmmyyyy",
             sortList: [[3,1], [1,0]]
         });
 
@@ -234,7 +234,7 @@
             headers: {
                 0: { sorter: false },      // disable first column
             },
-            dateFormat: "uk",
+            dateFormat : "ddmmyyyy",
             sortList: [[3,0], [1,0]]
         });
 
diff --git a/jarvis/followup/templates/chronos/list.html b/jarvis/followup/templates/chronos/list.html
index 7e818a3..530ebfa 100644
--- a/jarvis/followup/templates/chronos/list.html
+++ b/jarvis/followup/templates/chronos/list.html
@@ -161,10 +161,10 @@
 <script type="text/javascript">
     $(document).ready(function () {
         $('#chrono_table').tablesorter({
+            dateFormat : "ddmmyyyy",
             headers: {
                 0: { sorter: false },
             },
-            dateFormat: "uk",
             sortList: [[1, 1], [2, 1]]
         });
 
diff --git a/jarvis/followup/templates/heightweight/list.html b/jarvis/followup/templates/heightweight/list.html
index 9d73f13..b70d4c4 100644
--- a/jarvis/followup/templates/heightweight/list.html
+++ b/jarvis/followup/templates/heightweight/list.html
@@ -173,7 +173,7 @@
             headers: {
                 0: { sorter: false },
             },
-            dateFormat: "uk",
+            dateFormat : "ddmmyyyy",
             sortList: [[1, 1]]
         });
 
diff --git a/jarvis/followup/templates/injuries/list.html b/jarvis/followup/templates/injuries/list.html
index 68e6c2f..1ee6be9 100644
--- a/jarvis/followup/templates/injuries/list.html
+++ b/jarvis/followup/templates/injuries/list.html
@@ -93,7 +93,7 @@
             headers: {
                 0: { sorter: false },      // disable first column
             },
-            dateFormat: "uk",
+            dateFormat : "ddmmyyyy",
             sortList: [[1, 1]]
         });
 
diff --git a/jarvis/followup/templates/intensities/list.html b/jarvis/followup/templates/intensities/list.html
index 62469fa..25d3f2b 100644
--- a/jarvis/followup/templates/intensities/list.html
+++ b/jarvis/followup/templates/intensities/list.html
@@ -133,7 +133,7 @@
             headers: {
                 0: { sorter: false },
             },
-            dateFormat: "uk",
+            dateFormat : "ddmmyyyy",
             sortList: [[1, 1], [2, 1]]
         });
 
diff --git a/jarvis/followup/templates/notes/list.html b/jarvis/followup/templates/notes/list.html
index ad3e34e..b5eab81 100644
--- a/jarvis/followup/templates/notes/list.html
+++ b/jarvis/followup/templates/notes/list.html
@@ -88,7 +88,7 @@
             headers: {
                 0: { sorter: false },
             },
-            dateFormat: "uk",
+            dateFormat : "ddmmyyyy",
             {% if not gymnast %}
                 sortList: [[1, 1], [3, 1], [2, 1]],
             {% else %}
diff --git a/jarvis/followup/templates/routinedone/list.html b/jarvis/followup/templates/routinedone/list.html
index 26265c8..a8220ba 100644
--- a/jarvis/followup/templates/routinedone/list.html
+++ b/jarvis/followup/templates/routinedone/list.html
@@ -94,7 +94,7 @@
             headers: {
                 0: { sorter: false },
             },
-            dateFormat: "uk",
+            dateFormat : "ddmmyyyy",
             sortList: [[1, 1]]
         });
 
diff --git a/jarvis/followup/templates/scores/list.html b/jarvis/followup/templates/scores/list.html
index b291b63..98c8858 100644
--- a/jarvis/followup/templates/scores/list.html
+++ b/jarvis/followup/templates/scores/list.html
@@ -105,7 +105,7 @@
             headers: {
                 0: { sorter: false },
             },
-            dateFormat: "uk",
+            dateFormat : "ddmmyyyy",
             sortList: [[1, 0], [3, 1], [4, 0]]
         });
 
diff --git a/jarvis/followup/templates/seasoninformations/list.html b/jarvis/followup/templates/seasoninformations/list.html
index 7122bb2..cf70f92 100644
--- a/jarvis/followup/templates/seasoninformations/list.html
+++ b/jarvis/followup/templates/seasoninformations/list.html
@@ -75,7 +75,7 @@
             headers: {
                 0: { sorter: false },
             },
-            dateFormat: "uk",
+            dateFormat : "ddmmyyyy",
             sortList: [[2, 1]]
         });
 
diff --git a/jarvis/followup/templates/wellbeing/list.html b/jarvis/followup/templates/wellbeing/list.html
index ac877bf..adfd493 100644
--- a/jarvis/followup/templates/wellbeing/list.html
+++ b/jarvis/followup/templates/wellbeing/list.html
@@ -175,7 +175,7 @@
             headers: {
                 0: { sorter: false },
             },
-            dateFormat: "uk",
+            dateFormat : "ddmmyyyy",
             sortList: [[1, 1]]
         });
 
diff --git a/jarvis/location/templates/clubs/list.html b/jarvis/location/templates/clubs/list.html
index 48fd7a8..7273c00 100644
--- a/jarvis/location/templates/clubs/list.html
+++ b/jarvis/location/templates/clubs/list.html
@@ -41,7 +41,7 @@
             headers: {
               0: { sorter: false },      // disable first column
             },
-            dateFormat: "uk",
+            dateFormat : "ddmmyyyy",
             sortList: [[3,0], [1,0]]
         });
 
diff --git a/jarvis/location/templates/places/list.html b/jarvis/location/templates/places/list.html
index 231c0eb..5b1c6e9 100644
--- a/jarvis/location/templates/places/list.html
+++ b/jarvis/location/templates/places/list.html
@@ -72,7 +72,7 @@
             {% else %}
                 sortList: [[2, 0], [0, 0]],
             {% endif %}
-            dateFormat: "uk",
+            dateFormat : "ddmmyyyy",
         });
 
         $('#place_table').DataTable({
diff --git a/jarvis/people/templates/gymnasts/list_accident.html b/jarvis/people/templates/gymnasts/list_accident.html
index 6390902..377e21e 100644
--- a/jarvis/people/templates/gymnasts/list_accident.html
+++ b/jarvis/people/templates/gymnasts/list_accident.html
@@ -51,7 +51,6 @@
             headers: {
                 0: { sorter: false },
             },
-            // dateFormat: "uk",
             sortList: [[1, 0]]
         })
     });
diff --git a/jarvis/people/templates/gymnasts/list_events_and_notes.html b/jarvis/people/templates/gymnasts/list_events_and_notes.html
index 763ca94..f06908d 100644
--- a/jarvis/people/templates/gymnasts/list_events_and_notes.html
+++ b/jarvis/people/templates/gymnasts/list_events_and_notes.html
@@ -51,7 +51,7 @@
 <script type="text/javascript">
     $(document).ready(function () {
         $('#next_events').tablesorter({
-            dateFormat: "uk",
+            dateFormat : "ddmmyyyy",
             headers: {
                 0: { sorter: false },      // disable first column
             },
@@ -112,7 +112,7 @@
 <script type="text/javascript">
     $(document).ready(function () {
         $('#notes').tablesorter({
-            dateFormat: "uk",
+            dateFormat : "ddmmyyyy",
             headers: {
                 0: { sorter: false },      // disable first column
             },
@@ -199,7 +199,7 @@
 <script type="text/javascript">
     $(document).ready(function () {
         $('#previous_events').tablesorter({
-            dateFormat: "uk",
+            dateFormat : "ddmmyyyy",
             headers: {
                 0: { sorter: false },      // disable first column
             },
diff --git a/jarvis/people/templates/gymnasts/list_mindstate.html b/jarvis/people/templates/gymnasts/list_mindstate.html
index 2ef632a..2f62d05 100644
--- a/jarvis/people/templates/gymnasts/list_mindstate.html
+++ b/jarvis/people/templates/gymnasts/list_mindstate.html
@@ -53,7 +53,7 @@
                                 headers: {
                                     0: { sorter: false },
                                 },
-                                dateFormat: "uk",
+                                dateFormat : "ddmmyyyy",
                                 sortList: [[1, 0],]
                             });
 
diff --git a/jarvis/people/templates/gymnasts/tabs/tab_height_weight_wellbeing_injury.html b/jarvis/people/templates/gymnasts/tabs/tab_height_weight_wellbeing_injury.html
index 3480ce6..9388771 100644
--- a/jarvis/people/templates/gymnasts/tabs/tab_height_weight_wellbeing_injury.html
+++ b/jarvis/people/templates/gymnasts/tabs/tab_height_weight_wellbeing_injury.html
@@ -137,7 +137,7 @@
         headers: {
             0: { sorter: false },
         },
-        dateFormat: "uk",
+        dateFormat : "ddmmyyyy",
         sortList: [[1, 1]]
     });
 
diff --git a/jarvis/people/templates/gymnasts/tabs/tab_notes_events.html b/jarvis/people/templates/gymnasts/tabs/tab_notes_events.html
index 3839001..c834248 100644
--- a/jarvis/people/templates/gymnasts/tabs/tab_notes_events.html
+++ b/jarvis/people/templates/gymnasts/tabs/tab_notes_events.html
@@ -187,7 +187,7 @@
 <script type="text/javascript">
     $(document).ready(function(){
         $('#next_events').tablesorter({
-            dateFormat: "uk",
+            dateFormat : "ddmmyyyy",
             headers: {
                 0: { sorter: false },
             },
@@ -195,7 +195,7 @@
         });
 
         $('#notes').tablesorter({
-            dateFormat: "uk",
+            dateFormat : "ddmmyyyy",
             headers: {
                 0: { sorter: false },
             },
@@ -204,7 +204,7 @@
 
         {% if previous_events %}
         $('#previous_events').tablesorter({
-            dateFormat: "uk",
+            dateFormat : "ddmmyyyy",
             headers: {
                 0: { sorter: false },
             },
diff --git a/jarvis/people/templates/gymnasts/tabs/tab_routines_scores.html b/jarvis/people/templates/gymnasts/tabs/tab_routines_scores.html
index 1d82f7a..028020d 100644
--- a/jarvis/people/templates/gymnasts/tabs/tab_routines_scores.html
+++ b/jarvis/people/templates/gymnasts/tabs/tab_routines_scores.html
@@ -174,7 +174,7 @@
             // headers: {
             //   0: { sorter: false },      // disable first column
             // },
-            dateFormat: "uk",
+            dateFormat : "ddmmyyyy",
             sortList: [[0, 0],]
         });
 
@@ -182,7 +182,7 @@
             // headers: {
             //   0: { sorter: false },      // disable first column
             // },
-            dateFormat: "uk",
+            dateFormat : "ddmmyyyy",
             sortList: [[0, 1],]
         });
 
diff --git a/jarvis/people/templates/gymnasts/tabs/tab_season_informations.html b/jarvis/people/templates/gymnasts/tabs/tab_season_informations.html
index c50cd8e..c862f64 100644
--- a/jarvis/people/templates/gymnasts/tabs/tab_season_informations.html
+++ b/jarvis/people/templates/gymnasts/tabs/tab_season_informations.html
@@ -103,7 +103,7 @@
             headers: {
                 0: { sorter: false },
             },
-            dateFormat: "uk",
+            dateFormat : "ddmmyyyy",
             sortList: [[1, 1]]
         });
 
diff --git a/jarvis/people/templates/gymnasts/tabs/tab_skills.html b/jarvis/people/templates/gymnasts/tabs/tab_skills.html
index 326f8e0..1ab864b 100644
--- a/jarvis/people/templates/gymnasts/tabs/tab_skills.html
+++ b/jarvis/people/templates/gymnasts/tabs/tab_skills.html
@@ -613,7 +613,6 @@
               0: { sorter: false },      // disable first column
             },
             {% endif %}
-            // dateFormat: "uk",
             sortList: [[5,0], [4,0], [2,0]]
         });
 
@@ -623,7 +622,6 @@
               0: { sorter: false },      // disable first column
             },
             {% endif %}
-            // dateFormat: "uk",
             sortList: [[3, 0], [6,0], [5,0], [3, 0]]
         });
 
diff --git a/jarvis/people/views.py b/jarvis/people/views.py
index 7bbe78e..a83ea45 100644
--- a/jarvis/people/views.py
+++ b/jarvis/people/views.py
@@ -77,7 +77,7 @@ def gymnast_listing(request):
     """
     season = Season()
 
-    if request.user.groups.filter(name="trainer").exists():
+    if request.user.is_superuser or request.user.groups.filter(name="trainer").exists():
         season_information_list = SeasonInformation.objects.filter(
             season=season.label
         ).select_related("gymnast")
diff --git a/jarvis/planning/templates/events/list.html b/jarvis/planning/templates/events/list.html
index 09707a0..e09071d 100644
--- a/jarvis/planning/templates/events/list.html
+++ b/jarvis/planning/templates/events/list.html
@@ -79,7 +79,7 @@
 <script type="text/javascript">
     $(document).ready(function(){
         $('#event_table').tablesorter({
-            dateFormat: "uk",
+            dateFormat : "ddmmyyyy",
             {% if request.user|has_group:"trainer" %}
                 headers: {
                     0: { sorter: false },      // disable first column