Merge branch 'sd-acknowledgements' into 'master'

Acknowledgements

See merge request gridtracker.org/gridtracker!106

package.nw/data/acknowledgements.json

@@ -0,0 +1,62 @@
+{
+  "N0TTL": {
+    "badge": "img/emojis/star.png",
+    "message": "Creator of GridTracker"
+  },
+  "K1JT": {
+    "badge": "img/emojis/star.png",
+    "message": "Creator of FT8 and WSJT-X"
+  },
+  "K9AN": {
+    "badge": "img/emojis/star.png",
+    "message": "Co-Creator of FT8"
+  },
+  "N2VFL": {
+    "badge": "img/emojis/trophy.png",
+    "message": "GridTracker Developer"
+  },
+  "NR0Q": {
+    "badge": "img/emojis/coffee.png",
+    "message": "GridTracker Developer"
+  },
+  "KF5QHQ": {
+    "badge": "img/emojis/trophy.png",
+    "message": "GridTracker Developer"
+  },
+  "WA4YA": {
+    "badge": "img/emojis/trophy.png",
+    "message": "GridTracker Developer"
+  },
+  "KI2D": {
+    "badge": "img/emojis/flatbread.png",
+    "message": "GridTracker Developer"
+  },
+  "K5TUX": {
+    "badge": "img/emojis/penguin.png",
+    "message": "GridTracker Partner"
+  },
+  "KA0AZS": {
+    "badge": "img/emojis/pizza.png",
+    "message": "GridTracker Tester"
+  },
+  "G1MIC": {
+    "badge": "img/emojis/pizza.png",
+    "message": "GridTracker Tester"
+  },
+  "KD0YTE": {
+    "badge": "img/emojis/pizza.png",
+    "message": "GridTracker Tester"
+  },
+  "W4IPA": {
+    "badge": "img/emojis/beer-mug.png",
+    "message": "GridTracker Tester"
+  },
+  "W5AFK": {
+    "badge": "img/emojis/pizza.png",
+    "message": "GridTracker Tester"
+  },
+  "IW3HMH": {
+    "badge": "img/emojis/logbook.png",
+    "message": "Creator of Log4OM"
+  }
+}

package.nw/lib/gt.js

@@ -97,6 +97,8 @@ var g_callsignDatabaseUSplus = {
   202: true
 };
 
+var g_acknowledgedCalls = require("./data/acknowledgements.json");
+
 function loadAllSettings()
 {
   for (var x in localStorage)
@@ -15614,6 +15616,14 @@ function searchLogForCallsign(call)
     })
     .sort(myBandCompare);
 
+  var worker = ""
+
+  if (g_acknowledgedCalls[call])
+  {
+    worker = `<h3>GridTracker would like to acknowledge ${call}: ` +
+      `<img class='lookupAckBadge' src='${g_acknowledgedCalls[call].badge}'> ${g_acknowledgedCalls[call].message}</h3>`
+  }
+
   if (list.length > 0)
   {
     var work = {};
@@ -15637,7 +15647,7 @@ function searchLogForCallsign(call)
       }
       else if (!(what in conf)) work[what] = g_pskColors[list[row].band];
     }
-    var worker =
+    worker +=
       "<div class='mapItemNoSize'><table align='center' class='darkTable'>";
     if (Object.keys(work).length > 0)
     {
@@ -15699,9 +15709,10 @@ function searchLogForCallsign(call)
     }
 
     worker += "</td></tr></table></div>";
-    setLookupDiv("lookupLocalDiv", worker);
   }
 
+  setLookupDiv("lookupLocalDiv", worker);
+
   list = null;
 }
 
@@ -16058,7 +16069,8 @@ function pskSpotResults(buffer, flag)
             var call = json.receptionReport[key].receiverCallsign;
             var mode = json.receptionReport[key].mode;
             var grid = json.receptionReport[key].receiverLocator.substr(0, 6);
-            if (grid.length < 4) {
+            if (grid.length < 4)
+            {
               continue;
             }
             var band = Number(
@@ -16177,7 +16189,8 @@ function createSpot(report, key, fromPoint, addToLayer = true)
   {
     var LL = squareToLatLongAll(report.grid);
 
-    if (isNaN(LL.la1)) {
+    if (isNaN(LL.la1))
+    {
       // Bad value in grid, don't map //
       return;
     }

package.nw/lib/roster.js

@@ -1722,7 +1722,15 @@ function viewRoster()
 
     if (g_rosterSettings.compact == false)
     {
+      var acks = window.opener.g_acknowledgedCalls
+
       var thisHash = thisCall + callObj.band + callObj.mode;
+      var callStr = thisCall.formatCallsign()
+      if (acks[thisCall])
+      {
+        callStr = `${callStr} <span class='acknowledged'><img class='ackBadge' src='${acks[thisCall].badge}'></span>`
+        callObj.awardReason += ` - ${acks[thisCall].message}`
+      }
 
       worker += "<tbody><tr id='" + thisHash + "'>";
       worker +=
@@ -1735,7 +1743,7 @@ function viewRoster()
         callObj.band +
         callObj.mode +
         "\")'>" +
-        thisCall.formatCallsign() +
+        callStr +
         "</td>";
 
       if (showBands)

package.nw/lib/style.css

@@ -713,6 +713,11 @@ a {
   /* animation: fadeEffect .3s;  Fading effect takes 1 second */
 }
 
+.lookupAckBadge {
+  padding: 0;
+  width: 1em;
+}
+
 table.darkTable {
   border-collapse: collapse;
   border: 1px solid #888;

package.nw/lib/style_roster.css

@@ -547,3 +547,14 @@ table.rosterTable thead th:first-child {
   box-shadow: inset 0px 11px 6px -8px #888, inset 0px -11px 6px -8px #888;
 }
 
+.acknowledged {
+  float: right;
+  font-size: 70%;
+  padding-left: 3px;
+  padding-right: 3px;
+}
+
+.ackBadge {
+  padding: 0;
+  width: 1.5em;
+}