diff --git a/package.nw/lib/adif.js b/package.nw/lib/adif.js index 6cdd731..cb60dee 100644 --- a/package.nw/lib/adif.js +++ b/package.nw/lib/adif.js @@ -701,7 +701,7 @@ function grabLOtWLog(test) function grabLoTWQSO() { - var dLoTWQSO = Date.parse(g_adifLogSettings.lastFetch.lotw_qso); + var dLoTWQSO = Date.parse(dateToISO8601(g_adifLogSettings.lastFetch.lotw_qso, "Z")); var tmpDate = ((new Date().getTime()) - 300); if ((g_isGettingLOTW == false) && ((isNaN(dLoTWQSO) == false) && (dLoTWQSO < tmpDate))) @@ -728,7 +728,7 @@ function grabLoTWQSO() function grabLoTWQSL() { - var dLoTWQSL = Date.parse(g_adifLogSettings.lastFetch.lotw_qsl); + var dLoTWQSL = Date.parse(dateToISO8601(g_adifLogSettings.lastFetch.lotw_qsl, "Z")); var tmpDate = ((new Date().getTime()) - 300); if ((g_isGettingLOTW == false) && ((isNaN(dLoTWQSL) == false) && (dLoTWQSL < tmpDate))) diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js index d294e37..8a5d733 100644 --- a/package.nw/lib/gt.js +++ b/package.nw/lib/gt.js @@ -911,6 +911,28 @@ function userTimeString(Msec) return dateToString(dateTime); } +function dateToISO8601(dString, tZone) +{ + var retDate = ""; + var tZone = (typeof tZone !== "undefined") ? tZone : "Z"; + var dateParts = dString.match(/(\d{4}-\d{2}-\d{2})(\s+(\d{2}:\d{2}:\d{2}))?/); + + if (dateParts !== null) + { + retDate = dateParts[1] + if ((typeof dateParts[3]) !== "undefined") + { + retDate += "T" + dateParts[3] + ".000" + tZone; + } + else + { + retDate += "T00:00:00.000" + tZone; + } + } + + return retDate; +} + function getWpx(callsign) { var prefix = null;