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

Merge pull request #645 from kaeltis/fixTimeConversion 

Fix time conversion in overview and charts
pull/655/head
Hunter Long 2020-06-10 10:58:15 -07:00 committed by GitHub
parent f695195b9e 489b837972
commit 79a1e68ec1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,10 +130,10 @@
let ts = w.globals.seriesX[seriesIndex][dataPointIndex];
const dt = new Date(ts).toLocaleDateString("en-us", timeoptions)
let val = series[seriesIndex][dataPointIndex];
if (val >= 1000) {
val = (val * 0.1).toFixed(0) + " milliseconds"
if (val >= 10000) {
val = Math.round(val / 1000) + " ms"
} else {
val = (val * 0.01).toFixed(0) + " microseconds"
val = val + " μs"
}
return `<div class="chartmarker"><span>Response Time: </span><span class="font-3">${val}</span><span>${dt}</span></div>`
},

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

@ -113,12 +113,12 @@
let ts = w.globals.seriesX[seriesIndex][dataPointIndex];
const dt = new Date(ts).toLocaleDateString("en-us", timeoptions)
let val = series[seriesIndex][dataPointIndex];
let humanVal = this.humanTime(val);
return `<div class="chartmarker">
<span>Average Response Time: </span>
<span class="font-3">${humanVal}</span>
<span>${dt}</span>
</div>`
if (val >= 10000) {
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: {
enabled: true,

2
frontend/src/components/Service/ServiceInfo.vue
View File

@ -186,7 +186,7 @@
total += parseInt(f.y)
});
total = total / data.length
return total.toFixed(0) + "ms"
return Math.round(total) + " ms"
} else {
return "Offline"
}

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

@ -55,11 +55,7 @@
let ts = w.globals.seriesX[seriesIndex][dataPointIndex];
const dt = new Date(ts).toLocaleDateString("en-us", timeoptions)
let val = series[seriesIndex][dataPointIndex];
if (val >= 1000) {
val = (val * 0.1).toFixed(0) + " milliseconds"
} else {
val = (val * 0.01).toFixed(0) + " microseconds"
}
val = val + " ms"
return `<div class="chartmarker"><span>Average Response Time: </span><span class="font-3">${val}</span><span>${dt}</span></div>`
},
fixed: {

6
frontend/src/mixin.js
View File

@ -166,10 +166,10 @@ export default Vue.mixin({
return {data: newSet}
},
humanTime(val) {
if (val >= 10000) {
return Math.floor(val / 10000) + "ms"
if (val >= 1000) {
return Math.round(val / 1000) + " ms"
}
return Math.floor(val / 1000) + "μs"
return val + " μs"
},
firstDayOfMonth(date) {
return startOfMonth(date)

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

@ -269,10 +269,10 @@ export default {
let ts = w.globals.seriesX[seriesIndex][dataPointIndex];
const dt = new Date(ts).toLocaleDateString("en-us", timeoptions)
let val = series[seriesIndex][dataPointIndex];
if (val >= 1000) {
val = (val * 0.1).toFixed(0) + " milliseconds"
if (val >= 10000) {
val = Math.round(val / 1000) + " ms"
} else {
val = (val * 0.01).toFixed(0) + " microseconds"
val = val + " μs"
}
return `<div class="chartmarker"><span>Response Time: </span><span class="font-3">${val}</span><span>${dt}</span></div>`
},