From 136baf32c1f977dc1e4d94900991261b8b21715f Mon Sep 17 00:00:00 2001
From: phl0 <github@florian-wolters.de>
Date: Sun, 5 Feb 2023 12:37:23 +0100
Subject: [PATCH] Make exchange upper case (in table and db)

---
 application/models/Logbook_model.php | 8 ++++----
 assets/js/sections/contesting.js     | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index c0fe2b02..1ebdd99b 100755
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -161,8 +161,8 @@ class Logbook_model extends CI_Model {
             'COL_TX_PWR' => $tx_power,
             'COL_STX' => $stx,
             'COL_SRX' => $srx,
-            'COL_STX_STRING' => $stx_string,
-            'COL_SRX_STRING' => $srx_string,
+            'COL_STX_STRING' => strtoupper(trim($stx_string)),
+            'COL_SRX_STRING' => strtoupper(trim($srx_string)),
             'COL_CONTEST_ID' => $contestid,
             'COL_NR_BURSTS' => null,
             'COL_NR_PINGS' => null,
@@ -816,8 +816,8 @@ class Logbook_model extends CI_Model {
        'COL_QTH' => $this->input->post('qth'),
        'COL_PROP_MODE' => $this->input->post('prop_mode'),
        'COL_FREQ_RX' => $this->parse_frequency($this->input->post('freq_display_rx')),
-       'COL_STX_STRING' => $this->input->post('stx_string'),
-       'COL_SRX_STRING' => $this->input->post('srx_string'),
+       'COL_STX_STRING' => strtoupper(trim($this->input->post('stx_string'))),
+       'COL_SRX_STRING' => strtoupper(trim($this->input->post('srx_string'))),
        'COL_STX' => $stx_string,
        'COL_SRX' => $srx_string,
        'COL_CONTEST_ID' => $this->input->post('contest_name'),
diff --git a/assets/js/sections/contesting.js b/assets/js/sections/contesting.js
index ca546a0a..3199790a 100644
--- a/assets/js/sections/contesting.js
+++ b/assets/js/sections/contesting.js
@@ -394,8 +394,8 @@ function logQso() {
 				// Store contest session
 				localStorage.setItem("contestid", $("#contestname").val());
 				localStorage.setItem("exchangetype", $("#exchangetype").val());
-				localStorage.setItem("exchangereceived", $("#exch_rcvd").val());
-				localStorage.setItem("exchangesent", $("#exch_sent").val());
+				localStorage.setItem("exchangereceived", $("#exch_rcvd").val().toUpperCase());
+				localStorage.setItem("exchangesent", $("#exch_sent").val().toUpperCase());
 				localStorage.setItem("serialreceived", $("#exch_serial_r").val());
 				localStorage.setItem("serialsent", $("#exch_serial_s").val());
 				localStorage.setItem("gridsquarereceived", $("#exch_gridsquare_r").val());