From ea70ee94b5c56273f5faef943203396496369dbc Mon Sep 17 00:00:00 2001
From: Andreas <6977712+AndreasK79@users.noreply.github.com>
Date: Tue, 23 May 2023 12:12:21 +0200
Subject: [PATCH] [Contesting] Fixed sorting when adding qsos to table

---
 application/views/interface_assets/footer.php | 2 ++
 assets/js/sections/contesting.js              | 7 +++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index e7936563..4430a9c0 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -1189,6 +1189,8 @@ $(document).on('keypress',function(e) {
 
 <?php } ?>
 <?php if ( $this->uri->segment(1) == "qso" || ($this->uri->segment(1) == "contesting" && $this->uri->segment(2) != "add")) { ?>
+    <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/moment.min.js"></script>
+    <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/datetime-moment.js"></script>
     <script>
     function setRst(mode) {
         if(mode == 'JT65' || mode == 'JT65B' || mode == 'JT6C' || mode == 'JTMS' || mode == 'ISCAT' || mode == 'MSK144' || mode == 'JTMSK' || mode == 'QRA64' || mode == 'FT8' || mode == 'FT4' || mode == 'JS8' || mode == 'JT9' || mode == 'JT9-1' || mode == 'ROS'){
diff --git a/assets/js/sections/contesting.js b/assets/js/sections/contesting.js
index a82e2abf..6d37d09f 100644
--- a/assets/js/sections/contesting.js
+++ b/assets/js/sections/contesting.js
@@ -426,9 +426,8 @@ function logQso() {
 			vuccr,
 		]];
 
-		table.rows.add(data);
-		table.draw();
-
+		table.rows.add(data).draw();
+		
 		var formdata = new FormData(document.getElementById("qso_input"));
 		$.ajax({
 			url: base_url + 'index.php/qso/saveqso',
@@ -520,6 +519,7 @@ function restoreContestSession(data) {
 							'</tr>');
 					});
 					if (!$.fn.DataTable.isDataTable('.qsotable')) {
+						$.fn.dataTable.moment('DD-MM-YYYY HH:mm:ss');
 						$('.qsotable').DataTable({
 							"stateSave": true,
 							"pageLength": 25,
@@ -528,7 +528,6 @@ function restoreContestSession(data) {
 							"scrollCollapse": true,
 							"paging": false,
 							"scrollX": true,
-							columnDefs: [ { type: 'date', 'targets': [0] } ],
 							order: [0, 'desc']
 						});
 					}