github
/
statping
mirror of https://github.com/statping/statping
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Use humanTime instead of doing own calculations" 

This reverts commit 2c5a6318d6.
pull/645/head
Patrick Fruh 2020-06-09 20:45:12 +02:00
parent 2c5a6318d6
commit 5434b26b6e
4 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/components/Service/AdvancedChart.vue
View File

@ -130,8 +130,12 @@
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];
let humanVal = this.humanTime(val); if (val >= 10000) {
return `<div class="chartmarker"><span>Response Time: </span><span class="font-3">${humanVal}</span><span>${dt}</span></div>` val = Math.round(val / 1000) + " ms"
} 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,

6
frontend/src/components/Service/ServiceChart.vue
View File

@ -114,7 +114,11 @@
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"><span>Average Response Time: </span><span class="font-3">${humanVal}</span><span>${dt}</span></div>` return `<div class="chartmarker">
<span>Average Response Time: </span>
<span class="font-3">${humanVal}</span>
<span>${dt}</span>
</div>`
}, },
fixed: { fixed: {
enabled: true, enabled: true,

8
frontend/src/components/Service/ServiceSparkLine.vue
View File

@ -55,8 +55,12 @@
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];
let humanVal = this.humanTime(val); if (val >= 10000) {
return `<div class="chartmarker"><span>Average Response Time: </span><span class="font-3">${humanVal}</span><span>${dt}</span></div>` val = Math.round(val / 1000) + " ms"
} 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,

8
frontend/src/pages/Service.vue
View File

@ -269,8 +269,12 @@ 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];
let humanVal = this.humanTime(val); if (val >= 10000) {
return `<div class="chartmarker"><span>Response Time: </span><span class="font-3">${humanVal}</span><span>${dt}</span></div>` val = Math.round(val / 1000) + " ms"
} 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,