gnucash master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Tue Oct 31 21:00:21 EDT 2017
Updated via https://github.com/Gnucash/gnucash/commit/4f971636 (commit)
via https://github.com/Gnucash/gnucash/commit/a6f4ea65 (commit)
via https://github.com/Gnucash/gnucash/commit/f4acb6c0 (commit)
via https://github.com/Gnucash/gnucash/commit/3913c528 (commit)
via https://github.com/Gnucash/gnucash/commit/46b3e1ca (commit)
via https://github.com/Gnucash/gnucash/commit/85e56512 (commit)
via https://github.com/Gnucash/gnucash/commit/9c7ba523 (commit)
via https://github.com/Gnucash/gnucash/commit/2fcd1efd (commit)
via https://github.com/Gnucash/gnucash/commit/3c8eeb8b (commit)
via https://github.com/Gnucash/gnucash/commit/a8407484 (commit)
via https://github.com/Gnucash/gnucash/commit/be44db2e (commit)
via https://github.com/Gnucash/gnucash/commit/cbd87647 (commit)
via https://github.com/Gnucash/gnucash/commit/039dda52 (commit)
via https://github.com/Gnucash/gnucash/commit/41ad8915 (commit)
via https://github.com/Gnucash/gnucash/commit/49c70795 (commit)
via https://github.com/Gnucash/gnucash/commit/5ca2834b (commit)
via https://github.com/Gnucash/gnucash/commit/44df91ad (commit)
via https://github.com/Gnucash/gnucash/commit/9cb8a3c8 (commit)
via https://github.com/Gnucash/gnucash/commit/6e3d4781 (commit)
via https://github.com/Gnucash/gnucash/commit/d6d1549a (commit)
via https://github.com/Gnucash/gnucash/commit/3926535e (commit)
from https://github.com/Gnucash/gnucash/commit/f05761e6 (commit)
commit 4f9716362c7c10c5c02f4b14ca0f9f2aa66c244e
Merge: a6f4ea6 6e3d478
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Oct 31 17:31:33 2017 -0700
Merge branch J. Marino's fix-report-colors into unstable
commit a6f4ea65e94efd11f6dc495660b4fc19c48ba9ab
Merge: a840748 f4acb6c
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Oct 31 17:24:44 2017 -0700
Merge J. Marino's 'fix/report-net-barchart' into unstable
commit f4acb6c00071a8c4e900bf0f2ee479826c5eb372
Author: Jose Marino <jmarino at users.noreply.github.com>
Date: Wed Oct 18 14:44:54 2017 -0600
report/category-barchart: fix unit test to work with gnc-monetary
The unit test for category-barchart did not initialize html stylesheets.
Without any stylesheets available, the renderer defaults to a
trivial renderer. This works fine if the table in the report is
populated by doubles. However, now it is populated by gnc-monetary
and they need a stylesheet to be properly formatted.
This commit makes sure to initialize the html stylesheet code in
the unit test and adapts the parsing code to the new formatting.
commit 3913c528f10200e3bc1e5c46fa47c828a41d4b42
Author: Jose Marino <jmarino at users.noreply.github.com>
Date: Wed Oct 18 14:32:25 2017 -0600
report/category-barchart: calculate using gnc-monetary instead of double
Perform and store all calculations using gnc-monetary instead of double.
Conversion to double is only needed as a last step when adding data
to the chart (using new local function "monetary->double").
When a table is displayed, since the values are gnc-monetary, they are
properly formatted as monetary values.
commit 46b3e1caad3b585727803cd46e6f8d9d20a65d81
Author: Jose Marino <jmarino at users.noreply.github.com>
Date: Wed Oct 18 09:53:09 2017 -0600
report/net-linechart: fix unit test to work with gnc-monetary
The unit test for net-linechart did not initialize html stylesheets.
Without any stylesheets available, the renderer defaults to a
trivial renderer. This works fine if the table in the net-linechart
report is populated by doubles. However, now it is populated by
gnc-monetary and they need a stylesheet to be properly formatted.
This commit makes sure to initialize the html stylesheet code in
the unit test and adapts the parsing code to the new formatting.
commit 85e56512023f67bf6b8843625c427a836ec5eb88
Author: Jose Marino <jmarino at users.noreply.github.com>
Date: Wed Oct 18 09:46:50 2017 -0600
report/net-linechart: calculate using gnc-monetary instead of double
Perform and store all calculations using gnc-monetary instead of double.
Conversion to double is only needed as a last step when adding data
to the chart (using new function "monetary->double").
If the table is displayed, its values are properly formatted as monetary
values since they are gnc-monetary instead of doubles.
commit 9c7ba5231526914d922bcaf944fbe379a202e054
Author: Jose Marino <jmarino at users.noreply.github.com>
Date: Tue Oct 17 15:09:20 2017 -0600
report/net-barchart: fix unit test to work with gnc-monetary
The unit test for net-barchart did not initialize html stylesheets.
Without any stylesheets available, the renderer defaults to a
trivial renderer. This works fine if the table in the net-barchart
report is populated by doubles. However, now it is populated by
gnc-monetary and they need a stylesheet to be properly formatted.
Using doubles and the trivial renderer, a table cell looks like:
<td class="number-cell"><number> 6.0</td>
Using gnc-monetary and the trivial renderer, a table cell looks like:
<td class="number-cell"><gnc-monetary> #[unknown]</td>
Initializing the html stylesheets, the table cell looks like:
<td class="number-cell">$6.00</td>
This commit makes sure to initialize the html stylesheet code in
the unit test and adapts the parsing code to the new formatting.
commit 2fcd1efd6dc1a157143a8e010b9d59de5b628ccd
Author: Jose Marino <jmarino at users.noreply.github.com>
Date: Tue Oct 17 14:51:52 2017 -0600
report/net-barchart: default to list of zeros instead of empty list
This was the original behavior before the change to gnc-monetary.
commit 3c8eeb8b3bdb54683fe5a804aa35d87b60693657
Author: Jose Marino <jmarino at users.noreply.github.com>
Date: Fri Oct 13 10:40:52 2017 -0600
report/net-barchart: calculate using gnc-monetary instead of double
Perform and store all calculations using gnc-monetary instead of double.
Conversion to double is only needed as a last step when adding data
to the chart (using new function "monetary->double").
When a table is displayed, since the values are gnc-monetary, they are
properly formatted as monetary values.
commit a8407484094464c0159151d06c2e8be82180ff66
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Oct 31 14:31:00 2017 -0700
[Gwenhywfar] Use the new getpassword API only on the gwen5 branch.
commit be44db2ef8ed3b2df2335896a0286dbaa20f7e2c
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Oct 31 12:04:37 2017 -0700
Provide for report/report-system/test/test-extras to be built before other tests.
commit cbd87647806ca3700d2ead8a6623b758a07ba2a7
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Oct 31 10:59:12 2017 -0700
Ensure that report unit tests dependencies are built with target.
commit 039dda5294e3b103e449247114a733dbf6e47bc8
Merge: 49c7079 41ad891
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Oct 31 10:20:50 2017 -0700
Merge J. Marino's cashflow-barchart updates into unstable.
commit 41ad89154ff856b8d53ef6a7e135ba927594e199
Author: Jose Marino <jmarino at users.noreply.github.com>
Date: Tue Oct 31 09:59:18 2017 -0600
report-test: move add-to-load-path to build system
The unit test for cashflow-barchart.scm needs module stylesheets
to work, to render gnc-monetary objects correctly.
It makes sense to add the extra load-path needed by the module
in the build system instead of with code in the test file.
This is only needed when building with autotools. It seems cmake
builds don't need this.
commit 49c70795c39bf75c1999b45d0883fdaf076e1202
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Oct 30 10:08:07 2017 -0700
Remove X11 error handler
And with it the only direct X11 dependency.
commit 5ca2834bd0587e57b32eac77cd8089ca77072b23
Author: Jose Marino <jmarino at users.noreply.github.com>
Date: Fri Oct 27 14:53:08 2017 -0600
cashflow-barchart: split option "show money in/out" into two separate ones
The report had two display options: one to control the display of
money in/out and another one to control the display of net flow.
In this commit we split the first option into two separate ones to
allow toggling the display of money in, out and net independently.
commit 44df91adcaaa718b97b71cd4d16c13a4c24acc5d
Author: Jose Marino <jmarino at users.noreply.github.com>
Date: Fri Oct 27 15:21:57 2017 -0600
cashflow-barchart: delete unnecessary intermediate lists
These intermediate lists *-value-list hold the double values needed
by the barchart. We can easily create these lists on the fly,
there's no need to store them in a separate variable.
The same is done to include total values in the table, we can easily
append the total value on the fly.
commit 9cb8a3c87abc80be4db2b12ef60faac6405d6071
Author: Jose Marino <jmarino at users.noreply.github.com>
Date: Fri Oct 27 14:20:11 2017 -0600
cashflow-barchart: use direct gnc-monetary math instead of collectors
Operate between gnc-monetary objects instead of using collectors. The
resulting code is simpler and easier to read.
commit 6e3d47819d6f2cefed18b70656320fc50c790962
Author: Jose Marino <jmarino at users.noreply.github.com>
Date: Thu Oct 12 15:39:19 2017 -0600
report: render linechart with requested line colors
A report can specify the bar colors of a barchart with a call to:
(gnc:html-linechart-set-col-colors! chart (list "blue" "red"))
However, these colors were ignored when rendering the linechart.
This patch adds the jqplot option "seriesColors" to pass
the requested bar colors to jqplot. If no colors are requested,
we let jqplot use default colors by setting "seriesColors: false".
commit d6d1549a40d4c1ed0b3aeef62779db24c6c38a28
Author: Jose Marino <jmarino at users.noreply.github.com>
Date: Thu Oct 12 15:32:58 2017 -0600
report: render piechart with requested colors
A report can specify the pie chart colors with a call to:
(gnc:html-piechart-set-colors! chart (list "blue" "red"))
However, these colors were ignored when rendering the piechart.
This patch adds the jqplot option "seriesColors" to pass
the requested colors to jqplot. If no colors are requested,
we let jqplot use default colors by setting "seriesColors: false".
commit 3926535e67a1f559b67b7e4494bc41c8426387cd
Author: Jose Marino <jmarino at users.noreply.github.com>
Date: Thu Oct 12 15:11:00 2017 -0600
report: render barchart with requested bar colors
A report can specify the bar colors of a barchart with a call to:
(gnc:html-barchart-set-col-colors! chart (list "blue" "red"))
However, these colors were ignored when rendering the barchart.
This patch adds the jqplot option "seriesColors" to pass
the requested bar colors to jqplot. If no colors are requested,
we let jqplot use default colors by setting "seriesColors: false".
Summary of changes:
CMakeLists.txt | 4 -
common/cmake_modules/GncAddTest.cmake | 7 ++
common/config.h.cmake.in | 3 -
configure.ac | 11 +-
gnucash/gnome-utils/Makefile.am | 4 -
gnucash/gnome-utils/gnc-gnome-utils.c | 29 -----
gnucash/import-export/aqb/gnc-gwen-gui.c | 4 +-
gnucash/report/report-system/html-barchart.scm | 14 ++-
gnucash/report/report-system/html-linechart.scm | 16 ++-
gnucash/report/report-system/html-piechart.scm | 12 ++
gnucash/report/report-system/test/CMakeLists.txt | 27 ++--
.../report/standard-reports/cashflow-barchart.scm | 140 +++++++++++----------
.../report/standard-reports/category-barchart.scm | 101 ++++++++++-----
gnucash/report/standard-reports/net-barchart.scm | 52 +++++---
gnucash/report/standard-reports/net-linechart.scm | 56 +++++----
.../report/standard-reports/test/CMakeLists.txt | 12 +-
gnucash/report/standard-reports/test/Makefile.am | 1 +
.../test/test-cashflow-barchart.scm | 2 -
.../test/test-generic-category-report.scm | 23 ++--
.../test/test-generic-net-barchart.scm | 41 +++---
.../test/test-generic-net-linechart.scm | 25 ++--
21 files changed, 334 insertions(+), 250 deletions(-)
More information about the gnucash-patches
mailing list