[reports][API] gnc:make-html-table-cell/min-width

A better version of 5aa59e0 - new API call to create a table-cell with min-width style attribute. Can be used by balsheet-pnl as well.
Gnucash · Sep 30, 2019 · 2684e51 · 2684e51
1 parent 72dc9bd
commit 2684e51
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 44 deletions.
diff --git a/gnucash/report/report-system/html-table.scm b/gnucash/report/report-system/html-table.scm
@@ -73,6 +73,12 @@
   (gnc:make-html-table-cell-internal rowspan colspan markup
                                      objects (gnc:make-html-style-table)))
 
+(define (gnc:make-html-table-cell/min-width px)
+  (let ((cell (gnc:make-html-table-cell)))
+    (gnc:html-table-cell-set-style!
+     cell "td" 'attribute (list "style" (format #f "min-width:~apx" px)))
+    cell))
+
 (define (gnc:make-html-table-header-cell . objects)
   (gnc:make-html-table-cell-internal 1 1 "th" objects 
                                      (gnc:make-html-style-table)))

diff --git a/gnucash/report/report-system/report-system.scm b/gnucash/report/report-system/report-system.scm
@@ -563,6 +563,7 @@
 (export gnc:make-html-table-header-cell)
 (export gnc:make-html-table-header-cell/markup)
 (export gnc:make-html-table-header-cell/size)
+(export gnc:make-html-table-cell/min-width)
 (export gnc:html-table-cell?)
 (export gnc:html-table-cell-rowspan)
 (export gnc:html-table-cell-set-rowspan!)

diff --git a/gnucash/report/standard-reports/balance-sheet.scm b/gnucash/report/standard-reports/balance-sheet.scm
@@ -473,13 +473,10 @@
                (equity-table
                 (gnc:make-html-acct-table/env/accts table-env equity-accounts)))
 
-          (let ((wide (gnc:make-html-table-cell/markup "text-cell" #f)))
-            (gnc:html-table-cell-set-style!
-             wide "text-cell" 'attribute '("style" "min-width:60px"))
-            (let ((space (make-list tree-depth wide)))
-              (gnc:html-table-append-row! left-table space)
-              (unless report-form?
-                (gnc:html-table-append-row! right-table space))))
+          (let ((space (make-list tree-depth (gnc:make-html-table-cell/min-width 60))))
+            (gnc:html-table-append-row! left-table space)
+            (unless report-form?
+              (gnc:html-table-append-row! right-table space)))
           (gnc:report-percent-done 80)
 
           (when label-assets?

diff --git a/gnucash/report/standard-reports/balsheet-pnl.scm b/gnucash/report/standard-reports/balsheet-pnl.scm
@@ -419,11 +419,7 @@ also show overall period profit & loss."))
           (loop (cons (thunk) result) (1- n)))))
 
   (define (make-narrow-cell)
-    (let ((narrow (gnc:make-html-table-cell/markup "text-cell" #f)))
-      (gnc:html-table-cell-set-style!
-       narrow "text-cell"
-       'attribute '("style" "width:1px"))
-      narrow))
+    (gnc:make-html-table-cell/min-width 1))
 
   (define (add-indented-row indent label label-markup amount-indent rest)
     (when (or (not depth-limit) (<= indent depth-limit))

diff --git a/gnucash/report/standard-reports/budget-balance-sheet.scm b/gnucash/report/standard-reports/budget-balance-sheet.scm
@@ -653,16 +653,13 @@
 		 (list 'rule-mode use-rules?)
 		  )
 		)
-
-	  (let ((wide (gnc:make-html-table-cell/markup "text-cell" #f)))
-            (gnc:html-table-cell-set-style!
-             wide "text-cell" 'attribute '("style" "min-width:60px"))
-            (let ((space (make-list tree-depth wide)))
-              (gnc:html-table-append-row! left-table space)
-              (unless report-form?
-                (gnc:html-table-append-row! right-table space))))
-
-	  (gnc:report-percent-done 80)
+
+          (let ((space (make-list tree-depth (gnc:make-html-table-cell/min-width 60))))
+            (gnc:html-table-append-row! left-table space)
+            (unless report-form?
+              (gnc:html-table-append-row! right-table space)))
+
+          (gnc:report-percent-done 80)
 	  (if label-assets? (add-subtotal-line left-table (_ "Assets") #f #f))
 	  (set! asset-table
             (gnc:make-html-acct-table/env/accts

diff --git a/gnucash/report/standard-reports/budget-income-statement.scm b/gnucash/report/standard-reports/budget-income-statement.scm
@@ -582,11 +582,9 @@
 		  )
 		)
 
-	  (let ((wide (gnc:make-html-table-cell/markup "text-cell" #f)))
-            (gnc:html-table-cell-set-style!
-             wide "text-cell" 'attribute '("style" "min-width:60px"))
-            (gnc:html-table-append-row! inc-table (make-list tree-depth wide))
-            (gnc:html-table-append-row! exp-table (make-list tree-depth wide)))
+	  (let ((space (make-list tree-depth (gnc:make-html-table-cell/min-width 60))))
+            (gnc:html-table-append-row! inc-table space)
+            (gnc:html-table-append-row! exp-table space))
 
 	  (gnc:report-percent-done 80)
 	  (if label-revenue?

diff --git a/gnucash/report/standard-reports/equity-statement.scm b/gnucash/report/standard-reports/equity-statement.scm
@@ -440,10 +440,8 @@
 
 	  (gnc:report-percent-done 30)
 
-          (let ((wide (gnc:make-html-table-cell/markup "text-cell" #f)))
-            (gnc:html-table-cell-set-style!
-             wide "text-cell" 'attribute '("style" "min-width:60px"))
-            (gnc:html-table-append-row! build-table (make-list 2 wide)))
+          (gnc:html-table-append-row!
+           build-table (make-list 2 (gnc:make-html-table-cell/min-width 60)))
 
           (gnc:report-percent-done 80)
 

diff --git a/gnucash/report/standard-reports/income-statement.scm b/gnucash/report/standard-reports/income-statement.scm
@@ -548,12 +548,10 @@
 		  )
 		)
 
-	  (let ((wide (gnc:make-html-table-cell/markup "text-cell" #f)))
-            (gnc:html-table-cell-set-style!
-             wide "text-cell" 'attribute '("style" "min-width:60px"))
-            (gnc:html-table-append-row! inc-table (make-list tree-depth wide))
-            (gnc:html-table-append-row! exp-table (make-list tree-depth wide))
-            (gnc:html-table-append-row! tra-table (make-list tree-depth wide)))
+	  (let ((space (make-list tree-depth (gnc:make-html-table-cell/min-width 60))))
+            (gnc:html-table-append-row! inc-table space)
+            (gnc:html-table-append-row! exp-table space)
+            (gnc:html-table-append-row! tra-table space))
 
 	  (gnc:report-percent-done 80)
 	  (if label-revenue?

diff --git a/gnucash/report/standard-reports/trial-balance.scm b/gnucash/report/standard-reports/trial-balance.scm
@@ -557,13 +557,10 @@
           (let* ((env (gnc:html-acct-table-get-row-env acct-table 0)))
             (set! account-cols (get-val env 'account-cols)))
 
-          (let ((wide (gnc:make-html-table-cell/markup "text-cell" #f))
-                (ncols (+ account-cols (if (eq? report-variant 'work-sheet) 10 2))))
-            (gnc:html-table-cell-set-style!
-             wide "text-cell" 'attribute '("style" "min-width:60px"))
-            (let ((space (make-list ncols wide)))
-              (gnc:html-table-append-row! build-table space)
-              (set! header-rows (1+ header-rows))))
+          (let* ((ncols (+ account-cols (if (eq? report-variant 'work-sheet) 10 2)))
+                 (space (make-list ncols (gnc:make-html-table-cell/min-width 60))))
+            (gnc:html-table-append-row! build-table space)
+            (set! header-rows (1+ header-rows)))
 
           ;; add the double-column headers if required
           (if (eq? report-variant 'work-sheet)