From 177983a5e38479d5af3e89fa7f747e6affb0ec0a Mon Sep 17 00:00:00 2001
From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Date: Wed, 2 Jul 2025 12:27:47 +0200
Subject: [PATCH] Fixed sorting

---
 application/controllers/Stationsetup.php      | 24 +++++++++++++++++++
 .../views/stationsetup/stationsetup.php       |  3 +++
 assets/js/sections/stationsetup.js            |  7 +++++-
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/application/controllers/Stationsetup.php b/application/controllers/Stationsetup.php
index 3098c5536..996ad8511 100644
--- a/application/controllers/Stationsetup.php
+++ b/application/controllers/Stationsetup.php
@@ -29,9 +29,33 @@ class Stationsetup extends CI_Controller {
 
 		$footerData = [];
 		$footerData['scripts'] = [
+			'assets/js/moment.min.js',
+			'assets/js/datetime-moment.js',
 			'assets/js/sections/stationsetup.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/stationsetup.js")),
 		];
 
+				// Get Date format
+		if($this->session->userdata('user_date_format')) {
+			// If Logged in and session exists
+			$data['custom_date_format'] = $this->session->userdata('user_date_format');
+		} else {
+			// Get Default date format from /config/wavelog.php
+			$data['custom_date_format'] = $this->config->item('qso_date_format');
+		}
+
+		switch ($data['custom_date_format']) {
+			case "d/m/y": $data['custom_date_format'] = 'DD/MM/YY'; break;
+			case "d/m/Y": $data['custom_date_format'] = 'DD/MM/YYYY'; break;
+			case "m/d/y": $data['custom_date_format'] = 'MM/DD/YY'; break;
+			case "m/d/Y": $data['custom_date_format'] = 'MM/DD/YYYY'; break;
+			case "d.m.Y": $data['custom_date_format'] = 'DD.MM.YYYY'; break;
+			case "y/m/d": $data['custom_date_format'] = 'YY/MM/DD'; break;
+			case "Y-m-d": $data['custom_date_format'] = 'YYYY-MM-DD'; break;
+			case "M d, Y": $data['custom_date_format'] = 'MMM DD, YYYY'; break;
+			case "M d, y": $data['custom_date_format'] = 'MMM DD, YY'; break;
+			default: $data['custom_date_format'] = 'DD/MM/YYYY';
+		}
+
 		// Render Page
 		$data['page_title'] = __("Station Setup");
 		$this->load->view('interface_assets/header', $data);
diff --git a/application/views/stationsetup/stationsetup.php b/application/views/stationsetup/stationsetup.php
index 433f81f80..f2920d817 100644
--- a/application/views/stationsetup/stationsetup.php
+++ b/application/views/stationsetup/stationsetup.php
@@ -1,3 +1,6 @@
+<script type="text/javascript">
+    var custom_date_format = "<?php echo $custom_date_format ?>";
+</script>
 <div class="container">
 
     <br>
diff --git a/assets/js/sections/stationsetup.js b/assets/js/sections/stationsetup.js
index b7c003a65..7b65f1cab 100644
--- a/assets/js/sections/stationsetup.js
+++ b/assets/js/sections/stationsetup.js
@@ -536,6 +536,7 @@ function loadLogbookTable(rows) {
 }
 
 function loadLocationTable(rows) {
+	$.fn.dataTable.moment(custom_date_format + ' HH:mm');
 	var uninitialized = $('#station_locations_table').filter(function() {
 		return !$.fn.DataTable.isDataTable(this);
 	});
@@ -556,7 +557,11 @@ function loadLocationTable(rows) {
 				{ 'targets':0,
 				  'createdCell':  function (td, cellData, rowData, row, col) {
 				  			(td).attr('data-order', 1);	// not sure how to add ID dynamic here
-						  }
+					}
+				},
+				{
+					targets: 5,
+					type: 'datetime-moment'
 				}
 			]
 		});