From d84e55d891966588832a4acbfb238220dde431e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=A4=D0=B0?= =?UTF-8?q?=D1=80=D0=B1=D0=B5=D1=80?= Date: Sun, 8 Mar 2026 15:52:46 +0400 Subject: [PATCH] charts --- logs/error.log | 20 +++++++++++++ public/js/bulma.js | 71 +++++++++++++++++----------------------------- 2 files changed, 46 insertions(+), 45 deletions(-) diff --git a/logs/error.log b/logs/error.log index 91fa351..68bfb3c 100644 --- a/logs/error.log +++ b/logs/error.log @@ -442,3 +442,23 @@ coroutine 0: 2026/03/08 15:03:49 [error] 8788#0: *27 open() "/var/www/braga/favicon.ico" failed (2: No such file or directory), client: 127.0.0.1, server: braga, request: "GET /favicon.ico HTTP/1.1", host: "braga", referrer: "http://braga/" 2026/03/08 15:04:17 [error] 8788#0: *28 open() "/var/www/braga/public/css/style.css.map" failed (2: No such file or directory), client: 127.0.0.1, server: braga, request: "GET /public/css/style.css.map HTTP/1.1", host: "braga" 2026/03/08 15:04:19 [error] 8788#0: *27 open() "/var/www/braga/favicon.ico" failed (2: No such file or directory), client: 127.0.0.1, server: braga, request: "GET /favicon.ico HTTP/1.1", host: "braga", referrer: "http://braga/" +2026/03/08 15:40:32 [error] 8789#0: *31 open() "/var/www/braga/favicon.ico" failed (2: No such file or directory), client: 127.0.0.1, server: braga, request: "GET /favicon.ico HTTP/1.1", host: "braga", referrer: "http://braga/" +2026/03/08 15:40:38 [error] 8788#0: *35 open() "/var/www/braga/public/css/style.css.map" failed (2: No such file or directory), client: 127.0.0.1, server: braga, request: "GET /public/css/style.css.map HTTP/1.1", host: "braga" +2026/03/08 15:41:39 [error] 8791#0: *33 open() "/var/www/braga/favicon.ico" failed (2: No such file or directory), client: 127.0.0.1, server: braga, request: "GET /favicon.ico HTTP/1.1", host: "braga", referrer: "http://braga/" +2026/03/08 15:41:39 [error] 8788#0: *35 open() "/var/www/braga/installHook.js.map" failed (2: No such file or directory), client: 127.0.0.1, server: braga, request: "GET /installHook.js.map HTTP/1.1", host: "braga" +2026/03/08 15:42:01 [error] 8791#0: *33 open() "/var/www/braga/favicon.ico" failed (2: No such file or directory), client: 127.0.0.1, server: braga, request: "GET /favicon.ico HTTP/1.1", host: "braga", referrer: "http://braga/" +2026/03/08 15:42:01 [error] 8788#0: *35 open() "/var/www/braga/installHook.js.map" failed (2: No such file or directory), client: 127.0.0.1, server: braga, request: "GET /installHook.js.map HTTP/1.1", host: "braga" +2026/03/08 15:42:18 [error] 8791#0: *33 open() "/var/www/braga/favicon.ico" failed (2: No such file or directory), client: 127.0.0.1, server: braga, request: "GET /favicon.ico HTTP/1.1", host: "braga", referrer: "http://braga/" +2026/03/08 15:42:18 [error] 8788#0: *35 open() "/var/www/braga/installHook.js.map" failed (2: No such file or directory), client: 127.0.0.1, server: braga, request: "GET /installHook.js.map HTTP/1.1", host: "braga" +2026/03/08 15:43:00 [error] 8791#0: *33 open() "/var/www/braga/favicon.ico" failed (2: No such file or directory), client: 127.0.0.1, server: braga, request: "GET /favicon.ico HTTP/1.1", host: "braga", referrer: "http://braga/" +2026/03/08 15:43:00 [error] 8788#0: *35 open() "/var/www/braga/installHook.js.map" failed (2: No such file or directory), client: 127.0.0.1, server: braga, request: "GET /installHook.js.map HTTP/1.1", host: "braga" +2026/03/08 15:43:17 [error] 8791#0: *33 open() "/var/www/braga/favicon.ico" failed (2: No such file or directory), client: 127.0.0.1, server: braga, request: "GET /favicon.ico HTTP/1.1", host: "braga", referrer: "http://braga/" +2026/03/08 15:43:17 [error] 8788#0: *35 open() "/var/www/braga/installHook.js.map" failed (2: No such file or directory), client: 127.0.0.1, server: braga, request: "GET /installHook.js.map HTTP/1.1", host: "braga" +2026/03/08 15:43:38 [error] 8791#0: *33 open() "/var/www/braga/favicon.ico" failed (2: No such file or directory), client: 127.0.0.1, server: braga, request: "GET /favicon.ico HTTP/1.1", host: "braga", referrer: "http://braga/" +2026/03/08 15:43:39 [error] 8788#0: *35 open() "/var/www/braga/installHook.js.map" failed (2: No such file or directory), client: 127.0.0.1, server: braga, request: "GET /installHook.js.map HTTP/1.1", host: "braga" +2026/03/08 15:43:50 [error] 8791#0: *33 open() "/var/www/braga/favicon.ico" failed (2: No such file or directory), client: 127.0.0.1, server: braga, request: "GET /favicon.ico HTTP/1.1", host: "braga", referrer: "http://braga/" +2026/03/08 15:45:11 [error] 8789#0: *34 open() "/var/www/braga/favicon.ico" failed (2: No such file or directory), client: 127.0.0.1, server: braga, request: "GET /favicon.ico HTTP/1.1", host: "braga", referrer: "http://braga/" +2026/03/08 15:45:33 [error] 8789#0: *34 open() "/var/www/braga/favicon.ico" failed (2: No such file or directory), client: 127.0.0.1, server: braga, request: "GET /favicon.ico HTTP/1.1", host: "braga", referrer: "http://braga/" +2026/03/08 15:46:02 [error] 8789#0: *34 open() "/var/www/braga/favicon.ico" failed (2: No such file or directory), client: 127.0.0.1, server: braga, request: "GET /favicon.ico HTTP/1.1", host: "braga", referrer: "http://braga/" +2026/03/08 15:46:03 [error] 8788#0: *36 open() "/var/www/braga/installHook.js.map" failed (2: No such file or directory), client: 127.0.0.1, server: braga, request: "GET /installHook.js.map HTTP/1.1", host: "braga" +2026/03/08 15:52:18 [error] 8788#0: *38 open() "/var/www/braga/favicon.ico" failed (2: No such file or directory), client: 127.0.0.1, server: braga, request: "GET /favicon.ico HTTP/1.1", host: "braga", referrer: "http://braga/" diff --git a/public/js/bulma.js b/public/js/bulma.js index e45e478..4fb4f00 100644 --- a/public/js/bulma.js +++ b/public/js/bulma.js @@ -42,53 +42,34 @@ $( document ).ready(function() { Chart.defaults.color = '#FFF'; Chart.defaults.borderColor = '#555'; - - new Chart($('#daystats'), { - type: 'bar', - data: { - labels: $('#daystats').data('labels'), - datasets: [{ - label: 'Температура сусла', - data: $('#daystats').data('vals'), - borderWidth: 1, - backgroundColor: [ - 'rgb(255, 99, 132)', - 'rgb(54, 162, 235)', - 'rgb(255, 205, 86)' - ], - }] - }, - options: { - scales: { - y: { - beginAtZero: true - } - } - } - }); - new Chart($('#daystats1'), { - type: 'bar', - data: { - labels: $('#daystats1').data('labels'), - datasets: [{ - label: 'Температура сусла', - data: $('#daystats1').data('vals'), - borderWidth: 1, - backgroundColor: [ - 'rgb(255, 99, 132)', - 'rgb(54, 162, 235)', - 'rgb(255, 205, 86)' - ], - }] - }, - options: { - scales: { - y: { - beginAtZero: true + $('[id^="daystat"]').each(function() { + const chartElement = this; + let existingChart = Chart.getChart(chartElement); // Получаем ссылку на существующий экземпляр чарта + + if (existingChart !== undefined) { // Проверяем наличие предыдущего чарта + existingChart.destroy(); // Уничтожаем предыдущий экземпляр чарта + } + + new Chart(chartElement, { // Создаем новый график + type: 'bar', + data: { + labels: $(chartElement).data('labels'), // Используем данные, хранящиеся в атрибуте data-* + datasets: [{ + label: 'Температура сусла', + data: $(chartElement).data('vals'), + borderWidth: 1, + backgroundColor: ['rgb(255, 99, 132)', 'rgb(54, 162, 235)', 'rgb(255, 205, 86)'] + }] + }, + options: { + scales: { + y: { + beginAtZero: true + } + } } - } - } + }); }); });