From 1c81b0b3dedf2e100b37da78b0a6e52d1688605f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?=
 <dominik.pantucek@trustica.cz>
Date: Mon, 22 May 2023 19:56:54 +0200
Subject: [PATCH] Major cleanup of printing members base table.

---
 src/members-print.scm | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/members-print.scm b/src/members-print.scm
index 975fc1a..be63453 100644
--- a/src/members-print.scm
+++ b/src/members-print.scm
@@ -258,11 +258,7 @@
 	  (invalid-mrs (find-members-by-predicate
 			mb
 			(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?))
-	  (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
 		       (members-to-notify mb 3)
 		       brmember<?))
@@ -294,10 +290,19 @@
 				      (ansi-string #:yellow "Grant:")
 				      brmember-grant?
 				      "~N")
-	      (members-table-row a:success "Active:" active-mrs "~N~E")
-	      (members-table-row a:highlight "Students:" student-mrs "~N~E")
+	      (members-pred-table-row mb
+				      (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 "Destroyed:" destroyed-mrs "~N~E")
+	      (members-pred-table-row mb
+				      (string-append a:warning "Destroyed:")
+				      brmember-destroyed?
+				      "~N~E")
 	      (let ((suspended2 (filter
 				 (lambda (mr)
 				   (>= (brmember-suspended-months mr)
@@ -310,9 +315,10 @@
 		  #f
 		  (members-table-row (ansi #:magenta #:bold) "Expire Soon:"
 				     soon-expire-mrs "~N (~S)"))
-	      (if (null? problem-mrs)
-		  #f
-		  (members-table-row (ansi #:red #:bold) "Problems:" problem-mrs "~N~E ~A"))
+	      (members-pred-table-row mb
+				      (ansi-string #:red #:bold "Prolems:")
+				      brmember-has-problems?
+				      "~N~E ~A")
 	      (if (null? debtor-mrs)
 		  #f
 		  (list (ansi-string "\t" #:magenta #:bold "Debtors:")