From d7fa0a6039b20288b3743119db5fe0c94dc3f4c4 Mon Sep 17 00:00:00 2001
From: Mashintime <awh@brainless.us>
Date: Fri, 3 Nov 2023 21:41:23 -0400
Subject: [PATCH 01/12] Dont allow creation of blank callsigns in chat.

---
 gui/src/components/chat_navbar.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gui/src/components/chat_navbar.vue b/gui/src/components/chat_navbar.vue
index 46a2bc72..d7b90f21 100644
--- a/gui/src/components/chat_navbar.vue
+++ b/gui/src/components/chat_navbar.vue
@@ -121,7 +121,8 @@ const beaconHistogramData = computed(() => ({
 
 function newChat() {
   let callsign = this.newChatCall.value;
-  callsign = callsign.toUpperCase();
+  callsign = callsign.toUpperCase().trim();
+  if (callsign === "") return;
   chat.callsign_list.add(callsign);
   this.newChatCall.value = "";
 }

From 8015ce88c66ab3c7a9b7f34bb7585f56fe61cd9a Mon Sep 17 00:00:00 2001
From: Mashintime <awh@brainless.us>
Date: Fri, 3 Nov 2023 21:43:07 -0400
Subject: [PATCH 02/12] Fix kHz label

---
 gui/src/components/main_footer_navbar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gui/src/components/main_footer_navbar.vue b/gui/src/components/main_footer_navbar.vue
index 4df19e5a..b03635d4 100644
--- a/gui/src/components/main_footer_navbar.vue
+++ b/gui/src/components/main_footer_navbar.vue
@@ -130,7 +130,7 @@ const state = useStateStore(pinia);
             data-bs-title="What's the frequency, Kenneth?"
             style="pointer-events: auto"
           >
-            {{ parseInt(state.frequency) / 1000 }} KHz
+            {{ parseInt(state.frequency) / 1000 }} kHz
           </button>
         </div>
 

From 39b28884bf214b70bf90944b517f15415a8a299a Mon Sep 17 00:00:00 2001
From: Mashintime <awh@brainless.us>
Date: Fri, 3 Nov 2023 21:44:39 -0400
Subject: [PATCH 03/12] Remove text from frequency dropdown

---
 gui/src/components/main_active_rig_control.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gui/src/components/main_active_rig_control.vue b/gui/src/components/main_active_rig_control.vue
index 51bd4e02..61dbd37a 100644
--- a/gui/src/components/main_active_rig_control.vue
+++ b/gui/src/components/main_active_rig_control.vue
@@ -80,7 +80,7 @@ function set_hamlib_rf_level() {
                 data-bs-toggle="dropdown"
                 aria-expanded="false"
               >
-                Select Frequency
+                
               </button>
 
               <!-- Dropdown Menu -->

From 7eb65dd91ec63feb38a6d473939bbfb933277ad7 Mon Sep 17 00:00:00 2001
From: Mashintime <awh@brainless.us>
Date: Fri, 3 Nov 2023 21:50:28 -0400
Subject: [PATCH 04/12] Move sort functions for freedata.js for use elsewhere,
 add a sort desc function as well.

---
 gui/src/js/chatHandler.ts | 12 +-----------
 gui/src/js/freedata.ts    | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/gui/src/js/chatHandler.ts b/gui/src/js/chatHandler.ts
index 79191f3b..3138b07f 100644
--- a/gui/src/js/chatHandler.ts
+++ b/gui/src/js/chatHandler.ts
@@ -20,7 +20,7 @@ import { sendMessage, sendBroadcastChannel } from "./sock.js";
 import { displayToast } from "./popupHandler.js";
 
 //const FD = require("./src/js/freedata.js");
-import { btoa_FD } from "./freedata.js";
+import { btoa_FD,sortByProperty } from "./freedata.js";
 
 // define default message object
 interface Attachment {
@@ -279,16 +279,6 @@ function sortChatList() {
   return reorderedData;
 }
 
-//https://medium.com/@asadise/sorting-a-json-array-according-one-property-in-javascript-18b1d22cd9e9
-function sortByProperty(property) {
-  return function (a, b) {
-    if (a[property] > b[property]) return 1;
-    else if (a[property] < b[property]) return -1;
-
-    return 0;
-  };
-}
-
 export function getMessageAttachment(id) {
   return new Promise(async (resolve, reject) => {
     try {
diff --git a/gui/src/js/freedata.ts b/gui/src/js/freedata.ts
index 6f532bee..18fdd623 100644
--- a/gui/src/js/freedata.ts
+++ b/gui/src/js/freedata.ts
@@ -25,3 +25,22 @@ export function atob(data) {
   //exports.atob = function (data) {
   return window.btoa(Buffer.from(data, "base64").toString("utf8"));
 }
+//https://medium.com/@asadise/sorting-a-json-array-according-one-property-in-javascript-18b1d22cd9e9
+export function sortByProperty(property) {
+  return function (a, b) {
+    if (a[property] > b[property]) return 1;
+    else if (a[property] < b[property]) return -1;
+
+    return 0;
+  };
+}
+
+//https://medium.com/@asadise/sorting-a-json-array-according-one-property-in-javascript-18b1d22cd9e9
+export function sortByPropertyDesc(property) {
+  return function (a, b) {
+    if (a[property] < b[property]) return 1;
+    else if (a[property] > b[property]) return -1;
+
+    return 0;
+  };
+}
\ No newline at end of file

From 331031c0b9d69d1054efc41fe0a2010081877fcf Mon Sep 17 00:00:00 2001
From: Mashintime <awh@brainless.us>
Date: Fri, 3 Nov 2023 21:54:29 -0400
Subject: [PATCH 05/12] Sort heard stations descending by timestamp

---
 gui/src/js/sock.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gui/src/js/sock.js b/gui/src/js/sock.js
index 72282466..f7e02866 100644
--- a/gui/src/js/sock.js
+++ b/gui/src/js/sock.js
@@ -1,5 +1,5 @@
 var net = require("net");
-import { atob_FD, btoa_FD } from "./freedata";
+import { atob_FD, btoa_FD,sortByPropertyDesc } from "./freedata";
 import { addDataToWaterfall } from "../js/waterfallHandler.js";
 
 import {
@@ -215,7 +215,7 @@ client.on("data", function (socketdata) {
         stateStore.dbfs_level = Math.round(stateStore.dbfs_level);
 
         stateStore.arq_total_bytes = data["total_bytes"];
-        stateStore.heard_stations = data["stations"];
+        stateStore.heard_stations = data["stations"].sort(sortByPropertyDesc("timestamp"));
         stateStore.dxcallsign = data["dxcallsign"];
 
         stateStore.beacon_state = data["beacon_state"];

From 7e3e315f06f6bf56b8658d2e4564aaa4725bd30a Mon Sep 17 00:00:00 2001
From: Mashintime <awh@brainless.us>
Date: Fri, 3 Nov 2023 22:12:06 -0400
Subject: [PATCH 06/12] Waterfall theme support

---
 gui/src/components/settings_gui.vue | 4 +++-
 gui/src/js/settingsHandler.ts       | 5 ++++-
 gui/src/js/waterfallHandler.js      | 9 +++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/gui/src/components/settings_gui.vue b/gui/src/components/settings_gui.vue
index 19a15e60..7468d0b3 100644
--- a/gui/src/components/settings_gui.vue
+++ b/gui/src/components/settings_gui.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { setColormap } from "../js/waterfallHandler";
 import { saveSettingsToFile } from "../js/settingsHandler";
 
 import { setActivePinia } from "pinia";
@@ -10,6 +11,7 @@ const settings = useSettingsStore(pinia);
 
 function saveSettings() {
   saveSettingsToFile();
+  setColormap(settings.wftheme);
 }
 </script>
 <template>
@@ -59,7 +61,7 @@ function saveSettings() {
       id="wftheme_selector"
       @change="saveSettings"
       v-model="settings.wftheme"
-      disabled
+      
     >
       <option value="2">Default</option>
       <option value="0">Turbo</option>
diff --git a/gui/src/js/settingsHandler.ts b/gui/src/js/settingsHandler.ts
index d18464f7..979d3de5 100644
--- a/gui/src/js/settingsHandler.ts
+++ b/gui/src/js/settingsHandler.ts
@@ -1,6 +1,6 @@
 import path from "node:path";
 import fs from "fs";
-
+import { setColormap } from "./waterfallHandler";
 // pinia store setup
 import { setActivePinia } from "pinia";
 import pinia from "../store/index";
@@ -133,6 +133,9 @@ export function loadSettings() {
       fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
     }
     try {
+      if (key=="wftheme") {
+        setColormap(config[key]);
+      }
       if (key == "mycall") {
         settings.mycall = config[key].split("-")[0];
         settings.myssid = config[key].split("-")[1];
diff --git a/gui/src/js/waterfallHandler.js b/gui/src/js/waterfallHandler.js
index 7d4aa15c..b2e0156d 100644
--- a/gui/src/js/waterfallHandler.js
+++ b/gui/src/js/waterfallHandler.js
@@ -15,8 +15,6 @@ export function initWaterfall() {
     wf_rows: 192, //Assuming 1 row = 1 pixe1, 192 is the height of the spectrum container
   });
 
-  console.log(settings.wftheme);
-  spectrum.setColorMap(settings.wftheme);
 }
 
 export function addDataToWaterfall(data) {
@@ -27,3 +25,10 @@ export function addDataToWaterfall(data) {
     //console.log(e);
   }
 }
+
+export function setColormap(index)
+{
+  if (isNaN(index)) index=0;
+  console.log("Setting waterfall colormap to " + index)
+  spectrum.setColorMap(index);
+}

From 3cbd8532b12a68f4fffd6757ef3cad086a54b4b9 Mon Sep 17 00:00:00 2001
From: Mashintime <awh@brainless.us>
Date: Fri, 3 Nov 2023 22:31:32 -0400
Subject: [PATCH 07/12] One less error message in console

---
 gui/src/components/chat_navbar.vue | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/gui/src/components/chat_navbar.vue b/gui/src/components/chat_navbar.vue
index d7b90f21..d8429185 100644
--- a/gui/src/components/chat_navbar.vue
+++ b/gui/src/components/chat_navbar.vue
@@ -94,14 +94,15 @@ var beaconHistogramOptions = {
 //console.log(dataArray1)
 //[-3, 10, 8, 5, 3, 0, -5]
 
-try {
-  chat.beaconLabelArray = Object.values(
-    chat.sorted_beacon_list["DJ2LS-0"].timestamp,
-  );
-  chat.beaconDataArray = Object.values(chat.sorted_beacon_list["DJ2LS-0"].snr);
-} catch (e) {
-  console.log(e);
-}
+//Think Simon might have been testing and forgot to remove?
+// try {
+//   chat.beaconLabelArray = Object.values(
+//     chat.sorted_beacon_list["DJ2LS-0"].timestamp,
+//   );
+//   chat.beaconDataArray = Object.values(chat.sorted_beacon_list["DJ2LS-0"].snr);
+// } catch (e) {
+//   console.log(e);
+// }
 
 const beaconHistogramData = computed(() => ({
   labels: chat.beaconLabelArray,

From 85044465aad84467243c30d4cca133a35611dc11 Mon Sep 17 00:00:00 2001
From: Mashintime <awh@brainless.us>
Date: Sat, 4 Nov 2023 00:13:47 -0400
Subject: [PATCH 08/12] Attempt at fixing new chat not working

---
 gui/src/components/chat_navbar.vue |  5 ++++-
 gui/src/js/chatHandler.ts          | 31 +++++++++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/gui/src/components/chat_navbar.vue b/gui/src/components/chat_navbar.vue
index d8429185..60aed87e 100644
--- a/gui/src/components/chat_navbar.vue
+++ b/gui/src/components/chat_navbar.vue
@@ -13,6 +13,8 @@ const chat = useChatStore(pinia);
 
 import { getRxBuffer } from "../js/sock.js";
 
+import { newChatCreate } from "../js/chatHandler";
+
 import {
   Chart as ChartJS,
   CategoryScale,
@@ -124,7 +126,8 @@ function newChat() {
   let callsign = this.newChatCall.value;
   callsign = callsign.toUpperCase().trim();
   if (callsign === "") return;
-  chat.callsign_list.add(callsign);
+  newChatCreate(callsign);  
+  //updateAllChat(false);
   this.newChatCall.value = "";
 }
 
diff --git a/gui/src/js/chatHandler.ts b/gui/src/js/chatHandler.ts
index 3138b07f..72ed4483 100644
--- a/gui/src/js/chatHandler.ts
+++ b/gui/src/js/chatHandler.ts
@@ -67,6 +67,13 @@ interface beaconDefaultObject {
   snr: string;
 }
 
+interface newChatDefaultObject {
+  command: string;
+  is_new: boolean;
+  timestamp: number;
+  dxcallsign: string;
+}
+
 // ---- MessageDB
 try {
   var PouchDB = require("pouchdb");
@@ -587,7 +594,7 @@ function addObjToDatabase(newobj) {
       console.log("new database entry");
       console.log(response);
 
-      if (newobj.command === "msg") {
+      if (newobj.command === "msg" || newobj.command==="newchat") {
         chat.unsorted_chat_list.push(newobj);
         chat.sorted_chat_list = sortChatList();
       }
@@ -688,6 +695,28 @@ function deleteFromDatabaseByCallsign(callsign) {
     });
 }
 
+export function newChatCreate(call) {
+  let newchat: newChatDefaultObject = {
+  command: "newchat",
+  is_new: false,
+  timestamp: Math.floor((new Date()).getTime() / 1000),
+  dxcallsign: call,
+};
+addObjToDatabase(newchat);
+if (!chat.sorted_beacon_list[call]) {
+  // If not, initialize it with an empty array for snr values
+  chat.sorted_beacon_list[call] = {
+    call,
+    snr: [],
+    timestamp: [],
+  };
+  chat.callsign_list.add(call);
+}
+//chat.unsorted_chat_list.push(newchat);
+//chat.sorted_chat_list = sortChatList();
+
+}
+
 // function for handling a received beacon
 export function newBeaconReceived(obj) {
   /*

From d018627e9e44949c4432c7c827f0a30e9c2c7aa9 Mon Sep 17 00:00:00 2001
From: Mashintime <awh@brainless.us>
Date: Sat, 4 Nov 2023 00:18:43 -0400
Subject: [PATCH 09/12] Fix message window height being too large and pushing
 new message area off screen.

---
 gui/src/components/chat.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gui/src/components/chat.vue b/gui/src/components/chat.vue
index d625d309..7f0f145a 100644
--- a/gui/src/components/chat.vue
+++ b/gui/src/components/chat.vue
@@ -33,7 +33,7 @@ import chat_new_message from "./chat_new_message.vue";
         <div
           class="container overflow-auto"
           id="message-container"
-          style="height: calc(100% - 200px)"
+          style="height: calc(100% - 225px)"
         >
           <chat_messages />
         </div>

From d88d89373fafeca3ffedb21fd45e0b7ca6f2b765 Mon Sep 17 00:00:00 2001
From: Mashintime <awh@brainless.us>
Date: Sat, 4 Nov 2023 14:44:06 -0400
Subject: [PATCH 10/12] Remove comments

---
 gui/src/components/chat_navbar.vue | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/gui/src/components/chat_navbar.vue b/gui/src/components/chat_navbar.vue
index 60aed87e..e0cde728 100644
--- a/gui/src/components/chat_navbar.vue
+++ b/gui/src/components/chat_navbar.vue
@@ -90,22 +90,6 @@ var beaconHistogramOptions = {
   },
 };
 
-//let dataArray = new Array(25).fill(0)
-//dataArray = dataArray.add([-3, 10, 8, 5, 3, 0, -5])
-//let dataArray1 = dataArray.shift(2)
-//console.log(dataArray1)
-//[-3, 10, 8, 5, 3, 0, -5]
-
-//Think Simon might have been testing and forgot to remove?
-// try {
-//   chat.beaconLabelArray = Object.values(
-//     chat.sorted_beacon_list["DJ2LS-0"].timestamp,
-//   );
-//   chat.beaconDataArray = Object.values(chat.sorted_beacon_list["DJ2LS-0"].snr);
-// } catch (e) {
-//   console.log(e);
-// }
-
 const beaconHistogramData = computed(() => ({
   labels: chat.beaconLabelArray,
   datasets: [

From 9a39d2246ee4085d8fb8645d916980edfbb4a728 Mon Sep 17 00:00:00 2001
From: Mashintime <awh@brainless.us>
Date: Sat, 4 Nov 2023 14:55:18 -0400
Subject: [PATCH 11/12] Use clearer function name

---
 gui/src/components/chat_navbar.vue | 4 ++--
 gui/src/js/chatHandler.ts          | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/gui/src/components/chat_navbar.vue b/gui/src/components/chat_navbar.vue
index e0cde728..2e06d129 100644
--- a/gui/src/components/chat_navbar.vue
+++ b/gui/src/components/chat_navbar.vue
@@ -13,7 +13,7 @@ const chat = useChatStore(pinia);
 
 import { getRxBuffer } from "../js/sock.js";
 
-import { newChatCreate } from "../js/chatHandler";
+import { startChatWithNewStation } from "../js/chatHandler";
 
 import {
   Chart as ChartJS,
@@ -110,7 +110,7 @@ function newChat() {
   let callsign = this.newChatCall.value;
   callsign = callsign.toUpperCase().trim();
   if (callsign === "") return;
-  newChatCreate(callsign);  
+  startChatWithNewStation(callsign);  
   //updateAllChat(false);
   this.newChatCall.value = "";
 }
diff --git a/gui/src/js/chatHandler.ts b/gui/src/js/chatHandler.ts
index 72ed4483..416c70d6 100644
--- a/gui/src/js/chatHandler.ts
+++ b/gui/src/js/chatHandler.ts
@@ -694,8 +694,12 @@ function deleteFromDatabaseByCallsign(callsign) {
       console.log(err);
     });
 }
-
-export function newChatCreate(call) {
+//Function creates a new 'newchat' database entry when user initates a new chat, otherwise cannot send messages unless receiving a message/beacon from user first
+/**
+ * Add a newuser to the database, for when newuser button is clicked
+ * @param {string} call callsign of new user
+  */
+export function startChatWithNewStation(call) {
   let newchat: newChatDefaultObject = {
   command: "newchat",
   is_new: false,

From dcfff32fcc82ce08f04279579d5dc8cbce37efb3 Mon Sep 17 00:00:00 2001
From: Mashintime <awh@brainless.us>
Date: Sat, 4 Nov 2023 14:56:25 -0400
Subject: [PATCH 12/12] Function descriptions

---
 gui/src/js/freedata.ts         | 10 ++++++++++
 gui/src/js/waterfallHandler.js |  7 +++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/gui/src/js/freedata.ts b/gui/src/js/freedata.ts
index 18fdd623..01bf11a5 100644
--- a/gui/src/js/freedata.ts
+++ b/gui/src/js/freedata.ts
@@ -26,6 +26,11 @@ export function atob(data) {
   return window.btoa(Buffer.from(data, "base64").toString("utf8"));
 }
 //https://medium.com/@asadise/sorting-a-json-array-according-one-property-in-javascript-18b1d22cd9e9
+/**
+ * Sort a json collection by a property ascending
+ * @param {string} property property to sort on
+ * @returns sorted json collection
+ */
 export function sortByProperty(property) {
   return function (a, b) {
     if (a[property] > b[property]) return 1;
@@ -36,6 +41,11 @@ export function sortByProperty(property) {
 }
 
 //https://medium.com/@asadise/sorting-a-json-array-according-one-property-in-javascript-18b1d22cd9e9
+/**
+ * Sort a json collection by a property descending
+ * @param {string} property property to sort on
+ * @returns sorted json collection
+ */
 export function sortByPropertyDesc(property) {
   return function (a, b) {
     if (a[property] < b[property]) return 1;
diff --git a/gui/src/js/waterfallHandler.js b/gui/src/js/waterfallHandler.js
index b2e0156d..022cf446 100644
--- a/gui/src/js/waterfallHandler.js
+++ b/gui/src/js/waterfallHandler.js
@@ -25,10 +25,13 @@ export function addDataToWaterfall(data) {
     //console.log(e);
   }
 }
-
+/**
+ * Setwaterfall colormap array by index
+ * @param {number} index colormap index to use
+  */
 export function setColormap(index)
 {
   if (isNaN(index)) index=0;
-  console.log("Setting waterfall colormap to " + index)
+  //console.log("Setting waterfall colormap to " + index)
   spectrum.setColorMap(index);
 }