mirror of
https://github.com/monkeytypegame/monkeytype.git
synced 2025-10-08 14:42:46 +08:00
fixed current date showing up if no date was found in pb data
This commit is contained in:
Jack
parent
b2f2e7b89d
commit
607f5ea9c4
2 changed files with 82 additions and 44 deletions
|
|
@ -77,12 +77,20 @@ export function update() {
|
|||
const pb = DB.getSnapshot().personalBests;
|
||||
let pbData;
|
||||
let text;
|
||||
|
||||
let dateText = "-";
|
||||
let multiplier = Config.alwaysShowCPM ? 5 : 1;
|
||||
|
||||
text = "";
|
||||
try {
|
||||
pbData = pb.time[15].sort((a, b) => b.wpm - a.wpm)[0];
|
||||
dateText = "-";
|
||||
if (pbData.timestamp) {
|
||||
dateText =
|
||||
moment(pbData.timestamp).format("DD MMM YYYY") +
|
||||
"<br><div class='sub'>" +
|
||||
moment(pbData.timestamp).format("HH:mm") +
|
||||
"</div>";
|
||||
}
|
||||
text += `<tr>
|
||||
<td>15</td>
|
||||
<td>${Misc.roundTo2(pbData.wpm * multiplier)}<br><span class="sub">${
|
||||
|
|
@ -91,11 +99,7 @@ export function update() {
|
|||
<td>${Misc.roundTo2(pbData.raw * multiplier)}<br><span class="sub">${
|
||||
pbData.consistency === undefined ? "-" : pbData.consistency + "%"
|
||||
}</span></td>
|
||||
<td>${moment(pbData.timestamp).format(
|
||||
"DD MMM YYYY"
|
||||
)}<br><div class='sub'>${moment(pbData.timestamp).format(
|
||||
"HH:mm"
|
||||
)}</div></td>
|
||||
<td>${dateText}</td>
|
||||
</tr>`;
|
||||
} catch (e) {
|
||||
text += `<tr>
|
||||
|
|
@ -107,6 +111,14 @@ export function update() {
|
|||
}
|
||||
try {
|
||||
pbData = pb.time[30].sort((a, b) => b.wpm - a.wpm)[0];
|
||||
dateText = "-";
|
||||
if (pbData.timestamp) {
|
||||
dateText =
|
||||
moment(pbData.timestamp).format("DD MMM YYYY") +
|
||||
"<br><div class='sub'>" +
|
||||
moment(pbData.timestamp).format("HH:mm") +
|
||||
"</div>";
|
||||
}
|
||||
text += `<tr>
|
||||
<td>30</td>
|
||||
<td>${Misc.roundTo2(pbData.wpm * multiplier)}<br><span class="sub">${
|
||||
|
|
@ -115,11 +127,7 @@ export function update() {
|
|||
<td>${Misc.roundTo2(pbData.raw * multiplier)}<br><span class="sub">${
|
||||
pbData.consistency === undefined ? "-" : pbData.consistency + "%"
|
||||
}</span></td>
|
||||
<td>${moment(pbData.timestamp).format(
|
||||
"DD MMM YYYY"
|
||||
)}<br><div class='sub'>${moment(pbData.timestamp).format(
|
||||
"HH:mm"
|
||||
)}</div></td>
|
||||
<td>${dateText}</td>
|
||||
</tr>`;
|
||||
} catch (e) {
|
||||
text += `<tr>
|
||||
|
|
@ -131,6 +139,14 @@ export function update() {
|
|||
}
|
||||
try {
|
||||
pbData = pb.time[60].sort((a, b) => b.wpm - a.wpm)[0];
|
||||
dateText = "-";
|
||||
if (pbData.timestamp) {
|
||||
dateText =
|
||||
moment(pbData.timestamp).format("DD MMM YYYY") +
|
||||
"<br><div class='sub'>" +
|
||||
moment(pbData.timestamp).format("HH:mm") +
|
||||
"</div>";
|
||||
}
|
||||
text += `<tr>
|
||||
<td>60</td>
|
||||
<td>${Misc.roundTo2(pbData.wpm * multiplier)}<br><span class="sub">${
|
||||
|
|
@ -139,11 +155,7 @@ export function update() {
|
|||
<td>${Misc.roundTo2(pbData.raw * multiplier)}<br><span class="sub">${
|
||||
pbData.consistency === undefined ? "-" : pbData.consistency + "%"
|
||||
}</span></td>
|
||||
<td>${moment(pbData.timestamp).format(
|
||||
"DD MMM YYYY"
|
||||
)}<br><div class='sub'>${moment(pbData.timestamp).format(
|
||||
"HH:mm"
|
||||
)}</div></td>
|
||||
<td>${dateText}</td>
|
||||
</tr>`;
|
||||
} catch (e) {
|
||||
text += `<tr>
|
||||
|
|
@ -155,6 +167,14 @@ export function update() {
|
|||
}
|
||||
try {
|
||||
pbData = pb.time[120].sort((a, b) => b.wpm - a.wpm)[0];
|
||||
dateText = "-";
|
||||
if (pbData.timestamp) {
|
||||
dateText =
|
||||
moment(pbData.timestamp).format("DD MMM YYYY") +
|
||||
"<br><div class='sub'>" +
|
||||
moment(pbData.timestamp).format("HH:mm") +
|
||||
"</div>";
|
||||
}
|
||||
text += `<tr>
|
||||
<td>120</td>
|
||||
<td>${Misc.roundTo2(pbData.wpm * multiplier)}<br><span class="sub">${
|
||||
|
|
@ -163,11 +183,7 @@ export function update() {
|
|||
<td>${Misc.roundTo2(pbData.raw * multiplier)}<br><span class="sub">${
|
||||
pbData.consistency === undefined ? "-" : pbData.consistency + "%"
|
||||
}</span></td>
|
||||
<td>${moment(pbData.timestamp).format(
|
||||
"DD MMM YYYY"
|
||||
)}<br><div class='sub'>${moment(pbData.timestamp).format(
|
||||
"HH:mm"
|
||||
)}</div></td>
|
||||
<td>${dateText}</td>
|
||||
</tr>`;
|
||||
} catch (e) {
|
||||
text += `<tr>
|
||||
|
|
@ -182,6 +198,14 @@ export function update() {
|
|||
text = "";
|
||||
try {
|
||||
pbData = pb.words[10].sort((a, b) => b.wpm - a.wpm)[0];
|
||||
dateText = "-";
|
||||
if (pbData.timestamp) {
|
||||
dateText =
|
||||
moment(pbData.timestamp).format("DD MMM YYYY") +
|
||||
"<br><div class='sub'>" +
|
||||
moment(pbData.timestamp).format("HH:mm") +
|
||||
"</div>";
|
||||
}
|
||||
text += `<tr>
|
||||
<td>10</td>
|
||||
<td>${Misc.roundTo2(pbData.wpm * multiplier)}<br><span class="sub">${
|
||||
|
|
@ -190,11 +214,7 @@ export function update() {
|
|||
<td>${Misc.roundTo2(pbData.raw * multiplier)}<br><span class="sub">${
|
||||
pbData.consistency === undefined ? "-" : pbData.consistency + "%"
|
||||
}</span></td>
|
||||
<td>${moment(pbData.timestamp).format(
|
||||
"DD MMM YYYY"
|
||||
)}<br><div class='sub'>${moment(pbData.timestamp).format(
|
||||
"HH:mm"
|
||||
)}</div></td>
|
||||
<td>${dateText}</td>
|
||||
</tr>`;
|
||||
} catch (e) {
|
||||
text += `<tr>
|
||||
|
|
@ -206,6 +226,14 @@ export function update() {
|
|||
}
|
||||
try {
|
||||
pbData = pb.words[25].sort((a, b) => b.wpm - a.wpm)[0];
|
||||
dateText = "-";
|
||||
if (pbData.timestamp) {
|
||||
dateText =
|
||||
moment(pbData.timestamp).format("DD MMM YYYY") +
|
||||
"<br><div class='sub'>" +
|
||||
moment(pbData.timestamp).format("HH:mm") +
|
||||
"</div>";
|
||||
}
|
||||
text += `<tr>
|
||||
<td>25</td>
|
||||
<td>${Misc.roundTo2(pbData.wpm * multiplier)}<br><span class="sub">${
|
||||
|
|
@ -214,11 +242,7 @@ export function update() {
|
|||
<td>${Misc.roundTo2(pbData.raw * multiplier)}<br><span class="sub">${
|
||||
pbData.consistency === undefined ? "-" : pbData.consistency + "%"
|
||||
}</span></td>
|
||||
<td>${moment(pbData.timestamp).format(
|
||||
"DD MMM YYYY"
|
||||
)}<br><div class='sub'>${moment(pbData.timestamp).format(
|
||||
"HH:mm"
|
||||
)}</div></td>
|
||||
<td>${dateText}</td>
|
||||
</tr>`;
|
||||
} catch (e) {
|
||||
text += `<tr>
|
||||
|
|
@ -230,6 +254,14 @@ export function update() {
|
|||
}
|
||||
try {
|
||||
pbData = pb.words[50].sort((a, b) => b.wpm - a.wpm)[0];
|
||||
dateText = "-";
|
||||
if (pbData.timestamp) {
|
||||
dateText =
|
||||
moment(pbData.timestamp).format("DD MMM YYYY") +
|
||||
"<br><div class='sub'>" +
|
||||
moment(pbData.timestamp).format("HH:mm") +
|
||||
"</div>";
|
||||
}
|
||||
text += `<tr>
|
||||
<td>50</td>
|
||||
<td>${Misc.roundTo2(pbData.wpm * multiplier)}<br><span class="sub">${
|
||||
|
|
@ -238,11 +270,7 @@ export function update() {
|
|||
<td>${Misc.roundTo2(pbData.raw * multiplier)}<br><span class="sub">${
|
||||
pbData.consistency === undefined ? "-" : pbData.consistency + "%"
|
||||
}</span></td>
|
||||
<td>${moment(pbData.timestamp).format(
|
||||
"DD MMM YYYY"
|
||||
)}<br><div class='sub'>${moment(pbData.timestamp).format(
|
||||
"HH:mm"
|
||||
)}</div></td>
|
||||
<td>${dateText}</td>
|
||||
</tr>`;
|
||||
} catch (e) {
|
||||
text += `<tr>
|
||||
|
|
@ -254,6 +282,14 @@ export function update() {
|
|||
}
|
||||
try {
|
||||
pbData = pb.words[100].sort((a, b) => b.wpm - a.wpm)[0];
|
||||
dateText = "-";
|
||||
if (pbData.timestamp) {
|
||||
dateText =
|
||||
moment(pbData.timestamp).format("DD MMM YYYY") +
|
||||
"<br><div class='sub'>" +
|
||||
moment(pbData.timestamp).format("HH:mm") +
|
||||
"</div>";
|
||||
}
|
||||
text += `<tr>
|
||||
<td>100</td>
|
||||
<td>${Misc.roundTo2(pbData.wpm * multiplier)}<br><span class="sub">${
|
||||
|
|
@ -262,11 +298,7 @@ export function update() {
|
|||
<td>${Misc.roundTo2(pbData.raw * multiplier)}<br><span class="sub">${
|
||||
pbData.consistency === undefined ? "-" : pbData.consistency + "%"
|
||||
}</span></td>
|
||||
<td>${moment(pbData.timestamp).format(
|
||||
"DD MMM YYYY"
|
||||
)}<br><div class='sub'>${moment(pbData.timestamp).format(
|
||||
"HH:mm"
|
||||
)}</div></td>
|
||||
<td>${dateText}</td>
|
||||
</tr>`;
|
||||
} catch (e) {
|
||||
text += `<tr>
|
||||
|
|
|
|||
|
|
@ -27,6 +27,14 @@ function update(mode) {
|
|||
let mode2memory;
|
||||
|
||||
list.forEach((pb) => {
|
||||
let dateText = "-";
|
||||
if (pb.timestamp) {
|
||||
dateText =
|
||||
moment(pb.timestamp).format("DD MMM YYYY") +
|
||||
"<br><div class='sub'>" +
|
||||
moment(pb.timestamp).format("HH:mm") +
|
||||
"</div>";
|
||||
}
|
||||
$("#pbTablesPopup table tbody").append(`
|
||||
<tr>
|
||||
<td>${mode2memory === pb.mode2 ? "" : pb.mode2}</td>
|
||||
|
|
@ -46,9 +54,7 @@ function update(mode) {
|
|||
<td>${pb.language ? pb.language.replace(/_/g, " ") : "-"}</td>
|
||||
<td>${pb.punctuation ? '<i class="fas fa-check"></i>' : ""}</td>
|
||||
<td>${pb.lazyMode ? '<i class="fas fa-check"></i>' : ""}</td>
|
||||
<td>${moment(pb.timestamp).format(
|
||||
"DD MMM YYYY"
|
||||
)}<br><div class='sub'>${moment(pb.timestamp).format("HH:mm")}</td>
|
||||
<td>${dateText}</td>
|
||||
</tr>
|
||||
`);
|
||||
mode2memory = pb.mode2;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue