From cbd5e89f6e70191fff6d49873285a01a7cb32c2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?=
 <dominik.pantucek@trustica.cz>
Date: Thu, 30 Mar 2023 22:02:33 +0200
Subject: [PATCH] Improve fees table display.

---
 members-print.scm | 59 +++++++++++++++++++++++++++++++++++------------
 1 file changed, 44 insertions(+), 15 deletions(-)

diff --git a/members-print.scm b/members-print.scm
index 7fe5bde..5c0a6dc 100644
--- a/members-print.scm
+++ b/members-print.scm
@@ -326,20 +326,49 @@
    (print
     (table->string
      (cons
-      (list "Member" "Fees" "Credit" "Payments" "Balance")
-      (map
-       (lambda (mr)
-	 (let* ((balance (member-balance mr))
-		(fees (dict-ref balance 'fees))
-		(credit (dict-ref balance 'credit))
-		(payment (dict-ref balance 'payment)))
-	   (list (member-nick mr)
-		 (sprintf "\t~A" fees)
-		 (sprintf "\t~A" credit)
-		 (sprintf "\t~A" payment)
-		 (sprintf "\t~A" (- (+ credit payment) fees))
-		 )))
-       (sort (filter-members-by-predicate MB member-active?) member<?)))
-     #:col-border #t #:row0-border #t)))
+      (list (ansi-string #:bgblue #:brightyellow #:bold "Member")
+	    (ansi-string #:bgblue #:brightyellow #:bold "Fees")
+	    (ansi-string #:bgblue #:brightyellow #:bold "Credit")
+	    (ansi-string #:bgblue #:brightyellow #:bold "Payments")
+	    (ansi-string #:bgblue #:brightyellow #:bold "Balance"))
+      (append
+       (map
+	(lambda (mr)
+	  (let* ((balance (member-balance mr))
+		 (fees (dict-ref balance 'fees))
+		 (credit (dict-ref balance 'credit))
+		 (payment (dict-ref balance 'payment))
+		 (total (- (+ credit payment) fees)))
+	    (list (member-nick mr)
+		  (sprintf "\t~A" fees)
+		  (sprintf "\t~A" credit)
+		  (sprintf "\t~A" payment)
+		  (sprintf "\t~A~A~A"
+			   (if (< total -500)
+			       a:error
+			       (if (< total 0)
+				   a:warning
+				   a:success))
+			   (exact->inexact total)
+			   a:default)
+		  )))
+	(sort (filter-members-by-predicate MB member-active?) member<?))
+       (let* ((balances (map member-balance MB))
+	      (fees (foldl + 0 (map (lambda (b) (dict-ref b 'fees)) balances)))
+	      (credit (foldl + 0 (map (lambda (b) (dict-ref b 'credit)) balances)))
+	      (payment (foldl + 0 (map (lambda (b) (dict-ref b 'payment)) balances)))
+	      (total (- (+ credit payment) fees)))
+	 (list (list (ansi-string #:bold "Total")
+		     (ansi-string "\t" #:bold (sprintf "~A" fees))
+		     (ansi-string "\t" #:bold (sprintf "~A" credit))
+		     (ansi-string "\t" #:bold (sprintf "~A" payment))
+		     (ansi-string "\t" #:bold
+				  (sprintf "~A~A"
+					   (if (< total 0)
+					       a:error
+					       a:success)
+					   total))
+		     )))))
+     #:col-border #t #:row0-border #t #:ansi #t)))
 
  )