add True Completion percent boxes
This commit is contained in:
parent
6e272d682b
commit
5921b01088
3 changed files with 91 additions and 24 deletions
53
build/app.js
53
build/app.js
|
|
@ -12112,10 +12112,10 @@ function CompletionFillNoSave(section) {
|
||||||
var id = "";
|
var id = "";
|
||||||
var h2 = "";
|
var h2 = "";
|
||||||
var h2id = "";
|
var h2id = "";
|
||||||
var mp = ""; // max Percent
|
var percentBox = ""; // Percent Box
|
||||||
|
|
||||||
var symbol = "";
|
var symbol = "";
|
||||||
var textFill = "";
|
var fullString = "";
|
||||||
id = section.id;
|
id = section.id;
|
||||||
h2 = section.h2;
|
h2 = section.h2;
|
||||||
h2id = "h2-" + section.id;
|
h2id = "h2-" + section.id;
|
||||||
|
|
@ -12145,19 +12145,19 @@ function CompletionFillNoSave(section) {
|
||||||
symbol = "";
|
symbol = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
mp = "<div class='percent-box'>".concat(id === "hk-intro" ? 0 : section.maxPercent).concat(symbol, "</div>");
|
percentBox = "<div class='percent-box'>".concat(id === "hk-intro" ? 0 : section.maxPercent).concat(symbol, "</div>");
|
||||||
if (!section.hasOwnProperty("maxPercent")) mp = "";
|
if (!section.hasOwnProperty("maxPercent")) percentBox = "";
|
||||||
textFill += "<h2 id='".concat(h2id, "'>").concat(h2).concat(mp, "</h2>"); // ----------------- True Completion h2 title ---------------- //
|
fullString += "<h2 id='".concat(h2id, "'>").concat(h2).concat(percentBox, "</h2>"); // ----------------- add True Completion h2 title ---------------- //
|
||||||
|
|
||||||
switch (id) {
|
switch (id) {
|
||||||
case "hk-intro":
|
case "hk-intro":
|
||||||
textFill += "<h2 id='hk-true-completion'>True Completion<div class='percent-box'>89.98%</div></h2>";
|
fullString += "<h2 id='hk-true-completion'>True Completion<div class='percent-box'>0.00%</div></h2>";
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
}
|
}
|
||||||
|
|
||||||
return textFill;
|
return fullString;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* Replaces the h2 titles with a current percent/max percent values as read from the database
|
* Replaces the h2 titles with a current percent/max percent values as read from the database
|
||||||
|
|
@ -12174,12 +12174,17 @@ function CompletionFill(section) {
|
||||||
|
|
||||||
var mp = 0; // max Percent
|
var mp = 0; // max Percent
|
||||||
|
|
||||||
|
var trueCompletionCurrent = 0;
|
||||||
|
var trueCompletionTotal = 0;
|
||||||
|
var trueCompletionPercent = 0; // True Completion %
|
||||||
|
|
||||||
var symbol = "";
|
var symbol = "";
|
||||||
var fillText = "";
|
var percentBox = "";
|
||||||
|
var fullString = "";
|
||||||
section.hasOwnProperty("percent") ? cp = section.percent : cp = 0; // Don't use percent-box for Essentials, Achievements, Statistics etc.
|
section.hasOwnProperty("percent") ? cp = section.percent : cp = 0; // Don't use percent-box for Essentials, Achievements, Statistics etc.
|
||||||
|
|
||||||
if (!section.hasOwnProperty("maxPercent")) {
|
if (!section.hasOwnProperty("maxPercent")) {
|
||||||
fillText = "";
|
percentBox = "";
|
||||||
} // otherwise use percent-box with values cp/mp%
|
} // otherwise use percent-box with values cp/mp%
|
||||||
else {
|
else {
|
||||||
mp = section.maxPercent;
|
mp = section.maxPercent;
|
||||||
|
|
@ -12207,6 +12212,13 @@ function CompletionFill(section) {
|
||||||
|
|
||||||
switch (section.id) {
|
switch (section.id) {
|
||||||
case "hk-intro":
|
case "hk-intro":
|
||||||
|
// True Completion % reading and calculation for percent-box and box colors
|
||||||
|
trueCompletionCurrent = section.extendedCompletionDone;
|
||||||
|
trueCompletionTotal = section.extendedCompletionTotal;
|
||||||
|
trueCompletionPercent = trueCompletionCurrent / trueCompletionTotal * 100;
|
||||||
|
symbol = "%";
|
||||||
|
break;
|
||||||
|
|
||||||
case "hk-bosses":
|
case "hk-bosses":
|
||||||
case "hk-charms":
|
case "hk-charms":
|
||||||
case "hk-equipment":
|
case "hk-equipment":
|
||||||
|
|
@ -12229,10 +12241,29 @@ function CompletionFill(section) {
|
||||||
symbol = "";
|
symbol = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
fillText = "<div class='percent-box".concat(cl, "'>").concat(section.id === "hk-intro" ? cp : "".concat(cp).concat(section.maxPercent)).concat(symbol, "</div>");
|
percentBox = "<div class='percent-box".concat(cl, "'>").concat(section.id === "hk-intro" ? cp : "".concat(cp).concat(section.maxPercent)).concat(symbol, "</div>");
|
||||||
}
|
}
|
||||||
|
|
||||||
return "\t".concat(h2id).concat(h2).concat(fillText, "</h2>\n");
|
fullString += "\t".concat(h2id).concat(h2).concat(percentBox, "</h2>\n"); // ----------------- add True Completion h2 title ---------------- //
|
||||||
|
|
||||||
|
switch (section.id) {
|
||||||
|
case "hk-intro":
|
||||||
|
// switches the box to red when True Completion is 0
|
||||||
|
if (trueCompletionCurrent === 0) {
|
||||||
|
cl = " ".concat(clRed);
|
||||||
|
} // switches the box to green when True Completion is 100.00%
|
||||||
|
else if (trueCompletionCurrent === trueCompletionTotal) {
|
||||||
|
cl = " ".concat(clGreen);
|
||||||
|
} // default is blue (partially completed and starting value)
|
||||||
|
else cl = "";
|
||||||
|
|
||||||
|
fullString += "<h2 id='hk-true-completion'>\n True Completion<div class='percent-box".concat(cl, "'>").concat(trueCompletionPercent.toFixed(2)).concat(symbol, "</div>\n </h2>");
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
}
|
||||||
|
|
||||||
|
return fullString;
|
||||||
}
|
}
|
||||||
/* function SingleEntryFill(section, entry) { */
|
/* function SingleEntryFill(section, entry) { */
|
||||||
|
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -745,9 +745,9 @@ function CompletionFillNoSave(section) {
|
||||||
let id = "";
|
let id = "";
|
||||||
let h2 = "";
|
let h2 = "";
|
||||||
let h2id = "";
|
let h2id = "";
|
||||||
let mp = ""; // max Percent
|
let percentBox = ""; // Percent Box
|
||||||
let symbol = "";
|
let symbol = "";
|
||||||
let textFill = "";
|
let fullString = "";
|
||||||
|
|
||||||
id = section.id;
|
id = section.id;
|
||||||
h2 = section.h2;
|
h2 = section.h2;
|
||||||
|
|
@ -782,21 +782,21 @@ function CompletionFillNoSave(section) {
|
||||||
symbol = "";
|
symbol = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
mp = `<div class='percent-box'>${(id === "hk-intro") ? 0: section.maxPercent}${symbol}</div>`;
|
percentBox = `<div class='percent-box'>${(id === "hk-intro") ? 0: section.maxPercent}${symbol}</div>`;
|
||||||
if (!section.hasOwnProperty("maxPercent")) mp = "";
|
if (!section.hasOwnProperty("maxPercent")) percentBox = "";
|
||||||
|
|
||||||
textFill += `<h2 id='${h2id}'>${h2}${mp}</h2>`;
|
fullString += `<h2 id='${h2id}'>${h2}${percentBox}</h2>`;
|
||||||
|
|
||||||
// ----------------- True Completion h2 title ---------------- //
|
// ----------------- add True Completion h2 title ---------------- //
|
||||||
switch (id) {
|
switch (id) {
|
||||||
|
|
||||||
case "hk-intro":
|
case "hk-intro":
|
||||||
textFill += `<h2 id='hk-true-completion'>True Completion<div class='percent-box'>89.98%</div></h2>`;
|
fullString += `<h2 id='hk-true-completion'>True Completion<div class='percent-box'>0.00%</div></h2>`;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
}
|
}
|
||||||
|
|
||||||
return textFill;
|
return fullString;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -811,14 +811,18 @@ function CompletionFill(section) {
|
||||||
let clRed = "box-red";
|
let clRed = "box-red";
|
||||||
let cp = 0; // current Percent
|
let cp = 0; // current Percent
|
||||||
let mp = 0; // max Percent
|
let mp = 0; // max Percent
|
||||||
|
let trueCompletionCurrent = 0;
|
||||||
|
let trueCompletionTotal = 0;
|
||||||
|
let trueCompletionPercent = 0; // True Completion %
|
||||||
let symbol = "";
|
let symbol = "";
|
||||||
let fillText = "";
|
let percentBox = "";
|
||||||
|
let fullString = "";
|
||||||
|
|
||||||
(section.hasOwnProperty("percent")) ? cp = section.percent: cp = 0;
|
(section.hasOwnProperty("percent")) ? cp = section.percent: cp = 0;
|
||||||
|
|
||||||
// Don't use percent-box for Essentials, Achievements, Statistics etc.
|
// Don't use percent-box for Essentials, Achievements, Statistics etc.
|
||||||
if (!section.hasOwnProperty("maxPercent")) {
|
if (!section.hasOwnProperty("maxPercent")) {
|
||||||
fillText = "";
|
percentBox = "";
|
||||||
}
|
}
|
||||||
// otherwise use percent-box with values cp/mp%
|
// otherwise use percent-box with values cp/mp%
|
||||||
else {
|
else {
|
||||||
|
|
@ -851,6 +855,14 @@ function CompletionFill(section) {
|
||||||
switch (section.id) {
|
switch (section.id) {
|
||||||
|
|
||||||
case "hk-intro":
|
case "hk-intro":
|
||||||
|
|
||||||
|
// True Completion % reading and calculation for percent-box and box colors
|
||||||
|
trueCompletionCurrent = section.extendedCompletionDone;
|
||||||
|
trueCompletionTotal = section.extendedCompletionTotal;
|
||||||
|
trueCompletionPercent = (trueCompletionCurrent / trueCompletionTotal) * 100;
|
||||||
|
symbol = "%";
|
||||||
|
|
||||||
|
break;
|
||||||
case "hk-bosses":
|
case "hk-bosses":
|
||||||
case "hk-charms":
|
case "hk-charms":
|
||||||
case "hk-equipment":
|
case "hk-equipment":
|
||||||
|
|
@ -876,11 +888,35 @@ function CompletionFill(section) {
|
||||||
symbol = "";
|
symbol = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
fillText = `<div class='percent-box${cl}'>${(section.id === "hk-intro") ? cp: `${cp}${section.maxPercent}`}${symbol}</div>`;
|
percentBox = `<div class='percent-box${cl}'>${(section.id === "hk-intro") ? cp: `${cp}${section.maxPercent}`}${symbol}</div>`;
|
||||||
}
|
}
|
||||||
|
|
||||||
return `\t${h2id}${h2}${fillText}</h2>\n`;
|
fullString += `\t${h2id}${h2}${percentBox}</h2>\n`;
|
||||||
|
|
||||||
|
// ----------------- add True Completion h2 title ---------------- //
|
||||||
|
switch (section.id) {
|
||||||
|
|
||||||
|
case "hk-intro":
|
||||||
|
|
||||||
|
// switches the box to red when True Completion is 0
|
||||||
|
if (trueCompletionCurrent === 0) {
|
||||||
|
cl = ` ${clRed}`;
|
||||||
|
}
|
||||||
|
// switches the box to green when True Completion is 100.00%
|
||||||
|
else if (trueCompletionCurrent === trueCompletionTotal) {
|
||||||
|
cl = ` ${clGreen}`;
|
||||||
|
}
|
||||||
|
// default is blue (partially completed and starting value)
|
||||||
|
else cl = "";
|
||||||
|
|
||||||
|
fullString += `<h2 id='hk-true-completion'>
|
||||||
|
True Completion<div class='percent-box${cl}'>${trueCompletionPercent.toFixed(2)}${symbol}</div>
|
||||||
|
</h2>`;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
}
|
||||||
|
|
||||||
|
return fullString;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* function SingleEntryFill(section, entry) { */
|
/* function SingleEntryFill(section, entry) { */
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue