From 714b29afa48e4001ee6ab4d783b7515c7698f730 Mon Sep 17 00:00:00 2001
From: nr0q <nr0q@gridtracker.org>
Date: Thu, 9 Dec 2021 14:31:02 -0600
Subject: [PATCH] a few of SD's roster tweaks

---
 package.nw/lib/protos.js                    |  2 +-
 package.nw/lib/roster.js                    | 12 ++++++++++++
 package.nw/lib/roster/renderNormalRoster.js |  7 ++++---
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/package.nw/lib/protos.js b/package.nw/lib/protos.js
index 92a87cd5..8bae58d5 100644
--- a/package.nw/lib/protos.js
+++ b/package.nw/lib/protos.js
@@ -141,7 +141,7 @@ Number.prototype.toDHM = function ()
 
   days = days ? days + "d " : "";
   hrs = hrs ? hrs + "h " : "";
-  mnts = mnts ? mnts + "m " : "";
+  mnts = mnts || seconds ? mnts + "m " : "";
   val = days + hrs + mnts;
   return val;
 };
diff --git a/package.nw/lib/roster.js b/package.nw/lib/roster.js
index f8de264c..60d90fb3 100644
--- a/package.nw/lib/roster.js
+++ b/package.nw/lib/roster.js
@@ -302,8 +302,20 @@ function myLifeCompare(a, b)
 
 function mySpotCompare(a, b)
 {
+  var cutoff = timeNowSec() - window.opener.g_receptionSettings.viewHistoryTimeSec;
+
+  if (a.spot.when <= cutoff) return -1;
+  if (b.spot.when <= cutoff) return 1;
+
+  var aSNR = Number(a.spot.snr);
+  var bSNR = Number(b.spot.snr);
+
+  if (aSNR > bSNR) return 1;
+  if (aSNR < bSNR) return -1;
+
   if (a.callObj.spot.when > b.callObj.spot.when) return 1;
   if (a.callObj.spot.when < b.callObj.spot.when) return -1;
+
   return 0;
 }
 
diff --git a/package.nw/lib/roster/renderNormalRoster.js b/package.nw/lib/roster/renderNormalRoster.js
index 3fdcd97f..6247c8df 100644
--- a/package.nw/lib/roster/renderNormalRoster.js
+++ b/package.nw/lib/roster/renderNormalRoster.js
@@ -201,7 +201,8 @@ function renderNormalRosterRow(callObj, showBands, showModes)
       (callObj.cnty
         ? (callObj.qual
             ? ""
-            : "onClick='window.opener.lookupCallsign(\"" +
+            : "title='ZIP Code matches multiple counties, click to do a full lookup' " +
+              "onClick='window.opener.lookupCallsign(\"" +
               thisCall +
               "\",\"" +
               grid +
@@ -210,9 +211,9 @@ function renderNormalRosterRow(callObj, showBands, showModes)
         : "") +
       ">" +
       (callObj.cnty
-        ? (callObj.qual ? "" : "~ ") +
+        ? (callObj.qual ? "" : "¿ ") +
           window.opener.g_cntyToCounty[callObj.cnty] +
-          (callObj.qual ? "" : " ~")
+          (callObj.qual ? "" : " ?")
         : "") +
       "</td>";
   }