Sulley
/
Jarvis
1
0
Fork 0
Code Issues 22 Pull Requests 1 Projects Releases Wiki Activity

Bug fix on date for tablesorter

This commit is contained in:
Gregory Trullemans 2024-05-05 12:58:50 +02:00
parent f89dffbc79
commit 50c03271c5
23 changed files with 56 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
jarvis/core/templates/base.html
View File

@ -40,7 +40,7 @@
<!-- Core JS Files --> <!-- 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> <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/popper.min.js" %}"></script>
<script src="{% static "js/core/bootstrap.min.js" %}"></script> <script src="{% static "js/core/bootstrap.min.js" %}"></script>
@ -220,42 +220,40 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
$().ready(function() { $sidebar = $('.sidebar');
$sidebar = $('.sidebar'); $navbar = $('.navbar');
$navbar = $('.navbar'); $main_panel = $('.main-panel');
$main_panel = $('.main-panel'); $full_page = $('.full-page');
$full_page = $('.full-page'); $sidebar_responsive = $('body > .navbar-collapse');
$sidebar_responsive = $('body > .navbar-collapse');
{% if request.session.is_sidebar_minified %}sidebar_mini_active = true; {% if request.session.is_sidebar_minified %}sidebar_mini_active = true;
{% else %}sidebar_mini_active = false; {% else %}sidebar_mini_active = false;
{% endif %} {% endif %}
{% if request.session.template == 0 %}white_color = false; {% if request.session.template == 0 %}white_color = false;
{% else %}white_color = true; {% else %}white_color = true;
{% endif %} {% endif %}
window_width = $(window).width(); window_width = $(window).width();
fixed_plugin_open = $('.sidebar .sidebar-wrapper .nav li.active a p').html(); fixed_plugin_open = $('.sidebar .sidebar-wrapper .nav li.active a p').html();
{% if request.session.sidebar == 1 %}color = 'blue'; {% if request.session.sidebar == 1 %}color = 'blue';
{% elif request.session.sidebar == 2 %}color = 'green'; {% elif request.session.sidebar == 2 %}color = 'green';
{% elif request.session.sidebar == 3 %}color = 'orange'; {% elif request.session.sidebar == 3 %}color = 'orange';
{% elif request.session.sidebar == 4 %}color = 'red'; {% elif request.session.sidebar == 4 %}color = 'red';
{% else %}color = 'purple' {% else %}color = 'purple'
{% endif %} {% endif %}
$sidebar.attr('data', color); $sidebar.attr('data', color);
$main_panel.attr('data', color); $main_panel.attr('data', color);
$full_page.attr('filter-color', color); $full_page.attr('filter-color', color);
$sidebar_responsive.attr('data', color); $sidebar_responsive.attr('data', color);
$('.light-badge').click(function() { $('.light-badge').click(function() {
$('body').addClass('white-content'); $('body').addClass('white-content');
}); });
$('.dark-badge').click(function() { $('.dark-badge').click(function() {
$('body').removeClass('white-content'); $('body').removeClass('white-content');
});
}); });
}); });
</script> </script>

6
jarvis/core/templates/search/results.html
View File

@ -190,7 +190,7 @@
headers: { headers: {
0: { sorter: false }, // disable first column 0: { sorter: false }, // disable first column
}, },
dateFormat: "uk", dateFormat : "ddmmyyyy",
sortList: [[1,0], [2,0]] sortList: [[1,0], [2,0]]
}) })
@ -219,7 +219,7 @@
headers: { headers: {
0: { sorter: false }, // disable first column 0: { sorter: false }, // disable first column
}, },
dateFormat: "uk", dateFormat : "ddmmyyyy",
sortList: [[3,1], [1,0]] sortList: [[3,1], [1,0]]
}); });
@ -234,7 +234,7 @@
headers: { headers: {
0: { sorter: false }, // disable first column 0: { sorter: false }, // disable first column
}, },
dateFormat: "uk", dateFormat : "ddmmyyyy",
sortList: [[3,0], [1,0]] sortList: [[3,0], [1,0]]
}); });

2
jarvis/followup/templates/chronos/list.html
View File

@ -161,10 +161,10 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function () { $(document).ready(function () {
$('#chrono_table').tablesorter({ $('#chrono_table').tablesorter({
dateFormat : "ddmmyyyy",
headers: { headers: {
0: { sorter: false }, 0: { sorter: false },
}, },
dateFormat: "uk",
sortList: [[1, 1], [2, 1]] sortList: [[1, 1], [2, 1]]
}); });

2
jarvis/followup/templates/heightweight/list.html
View File

@ -173,7 +173,7 @@
headers: { headers: {
0: { sorter: false }, 0: { sorter: false },
}, },
dateFormat: "uk", dateFormat : "ddmmyyyy",
sortList: [[1, 1]] sortList: [[1, 1]]
}); });

2
jarvis/followup/templates/injuries/list.html
View File

@ -93,7 +93,7 @@
headers: { headers: {
0: { sorter: false }, // disable first column 0: { sorter: false }, // disable first column
}, },
dateFormat: "uk", dateFormat : "ddmmyyyy",
sortList: [[1, 1]] sortList: [[1, 1]]
}); });

2
jarvis/followup/templates/intensities/list.html
View File

@ -133,7 +133,7 @@
headers: { headers: {
0: { sorter: false }, 0: { sorter: false },
}, },
dateFormat: "uk", dateFormat : "ddmmyyyy",
sortList: [[1, 1], [2, 1]] sortList: [[1, 1], [2, 1]]
}); });

2
jarvis/followup/templates/notes/list.html
View File

@ -88,7 +88,7 @@
headers: { headers: {
0: { sorter: false }, 0: { sorter: false },
}, },
dateFormat: "uk", dateFormat : "ddmmyyyy",
{% if not gymnast %} {% if not gymnast %}
sortList: [[1, 1], [3, 1], [2, 1]], sortList: [[1, 1], [3, 1], [2, 1]],
{% else %} {% else %}

2
jarvis/followup/templates/routinedone/list.html
View File

@ -94,7 +94,7 @@
headers: { headers: {
0: { sorter: false }, 0: { sorter: false },
}, },
dateFormat: "uk", dateFormat : "ddmmyyyy",
sortList: [[1, 1]] sortList: [[1, 1]]
}); });

2
jarvis/followup/templates/scores/list.html
View File

@ -105,7 +105,7 @@
headers: { headers: {
0: { sorter: false }, 0: { sorter: false },
}, },
dateFormat: "uk", dateFormat : "ddmmyyyy",
sortList: [[1, 0], [3, 1], [4, 0]] sortList: [[1, 0], [3, 1], [4, 0]]
}); });

2
jarvis/followup/templates/seasoninformations/list.html
View File

@ -75,7 +75,7 @@
headers: { headers: {
0: { sorter: false }, 0: { sorter: false },
}, },
dateFormat: "uk", dateFormat : "ddmmyyyy",
sortList: [[2, 1]] sortList: [[2, 1]]
}); });

2
jarvis/followup/templates/wellbeing/list.html
View File

@ -175,7 +175,7 @@
headers: { headers: {
0: { sorter: false }, 0: { sorter: false },
}, },
dateFormat: "uk", dateFormat : "ddmmyyyy",
sortList: [[1, 1]] sortList: [[1, 1]]
}); });

2
jarvis/location/templates/clubs/list.html
View File

@ -41,7 +41,7 @@
headers: { headers: {
0: { sorter: false }, // disable first column 0: { sorter: false }, // disable first column
}, },
dateFormat: "uk", dateFormat : "ddmmyyyy",
sortList: [[3,0], [1,0]] sortList: [[3,0], [1,0]]
}); });

2
jarvis/location/templates/places/list.html
View File

@ -72,7 +72,7 @@
{% else %} {% else %}
sortList: [[2, 0], [0, 0]], sortList: [[2, 0], [0, 0]],
{% endif %} {% endif %}
dateFormat: "uk", dateFormat : "ddmmyyyy",
}); });
$('#place_table').DataTable({ $('#place_table').DataTable({

1
jarvis/people/templates/gymnasts/list_accident.html
View File

@ -51,7 +51,6 @@
headers: { headers: {
0: { sorter: false }, 0: { sorter: false },
}, },
// dateFormat: "uk",
sortList: [[1, 0]] sortList: [[1, 0]]
}) })
}); });

6
jarvis/people/templates/gymnasts/list_events_and_notes.html
View File

@ -51,7 +51,7 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function () { $(document).ready(function () {
$('#next_events').tablesorter({ $('#next_events').tablesorter({
dateFormat: "uk", dateFormat : "ddmmyyyy",
headers: { headers: {
0: { sorter: false }, // disable first column 0: { sorter: false }, // disable first column
}, },
@ -112,7 +112,7 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function () { $(document).ready(function () {
$('#notes').tablesorter({ $('#notes').tablesorter({
dateFormat: "uk", dateFormat : "ddmmyyyy",
headers: { headers: {
0: { sorter: false }, // disable first column 0: { sorter: false }, // disable first column
}, },
@ -199,7 +199,7 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function () { $(document).ready(function () {
$('#previous_events').tablesorter({ $('#previous_events').tablesorter({
dateFormat: "uk", dateFormat : "ddmmyyyy",
headers: { headers: {
0: { sorter: false }, // disable first column 0: { sorter: false }, // disable first column
}, },

2
jarvis/people/templates/gymnasts/list_mindstate.html
View File

@ -53,7 +53,7 @@
headers: { headers: {
0: { sorter: false }, 0: { sorter: false },
}, },
dateFormat: "uk", dateFormat : "ddmmyyyy",
sortList: [[1, 0],] sortList: [[1, 0],]
}); });

2
jarvis/people/templates/gymnasts/tabs/tab_height_weight_wellbeing_injury.html
View File

@ -137,7 +137,7 @@
headers: { headers: {
0: { sorter: false }, 0: { sorter: false },
}, },
dateFormat: "uk", dateFormat : "ddmmyyyy",
sortList: [[1, 1]] sortList: [[1, 1]]
}); });

6
jarvis/people/templates/gymnasts/tabs/tab_notes_events.html
View File

@ -187,7 +187,7 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
$('#next_events').tablesorter({ $('#next_events').tablesorter({
dateFormat: "uk", dateFormat : "ddmmyyyy",
headers: { headers: {
0: { sorter: false }, 0: { sorter: false },
}, },
@ -195,7 +195,7 @@
}); });
$('#notes').tablesorter({ $('#notes').tablesorter({
dateFormat: "uk", dateFormat : "ddmmyyyy",
headers: { headers: {
0: { sorter: false }, 0: { sorter: false },
}, },
@ -204,7 +204,7 @@
{% if previous_events %} {% if previous_events %}
$('#previous_events').tablesorter({ $('#previous_events').tablesorter({
dateFormat: "uk", dateFormat : "ddmmyyyy",
headers: { headers: {
0: { sorter: false }, 0: { sorter: false },
}, },

4
jarvis/people/templates/gymnasts/tabs/tab_routines_scores.html
View File

@ -174,7 +174,7 @@
// headers: { // headers: {
// 0: { sorter: false }, // disable first column // 0: { sorter: false }, // disable first column
// }, // },
dateFormat: "uk", dateFormat : "ddmmyyyy",
sortList: [[0, 0],] sortList: [[0, 0],]
}); });
@ -182,7 +182,7 @@
// headers: { // headers: {
// 0: { sorter: false }, // disable first column // 0: { sorter: false }, // disable first column
// }, // },
dateFormat: "uk", dateFormat : "ddmmyyyy",
sortList: [[0, 1],] sortList: [[0, 1],]
}); });

2
jarvis/people/templates/gymnasts/tabs/tab_season_informations.html
View File

@ -103,7 +103,7 @@
headers: { headers: {
0: { sorter: false }, 0: { sorter: false },
}, },
dateFormat: "uk", dateFormat : "ddmmyyyy",
sortList: [[1, 1]] sortList: [[1, 1]]
}); });

2
jarvis/people/templates/gymnasts/tabs/tab_skills.html
View File

@ -613,7 +613,6 @@
0: { sorter: false }, // disable first column 0: { sorter: false }, // disable first column
}, },
{% endif %} {% endif %}
// dateFormat: "uk",
sortList: [[5,0], [4,0], [2,0]] sortList: [[5,0], [4,0], [2,0]]
}); });
@ -623,7 +622,6 @@
0: { sorter: false }, // disable first column 0: { sorter: false }, // disable first column
}, },
{% endif %} {% endif %}
// dateFormat: "uk",
sortList: [[3, 0], [6,0], [5,0], [3, 0]] sortList: [[3, 0], [6,0], [5,0], [3, 0]]
}); });

2
jarvis/people/views.py
View File

@ -77,7 +77,7 @@ def gymnast_listing(request):
""" """
season = Season() 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_information_list = SeasonInformation.objects.filter(
season=season.label season=season.label
).select_related("gymnast") ).select_related("gymnast")

2
jarvis/planning/templates/events/list.html
View File

@ -79,7 +79,7 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
$('#event_table').tablesorter({ $('#event_table').tablesorter({
dateFormat: "uk", dateFormat : "ddmmyyyy",
{% if request.user|has_group:"trainer" %} {% if request.user|has_group:"trainer" %}
headers: { headers: {
0: { sorter: false }, // disable first column 0: { sorter: false }, // disable first column