From 9b1652c9b5b6e46b8f8aefd4c21bf0341443f0a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?= Date: Wed, 29 Mar 2023 14:38:26 +0200 Subject: [PATCH] Move the fees table to members-fees. --- bbstool.scm | 14 +------------- member-fees.scm | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/bbstool.scm b/bbstool.scm index 3c71e80..e30b4e4 100644 --- a/bbstool.scm +++ b/bbstool.scm @@ -27,7 +27,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. (import testing (chicken format) - (chicken sort) listing dictionary month @@ -186,17 +185,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. (loop (cdr mb))))) ((fees) (newline) - (print - (table->string - (cons - (list "Member" "Fees" "Credit") - (map - (lambda (mr) - (list (member-nick mr) - (sprintf "\t~A" (member-fees-total mr)) - (sprintf "\t~A" (member-credit-total mr)) - )) - (sort (filter-members-by-predicate MB member-active?) memberfees member-fees-total member-credit-total + print-members-fees-table ) (import scheme (chicken base) + (chicken format) + (chicken sort) configuration member-record month - ansi) + ansi + table + members-base) ;; Returns a list of months where each month is a list containing: ;; * month (from month module) @@ -145,4 +150,19 @@ (amounts (map car credit))) (foldl + 0 amounts))) + ;; Prints summary table of all fees and credits for all members + (define (print-members-fees-table MB) + (print + (table->string + (cons + (list "Member" "Fees" "Credit") + (map + (lambda (mr) + (list (member-nick mr) + (sprintf "\t~A" (member-fees-total mr)) + (sprintf "\t~A" (member-credit-total mr)) + )) + (sort (filter-members-by-predicate MB member-active?) member