добавил ошибку обновления текущих статусов и графика, исправил формат даты и времени на графике

This commit is contained in:
VladislavOstapov 2024-01-25 19:39:14 +03:00
parent 9f422bef8b
commit 9082cae4e6
2 changed files with 34 additions and 6 deletions

View File

@ -76,13 +76,26 @@ async function makeRequest(url) {
} }
async function loadChartData() { async function loadChartData() {
let chartTime = localStorage.getItem("settings-chart-time") try {
const chartTime = localStorage.getItem("settings-chart-time")
return (await makeRequest('/fetch/tank-chart?days=' + chartTime))['tank_chart'] const res = await makeRequest('/fetch/tank-chart?days=' + chartTime)
document.getElementById('chart-update-error').hidden = true
return res['tank_chart']
} catch (e) {
document.getElementById('chart-update-error').hidden = false
return undefined
}
} }
async function loadLastUpdates() { async function loadLastUpdates() {
return (await makeRequest('/fetch/stats'))['stats'] try {
const res = await makeRequest('/fetch/stats')
document.getElementById('stats-update-error').hidden = true
return res['stats']
} catch (e) {
document.getElementById('stats-update-error').hidden = false
return undefined
}
} }
/** /**
@ -352,7 +365,10 @@ const updateFunctions = {
} }
async function updateStatus() { async function updateStatus() {
let dataset = await loadLastUpdates() const dataset = await loadLastUpdates()
if (dataset === undefined) {
return
}
for (let id in updateFunctions) { for (let id in updateFunctions) {
let element = document.getElementById(id) let element = document.getElementById(id)

View File

@ -36,10 +36,21 @@
#canvas-wrapper { #canvas-wrapper {
max-width: 1000px; max-width: 1000px;
} }
.error-message {
border: 2px var(--text-bad) solid;
border-radius: 8px;
margin: 0.5em 0;
padding: 0.5em;
color: var(--text-bad);
text-align: center;
}
</style> </style>
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div id="stats-update-error" class="error-message" hidden>Ошибка обновления состояния</div>
<div id="chart-update-error" class="error-message" hidden>Ошибка обновления графика</div>
<div class="params-wrapper"> <div class="params-wrapper">
<div> <div>
{% if perms.logs_service.view_pump_stats %} {% if perms.logs_service.view_pump_stats %}
@ -134,7 +145,8 @@
x: { x: {
type: 'time', type: 'time',
time: { time: {
unit: 'day' unit: 'day',
tooltipFormat: DATETIME_FORMAT,
}, },
scaleLabel: { scaleLabel: {
labelString: 'Timestamp' labelString: 'Timestamp'