Major cleanup of printing members base table.
This commit is contained in:
parent
9f4b5cba1b
commit
1c81b0b3de
1 changed files with 16 additions and 10 deletions
|
@ -258,11 +258,7 @@
|
||||||
(invalid-mrs (find-members-by-predicate
|
(invalid-mrs (find-members-by-predicate
|
||||||
mb
|
mb
|
||||||
(compose not is-4digit-prime? brmember-id)))
|
(compose not is-4digit-prime? brmember-id)))
|
||||||
(active-mrs (find-members-by-predicate mb brmember-active?))
|
|
||||||
(suspended-mrs (find-members-by-predicate mb brmember-suspended?))
|
(suspended-mrs (find-members-by-predicate mb brmember-suspended?))
|
||||||
(destroyed-mrs (find-members-by-predicate mb brmember-destroyed?))
|
|
||||||
(student-mrs (find-members-by-predicate mb brmember-student?))
|
|
||||||
(problem-mrs (find-members-by-predicate mb brmember-has-problems?))
|
|
||||||
(debtor-mrs (sort
|
(debtor-mrs (sort
|
||||||
(members-to-notify mb 3)
|
(members-to-notify mb 3)
|
||||||
brmember<?))
|
brmember<?))
|
||||||
|
@ -294,10 +290,19 @@
|
||||||
(ansi-string #:yellow "Grant:")
|
(ansi-string #:yellow "Grant:")
|
||||||
brmember-grant?
|
brmember-grant?
|
||||||
"~N")
|
"~N")
|
||||||
(members-table-row a:success "Active:" active-mrs "~N~E")
|
(members-pred-table-row mb
|
||||||
(members-table-row a:highlight "Students:" student-mrs "~N~E")
|
(string-append a:success "Active:")
|
||||||
|
brmember-active?
|
||||||
|
"~N~E")
|
||||||
|
(members-pred-table-row mb
|
||||||
|
(string-append a:highlight "Students:")
|
||||||
|
brmember-student?
|
||||||
|
"~N~E")
|
||||||
(members-table-row a:warning "Suspended:" suspended-mrs "~N~E (~S)")
|
(members-table-row a:warning "Suspended:" suspended-mrs "~N~E (~S)")
|
||||||
(members-table-row a:warning "Destroyed:" destroyed-mrs "~N~E")
|
(members-pred-table-row mb
|
||||||
|
(string-append a:warning "Destroyed:")
|
||||||
|
brmember-destroyed?
|
||||||
|
"~N~E")
|
||||||
(let ((suspended2 (filter
|
(let ((suspended2 (filter
|
||||||
(lambda (mr)
|
(lambda (mr)
|
||||||
(>= (brmember-suspended-months mr)
|
(>= (brmember-suspended-months mr)
|
||||||
|
@ -310,9 +315,10 @@
|
||||||
#f
|
#f
|
||||||
(members-table-row (ansi #:magenta #:bold) "Expire Soon:"
|
(members-table-row (ansi #:magenta #:bold) "Expire Soon:"
|
||||||
soon-expire-mrs "~N (~S)"))
|
soon-expire-mrs "~N (~S)"))
|
||||||
(if (null? problem-mrs)
|
(members-pred-table-row mb
|
||||||
#f
|
(ansi-string #:red #:bold "Prolems:")
|
||||||
(members-table-row (ansi #:red #:bold) "Problems:" problem-mrs "~N~E ~A"))
|
brmember-has-problems?
|
||||||
|
"~N~E ~A")
|
||||||
(if (null? debtor-mrs)
|
(if (null? debtor-mrs)
|
||||||
#f
|
#f
|
||||||
(list (ansi-string "\t" #:magenta #:bold "Debtors:")
|
(list (ansi-string "\t" #:magenta #:bold "Debtors:")
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue