From 952fd03f1681e001a6a304c4f37ae02b649335ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?= Date: Sun, 2 Apr 2023 19:02:32 +0200 Subject: [PATCH] Use balance struct and move it to member-print-table. --- src/bbstool.scm | 12 +----------- src/members-print.scm | 12 +++++++++++- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/bbstool.scm b/src/bbstool.scm index 083dd8c..cd2e850 100644 --- a/src/bbstool.scm +++ b/src/bbstool.scm @@ -169,17 +169,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. (print "Current month: " (month->string (*current-month*))) (newline) (if mr - (let () - (print-member-table mr) - (let* ((fees (member-fees-total mr)) - (credit (member-credit-total mr)) - (payments (member-payments-total mr)) - (balance (- (+ credit payments) fees))) - (print "Total fees: " fees) - (print "Total credit: " credit) - (print "Total payments: " payments) - (print "Balance: " balance) - )) + (print-member-table mr) (print-members-base-table MB)) (newline)) ((print-stats) diff --git a/src/members-print.scm b/src/members-print.scm index 119aa05..5fab5af 100644 --- a/src/members-print.scm +++ b/src/members-print.scm @@ -147,7 +147,17 @@ (member-calendar->table mr)) ) #:row0-border #t - #:col-border #t))) + #:col-border #t)) + (let* ((balance (member-balance mr)) + (fees (dict-ref balance 'fees)) + (credit (dict-ref balance 'credit)) + (payment (dict-ref balance 'payment)) + (total (- (+ credit payment) fees))) + (print "Total fees: " fees) + (print "Total credit: " credit) + (print "Total payments: " payment) + (print "Balance: " total) + )) ;; Nicely prints the member source with any errors recorded. (define (print-member-source mr)