brmlab/hackerbase
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Finish splitting out member-format.

Browse source
This commit is contained in:
Dominik Pantůček 2023-04-11 13:28:07 +02:00
parent 9f98bcb17d
commit 30664d10f8
3 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Makefile
View file

@ -186,7 +186,7 @@ MEMBERS-PRINT-SOURCES=members-print.scm util-dict-list.import.scm \
primes.import.scm members-base.import.scm \ primes.import.scm members-base.import.scm \
configuration.import.scm bank-account.import.scm \ configuration.import.scm bank-account.import.scm \
member-fees.import.scm members-payments.import.scm \ member-fees.import.scm members-payments.import.scm \
util-list.import.scm util-list.import.scm brmember-format.import.scm
members-print.o: members-print.import.scm members-print.o: members-print.import.scm
members-print.import.scm: $(MEMBERS-PRINT-SOURCES) members-print.import.scm: $(MEMBERS-PRINT-SOURCES)
@ -318,7 +318,8 @@ util-mail.import.scm: $(UTIL-MAIL-SOURCES)
REMINDERS-SOURCES=reminders.scm member-record.import.scm \ REMINDERS-SOURCES=reminders.scm member-record.import.scm \
util-mail.import.scm util-dict-list.import.scm \ util-mail.import.scm util-dict-list.import.scm \
members-payments.import.scm util-format.import.scm members-payments.import.scm util-format.import.scm \
brmember-format.import.scm
reminders.o: reminders.import.scm reminders.o: reminders.import.scm
reminders.import.scm: $(REMINDERS-SOURCES) reminders.import.scm: $(REMINDERS-SOURCES)

7
src/members-print.scm
View file

@ -59,7 +59,8 @@
configuration configuration
bank-account bank-account
member-fees member-fees
members-payments) members-payments
brmember-format)
;; Prints human-readable information ;; Prints human-readable information
(define (print-member-info mr) (define (print-member-info mr)
@ -201,7 +202,7 @@
(cadr args)))) (cadr args))))
(string-intersperse (string-intersperse
(map (lambda (mr) (map (lambda (mr)
(member-format fmt mr)) (brmember-format fmt mr))
mrs) mrs)
sep))) sep)))
@ -329,7 +330,7 @@
(string-intersperse (string-intersperse
(map (lambda (id) (map (lambda (id)
(let ((mr (find-member-by-id MB id))) (let ((mr (find-member-by-id MB id)))
(member-format (brmember-format
"~I - ~N" "~I - ~N"
mr))) mr)))
iids) iids)

5
src/reminders.scm
View file

@ -39,13 +39,14 @@
util-mail util-mail
util-dict-list util-dict-list
members-payments members-payments
util-format) util-format
brmember-format)
;; Creates reminder email body ;; Creates reminder email body
(define (reminder-email-body mr) (define (reminder-email-body mr)
(let ((C identity) (let ((C identity)
(M (lambda (s) (M (lambda (s)
(member-format s mr))) (brmember-format s mr)))
(F format) (F format)
(absdebt (format-amount (- (member-total-balance mr)))) (absdebt (format-amount (- (member-total-balance mr))))
(macc "2500079551/2010")) (macc "2500079551/2010"))