From 82a4742914de202f31cff010f7da7e51e2362cdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?= Date: Sun, 21 May 2023 20:22:15 +0200 Subject: [PATCH] Support cal-day in joined/destroyed. --- src/brmember-parser.scm | 2 +- src/members-fees.scm | 3 ++- src/members-print.scm | 7 ++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/brmember-parser.scm b/src/brmember-parser.scm index 571b2b1..2929cd4 100644 --- a/src/brmember-parser.scm +++ b/src/brmember-parser.scm @@ -96,7 +96,7 @@ (kind (cadr mk))) (foldl (lambda (mr value) (let* ((mspec (string-first+rest (car value))) - (month (string->cal-month (car mspec))) + (month (parse-cal-day/month (car mspec))) (comment (cdr mspec))) (if month (brmember-sub-prepend diff --git a/src/members-fees.scm b/src/members-fees.scm index ccb94c9..e631346 100644 --- a/src/members-fees.scm +++ b/src/members-fees.scm @@ -74,7 +74,8 @@ (let ((last-month (if (null? args) (*current-month*) (car args))) - (first-month (cal-period-since (car (brmember-info mr 'member))))) + (first-month (cal-ensure-month + (cal-period-since (car (brmember-info mr 'member)))))) (let loop ((cm first-month) (cal '())) (if (cal-month>? cm last-month) diff --git a/src/members-print.scm b/src/members-print.scm index 2eace55..e8d6493 100644 --- a/src/members-print.scm +++ b/src/members-print.scm @@ -63,7 +63,8 @@ brmember-format specification cal-format - util-git) + util-git + cal-day) ;; Returns nicely formatted table (define (member-info->table mr) @@ -114,10 +115,10 @@ (map (lambda (p) (list - (string-append (cal-month->string + (string-append (cal-day/month->string (cal-period-since p)) " " (or (cal-period-scomment p) "")) - (string-append (cal-month->string + (string-append (cal-day/month->string (cal-period-before p)) " " (or (cal-period-bcomment p) "")))) v))