Bug fix on date for tablesorter
This commit is contained in:
parent
f89dffbc79
commit
50c03271c5
|
@ -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,7 +220,6 @@
|
||||||
|
|
||||||
<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');
|
||||||
|
@ -257,7 +256,6 @@
|
||||||
$('body').removeClass('white-content');
|
$('body').removeClass('white-content');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
{% block footerscript %}{% endblock %}
|
{% block footerscript %}{% endblock %}
|
||||||
|
|
|
@ -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]]
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -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]]
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -173,7 +173,7 @@
|
||||||
headers: {
|
headers: {
|
||||||
0: { sorter: false },
|
0: { sorter: false },
|
||||||
},
|
},
|
||||||
dateFormat: "uk",
|
dateFormat : "ddmmyyyy",
|
||||||
sortList: [[1, 1]]
|
sortList: [[1, 1]]
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -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]]
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -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]]
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -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 %}
|
||||||
|
|
|
@ -94,7 +94,7 @@
|
||||||
headers: {
|
headers: {
|
||||||
0: { sorter: false },
|
0: { sorter: false },
|
||||||
},
|
},
|
||||||
dateFormat: "uk",
|
dateFormat : "ddmmyyyy",
|
||||||
sortList: [[1, 1]]
|
sortList: [[1, 1]]
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -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]]
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -75,7 +75,7 @@
|
||||||
headers: {
|
headers: {
|
||||||
0: { sorter: false },
|
0: { sorter: false },
|
||||||
},
|
},
|
||||||
dateFormat: "uk",
|
dateFormat : "ddmmyyyy",
|
||||||
sortList: [[2, 1]]
|
sortList: [[2, 1]]
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -175,7 +175,7 @@
|
||||||
headers: {
|
headers: {
|
||||||
0: { sorter: false },
|
0: { sorter: false },
|
||||||
},
|
},
|
||||||
dateFormat: "uk",
|
dateFormat : "ddmmyyyy",
|
||||||
sortList: [[1, 1]]
|
sortList: [[1, 1]]
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -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]]
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -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({
|
||||||
|
|
|
@ -51,7 +51,6 @@
|
||||||
headers: {
|
headers: {
|
||||||
0: { sorter: false },
|
0: { sorter: false },
|
||||||
},
|
},
|
||||||
// dateFormat: "uk",
|
|
||||||
sortList: [[1, 0]]
|
sortList: [[1, 0]]
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
|
|
|
@ -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
|
||||||
},
|
},
|
||||||
|
|
|
@ -53,7 +53,7 @@
|
||||||
headers: {
|
headers: {
|
||||||
0: { sorter: false },
|
0: { sorter: false },
|
||||||
},
|
},
|
||||||
dateFormat: "uk",
|
dateFormat : "ddmmyyyy",
|
||||||
sortList: [[1, 0],]
|
sortList: [[1, 0],]
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -137,7 +137,7 @@
|
||||||
headers: {
|
headers: {
|
||||||
0: { sorter: false },
|
0: { sorter: false },
|
||||||
},
|
},
|
||||||
dateFormat: "uk",
|
dateFormat : "ddmmyyyy",
|
||||||
sortList: [[1, 1]]
|
sortList: [[1, 1]]
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -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 },
|
||||||
},
|
},
|
||||||
|
|
|
@ -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],]
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -103,7 +103,7 @@
|
||||||
headers: {
|
headers: {
|
||||||
0: { sorter: false },
|
0: { sorter: false },
|
||||||
},
|
},
|
||||||
dateFormat: "uk",
|
dateFormat : "ddmmyyyy",
|
||||||
sortList: [[1, 1]]
|
sortList: [[1, 1]]
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -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]]
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -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")
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue