From b9030db455a0e3c364e0c055cbd185384dee21c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?= Date: Mon, 18 Dec 2023 23:02:35 +0100 Subject: [PATCH] Formatting of new fee period amounts. --- src/members-print.scm | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/src/members-print.scm b/src/members-print.scm index adf90c4..cc16605 100644 --- a/src/members-print.scm +++ b/src/members-print.scm @@ -114,7 +114,7 @@ (caddr c))) (brmember-credit mr)) #:border '(((#:right light) ... none) ...)))) - ((suspend student member council chair revision grant fee) + ((suspend student member council chair revision grant) (let* ((pdata (cons (list "Since" "Until") (map (lambda (p) @@ -132,6 +132,27 @@ ;;(print pdata) ;;(write ptbl)(newline) (list k ptbl))) + ((fee) + (let* ((pdata + (cons + (list "Amount" "Since" "Until") + (map + (lambda (p) + (list + (format "\t~A" (car (cal-period-scomment p))) + (string-append (cal-day/month->string + (cal-period-since p)) " " + (or (cadr (cal-period-scomment p)) "")) + (string-append (cal-day/month->string + (cal-period-before p)) " " + (or (cal-period-bcomment p) "")))) + v))) + (ptbl (table->string + pdata + #:border '(((#:right light) ... none) ...)))) + ;;(print pdata) + ;;(write ptbl)(newline) + (list k ptbl))) (else (if v (list k v)