From 02641de32ecc6e0e4fd9de030399728080b6ed41 Mon Sep 17 00:00:00 2001 From: maTh Date: Sat, 16 Oct 2021 12:00:07 +0200 Subject: Stats: replace flotr2 with chart.js (#3858) * include Chart.js * page: main statistics. Flotr.js replaced with Chart.js * main stats + repartition * Delete: repartition.js + stats.js * delete flotr2 * add libs in README * polish * code polish * fixed amount of week days and months * added manget link for LibreJS * added: @license-end * phpcbf + jshint formatting * delete old code * fix stats * fix Comments * finally I found the issue and fixed its best * fix the month stats * Whitespace fixes * Remove flotr2 * Rename to chart.min.js * Remove console.log Co-authored-by: Alexandre Alapetite --- app/Models/StatsDAOSQLite.php | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'app/Models/StatsDAOSQLite.php') diff --git a/app/Models/StatsDAOSQLite.php b/app/Models/StatsDAOSQLite.php index f96f8f479..d262b40f8 100644 --- a/app/Models/StatsDAOSQLite.php +++ b/app/Models/StatsDAOSQLite.php @@ -24,7 +24,21 @@ SQL; $stm = $this->pdo->query($sql); $res = $stm->fetchAll(PDO::FETCH_NAMED); - $repartition = array(); + switch ($period) { + case '%H': + $periodMax = 24; + break; + case '%w': + $periodMax = 7; + break; + case '%m': + $periodMax = 12; + break; + default: + $periodMax = 30; + } + + $repartition = array_fill(0, $periodMax, 0); foreach ($res as $value) { $repartition[(int) $value['period']] = (int) $value['count']; } -- cgit v1.2.3