Members comparator.

This commit is contained in:
Dominik Pantůček 2023-04-11 22:39:00 +02:00
parent 12a911bbff
commit b0e5411c5e
2 changed files with 10 additions and 10 deletions

View file

@ -61,7 +61,7 @@
brmember-id brmember-id
brmember-suspended-months brmember-suspended-months
member<? brmember<?
member-record-add-payment member-record-add-payment
member-payments member-payments
@ -320,7 +320,7 @@
0)) 0))
;; Comparator of member records based on nickname. ;; Comparator of member records based on nickname.
(define (member<? a b) (define (brmember<? a b)
(string-ci<? (brmember-nick a) (string-ci<? (brmember-nick a)
(brmember-nick b))) (brmember-nick b)))

View file

@ -219,13 +219,13 @@
(destroyed-mrs (ldict-ref bi 'destroyed)) (destroyed-mrs (ldict-ref bi 'destroyed))
(student-mrs (ldict-ref bi 'students))) (student-mrs (ldict-ref bi 'students)))
(print a:success " Active (" (length active-mrs) "): " a:default (print a:success " Active (" (length active-mrs) "): " a:default
(member-records->string (sort active-mrs member<?) "~N~E")) (member-records->string (sort active-mrs brmember<?) "~N~E"))
(print a:warning " Suspended (" (length suspended-mrs) "): " a:default (print a:warning " Suspended (" (length suspended-mrs) "): " a:default
(member-records->string (sort suspended-mrs member<?) "~N~E")) (member-records->string (sort suspended-mrs brmember<?) "~N~E"))
(print a:warning " Destroyed (" (length destroyed-mrs) "): " a:default (print a:warning " Destroyed (" (length destroyed-mrs) "): " a:default
(member-records->string (sort destroyed-mrs member<?) "~N~E")) (member-records->string (sort destroyed-mrs brmember<?) "~N~E"))
(print a:highlight " Students (" (length student-mrs) "): " a:default (print a:highlight " Students (" (length student-mrs) "): " a:default
(member-records->string (sort student-mrs member<?))) (member-records->string (sort student-mrs brmember<?)))
(let ((suspended2 (filter (let ((suspended2 (filter
(lambda (mr) (lambda (mr)
(>= (brmember-suspended-months mr) 24)) (>= (brmember-suspended-months mr) 24))
@ -233,10 +233,10 @@
(when (not (null? suspended2)) (when (not (null? suspended2))
(print (ansi #:magenta) " Suspended for at least 24 months (" (print (ansi #:magenta) " Suspended for at least 24 months ("
(length suspended2) "): " a:default (length suspended2) "): " a:default
(member-records->string (sort suspended2 member<?) "~N (~S)")))) (member-records->string (sort suspended2 brmember<?) "~N (~S)"))))
(when (not (null? invalid-mrs)) (when (not (null? invalid-mrs))
(print a:error " Invalid Id (" (length invalid-mrs) "): " (print a:error " Invalid Id (" (length invalid-mrs) "): "
(member-records->string (sort invalid-mrs member<?) "~N (~I)") (member-records->string (sort invalid-mrs brmember<?) "~N (~I)")
a:default))))) a:default)))))
;; Helper function for pretty-formatting the filtered members lists ;; Helper function for pretty-formatting the filtered members lists
@ -246,7 +246,7 @@
(length mrs) (length mrs)
(ansi-paragraph-format (ansi-paragraph-format
(member-records->string (member-records->string
(sort mrs member<?) (sort mrs brmember<?)
fmt) fmt)
60))) 60)))
@ -370,7 +370,7 @@
(filter (lambda (mr) (filter (lambda (mr)
(not (brmember-destroyed? mr))) (not (brmember-destroyed? mr)))
(members-base-members MB))) (members-base-members MB)))
member<?))) brmember<?)))
(balances (map (lambda (m) (balances (map (lambda (m)
(list-ref m 6)) (list-ref m 6))
members))) members)))