Fix most members base filters.

This commit is contained in:
Dominik Pantůček 2023-04-04 22:57:14 +02:00
parent f2874ebe5d
commit 08a2eb2251
3 changed files with 18 additions and 16 deletions

View file

@ -207,10 +207,12 @@
;; Returns new members base with member records matching the
;; predicate processed by proc.
(define (members-base-update mb pred? proc)
(dict-set mb
'members
(map (lambda (mr)
(if (pred? mr)
(proc mr)
mr))
mb))
(members-base-members mb))))
)

View file

@ -128,11 +128,11 @@
(let* ((acc-list (load-accounts-list apikeys-file))
(accounts (if acc-list (load-accounts acc-list dir) #f)))
(if accounts
(map member-sort-payments
(foldl members-payments-process-bank
(let ((mbp (foldl members-payments-process-bank
mb
(filter identity
accounts)))
accounts))))
(members-base-update mb identity member-sort-payments))
(let ()
(print "Warning: no accounts loaded!")
mb)))

View file

@ -222,10 +222,10 @@
(member-records->string (sort destroyed-mrs member<?) "~N~E"))
(print a:highlight " Students (" (length student-mrs) "): " a:default
(member-records->string (sort student-mrs member<?)))
(let ((suspended2 (filter-members-by-predicate
suspended-mrs
(let ((suspended2 (filter
(lambda (mr)
(>= (member-suspended-months mr) 24)))))
(>= (member-suspended-months mr) 24))
suspended-mrs)))
(when (not (null? suspended2))
(print (ansi #:magenta) " Suspended for at least 24 months ("
(length suspended2) "): " a:default
@ -266,11 +266,11 @@
(members-table-row a:highlight "Students:" student-mrs "~N~E")
(members-table-row a:warning "Suspended:" suspended-mrs "~N~E")
(members-table-row a:warning "Destroyed:" destroyed-mrs "~N~E")
(let ((suspended2 (filter-members-by-predicate
suspended-mrs
(let ((suspended2 (filter
(lambda (mr)
(>= (member-suspended-months mr)
(*member-suspend-max-months*))))))
(*member-suspend-max-months*)))
suspended-mrs)))
(if (null? suspended2)
#f
(members-table-row (ansi #:magenta) "Suspended (long):" suspended2 "~N (~S)")))