gnucash master: Bug763257 - update Budget Line Chart to only send ISO formated date strings to jqplot

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/f0aff93d (commit)
	from  https://github.com/Gnucash/gnucash/commit/5cd57e24 (commit)



commit f0aff93dd5712e4dd57145ce1336d270280b8dc9
Author: Carsten Rinke <carsten.rinke at gmx.de>
Date:   Fri Jun 10 09:02:17 2016 +0200

    Bug763257 - update Budget Line Chart to only send ISO formated date strings to jqplot

diff --git a/src/report/standard-reports/budget-barchart.scm b/src/report/standard-reports/budget-barchart.scm
index b1e0970..b76ca23 100644
--- a/src/report/standard-reports/budget-barchart.scm
+++ b/src/report/standard-reports/budget-barchart.scm
@@ -181,9 +181,13 @@
         (period-start-time (car date))
         (bgt-vals '())
         (act-vals '())
-        (date-list '())
+        (date-iso-string-list '())
+        (save-fmt (qof-date-format-get))
       )
 
+      ;; make sure jqplot receives the date strings in ISO format (Bug763257)
+      (qof-date-format-set QOF-DATE-FORMAT-ISO)
+
       ;; Loop through periods
       (while (< period num-periods)
         ;;add calc new running sums
@@ -212,7 +216,7 @@
             )
             (set! bgt-vals (append bgt-vals (list bgt-sum)))
             (set! act-vals (append act-vals (list act-sum)))
-            (set! date-list (append date-list (list (gnc-print-date date))))
+            (set! date-iso-string-list (append date-iso-string-list (list (gnc-print-date date))))
           )
         )
         ;; prepare data for next loop repetition
@@ -224,12 +228,15 @@
         )
       )
 
+      ;; restore the date strings format
+      (qof-date-format-set save-fmt)
+
       (if (eqv? chart-type 'bars)
         (begin
           ;; Add data to the bar chart
           (gnc:html-barchart-append-column! chart bgt-vals)
           (gnc:html-barchart-append-column! chart act-vals)
-          (gnc:html-barchart-set-row-labels! chart date-list)
+          (gnc:html-barchart-set-row-labels! chart date-iso-string-list)
           (if running-sum
             (gnc:html-barchart-set-subtitle! chart
               (string-append "Bgt:"
@@ -245,7 +252,7 @@
           ;; Add data to the line chart
           (gnc:html-linechart-append-column! chart bgt-vals)
           (gnc:html-linechart-append-column! chart act-vals)
-          (gnc:html-linechart-set-row-labels! chart date-list)
+          (gnc:html-linechart-set-row-labels! chart date-iso-string-list)
           (if running-sum
             (gnc:html-linechart-set-subtitle! chart
               (string-append "Bgt:"



Summary of changes:
 src/report/standard-reports/budget-barchart.scm | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)