From ac1ae9b6984a99843ff7f97245900c40418403fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?= Date: Thu, 11 May 2023 14:39:17 +0200 Subject: [PATCH] Use new cal-format for days and months. --- src/Makefile | 7 ++++--- src/members-print.scm | 10 ++++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/Makefile b/src/Makefile index 409a03a..aad54f1 100644 --- a/src/Makefile +++ b/src/Makefile @@ -179,12 +179,13 @@ brmember-parser.o: brmember-parser.import.scm brmember-parser.import.scm: $(BRMEMBER-PARSER-SOURCES) MEMBERS-PRINT-SOURCES=members-print.scm util-dict-list.import.scm \ - brmember.import.scm cal-month.import.scm table.import.scm \ - listing.import.scm ansi.import.scm cal-period.import.scm \ + brmember.import.scm cal-month.import.scm table.import.scm \ + listing.import.scm ansi.import.scm cal-period.import.scm \ primes.import.scm mbase.import.scm configuration.import.scm \ bank-account.import.scm members-fees.import.scm \ members-payments.import.scm util-list.import.scm \ - brmember-format.import.scm specification.import.scm + brmember-format.import.scm specification.import.scm \ + cal-format.import.scm members-print.o: members-print.import.scm members-print.import.scm: $(MEMBERS-PRINT-SOURCES) diff --git a/src/members-print.scm b/src/members-print.scm index e9124b1..0c94c21 100644 --- a/src/members-print.scm +++ b/src/members-print.scm @@ -60,7 +60,8 @@ members-fees members-payments brmember-format - specification) + specification + cal-format) ;; Returns nicely formatted table (define (member-info->table mr) @@ -97,7 +98,12 @@ #:col-border #t))) ((credit) (list k - (table->string v + (table->string + (map (lambda (c) + (list (car c) + (cal-format (cadr c)) + (caddr c))) + v) #:col-border #t))) ((suspend student member) (list k