Overview
Comment: | Improve graph labels |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | dev | 1.0.0-alpha6 |
Files: | files | file ages | folders |
SHA1: |
c3823b9a014c892a62ab88d49b6e16ea |
User & Date: | bohwaz on 2020-11-10 03:04:51 |
Other Links: | branch diff | manifest | tags |
Context
2020-11-10
| ||
04:34 | Only show details for first 95% in pie charts, enable percentage check-in: 9efb5b3b67 user: bohwaz tags: dev, 1.0.0-alpha6 | |
03:04 | Improve graph labels check-in: c3823b9a01 user: bohwaz tags: dev, 1.0.0-alpha6 | |
02:50 | Fix issues with dynamic lists and running sums check-in: 637353f2fe user: bohwaz tags: dev | |
Changes
Modified src/include/lib/Garradin/Accounting/Graph.php from [ef8fae7ae3] to [ad6f7a4521].
︙ | ︙ | |||
20 21 22 23 24 25 26 | use KD2\Graphics\SVG\Pie_Data; class Graph { const URL_LIST = [ ADMIN_URL . 'acc/reports/graph_plot.php?type=assets&year=%s' => 'Évolution banques et caisses', ADMIN_URL . 'acc/reports/graph_plot.php?type=result&year=%s' => 'Évolution dépenses et recettes', | | | | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 | use KD2\Graphics\SVG\Pie_Data; class Graph { const URL_LIST = [ ADMIN_URL . 'acc/reports/graph_plot.php?type=assets&year=%s' => 'Évolution banques et caisses', ADMIN_URL . 'acc/reports/graph_plot.php?type=result&year=%s' => 'Évolution dépenses et recettes', ADMIN_URL . 'acc/reports/graph_plot.php?type=debts&year=%s' => 'Évolution créances (positif) et dettes (négatif)', ADMIN_URL . 'acc/reports/graph_pie.php?type=revenue&year=%s' => 'Répartition recettes', ADMIN_URL . 'acc/reports/graph_pie.php?type=expense&year=%s' => 'Répartition dépenses', ADMIN_URL . 'acc/reports/graph_pie.php?type=assets&year=%s' => 'Répartition actif', ]; const PLOT_TYPES = [ 'assets' => [ 'Total' => ['type' => [Account::TYPE_BANK, Account::TYPE_CASH, Account::TYPE_OUTSTANDING]], 'Banques' => ['type' => Account::TYPE_BANK], 'Caisses' => ['type' => Account::TYPE_CASH], 'En attente' => ['type' => Account::TYPE_OUTSTANDING], ], 'result' => [ 'Recettes' => ['position' => Account::REVENUE], 'Dépenses' => ['position' => Account::EXPENSE], ], 'debts' => [ 'Comptes de tiers' => ['type' => Account::TYPE_THIRD_PARTY], ], ]; const PIE_TYPES = [ 'revenue' => ['position' => Account::REVENUE], 'expense' => ['position' => Account::EXPENSE], 'assets' => ['type' => [Account::TYPE_BANK, Account::TYPE_CASH, Account::TYPE_OUTSTANDING]], |
︙ | ︙ | |||
71 72 73 74 75 76 77 | $sums = Reports::getSumsByInterval($line_criterias, $interval); if (count($sums) <= 1) { continue; } // Invert sums for banks, cash, etc. | | | 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 | $sums = Reports::getSumsByInterval($line_criterias, $interval); if (count($sums) <= 1) { continue; } // Invert sums for banks, cash, etc. if ('assets' === $type || 'debts' === $type) { $sums = array_map(function ($v) { return $v * -1; }, $sums); } elseif ('result' === $type) { $sums = array_map('abs', $sums); } $sums = array_map(function ($v) { return (int)$v/100; }, $sums); |
︙ | ︙ |