Merge branch 'master' into 'dev-test'

# Conflicts:
#   package.nw/lib/roster/renderRoster.js

package.nw/GridTracker.html

@@ -2628,6 +2628,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                     size="12"
                     oninput=" ValidateText(this); adifTextValueChange(this);"
                   />
+                  <br />
+                  Station Profile ID<input
+                    id="CloudlogStationProfileID"
+                    type="text"
+                    class="inputTextValue"
+                    size="12"
+                    oninput=" ValidateText(this); adifTextValueChange(this);"
+                  />
                 </td>
                 <td>
                   <div

package.nw/lib/adif.js

@@ -2619,7 +2619,7 @@ function sendCloudlogEntry(report)
   {
     if (typeof nw != "undefined")
     {
-      var postData = { key: CloudlogAPI.value, type: "adif", string: report };
+      var postData = { key: CloudlogAPI.value, station_profile_id: CloudlogStationProfileID.value, type: "adif", string: report };
       getPostJSONBuffer(
         CloudlogURL.value,
         CloudlogSendLogResult,

package.nw/lib/defaults.js

@@ -172,6 +172,7 @@ var def_adifLogSettings = {
     HRDLOGUploadCode: "",
     CloudlogURL: "http://127.0.0.1/index.php/api/qso",
     CloudlogAPI: "",
+    CloudlogStationProfileID: "1",
     eQSLUser: "",
     eQSLPassword: "",
     eQSLNickname: ""

package.nw/lib/roster.js

@@ -3460,3 +3460,24 @@ function doubleCompile(award, firstLevel)
 
   return singleCompile(award, firstLevel);
 }
+
+function listShortInstances()
+{
+  let shortInstances = [];
+  if (typeof window.opener.g_instancesIndex != "undefined" && typeof window.opener.g_instances != "undefined")
+  {
+    if (window.opener.g_instancesIndex.length > 1)
+    {
+      let instances = window.opener.g_instances;
+      let keys = Object.keys(instances).sort();
+      for (let key in keys)
+      {
+        let inst = keys[key];
+        let sp = inst.split(" - ");
+        let shortInst = sp[sp.length - 1].substring(0, 18);
+        shortInstances.push(shortInst);
+      }
+    }
+  }
+  return shortInstances;
+}

package.nw/lib/roster/renderRoster.js

@@ -92,6 +92,10 @@ function renderRoster(callRoster, rosterSettings)
   }
 
   window.document.title = `Call Roster: ${countParts.join(" • ")}`;
+  if (listShortInstances().length > 0)
+  {
+    window.document.title += " | " + listShortInstances().join(" • ");
+  }
 
   let showBands = (Object.keys(rosterSettings.bands).length > 1) || g_rosterSettings.columns.Band;
   let showModes = (Object.keys(rosterSettings.modes).length > 1) || g_rosterSettings.columns.Mode;
@@ -116,6 +120,24 @@ function renderRoster(callRoster, rosterSettings)
   {
     let callObj = visibleCallList[x].callObj;
 
+    // TODO: This is filtering
+    if (callObj.shouldAlert == false && rosterSettings.onlyHits == true && callObj.qrz == false)
+    { continue; }
+
+    if (callObj.DEcall.match("^[KNW][0-9][A-W|Y|Z](/w+)?$"))
+    { callObj.style.call = "class='oneByOne'"; }
+    if (callObj.DEcall == window.opener.g_instances[callObj.instance].status.DXcall)
+    {
+      if (window.opener.g_instances[callObj.instance].status.TxEnabled == 1)
+      {
+        callObj.style.call = "class='dxCalling'";
+      }
+      else
+      {
+        callObj.style.call = "class='dxCaller'";
+      }
+    }
+
     worker += g_rosterSettings.compact ? renderCompactRosterRow(callObj) : renderNormalRosterRow(rosterColumns, callObj)
   }