From 7f1ad13349b6dd4c307f79b578856a2b7f842fd9 Mon Sep 17 00:00:00 2001
From: Paul Traina <bulk+github@pst.org>
Date: Wed, 26 Aug 2020 13:17:55 -0700
Subject: [PATCH] Import upstream v1.20.0826

---
 package.nw/GridTracker.html | 13 +++++++------
 package.nw/gt_update.html   |  9 +++++++--
 package.nw/lib/callsigns.js |  4 ++--
 package.nw/lib/gt.js        | 20 +++++++++-----------
 package.nw/lib/roster.js    |  6 +++---
 5 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/package.nw/GridTracker.html b/package.nw/GridTracker.html
index b5dd213e..f776bbcf 100644
--- a/package.nw/GridTracker.html
+++ b/package.nw/GridTracker.html
@@ -36,7 +36,7 @@
 		</div>
 		<div id="documentsDiv" style="display:none" >
 		<div  >
-			<div>Your documents folder ( <text id="searchedDocFolder"></text> ) could not be located.</div><br/>
+			<div>Your documents folder ( <div id="searchedDocFolder"></div> ) could not be located.</div><br/>
 			<div>GridTracker can not continue without it.</div><br/>
 			<div>Please select a directory so that GridTracker can store important files.</div><br/>
 			<input id="documentDirectoryInput" type="file" nwdirectory onchange="directoryInput(this)"/>
@@ -308,7 +308,7 @@
          <div id="myGridTooltip" style="background-color:black;padding:5px;text-align:center;display:block;position:absolute;z-index:-499;left:50px;top:50px;border:2px solid white;white-space: nowrap;overflow:hidden" class="roundBorder"></div>
 		 <div id="myTrophyTooltip" style="background-color:black;padding:5px;text-align:center;display:block;position:absolute;z-index:-499;left:50px;top:50px;border:2px solid white;white-space: nowrap;overflow:hidden" class="roundBorder"></div>
 		<div id="myMoonTooltip" style="background-color:black;padding:5px;text-align:center;display:block;position:absolute;z-index:-499;left:50px;top:50px;border:2px solid white;white-space: nowrap;overflow:hidden" class="roundBorder"></div>
-		<div id="helpDiv"style="animation: fadeInEffect .1s;margin: 2px;left:30px;top:20px;display:none;background-color:black;padding:5px;text-align:center;vertical-align:middle;position:absolute;z-index:600;border:1px cyan;" class="roundBorder" >
+		<div id="helpDiv" style="animation: fadeInEffect .1s;margin: 2px;left:30px;top:20px;display:none;background-color:black;padding:5px;text-align:center;vertical-align:middle;position:absolute;z-index:600;border:1px cyan;" class="roundBorder" >
 			<div id="printHotKeyDiv" style="border:1px solid cyan;color:white;text-align:auto;" >
 <table align=center class="darkTable" >
 <tr><th  colspan=6 >Hot Key List (v1.20.0825+)</th>
@@ -750,7 +750,7 @@
             </div>
 			<div id="logbookSettingsDiv" 	class="settingsTabcontent" style="padding:5px;">
 				<div style="padding:5px;" class="mapItem">
-					<div style="padding:5px;"  class="mapItem" title="Filter Logbook QSO To These Callsigns Only&#10;(comma seperated)">
+					<div style="padding:5px;"  class="mapItem" title="Filter Logbook QSOs to include these Callsigns only&#10;(comma separated)">
 						 <table align=center>
 							<tr>
 							   <td><b>Working Callsign(s)</b></td>
@@ -763,7 +763,7 @@
 							</tr>
 						 </table>
 					</div>
-					<div style="padding:5px;"  class="mapItem" title="Filter Logbook QSO From This Date And After">
+					<div style="padding:5px;"  class="mapItem" title="Filter Logbook QSOs from before this Date">
 						 <table align=center>
 							<tr>
 							   <td><b>Working Date</b></td>
@@ -785,7 +785,7 @@
 						 </table>
 					</div>
 					<br/>
-					<div  style="padding:5px;display:none;font-size:larger:font-weight:bold:color:cyan;" id="applyCallsignsAndDateDiv" class="button"  onclick="applyCallsignsAndDates();" title="Apply Changes and Re-Import Logbook(s)">Apply Changes</div>
+					<div  style="padding:5px;display:none;font-size:larger;font-weight:bold;color:cyan;" id="applyCallsignsAndDateDiv" class="button"  onclick="applyCallsignsAndDates();" title="Apply Changes and Re-Import Logbook(s)">Apply Changes</div>
 				</div>
 			</div>
             <div id="mapSettingsDiv" 	class="settingsTabcontent" style="background-color:#00000044;text-shadow: 0 0 5px #000000FF;">
@@ -1747,7 +1747,8 @@
 				  &copy;2020 Henry "atouk" Forte / N2VFL<br/>                 
                   <p>
 				  <H3>Contributors</H3>
-				  <b>NR&Oslash;Q</b> - "d3jake" KE&Oslash;RIY - "Don" KB2YSI - K4KPW
+				  <b>NR&Oslash;Q</b><p>
+				  "d3jake" KE&Oslash;RIY - "Don" KB2YSI - K4KPW - "Paul" K6PST
                   <br />
                   <img src="./gridview.png" /> <br />
 				 
diff --git a/package.nw/gt_update.html b/package.nw/gt_update.html
index 4ec7b1fd..55201b6a 100644
--- a/package.nw/gt_update.html
+++ b/package.nw/gt_update.html
@@ -46,10 +46,15 @@ Settings:
     New Tab!:
       "Working Callsign(s)"
         When enabled, filter your logbooks by callsigns
-          eg:  "N0TTL,N0OAW,KE0PEA" 
+          (eg:"N0TTL,N0OAW,KE0PEA") only those callsigns will be loaded
     
       "Working Date"
-        When enabled, filter your logbooks by anything on or after date
+        When enabled, filter your logbooks by date
+          (Only QSO on or after date will be loaded)
+		  (Dates are 00:00:00 UTC/Zulu)
+      
+      When "Apply Changes" is pressed, GridTracker will re-import logs
+        (it may take a while)
     
   Lookups:
     Update:
diff --git a/package.nw/lib/callsigns.js b/package.nw/lib/callsigns.js
index 0db27327..d20b911b 100644
--- a/package.nw/lib/callsigns.js
+++ b/package.nw/lib/callsigns.js
@@ -580,7 +580,7 @@ function getChunkedBuffer(file_url, callback, flag, mode, port, cookie, errorHan
 var g_ulsDatabase = openDatabase('ulsDB', '1.0', 'US Callsigns', 40 * 1024 * 1024);
 
 g_ulsDatabase.transaction(function (tx) {
-	tx.executeSql('CREATE TABLE IF NOT EXISTS calls (callsign PRIMARY KEY, zip, state)');
+	tx.executeSql('CREATE TABLE IF NOT EXISTS calls (callsign TEXT PRIMARY KEY, zip, state)');
 });
 
 
@@ -621,7 +621,7 @@ function processulsCallsigns(data, flag, cookies, starting, finished)
 					saveCallsignSettings();
 					ulsUpdatedTd.innerHTML = "<b><i>Processing...</i></b>";
 					tx.executeSql('drop table calls');
-					tx.executeSql('CREATE TABLE IF NOT EXISTS calls (callsign PRIMARY KEY, zip, state)');
+					tx.executeSql('CREATE TABLE IF NOT EXISTS calls (callsign TEXT PRIMARY KEY, zip, state)');
 				}
 				for (var x in lines )
 				{
diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js
index 0a2f5615..ec9d50b3 100644
--- a/package.nw/lib/gt.js
+++ b/package.nw/lib/gt.js
@@ -1,8 +1,8 @@
 // GridTracker ©2020 N0TTL
 var gtComment1 = "GridTracker is not open source, you may not change, modify or 'borrow' code for your needs that is redistributed in any form without first asking and receiving permission from N0TTL *and* N2VFL";
 var gtComment2 = "Third party libraries and functions used are seperated to third-party.js or their respective lib .js files, the GT close-source directive does not apply to these files of course";
-var gtVersion = 1200825;
-var gtBeta = "Betamax";
+var gtVersion = 1200826;
+var gtBeta = "";
 
 var g_startVersion = 0;
 
@@ -4549,6 +4549,7 @@ function loadStrikes ()
 				
 			
 				var worker = "<font style='color:yellow;font-weight:bold'>Lighting Strike Detected!</font><br/>";
+				worker += "<font style='color:white'>"+userTimeString(null)+"</font><br/>";
 				worker += "<font style='color:orange'>Distance: </font><font style='color:lightblue;font-weight:bold'>"+dist+"</font><br/>";
 				worker += "<font style='color:cyan'>Bearing: </font><font style='color:lightgreen;font-weight:bold'>"+azim+"</font>";
 
@@ -9411,7 +9412,7 @@ function updateBasedOnIni() {
 	if ( g_jtdxProcessRunning )
 		count++;
 	// UdpPortNotSet
-	if (g_appSettings.wsjtUdpPort == 0 || count == 1) {
+	if (g_appSettings.wsjtUdpPort == 0 && count == 1) {
 		if (g_wsjtxProcessRunning)
 			which = g_wsjtxIni;
 		else if (g_jtdxProcessRunning)
@@ -9517,9 +9518,10 @@ function validateNumAndLetter( input )
 
 function validCallsignsKeys( value )
 {
+	console.log(value);
 	if (value == 44)
 		return true;
-	if ( value >= 48 && value <= 57 )
+	if ( value >= 47 && value <= 57 )
 		return true;
 	if ( value >= 65 && value <= 90 )
 		return true;
@@ -11069,14 +11071,11 @@ function setMsgSettingsView() {
 		msgAwayTextDiv.style.display = "none";
 }
 
-function loadAdifSettings() {
-	
+function loadAdifSettings() 
+{
 	workingCallsignEnable.checked = g_appSettings.workingCallsignEnable;
 	workingCallsignsValue.value = (Object.keys(g_appSettings.workingCallsigns).join(","));
 	
-	if ( workingCallsignsValue.value.length == 0 )
-		 workingCallsignsValue.value = myDEcall;
-	 
 	ValidateCallsigns(workingCallsignsValue);
 	
 	workingDateEnable.checked = g_appSettings.workingDateEnable ;
@@ -11220,7 +11219,7 @@ function startupButtonsAndInputs() {
 	}
 	catch (e)
 	{
-		alert(e.message);
+		//alert(e.message);
 	}
 }
 
@@ -13415,7 +13414,6 @@ window.addEventListener("load", function(){
 });
 
 process.on('uncaughtException', function (e) {
-	alert(e);
 	console.error('uncaughtException:', e);
 	console.error(e.stack);
 });
diff --git a/package.nw/lib/roster.js b/package.nw/lib/roster.js
index 551b989b..e80f0b28 100644
--- a/package.nw/lib/roster.js
+++ b/package.nw/lib/roster.js
@@ -1459,14 +1459,14 @@ function viewRoster()
 			{
 				if ( g_rosterSettings.maxLoTW < 27 )
 				{
-					var months = (g_day -  window.opener.g_lotwCallsigns[thisCall]) / 30;
+					var months = (g_day -  window.opener.g_lotwCallsigns[thisCall]) / 30 ;
 					if ( months > g_rosterSettings.maxLoTW )
 						worker += "<td  style='color:yellow' align='center' title='Has not uploaded a QSO in "+Number(months).toYM()+"'>?</td>";
 					else
-						worker += "<td  style='color:#0F0' align='center'>&#10004;</td>";
+						worker += "<td  style='color:#0F0' align='center' title='  Last Upload&#10;" + window.opener.userDayString(window.opener.g_lotwCallsigns[thisCall] * 86400000 ) + "'>&#10004;</td>";
 				}
 				else
-					worker += "<td  style='color:#0F0' align='center'>&#10004;</td>";
+					worker += "<td  style='color:#0F0' align='center' title='  Last Upload&#10;" + window.opener.userDayString(window.opener.g_lotwCallsigns[thisCall] * 86400000 ) + "'>&#10004;</td>";
 			}
 			else 
 				worker += "<td></td>";