kopia lustrzana https://gitlab.com/gridtracker.org/gridtracker
Clean up award list
rodzic
6402b7e932
commit
e16145ef93
|
@ -115,8 +115,7 @@
|
|||
|
||||
<div id="AwardTrackerControls">
|
||||
<div id="AwardWantedList"></div>
|
||||
|
||||
<div data-i18n="roster.controls.awardTracker.addButton" class="button" onclick="openAwardPopup()">Add Awards</div>
|
||||
<div data-i18n="roster.controls.awardTracker.addButton" style="margin-top:2px;" class="button" onclick="openAwardPopup()">Add Awards</div>
|
||||
|
||||
<div id="awardHunterDiv" style="display: none;">
|
||||
<table style="padding: 15px">
|
||||
|
|
|
@ -668,20 +668,9 @@ function awardNameChanged()
|
|||
function updateAwardList(target = null)
|
||||
{
|
||||
let worker =
|
||||
"<table id=\"awardTable\" class=\"awardTableCSS\" style=\"padding:0;margin:0;margin-top:-5px;\" >";
|
||||
worker += "<tr style='font-size:smaller'>";
|
||||
worker += "<td align='left'>";
|
||||
worker += "Name";
|
||||
worker += "</td>";
|
||||
worker += "<td>";
|
||||
worker += "Award";
|
||||
worker += "</td>";
|
||||
worker += "<td>";
|
||||
worker += "Track";
|
||||
worker += "</td>";
|
||||
worker += "<td>";
|
||||
worker += "";
|
||||
worker += "</td>";
|
||||
"<table id='awardTable' class='awardTableCSS' >";
|
||||
worker += "<tr>";
|
||||
worker += "<th align='left'>Name</th><th>Award</th><th>Track</th><th></th>";
|
||||
worker += "</tr>";
|
||||
|
||||
worker += "</table>";
|
||||
|
@ -703,11 +692,7 @@ function updateAwardList(target = null)
|
|||
let endorseTotal = 0;
|
||||
let allEndorse = false;
|
||||
|
||||
let tooltip =
|
||||
g_awards[award.sponsor].awards[award.name].tooltip +
|
||||
" (" +
|
||||
g_awards[award.sponsor].sponsor +
|
||||
")\n";
|
||||
let tooltip = g_awards[award.sponsor].awards[award.name].tooltip + " (" + g_awards[award.sponsor].sponsor + ")\n";
|
||||
tooltip += toTitleCase(award.test.qsl_req) + " QSO\n";
|
||||
for (const mode in award.comp.counts)
|
||||
{
|
||||
|
@ -723,14 +708,7 @@ function updateAwardList(target = null)
|
|||
if (award.comp.counts[mode][count].num > baseCount)
|
||||
{ baseCount = award.comp.counts[mode][count].num; }
|
||||
|
||||
tooltip +=
|
||||
"\t" +
|
||||
award.comp.counts[mode][count].num +
|
||||
"/" +
|
||||
count +
|
||||
" (" +
|
||||
award.comp.counts[mode][count].per +
|
||||
"%)\n";
|
||||
tooltip += "\t" + award.comp.counts[mode][count].num + "/" + count + " (" + award.comp.counts[mode][count].per + "%)\n";
|
||||
let wrk = "";
|
||||
if (Object.keys(award.comp.endorse).length > 0)
|
||||
{
|
||||
|
@ -752,37 +730,22 @@ function updateAwardList(target = null)
|
|||
}
|
||||
if (baseCount > 0 && endorseCount == endorseTotal) allEndorse = true;
|
||||
|
||||
let cell = createCellHtml(
|
||||
row,
|
||||
"<p style='font-size:smaller;'>" + award.name + " - " + award.sponsor
|
||||
);
|
||||
let cell = createCellHtml(row, award.name + " - " + award.sponsor);
|
||||
cell.style.textAlign = "left";
|
||||
cell.style.color = "lightblue";
|
||||
|
||||
createCellHtml(
|
||||
row,
|
||||
"<p style='margin:0;' >" +
|
||||
(allEndorse
|
||||
? "<img src='./img/award-trophy.png' height='18px'>"
|
||||
: baseAward
|
||||
? "<img src='./img/award-medal.png' height='16px'>"
|
||||
: baseCount > 0
|
||||
? "<img src='./img/award-tally.png' height='16px'>"
|
||||
: "<img src='./img/award-empty.png' height='14px'>"),
|
||||
row, (allEndorse
|
||||
? "<img src='./img/award-trophy.png' height='14px'>"
|
||||
: baseAward
|
||||
? "<img src='./img/award-medal.png' height='13px'>"
|
||||
: baseCount > 0
|
||||
? "<img src='./img/award-tally.png' height='15px'>"
|
||||
: "<img src='./img/award-empty.png' height='12px'>"),
|
||||
tooltip
|
||||
);
|
||||
createCell(
|
||||
row,
|
||||
"enable",
|
||||
award.enable,
|
||||
award.enable,
|
||||
"Toggle Tracking",
|
||||
true
|
||||
);
|
||||
createCellHtml(
|
||||
row,
|
||||
"<p title='Remove Tracker' onclick='deleteAwardTracker(this)' style='margin:0;cursor:pointer;'><img src='./img/award-delete.png' height='16px'>"
|
||||
);
|
||||
createCell(row,"enable", award.enable, award.enable, "Toggle Tracking", true);
|
||||
createCellHtml(row, "<img title='Remove Tracker' onclick='deleteAwardTracker(this)' style='margin:0;padding:0;margin-top:2px;cursor:pointer;' src='./img/award-delete.png' height='12px'>");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -406,13 +406,25 @@ table.awardTableCSS {
|
|||
border: 0px solid #888;
|
||||
background-color: black;
|
||||
text-align: center;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
table.awardTableCSS td,
|
||||
|
||||
table.awardTableCSS td,
|
||||
table.awardTableCSS th {
|
||||
border: 1px solid #888;
|
||||
padding: 2px 4px;
|
||||
padding: 0px;
|
||||
margin: 0px;
|
||||
border-left: none;
|
||||
border-right: none;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
table.awardTableCSS tr {
|
||||
padding: 0px;
|
||||
margin: 0px;
|
||||
max-height: 16px;
|
||||
bottom: 0;
|
||||
}
|
||||
|
||||
table.awardTableCSS thead {
|
||||
|
|
Ładowanie…
Reference in New Issue