Use humanTime instead of doing own calculations

pull/645/head
Patrick Fruh 2020-06-09 20:36:09 +02:00
parent 0d350fb023
commit 2c5a6318d6
4 changed files with 7 additions and 23 deletions

View File

@ -130,12 +130,8 @@
let ts = w.globals.seriesX[seriesIndex][dataPointIndex]; let ts = w.globals.seriesX[seriesIndex][dataPointIndex];
const dt = new Date(ts).toLocaleDateString("en-us", timeoptions) const dt = new Date(ts).toLocaleDateString("en-us", timeoptions)
let val = series[seriesIndex][dataPointIndex]; let val = series[seriesIndex][dataPointIndex];
if (val >= 10000) { let humanVal = this.humanTime(val);
val = Math.round(val / 1000) + " ms" return `<div class="chartmarker"><span>Response Time: </span><span class="font-3">${humanVal}</span><span>${dt}</span></div>`
} else {
val = val + " μs"
}
return `<div class="chartmarker"><span>Response Time: </span><span class="font-3">${val}</span><span>${dt}</span></div>`
}, },
fixed: { fixed: {
enabled: true, enabled: true,

View File

@ -114,11 +114,7 @@
const dt = new Date(ts).toLocaleDateString("en-us", timeoptions) const dt = new Date(ts).toLocaleDateString("en-us", timeoptions)
let val = series[seriesIndex][dataPointIndex]; let val = series[seriesIndex][dataPointIndex];
let humanVal = this.humanTime(val); let humanVal = this.humanTime(val);
return `<div class="chartmarker"> return `<div class="chartmarker"><span>Average Response Time: </span><span class="font-3">${humanVal}</span><span>${dt}</span></div>`
<span>Average Response Time: </span>
<span class="font-3">${humanVal}</span>
<span>${dt}</span>
</div>`
}, },
fixed: { fixed: {
enabled: true, enabled: true,

View File

@ -55,12 +55,8 @@
let ts = w.globals.seriesX[seriesIndex][dataPointIndex]; let ts = w.globals.seriesX[seriesIndex][dataPointIndex];
const dt = new Date(ts).toLocaleDateString("en-us", timeoptions) const dt = new Date(ts).toLocaleDateString("en-us", timeoptions)
let val = series[seriesIndex][dataPointIndex]; let val = series[seriesIndex][dataPointIndex];
if (val >= 10000) { let humanVal = this.humanTime(val);
val = Math.round(val / 1000) + " ms" return `<div class="chartmarker"><span>Average Response Time: </span><span class="font-3">${humanVal}</span><span>${dt}</span></div>`
} else {
val = val + " μs"
}
return `<div class="chartmarker"><span>Average Response Time: </span><span class="font-3">${val}</span><span>${dt}</span></div>`
}, },
fixed: { fixed: {
enabled: true, enabled: true,

View File

@ -269,12 +269,8 @@ export default {
let ts = w.globals.seriesX[seriesIndex][dataPointIndex]; let ts = w.globals.seriesX[seriesIndex][dataPointIndex];
const dt = new Date(ts).toLocaleDateString("en-us", timeoptions) const dt = new Date(ts).toLocaleDateString("en-us", timeoptions)
let val = series[seriesIndex][dataPointIndex]; let val = series[seriesIndex][dataPointIndex];
if (val >= 10000) { let humanVal = this.humanTime(val);
val = Math.round(val / 1000) + " ms" return `<div class="chartmarker"><span>Response Time: </span><span class="font-3">${humanVal}</span><span>${dt}</span></div>`
} else {
val = val + " μs"
}
return `<div class="chartmarker"><span>Response Time: </span><span class="font-3">${val}</span><span>${dt}</span></div>`
}, },
fixed: { fixed: {
enabled: true, enabled: true,